Skip to content

Commit

Permalink
Add UsingDecl AST node.
Browse files Browse the repository at this point in the history 
Closes #1758.
  • Loading branch information
@tritao
tritao committed Sep 30, 2023
1 parent 1710202 commit 54b88a5
Show file tree
Hide file tree
Showing 23 changed files with 3,757 additions and 1,117 deletions.
13 changes: 13 additions & 0 deletions src/AST/Class.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ public override T Visit<T>(IDeclVisitor<T> visitor)
}
}

// A C++ using declaration.
public class Using: Declaration
{
public DeclarationName DeclarationName { get; set; }

public override T Visit<T>(IDeclVisitor<T> visitor)
{
throw new NotImplementedException();
}
}

// Represents a base class of a C++ class.
public class BaseClassSpecifier : DeclarationBase
{
Expand Down Expand Up @@ -79,6 +90,7 @@ public class Class : DeclarationContext
public List<Property> Properties;
public List<Method> Methods;
public List<AccessSpecifierDecl> Specifiers;
public List<Using> Usings;

// True if the record is a POD (Plain Old Data) type.
public bool IsPOD;
Expand Down Expand Up @@ -136,6 +148,7 @@ public Class()
Properties = new List<Property>();
Methods = new List<Method>();
Specifiers = new List<AccessSpecifierDecl>();
Usings = new List<Using>();
IsAbstract = false;
IsUnion = false;
IsFinal = false;
Expand Down
24 changes: 24 additions & 0 deletions src/AST/DeclarationName.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

namespace CppSharp.AST
{
public enum DeclarationNameKind
{
Identifier,
ObjCZeroArgSelector,
ObjCOneArgSelector,
CXXConstructorName,
CXXDestructorName,
CXXConversionFunctionName,
CXXOperatorName,
CXXDeductionGuideName,
CXXLiteralOperatorName,
CXXUsingDirective,
ObjCMultiArgSelector,
}

public class DeclarationName
{
public DeclarationNameKind Kind { get; set; }
public string Identifier { get; set; }
}
}
5 changes: 5 additions & 0 deletions src/CppParser/AST.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ DEF_VECTOR(Class, BaseClassSpecifier*, Bases)
DEF_VECTOR(Class, Field*, Fields)
DEF_VECTOR(Class, Method*, Methods)
DEF_VECTOR(Class, AccessSpecifierDecl*, Specifiers)
DEF_VECTOR(Class, Using*, Usings)

Template::Template() : Declaration(DeclarationKind::Template),
TemplatedDecl(0) {}
Expand Down Expand Up @@ -872,6 +873,10 @@ UnresolvedUsingTypename::UnresolvedUsingTypename() : Declaration(DeclarationKind

UnresolvedUsingTypename::~UnresolvedUsingTypename() {}

Using::Using() : Declaration(DeclarationKind::Using) {}

Using::~Using() {}

Namespace::Namespace()
: DeclarationContext(DeclarationKind::Namespace)
, isInline(false)
Expand Down
180 changes: 180 additions & 0 deletions src/CppParser/Bindings/CLI/Decl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2647,6 +2647,137 @@ CppSharp::Parser::AST::AccessSpecifierDecl::AccessSpecifierDecl(CppSharp::Parser
NativePtr = new class ::CppSharp::CppParser::AST::AccessSpecifierDecl(__arg0);
}

CppSharp::Parser::AST::DeclarationName::DeclarationName(class ::CppSharp::CppParser::AST::DeclarationName* native)
: __ownsNativeInstance(false)
{
NativePtr = native;
}

CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::DeclarationName::__CreateInstance(::System::IntPtr native)
{
return gcnew ::CppSharp::Parser::AST::DeclarationName((class ::CppSharp::CppParser::AST::DeclarationName*) native.ToPointer());
}

CppSharp::Parser::AST::DeclarationName::DeclarationName(class ::CppSharp::CppParser::AST::DeclarationName* native, bool ownNativeInstance)
: __ownsNativeInstance(ownNativeInstance)
{
NativePtr = native;
}

CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::DeclarationName::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
{
return gcnew ::CppSharp::Parser::AST::DeclarationName((class ::CppSharp::CppParser::AST::DeclarationName*) native.ToPointer(), __ownsNativeInstance);
}

CppSharp::Parser::AST::DeclarationName::~DeclarationName()
{
delete NativePtr;
}

CppSharp::Parser::AST::DeclarationName::DeclarationName(CppSharp::Parser::AST::DeclarationName^ _0)
{
__ownsNativeInstance = true;
if (ReferenceEquals(_0, nullptr))
throw gcnew ::System::ArgumentNullException("_0", "Cannot be null because it is a C++ reference (&).");
auto &__arg0 = *(class ::CppSharp::CppParser::AST::DeclarationName*)_0->NativePtr;
NativePtr = new class ::CppSharp::CppParser::AST::DeclarationName(__arg0);
}

CppSharp::Parser::AST::DeclarationName::DeclarationName()
{
__ownsNativeInstance = true;
NativePtr = new class ::CppSharp::CppParser::AST::DeclarationName();
}

::System::IntPtr CppSharp::Parser::AST::DeclarationName::__Instance::get()
{
return ::System::IntPtr(NativePtr);
}

void CppSharp::Parser::AST::DeclarationName::__Instance::set(::System::IntPtr object)
{
NativePtr = (class ::CppSharp::CppParser::AST::DeclarationName*)object.ToPointer();
}

CppSharp::Parser::AST::DeclarationNameKind CppSharp::Parser::AST::DeclarationName::Kind::get()
{
return (CppSharp::Parser::AST::DeclarationNameKind)NativePtr->kind;
}

void CppSharp::Parser::AST::DeclarationName::Kind::set(CppSharp::Parser::AST::DeclarationNameKind value)
{
((class ::CppSharp::CppParser::AST::DeclarationName*)NativePtr)->kind = (enum ::CppSharp::CppParser::AST::DeclarationNameKind)value;
}

::System::String^ CppSharp::Parser::AST::DeclarationName::Identifier::get()
{
return clix::marshalString<clix::E_UTF8>(NativePtr->identifier);
}

void CppSharp::Parser::AST::DeclarationName::Identifier::set(::System::String^ value)
{
((class ::CppSharp::CppParser::AST::DeclarationName*)NativePtr)->identifier = clix::marshalString<clix::E_UTF8>(value);
}

CppSharp::Parser::AST::Using::Using(class ::CppSharp::CppParser::AST::Using* native)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
{
}

CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Using::__CreateInstance(::System::IntPtr native)
{
return gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*) native.ToPointer());
}

