Fix regressed marshalling of lists in C++/CLI

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/CppParser/Bindings/CLI/AST.cpp

@@ -9,36 +9,36 @@
 using namespace System;
 using namespace System::Runtime::InteropServices;
 
-CppSharp::Parser::SourceLocation::SourceLocation(::CppSharp::CppParser::SourceLocation* native)
+CppSharp::Parser::SourceLocation::SourceLocation(struct ::CppSharp::CppParser::SourceLocation* native)
 {
     __ID = native->ID;
 }
 
 CppSharp::Parser::SourceLocation^ CppSharp::Parser::SourceLocation::__CreateInstance(::System::IntPtr native)
 {
-    return gcnew ::CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*) native.ToPointer());
+    return gcnew ::CppSharp::Parser::SourceLocation((struct ::CppSharp::CppParser::SourceLocation*) native.ToPointer());
 }
 
-CppSharp::Parser::SourceLocation::SourceLocation(::CppSharp::CppParser::SourceLocation* native, bool ownNativeInstance)
+CppSharp::Parser::SourceLocation::SourceLocation(struct ::CppSharp::CppParser::SourceLocation* native, bool ownNativeInstance)
 {
     __ID = native->ID;
 }
 
 CppSharp::Parser::SourceLocation^ CppSharp::Parser::SourceLocation::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
 {
-    return gcnew ::CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*) native.ToPointer(), __ownsNativeInstance);
+    return gcnew ::CppSharp::Parser::SourceLocation((struct ::CppSharp::CppParser::SourceLocation*) native.ToPointer(), __ownsNativeInstance);
 }
 
 CppSharp::Parser::SourceLocation::SourceLocation(unsigned int ID)
 {
-    ::CppSharp::CppParser::SourceLocation _native(ID);
+    struct ::CppSharp::CppParser::SourceLocation _native(ID);
     this->ID = _native.ID;
 }
 
 CppSharp::Parser::SourceLocation::operator CppSharp::Parser::SourceLocation(unsigned int ID)
 {
     auto __ret = (::CppSharp::CppParser::SourceLocation) ID;
-    return ::CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*)&__ret);
+    return ::CppSharp::Parser::SourceLocation((struct ::CppSharp::CppParser::SourceLocation*)&__ret);
 }
 
 unsigned int CppSharp::Parser::SourceLocation::ID::get()
@@ -51,26 +51,26 @@ void CppSharp::Parser::SourceLocation::ID::set(unsigned int value)
     __ID = value;
 }
 
-CppSharp::Parser::SourceRange::SourceRange(::CppSharp::CppParser::SourceRange* native)
+CppSharp::Parser::SourceRange::SourceRange(struct ::CppSharp::CppParser::SourceRange* native)
     : __ownsNativeInstance(false)
 {
     NativePtr = native;
 }
 
 CppSharp::Parser::SourceRange^ CppSharp::Parser::SourceRange::__CreateInstance(::System::IntPtr native)
 {
-    return gcnew ::CppSharp::Parser::SourceRange((::CppSharp::CppParser::SourceRange*) native.ToPointer());
+    return gcnew ::CppSharp::Parser::SourceRange((struct ::CppSharp::CppParser::SourceRange*) native.ToPointer());
 }
 
-CppSharp::Parser::SourceRange::SourceRange(::CppSharp::CppParser::SourceRange* native, bool ownNativeInstance)
+CppSharp::Parser::SourceRange::SourceRange(struct ::CppSharp::CppParser::SourceRange* native, bool ownNativeInstance)
     : __ownsNativeInstance(ownNativeInstance)
 {
     NativePtr = native;
 }
 
 CppSharp::Parser::SourceRange^ CppSharp::Parser::SourceRange::__CreateInstance(::System::IntPtr native, bool __ownsNativeInstance)
 {
-    return gcnew ::CppSharp::Parser::SourceRange((::CppSharp::CppParser::SourceRange*) native.ToPointer(), __ownsNativeInstance);
+    return gcnew ::CppSharp::Parser::SourceRange((struct ::CppSharp::CppParser::SourceRange*) native.ToPointer(), __ownsNativeInstance);
 }
 
 CppSharp::Parser::SourceRange::~SourceRange()
@@ -83,47 +83,47 @@ CppSharp::Parser::SourceRange::SourceRange(CppSharp::Parser::SourceRange^ _0)
     __ownsNativeInstance = true;
     if (ReferenceEquals(_0, nullptr))
         throw gcnew ::System::ArgumentNullException("_0", "Cannot be null because it is a C++ reference (&).");
