pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed code generation for structors with HasThisReturn set to true.

pull/355/head
triton 11 years ago
parent
3ab4d570a3
commit
b8d4999e98
5 changed files with 62 additions and 176 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 212
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs
  2. 12
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs
  3. 4
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs
  4. 4
      src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs
  5. 6
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs

212
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs
Unescape View File

@ -279,9 +279,7 @@ namespace CppSharp @@ -279,9 +279,7 @@ namespace CppSharp
__Instance = Marshal.AllocHGlobal(8);
__ownsNativeInstance = true;
var arg0 = kind;
var __ret = Internal.ctor_0(__Instance, arg0);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Type.__CreateInstance(__ret);
Internal.ctor_0(__Instance, arg0);
}
public void Dispose()
@ -495,9 +493,7 @@ namespace CppSharp @@ -495,9 +493,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(8);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.QualifiedType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -600,9 +596,7 @@ namespace CppSharp @@ -600,9 +596,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TagType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -699,9 +693,7 @@ namespace CppSharp @@ -699,9 +693,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(24);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ArrayType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -842,9 +834,7 @@ namespace CppSharp @@ -842,9 +834,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(32);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.FunctionType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -980,9 +970,7 @@ namespace CppSharp @@ -980,9 +970,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(20);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.PointerType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1080,9 +1068,7 @@ namespace CppSharp @@ -1080,9 +1068,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(16);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.MemberPointerType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1165,9 +1151,7 @@ namespace CppSharp @@ -1165,9 +1151,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TypedefType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1253,9 +1237,7 @@ namespace CppSharp @@ -1253,9 +1237,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(24);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.AttributedType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1359,9 +1341,7 @@ namespace CppSharp @@ -1359,9 +1341,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(32);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.DecayedType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1490,9 +1470,7 @@ namespace CppSharp @@ -1490,9 +1470,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(20);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TemplateArgument.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -1653,9 +1631,7 @@ namespace CppSharp @@ -1653,9 +1631,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(28);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TemplateSpecializationType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -1796,9 +1772,7 @@ namespace CppSharp @@ -1796,9 +1772,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(28);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TemplateParameter.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -1931,9 +1905,7 @@ namespace CppSharp @@ -1931,9 +1905,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(48);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TemplateParameterType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2061,9 +2033,7 @@ namespace CppSharp @@ -2061,9 +2033,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(16);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TemplateParameterSubstitutionType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2149,9 +2119,7 @@ namespace CppSharp @@ -2149,9 +2119,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(16);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.InjectedClassNameType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2246,9 +2214,7 @@ namespace CppSharp @@ -2246,9 +2214,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(8);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.DependentNameType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2313,9 +2279,7 @@ namespace CppSharp @@ -2313,9 +2279,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(8);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.PackExpansionType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2383,9 +2347,7 @@ namespace CppSharp @@ -2383,9 +2347,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.BuiltinType.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -2469,9 +2431,7 @@ namespace CppSharp @@ -2469,9 +2431,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.VTableComponent.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -2606,9 +2566,7 @@ namespace CppSharp @@ -2606,9 +2566,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.VTableLayout.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -2718,9 +2676,7 @@ namespace CppSharp @@ -2718,9 +2676,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(32);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.VFTableInfo.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -2892,9 +2848,7 @@ namespace CppSharp @@ -2892,9 +2848,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(48);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ClassLayout.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -3168,9 +3122,7 @@ namespace CppSharp @@ -3168,9 +3122,7 @@ namespace CppSharp
__Instance = Marshal.AllocHGlobal(120);
__ownsNativeInstance = true;
var arg0 = kind;
var __ret = Internal.ctor_0(__Instance, arg0);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Declaration.__CreateInstance(__ret);
Internal.ctor_0(__Instance, arg0);
}
public void Dispose()
@ -3625,9 +3577,7 @@ namespace CppSharp @@ -3625,9 +3577,7 @@ namespace CppSharp
__Instance = Marshal.AllocHGlobal(216);
__ownsNativeInstance = true;
var arg0 = kind;
var __ret = Internal.ctor_0(__Instance, arg0);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.DeclarationContext.__CreateInstance(__ret);
Internal.ctor_0(__Instance, arg0);
}
protected override void Dispose(bool disposing)
@ -3928,9 +3878,7 @@ namespace CppSharp @@ -3928,9 +3878,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(128);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TypedefDecl.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -4233,9 +4181,7 @@ namespace CppSharp @@ -4233,9 +4181,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(140);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Parameter.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -4474,9 +4420,7 @@ namespace CppSharp @@ -4474,9 +4420,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(208);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Function.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -4847,9 +4791,7 @@ namespace CppSharp @@ -4847,9 +4791,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(236);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Method.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -5227,9 +5169,7 @@ namespace CppSharp @@ -5227,9 +5169,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(152);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Enumeration.Item.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -5304,9 +5244,7 @@ namespace CppSharp @@ -5304,9 +5244,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(240);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Enumeration.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -5485,9 +5423,7 @@ namespace CppSharp @@ -5485,9 +5423,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(152);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Variable.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -5588,9 +5524,7 @@ namespace CppSharp @@ -5588,9 +5524,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.BaseClassSpecifier.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -5743,9 +5677,7 @@ namespace CppSharp @@ -5743,9 +5677,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(136);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Field.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -5884,9 +5816,7 @@ namespace CppSharp @@ -5884,9 +5816,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(120);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.AccessSpecifierDecl.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -6093,9 +6023,7 @@ namespace CppSharp @@ -6093,9 +6023,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(280);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Class.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -6476,9 +6404,7 @@ namespace CppSharp @@ -6476,9 +6404,7 @@ namespace CppSharp
__Instance = Marshal.AllocHGlobal(136);
__ownsNativeInstance = true;
var arg0 = kind;
var __ret = Internal.ctor_0(__Instance, arg0);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Template.__CreateInstance(__ret);
Internal.ctor_0(__Instance, arg0);
}
public Template()
@ -6486,9 +6412,7 @@ namespace CppSharp @@ -6486,9 +6412,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(136);
__ownsNativeInstance = true;
var __ret = Internal.ctor_1(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Template.__CreateInstance(__ret);
Internal.ctor_1(__Instance);
}
protected override void Dispose(bool disposing)
@ -6647,9 +6571,7 @@ namespace CppSharp @@ -6647,9 +6571,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(148);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ClassTemplate.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -6829,9 +6751,7 @@ namespace CppSharp @@ -6829,9 +6751,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(300);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ClassTemplateSpecialization.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7021,9 +6941,7 @@ namespace CppSharp @@ -7021,9 +6941,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(300);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ClassTemplatePartialSpecialization.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7140,9 +7058,7 @@ namespace CppSharp @@ -7140,9 +7058,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(148);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.FunctionTemplate.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7263,9 +7179,7 @@ namespace CppSharp @@ -7263,9 +7179,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(24);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.FunctionTemplateSpecialization.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -7443,9 +7357,7 @@ namespace CppSharp @@ -7443,9 +7357,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(220);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Namespace.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7557,9 +7469,7 @@ namespace CppSharp @@ -7557,9 +7469,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(124);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.PreprocessedEntity.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7681,9 +7591,7 @@ namespace CppSharp @@ -7681,9 +7591,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(148);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.MacroDefinition.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7810,9 +7718,7 @@ namespace CppSharp @@ -7810,9 +7718,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(152);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.MacroExpansion.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -7977,9 +7883,7 @@ namespace CppSharp @@ -7977,9 +7883,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(260);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.TranslationUnit.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -8156,9 +8060,7 @@ namespace CppSharp @@ -8156,9 +8060,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(52);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.NativeLibrary.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -8337,9 +8239,7 @@ namespace CppSharp @@ -8337,9 +8239,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(12);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.ASTContext.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -8436,9 +8336,7 @@ namespace CppSharp @@ -8436,9 +8336,7 @@ namespace CppSharp
__Instance = Marshal.AllocHGlobal(4);
__ownsNativeInstance = true;
var arg0 = kind;
var __ret = Internal.ctor_0(__Instance, arg0);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.Comment.__CreateInstance(__ret);
Internal.ctor_0(__Instance, arg0);
}
public void Dispose()
@ -8520,9 +8418,7 @@ namespace CppSharp @@ -8520,9 +8418,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(4);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.FullComment.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
protected override void Dispose(bool disposing)
@ -8613,9 +8509,7 @@ namespace CppSharp @@ -8613,9 +8509,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(56);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.AST.RawComment.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()