CppSharp::Parser::AST::Using::Using(class ::CppSharp::CppParser::AST::Using* native, bool ownNativeInstance)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native, ownNativeInstance)
{
}

CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Using::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
{
return gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*) native.ToPointer(), __ownsNativeInstance);
}

CppSharp::Parser::AST::Using::~Using()
{
if (NativePtr)
{
auto __nativePtr = NativePtr;
NativePtr = 0;
delete (class ::CppSharp::CppParser::AST::Using*) __nativePtr;
}
}

CppSharp::Parser::AST::Using::Using()
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
{
__ownsNativeInstance = true;
NativePtr = new class ::CppSharp::CppParser::AST::Using();
}

CppSharp::Parser::AST::Using::Using(CppSharp::Parser::AST::Using^ _0)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
{
__ownsNativeInstance = true;
if (ReferenceEquals(_0, nullptr))
throw gcnew ::System::ArgumentNullException("_0", "Cannot be null because it is a C++ reference (&).");
auto &__arg0 = *(class ::CppSharp::CppParser::AST::Using*)_0->NativePtr;
NativePtr = new class ::CppSharp::CppParser::AST::Using(__arg0);
}

CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::Using::Name::get()
{
return (&((class ::CppSharp::CppParser::AST::Using*)NativePtr)->name == nullptr) ? nullptr : gcnew ::CppSharp::Parser::AST::DeclarationName((class ::CppSharp::CppParser::AST::DeclarationName*)&((class ::CppSharp::CppParser::AST::Using*)NativePtr)->name);
}