-    auto &__arg0 = *(::CppSharp::CppParser::SourceRange*)_0->NativePtr;
-    NativePtr = new ::CppSharp::CppParser::SourceRange(__arg0);
+    auto &__arg0 = *(struct ::CppSharp::CppParser::SourceRange*)_0->NativePtr;
+    NativePtr = new struct ::CppSharp::CppParser::SourceRange(__arg0);
 }
 
 CppSharp::Parser::SourceRange::SourceRange()
 {
     __ownsNativeInstance = true;
-    NativePtr = new ::CppSharp::CppParser::SourceRange();
+    NativePtr = new struct ::CppSharp::CppParser::SourceRange();
 }
 
-System::IntPtr CppSharp::Parser::SourceRange::__Instance::get()
+::System::IntPtr CppSharp::Parser::SourceRange::__Instance::get()
 {
-    return System::IntPtr(NativePtr);
+    return ::System::IntPtr(NativePtr);
 }
 
-void CppSharp::Parser::SourceRange::__Instance::set(System::IntPtr object)
+void CppSharp::Parser::SourceRange::__Instance::set(::System::IntPtr object)
 {
-    NativePtr = (::CppSharp::CppParser::SourceRange*)object.ToPointer();
+    NativePtr = (struct ::CppSharp::CppParser::SourceRange*)object.ToPointer();
 }
 
 CppSharp::Parser::SourceLocation CppSharp::Parser::SourceRange::BeginLoc::get()
 {
-    return ::CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*)&((::CppSharp::CppParser::SourceRange*)NativePtr)->beginLoc);
+    return ::CppSharp::Parser::SourceLocation((struct ::CppSharp::CppParser::SourceLocation*)&NativePtr->beginLoc);
 }
 
 void CppSharp::Parser::SourceRange::BeginLoc::set(CppSharp::Parser::SourceLocation value)
 {
     auto _marshal0 = ::CppSharp::CppParser::SourceLocation();
     _marshal0.ID = value.ID;
-    ((::CppSharp::CppParser::SourceRange*)NativePtr)->beginLoc = _marshal0;
+    ((struct ::CppSharp::CppParser::SourceRange*)NativePtr)->beginLoc = _marshal0;
 }
 
 CppSharp::Parser::SourceLocation CppSharp::Parser::SourceRange::EndLoc::get()
 {
-    return ::CppSharp::Parser::SourceLocation((::CppSharp::CppParser::SourceLocation*)&((::CppSharp::CppParser::SourceRange*)NativePtr)->endLoc);
+    return ::CppSharp::Parser::SourceLocation((struct ::CppSharp::CppParser::SourceLocation*)&NativePtr->endLoc);
 }
 
 void CppSharp::Parser::SourceRange::EndLoc::set(CppSharp::Parser::SourceLocation value)
 {
     auto _marshal0 = ::CppSharp::CppParser::SourceLocation();
     _marshal0.ID = value.ID;
-    ((::CppSharp::CppParser::SourceRange*)NativePtr)->endLoc = _marshal0;
+    ((struct ::CppSharp::CppParser::SourceRange*)NativePtr)->endLoc = _marshal0;
 }
 

src/CppParser/Bindings/CLI/AST.h

@@ -26,8 +26,8 @@ namespace CppSharp
         {
         public:
 
-            SourceLocation(::CppSharp::CppParser::SourceLocation* native);
-            SourceLocation(::CppSharp::CppParser::SourceLocation* native, bool ownNativeInstance);
+            SourceLocation(struct ::CppSharp::CppParser::SourceLocation* native);
+            SourceLocation(struct ::CppSharp::CppParser::SourceLocation* native, bool ownNativeInstance);
             static SourceLocation^ __CreateInstance(::System::IntPtr native);
             static SourceLocation^ __CreateInstance(::System::IntPtr native, bool __ownsNativeInstance);
             SourceLocation(unsigned int ID);
@@ -49,15 +49,15 @@ namespace CppSharp
         {
         public:
 
-            property ::CppSharp::CppParser::SourceRange* NativePtr;
-            property System::IntPtr __Instance
+            property struct ::CppSharp::CppParser::SourceRange* NativePtr;
+            property ::System::IntPtr __Instance
             {
-                virtual System::IntPtr get();
-                virtual void set(System::IntPtr instance);
+                virtual ::System::IntPtr get();
+                virtual void set(::System::IntPtr instance);
             }
 
-            SourceRange(::CppSharp::CppParser::SourceRange* native);
-            SourceRange(::CppSharp::CppParser::SourceRange* native, bool ownNativeInstance);
+            SourceRange(struct ::CppSharp::CppParser::SourceRange* native);
+            SourceRange(struct ::CppSharp::CppParser::SourceRange* native, bool ownNativeInstance);
             static SourceRange^ __CreateInstance(::System::IntPtr native);
             static SourceRange^ __CreateInstance(::System::IntPtr native, bool __ownsNativeInstance);
             SourceRange(CppSharp::Parser::SourceRange^ _0);