Skip to content

Commit 919a613

Browse files
tritaotritao
committed
Add UsingDecl AST node.
Closes #1758.
1 parent 99a5ed3 commit 919a613

22 files changed

+3731
-1116
lines changed

‎src/AST/Class.cs

+13
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ public override T Visit<T>(IDeclVisitor<T> visitor)
3232
}
3333
}
3434

35+
// A C++ using declaration.
36+
public class Using: Declaration
37+
{
38+
public DeclarationName DeclarationName { get; set; }
39+
40+
public override T Visit<T>(IDeclVisitor<T> visitor)
41+
{
42+
throw new NotImplementedException();
43+
}
44+
}
45+
3546
// Represents a base class of a C++ class.
3647
public class BaseClassSpecifier : DeclarationBase
3748
{
@@ -79,6 +90,7 @@ public class Class : DeclarationContext
7990
public List<Property> Properties;
8091
public List<Method> Methods;
8192
public List<AccessSpecifierDecl> Specifiers;
93+
public List<Using> Usings;
8294

8395
// True if the record is a POD (Plain Old Data) type.
8496
public bool IsPOD;
@@ -136,6 +148,7 @@ public Class()
136148
Properties = new List<Property>();
137149
Methods = new List<Method>();
138150
Specifiers = new List<AccessSpecifierDecl>();
151+
Usings = new List<Using>();
139152
IsAbstract = false;
140153
IsUnion = false;
141154
IsFinal = false;

‎src/CppParser/AST.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,7 @@ DEF_VECTOR(Class, BaseClassSpecifier*, Bases)
755755
DEF_VECTOR(Class, Field*, Fields)
756756
DEF_VECTOR(Class, Method*, Methods)
757757
DEF_VECTOR(Class, AccessSpecifierDecl*, Specifiers)
758+
DEF_VECTOR(Class, Using*, Usings)
758759

759760
Template::Template() : Declaration(DeclarationKind::Template),
760761
TemplatedDecl(0) {}
@@ -871,6 +872,10 @@ UnresolvedUsingTypename::UnresolvedUsingTypename() : Declaration(DeclarationKind
871872

872873
UnresolvedUsingTypename::~UnresolvedUsingTypename() {}
873874

875+
Using::Using() : Declaration(DeclarationKind::Using) {}
876+
877+
Using::~Using() {}
878+
874879
Namespace::Namespace()
875880
: DeclarationContext(DeclarationKind::Namespace)
876881
, isInline(false)

‎src/CppParser/Bindings/CLI/Decl.cpp

+180
Original file line numberDiff line numberDiff line change
@@ -2637,6 +2637,137 @@ CppSharp::Parser::AST::AccessSpecifierDecl::AccessSpecifierDecl(CppSharp::Parser
26372637
NativePtr = new class ::CppSharp::CppParser::AST::AccessSpecifierDecl(__arg0);
26382638
}
26392639

2640+
CppSharp::Parser::AST::DeclarationName::DeclarationName(class ::CppSharp::CppParser::AST::DeclarationName* native)
2641+
: __ownsNativeInstance(false)
2642+
{
2643+
NativePtr = native;
2644+
}
2645+
2646+
CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::DeclarationName::__CreateInstance(::System::IntPtr native)
2647+
{
2648+
return gcnew ::CppSharp::Parser::AST::DeclarationName((class ::CppSharp::CppParser::AST::DeclarationName*) native.ToPointer());
2649+
}
2650+
2651+
CppSharp::Parser::AST::DeclarationName::DeclarationName(class ::CppSharp::CppParser::AST::DeclarationName* native, bool ownNativeInstance)
2652+
: __ownsNativeInstance(ownNativeInstance)
2653+
{
2654+
NativePtr = native;
2655+
}
2656+
2657+
CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::DeclarationName::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
2658+
{
2659+
return gcnew ::CppSharp::Parser::AST::DeclarationName((class ::CppSharp::CppParser::AST::DeclarationName*) native.ToPointer(), __ownsNativeInstance);
2660+
}
2661+
2662+
CppSharp::Parser::AST::DeclarationName::~DeclarationName()
2663+
{
2664+
delete NativePtr;
2665+
}
2666+
2667+
CppSharp::Parser::AST::DeclarationName::DeclarationName(CppSharp::Parser::AST::DeclarationName^ _0)
2668+
{
2669+
__ownsNativeInstance = true;
2670+
if (ReferenceEquals(_0, nullptr))
2671+
throw gcnew ::System::ArgumentNullException("_0", "Cannot be null because it is a C++ reference (&).");
2672+
auto &__arg0 = *(class ::CppSharp::CppParser::AST::DeclarationName*)_0->NativePtr;
2673+
NativePtr = new class ::CppSharp::CppParser::AST::DeclarationName(__arg0);
2674+
}
2675+
2676+
CppSharp::Parser::AST::DeclarationName::DeclarationName()
2677+
{
2678+
__ownsNativeInstance = true;
2679+
NativePtr = new class ::CppSharp::CppParser::AST::DeclarationName();
2680+
}
2681+
2682+
::System::IntPtr CppSharp::Parser::AST::DeclarationName::__Instance::get()
2683+
{
2684+
return ::System::IntPtr(NativePtr);
2685+
}
2686+
2687+
void CppSharp::Parser::AST::DeclarationName::__Instance::set(::System::IntPtr object)
2688+
{
2689+
NativePtr = (class ::CppSharp::CppParser::AST::DeclarationName*)object.ToPointer();
2690+
}
2691+
2692+
CppSharp::Parser::AST::DeclarationNameKind CppSharp::Parser::AST::DeclarationName::Kind::get()
2693+
{
2694+
return (CppSharp::Parser::AST::DeclarationNameKind)NativePtr->kind;
2695+
}
2696+
2697+
void CppSharp::Parser::AST::DeclarationName::Kind::set(CppSharp::Parser::AST::DeclarationNameKind value)
2698+
{
2699+
((class ::CppSharp::CppParser::AST::DeclarationName*)NativePtr)->kind = (enum ::CppSharp::CppParser::AST::DeclarationNameKind)value;
2700+
}
2701+
2702+
::System::String^ CppSharp::Parser::AST::DeclarationName::Identifier::get()
2703+
{
2704+
return clix::marshalString<clix::E_UTF8>(NativePtr->identifier);
2705+
}
2706+
2707+
void CppSharp::Parser::AST::DeclarationName::Identifier::set(::System::String^ value)
2708+
{
2709+
((class ::CppSharp::CppParser::AST::DeclarationName*)NativePtr)->identifier = clix::marshalString<clix::E_UTF8>(value);
2710+
}
2711+
2712+
CppSharp::Parser::AST::Using::Using(class ::CppSharp::CppParser::AST::Using* native)
2713+
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
2714+
{
2715+
}
2716+
2717+
CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Using::__CreateInstance(::System::IntPtr native)
2718+
{
2719+
return gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*) native.ToPointer());
2720+
}
2721+
2722+
CppSharp::Parser::AST::Using::Using(class ::CppSharp::CppParser::AST::Using* native, bool ownNativeInstance)
2723+
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native, ownNativeInstance)
2724+
{
2725+
}
2726+
2727+
CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Using::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
2728+
{
2729+
return gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*) native.ToPointer(), __ownsNativeInstance);
2730+
}
2731+
2732+
CppSharp::Parser::AST::Using::~Using()
2733+
{
2734+
if (NativePtr)
2735+
{
2736+
auto __nativePtr = NativePtr;
2737+
NativePtr = 0;
2738+
delete (class ::CppSharp::CppParser::AST::Using*) __nativePtr;
2739+
}
2740+
}
2741+
2742+
CppSharp::Parser::AST::Using::Using()
2743+
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
2744+
{
2745+
__ownsNativeInstance = true;
2746+
NativePtr = new class ::CppSharp::CppParser::AST::Using();
2747+
}
2748+
2749+
CppSharp::Parser::AST::Using::Using(CppSharp::Parser::AST::Using^ _0)
2750+
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)nullptr)
2751+
{
2752+
__ownsNativeInstance = true;
2753+
if (ReferenceEquals(_0, nullptr))
2754+
throw gcnew ::System::ArgumentNullException("_0", "Cannot be null because it is a C++ reference (&).");
2755+
auto &__arg0 = *(class ::CppSharp::CppParser::AST::Using*)_0->NativePtr;
2756+
NativePtr = new class ::CppSharp::CppParser::AST::Using(__arg0);
2757+
}
2758+
2759+
CppSharp::Parser::AST::DeclarationName^ CppSharp::Parser::AST::Using::Name::get()
2760+
{
2761+
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);
2762+
}
2763+
2764+
void CppSharp::Parser::AST::Using::Name::set(CppSharp::Parser::AST::DeclarationName^ value)
2765+
{
2766+
if (ReferenceEquals(value, nullptr))
2767+
throw gcnew ::System::ArgumentNullException("value", "Cannot be null because it is passed by value.");
2768+
((class ::CppSharp::CppParser::AST::Using*)NativePtr)->name = *(class ::CppSharp::CppParser::AST::DeclarationName*)value->NativePtr;
2769+
}
2770+
26402771
CppSharp::Parser::AST::VTableComponent::VTableComponent(struct ::CppSharp::CppParser::AST::VTableComponent* native)
26412772
: __ownsNativeInstance(false)
26422773
{
@@ -3490,6 +3621,26 @@ void CppSharp::Parser::AST::Class::ClearSpecifiers()
34903621
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->clearSpecifiers();
34913622
}
34923623