12
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs
Unescape View File

@ -261,9 +261,7 @@ namespace CppSharp @@ -261,9 +261,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(140);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserOptions.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -685,9 +683,7 @@ namespace CppSharp @@ -685,9 +683,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(60);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserDiagnostic.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()
@ -869,9 +865,7 @@ namespace CppSharp @@ -869,9 +865,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(28);
__ownsNativeInstance = true;
var __ret = Internal.ctor_0(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret);
Internal.ctor_0(__Instance);
}
public void Dispose()

4
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Sources.cs
Unescape View File

@ -68,10 +68,8 @@ namespace CppSharp @@ -68,10 +68,8 @@ namespace CppSharp
: this()
{
var __fixedInstance = ToInternal();
var __ret = Internal.ctor_1(new global::System.IntPtr(&__fixedInstance), ID);
Internal.ctor_1(new global::System.IntPtr(&__fixedInstance), ID);
FromInternal(&__fixedInstance);
if (__ret == global::System.IntPtr.Zero) return new CppSharp.Parser.SourceLocation();
return (__ret == IntPtr.Zero) ? new CppSharp.Parser.SourceLocation() : CppSharp.Parser.SourceLocation.__CreateInstance(__ret);
}
public uint ID

4
src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Target.cs
Unescape View File

@ -201,9 +201,7 @@ namespace CppSharp @@ -201,9 +201,7 @@ namespace CppSharp
{
__Instance = Marshal.AllocHGlobal(176);
__ownsNativeInstance = true;
var __ret = Internal.ctor_1(__Instance);
if (__ret == global::System.IntPtr.Zero) return null;
return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret);
Internal.ctor_1(__Instance);
}
public void Dispose()

6
src/Generator/Generators/CSharp/CSharpTextTemplate.cs
Unescape View File

@ -2309,12 +2309,14 @@ namespace CppSharp.Generators.CSharp @@ -2309,12 +2309,14 @@ namespace CppSharp.Generators.CSharp
var retType = function.OriginalReturnType;
if (returnType == null)
returnType = retType.Type;
var needsReturn = !retType.Type.IsPrimitiveType(PrimitiveType.Void);
var method = function as Method;
var hasThisReturnStructor = method != null && (method.IsConstructor || method.IsDestructor);
var needsReturn = !retType.Type.IsPrimitiveType(PrimitiveType.Void) && !hasThisReturnStructor;
var isValueType = false;
var needsInstance = false;
var method = function as Method;
Parameter operatorParam = null;
if (method != null)
{

Write Preview
Loading…
Cancel
Save