Skip to content

Draft bootstrap decl #1918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CppSharp.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CLI/@EntryIndexedValue">CLI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MSVC/@EntryIndexedValue">MSVC</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=diag/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=undefine/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
12 changes: 5 additions & 7 deletions src/AST/ASTContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,18 @@ public Enumeration FindCompleteEnum(string name)
}

/// Finds an existing struct/class in the library modules.
public IEnumerable<Class> FindClass(string name, bool create = false,
bool ignoreCase = false)
public IEnumerable<Class> FindClass(string name, bool create = false)
{
return TranslationUnits.Select(
module => module.FindClass(name,
ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))
module => module.FindClass(name))
.Where(type => type != null);
}

/// Finds the complete declaration of a class.
public Class FindCompleteClass(string name, bool ignoreCase = false)
public Class FindCompleteClass(string name)
{
return FindClass(name, ignoreCase: ignoreCase).FirstOrDefault(
@class => [email protected]);
return FindClass(name)
.FirstOrDefault(@class => [email protected]);
}

/// Finds an existing function in the library modules.
Expand Down
10 changes: 10 additions & 0 deletions src/AST/Class.cs
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,16 @@ public Variable FindVariable(string name)
return Variables.FirstOrDefault(m => m.Name == name);
}

public Property FindProperty(string name)
{
return Properties.FirstOrDefault(m => m.Name == name);
}

public Field FindField(string name)
{
return Fields.FirstOrDefault(m => m.Name == name);
}

public override T Visit<T>(IDeclVisitor<T> visitor)
{
return visitor.VisitClassDecl(this);
Expand Down
16 changes: 16 additions & 0 deletions src/AST/Declaration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,22 @@ public static IEnumerable<Declaration> GatherNamespaces(DeclarationContext @name
return namespaces;
}

public DeclarationContext GetRootNamespace()
{
var currentNamespace = Namespace;
while (currentNamespace.Namespace != null)
currentNamespace = currentNamespace.Namespace;

return currentNamespace;
}

public void MoveToNamespace(DeclarationContext @namespace)
{
Namespace = @namespace;
OriginalNamespace?.Declarations.Remove(this);
Namespace?.Declarations.Add(this);
}

public string QualifiedName
{
get
Expand Down
36 changes: 26 additions & 10 deletions src/AST/Namespace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,33 @@ Class CreateClass(string name, bool isComplete)
};
}

public Class FindClass(string name,
StringComparison stringComparison = StringComparison.Ordinal)
public Class FindClass(string name)
{
if (string.IsNullOrEmpty(name)) return null;

var @class = Classes.FirstOrDefault(c => c.Name.Equals(name, stringComparison)) ??
Namespaces.Select(n => n.FindClass(name, stringComparison)).FirstOrDefault(c => c != null);
if (@class != null)
return @class.CompleteDeclaration == null ?
@class : (Class)@class.CompleteDeclaration;
return null;
if (string.IsNullOrEmpty(name))
return null;

var entries = name.Split(new[] { "::" }, StringSplitOptions.RemoveEmptyEntries)
.ToArray();

if (entries.Length <= 1)
{
var @class = Classes.FirstOrDefault(e => e.Name.Equals(name));

if (@class == null)
return null;

if (@class.CompleteDeclaration == null)
return @class;

return (Class)@class.CompleteDeclaration;
}

var className = entries[^1];
var namespaces = entries.Take(entries.Length - 1);

var @namespace = FindNamespace(namespaces);

return @namespace?.FindClass(className);
}

public Class FindClass(string name, bool isComplete,
Expand Down
1 change: 0 additions & 1 deletion src/CppParser/AST.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,6 @@ namespace CppSharp { namespace CppParser { namespace AST {
kind = DeclarationKind::TranslationUnit;
}

TranslationUnit::~TranslationUnit() {}
DEF_VECTOR(TranslationUnit, MacroDefinition*, Macros)

NativeLibrary::NativeLibrary()
Expand Down
Loading
Loading