3624+
CppSharp::Parser::AST::Using^ CppSharp::Parser::AST::Class::GetUsings(unsigned int i)
3625+
{
3626+
auto ___ret = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->getUsings(i);
3627+
if (___ret == nullptr) return nullptr;
3628+
return (___ret == nullptr) ? nullptr : gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*)___ret);
3629+
}
3630+
3631+
void CppSharp::Parser::AST::Class::AddUsings(CppSharp::Parser::AST::Using^ s)
3632+
{
3633+
if (ReferenceEquals(s, nullptr))
3634+
throw gcnew ::System::ArgumentNullException("s", "Cannot be null because it is a C++ reference (&).");
3635+
auto __arg0 = (class ::CppSharp::CppParser::AST::Using*)s->NativePtr;
3636+
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->addUsings(__arg0);
3637+
}
3638+
3639+
void CppSharp::Parser::AST::Class::ClearUsings()
3640+
{
3641+
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->clearUsings();
3642+
}
3643+
34933644
CppSharp::Parser::AST::Class::Class(CppSharp::Parser::AST::Class^ _0)
34943645
: CppSharp::Parser::AST::DeclarationContext((::CppSharp::CppParser::AST::DeclarationContext*)nullptr)
34953646
{
@@ -3592,6 +3743,29 @@ void CppSharp::Parser::AST::Class::Specifiers::set(::System::Collections::Generi
35923743
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Specifiers = _tmpvalue;
35933744
}
35943745

3746+
::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>^ CppSharp::Parser::AST::Class::Usings::get()
3747+
{
3748+
auto _tmp__Usings = gcnew ::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>();
3749+
auto __list0 = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Usings;
3750+
for(auto _element : __list0)
3751+
{
3752+
auto _marshalElement = (_element == nullptr) ? nullptr : gcnew ::CppSharp::Parser::AST::Using((class ::CppSharp::CppParser::AST::Using*)_element);
3753+
_tmp__Usings->Add(_marshalElement);
3754+
}
3755+
return _tmp__Usings;
3756+
}
3757+
3758+
void CppSharp::Parser::AST::Class::Usings::set(::System::Collections::Generic::List<CppSharp::Parser::AST::Using^>^ value)
3759+
{
3760+
auto _tmpvalue = std::vector<::CppSharp::CppParser::AST::Using*>();
3761+
for each(CppSharp::Parser::AST::Using^ _element in value)
3762+
{
3763+
auto _marshalElement = (class ::CppSharp::CppParser::AST::Using*)_element->NativePtr;
3764+
_tmpvalue.push_back(_marshalElement);
3765+
}
3766+
((class ::CppSharp::CppParser::AST::Class*)NativePtr)->Usings = _tmpvalue;
3767+
}
3768+
35953769
bool CppSharp::Parser::AST::Class::IsPOD::get()
35963770
{
35973771
return ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->isPOD;
@@ -3736,6 +3910,12 @@ unsigned int CppSharp::Parser::AST::Class::SpecifiersCount::get()
37363910
return ___ret;
37373911
}
37383912

3913+
unsigned int CppSharp::Parser::AST::Class::UsingsCount::get()
3914+
{
3915+
auto ___ret = ((class ::CppSharp::CppParser::AST::Class*)NativePtr)->getUsingsCount();
3916+
return ___ret;
3917+
}
3918+
37393919
CppSharp::Parser::AST::Template::Template(class ::CppSharp::CppParser::AST::Template* native)
37403920
: CppSharp::Parser::AST::Declaration((::CppSharp::CppParser::AST::Declaration*)native)
37413921
{

0 commit comments

Comments
 (0)