void CppSharp::Parser::AST::Using::Name::set(CppSharp::Parser::AST::DeclarationName^ value)
{
if (ReferenceEquals(value, nullptr))
throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
((class ::CppSharp::CppParser::AST::Using*)NativePtr)->name = *(class ::CppSharp::CppParser::AST::DeclarationName*)value->NativePtr;
}

CppSharp::Parser::AST::VTableComponent::VTableComponent(struct ::CppSharp::CppParser::AST::VTableComponent* native)
: __ownsNativeInstance(false)
{
Expand Down Expand Up @@ -3500,6 +3631,26 @@ void CppSharp::Parser::AST::Class::ClearSpecifiers()
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->clearSpecifiers();
}

CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Class::GetUsings(unsigned int i)
{
auto ___ret = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->getUsings(i);
if (___ret == nullptr) return nullptr;
return (___ret == nullptr) ? nullptr : gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*)___ret);
}

void CppSharp::Parser::AST::Class::AddUsings(CppSharp::Parser::AST::Using^ s)
{
if (ReferenceEquals(s, nullptr))
throw gcnew ::System::ArgumentNullException("s", "Cannot be null because it is a C++ reference (&).");
auto __arg0 = (class ::CppSharp::CppParser::AST::Using*)s->NativePtr;
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->addUsings(__arg0);
}

void CppSharp::Parser::AST::Class::ClearUsings()
{
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->clearUsings();
}

CppSharp::Parser::AST::Class::Class(CppSharp::Parser::AST::Class^ _0)
: CppSharp::Parser::AST::DeclarationContext((::CppSharp::CppParser::AST::DeclarationContext*)nullptr)
{
Expand Down Expand Up @@ -3602,6 +3753,29 @@ void CppSharp::Parser::AST::Class::Specifiers::set(::System::Collections::Generi
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Specifiers = _tmpvalue;
}

::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>^ CppSharp::Parser::AST::Class::Usings::get()
{
auto _tmp__Usings = gcnew ::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>();
auto __list0 = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Usings;
for(auto _element : __list0)
{
auto _marshalElement = (_element == nullptr) ? nullptr : gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*)_element);
_tmp__Usings->Add(_marshalElement);
}
return _tmp__Usings;
}

void CppSharp::Parser::AST::Class::Usings::set(::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>^ value)
{
auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::Using*>();
for each(CppSharp::Parser::AST::Using^ _element in value)
{
auto _marshalElement = (class ::CppSharp::CppParser::AST::Using*)_element->NativePtr;
_tmpvalue.push_back(_marshalElement);
}
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Usings = _tmpvalue;
}

bool CppSharp::Parser::AST::Class::IsPOD::get()
{
return ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->isPOD;
Expand Down Expand Up @@ -3746,6 +3920,12 @@ unsigned int CppSharp::Parser::AST::Class::SpecifiersCount::get()
return ___ret;
}

unsigned int CppSharp::Parser::AST::Class::UsingsCount::get()
{
auto ___ret = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->getUsingsCount();
return ___ret;
}

CppSharp::Parser::AST::Template::Template(class ::CppSharp::CppParser::AST::Template* native)
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
{
Expand Down
Loading

3 comments on commit 54b88a5

@deadlocklogic
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using still needs a referring entity property.
I know maybe this branch isn't fully stable yet.
Nice progress overall, I think by the end of the year I will be pretty much ready to submit my work.

@tritao
Copy link
Collaborator Author

@tritao tritao commented on 54b88a5 Oct 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we can add a new property with the fully resolved entity.

Ths branch was working on Windows but fails CI on other platforms, so I just have to see what's up once I get some more time.

Looking forward to see your work.

@deadlocklogic
Copy link
Contributor

@deadlocklogic deadlocklogic commented on 54b88a5 Oct 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we can add a new property with the fully resolved entity.

It might be a list of entities (like in the case of functions inherited from a base class).

Yes, I can't wait to see everything finished and working as planned.
I have a use case in mind after everything is ready.

Please sign in to comment.