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

Merge pull request #502 from ddobrev/master 

Fixed a bug when a function returns an abstract class contained in a dependency
pull/504/head
João Matos 10 years ago
parent
4a24bff850 de0392ca1e
commit
a1d7e685bc
11 changed files with 89 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Generator/Driver.cs
  2. 17
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  3. 115
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  4. 2
      src/Generator/Options.cs
  5. 3
      tests/Basic/Basic.cs
  6. 2
      tests/CSharpTemp/CSharpTemp.cs
  7. 6
      tests/NamespacesBase/NamespacesBase.h
  8. 5
      tests/NamespacesDerived/NamespacesDerived.cpp
  9. 2
      tests/NamespacesDerived/NamespacesDerived.h
  10. 3
      tests/TypeMaps/TypeMaps.cs
  11. 1
      tests/VTables/VTables.cs

3
src/Generator/Driver.cs
Unescape View File

@ -265,7 +265,7 @@ namespace CppSharp
TranslationUnitPasses.AddPass(new FixDefaultParamValuesOfOverridesPass()); TranslationUnitPasses.AddPass(new FixDefaultParamValuesOfOverridesPass());
} }
if (Options.GenerateAbstractImpls) if (Options.IsCSharpGenerator)
TranslationUnitPasses.AddPass(new GenerateAbstractImplementationsPass()); TranslationUnitPasses.AddPass(new GenerateAbstractImplementationsPass());
if (Options.GenerateInterfacesForMultipleInheritance) if (Options.GenerateInterfacesForMultipleInheritance)
@ -274,7 +274,6 @@ namespace CppSharp
TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass()); TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass());
} }
if (Options.GenerateVirtualTables)
TranslationUnitPasses.AddPass(new CheckVTableComponentsPass()); TranslationUnitPasses.AddPass(new CheckVTableComponentsPass());
if (Options.GenerateProperties) if (Options.GenerateProperties)

17
src/Generator/Generators/CSharp/CSharpMarshal.cs
Unescape View File

@ -264,14 +264,11 @@ namespace CppSharp.Generators.CSharp
// if the class is an abstract impl, use the original for the object map // if the class is an abstract impl, use the original for the object map
var qualifiedClass = QualifiedIdentifier(originalClass); var qualifiedClass = QualifiedIdentifier(originalClass);
var type = qualifiedClass +
(Context.Driver.Options.GenerateAbstractImpls && originalClass.IsAbstract ?
"Internal" : "");
if (returnType.IsAddress()) if (returnType.IsAddress())
Context.Return.Write(HandleReturnedPointer(@class, type, qualifiedClass)); Context.Return.Write(HandleReturnedPointer(@class, qualifiedClass));
else else
Context.Return.Write("{0}.{1}({2})", type, Helpers.CreateInstanceIdentifier, Context.ReturnVarName); Context.Return.Write("{0}.{1}({2})", qualifiedClass, Helpers.CreateInstanceIdentifier, Context.ReturnVarName);
return true; return true;
} }
@ -309,13 +306,13 @@ namespace CppSharp.Generators.CSharp
return true; return true;
} }
private string HandleReturnedPointer(Class @class, string type, string qualifiedClass) private string HandleReturnedPointer(Class @class, string qualifiedClass)
{ {
var originalClass = @class.OriginalClass ?? @class; var originalClass = @class.OriginalClass ?? @class;
var ret = Generator.GeneratedIdentifier("result") + Context.ParameterIndex; var ret = Generator.GeneratedIdentifier("result") + Context.ParameterIndex;
Context.SupportBefore.WriteLine("{0} {1};", QualifiedIdentifier(@class), ret); Context.SupportBefore.WriteLine("{0} {1};", QualifiedIdentifier(@class), ret);
Context.SupportBefore.WriteLine("if ({0} == IntPtr.Zero) {1} = {2};", Context.ReturnVarName, ret, Context.SupportBefore.WriteLine("if ({0} == IntPtr.Zero) {1} = {2};", Context.ReturnVarName, ret,
originalClass.IsRefType ? "null" : string.Format("new {0}()", type)); originalClass.IsRefType ? "null" : string.Format("new {0}()", qualifiedClass));
if (originalClass.IsRefType) if (originalClass.IsRefType)
{ {
Context.SupportBefore.WriteLine( Context.SupportBefore.WriteLine(
@ -326,18 +323,18 @@ namespace CppSharp.Generators.CSharp
if (dtor != null && dtor.IsVirtual) if (dtor != null && dtor.IsVirtual)
{ {
Context.SupportBefore.WriteLine("else {0}.NativeToManagedMap[{1}] = {2} = ({3}) {4}.{5}({1});", Context.SupportBefore.WriteLine("else {0}.NativeToManagedMap[{1}] = {2} = ({3}) {4}.{5}({1});",
qualifiedClass, Context.ReturnVarName, ret, QualifiedIdentifier(@class), type, qualifiedClass, Context.ReturnVarName, ret, QualifiedIdentifier(@class), qualifiedClass,
Helpers.CreateInstanceIdentifier, Context.ReturnVarName); Helpers.CreateInstanceIdentifier, Context.ReturnVarName);
} }
else else
{ {
Context.SupportBefore.WriteLine("else {0} = {1}.{2}({3});", ret, type, Context.SupportBefore.WriteLine("else {0} = {1}.{2}({3});", ret, qualifiedClass,
Helpers.CreateInstanceIdentifier, Context.ReturnVarName); Helpers.CreateInstanceIdentifier, Context.ReturnVarName);
} }
} }
else else
{ {
Context.SupportBefore.WriteLine("else {0} = {1}.{2}({3});", ret, type, Context.SupportBefore.WriteLine("else {0} = {1}.{2}({3});", ret, qualifiedClass,
Helpers.CreateInstanceIdentifier, Context.ReturnVarName); Helpers.CreateInstanceIdentifier, Context.ReturnVarName);
} }
return ret; return ret;

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

@ -19,7 +19,7 @@ namespace CppSharp.Generators.CSharp
public static class Helpers public static class Helpers
{ {
// from https://github.com/mono/mono/blob/master/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs // from https://github.com/mono/mono/blob/master/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
private static readonly string[] Keywords = new string[] private static readonly string[] Keywords =
{ {
"abstract", "event", "new", "struct", "as", "explicit", "null", "switch", "abstract", "event", "new", "struct", "as", "explicit", "null", "switch",
"base", "extern", "this", "false", "operator", "throw", "break", "finally", "base", "extern", "this", "false", "operator", "throw", "break", "finally",
@ -407,7 +407,7 @@ namespace CppSharp.Generators.CSharp
GenerateClassVariables(@class); GenerateClassVariables(@class);
GenerateClassProperties(@class); GenerateClassProperties(@class);
if (Options.GenerateVirtualTables && @class.IsDynamic) if (@class.IsDynamic)
GenerateVTable(@class); GenerateVTable(@class);
} }
exit: exit:
@ -484,14 +484,6 @@ namespace CppSharp.Generators.CSharp
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
} }
private void GenerateUnionFields(Class @class)
{
foreach (var field in @class.Fields)
{
GenerateClassField(field);
}
}
public void GenerateClassInternals(Class @class) public void GenerateClassInternals(Class @class)
{ {
PushBlock(CSharpBlockKind.InternalsClass); PushBlock(CSharpBlockKind.InternalsClass);
@ -506,7 +498,7 @@ namespace CppSharp.Generators.CSharp
GenerateClassFields(@class, GenerateClassInternalsField, true); GenerateClassFields(@class, GenerateClassInternalsField, true);
if (@class.IsGenerated) if (@class.IsGenerated)
{ {
if (Options.GenerateVirtualTables && @class.IsDynamic) if (@class.IsDynamic)
GenerateVTablePointers(@class); GenerateVTablePointers(@class);
var functions = GatherClassInternalFunctions(@class); var functions = GatherClassInternalFunctions(@class);
@ -599,24 +591,20 @@ namespace CppSharp.Generators.CSharp
{ {
@params.Add("global::System.IntPtr instance"); @params.Add("global::System.IntPtr instance");
if (method.IsConstructor && base.Options.IsMicrosoftAbi) if (method.IsConstructor && Options.IsMicrosoftAbi)
retType = "global::System.IntPtr"; retType = "global::System.IntPtr";
} }
foreach (var param in function.Parameters) @params.AddRange(from param in function.Parameters
{ where param.Kind != ParameterKind.OperatorParameter
if (param.Kind == ParameterKind.OperatorParameter) let typeName = param.CSharpType(TypePrinter)
continue; select string.Format("{0} {1}", typeName, param.Name));
var typeName = param.CSharpType(TypePrinter);
@params.Add(string.Format("{0} {1}", typeName, param.Name));
}
if (method != null && method.IsConstructor) if (method != null && method.IsConstructor)
{ {
var @class = (Class) method.Namespace; var @class = (Class) method.Namespace;
if (Options.IsMicrosoftAbi && @class.Layout.HasVirtualBases) if (Options.IsMicrosoftAbi && @class.Layout.HasVirtualBases)
@params.Add("int " + CSharpTextTemplate.GeneratedIdentifier("forBases")); @params.Add("int " + GeneratedIdentifier("forBases"));
} }
TypePrinter.PopContext(); TypePrinter.PopContext();
@ -648,7 +636,7 @@ namespace CppSharp.Generators.CSharp
Write("internal "); Write("internal ");
Write("unsafe "); Write("unsafe ");
if (Driver.Options.GenerateAbstractImpls && @class.IsAbstract) if (@class.IsAbstract)
Write("abstract "); Write("abstract ");
if (@class.IsStatic) if (@class.IsStatic)
@ -752,8 +740,6 @@ namespace CppSharp.Generators.CSharp
GenerateDeclarationCommon(field); GenerateDeclarationCommon(field);
var @class = (Class) field.Namespace;
WriteLine("{0} {1} {2};", @public ? "public" : "private", WriteLine("{0} {1} {2};", @public ? "public" : "private",
field.Type, field.Name); field.Type, field.Name);
@ -779,8 +765,7 @@ namespace CppSharp.Generators.CSharp
return Tuple.Create(library, decl.Mangled); return Tuple.Create(library, decl.Mangled);
} }
private void GeneratePropertySetter<T>(QualifiedType returnType, T decl, private void GeneratePropertySetter<T>(T decl, Class @class, bool isAbstract = false)
Class @class, bool isAbstract = false)
where T : Declaration, ITypedDecl where T : Declaration, ITypedDecl
{ {
if (!(decl is Function || decl is Field) ) if (!(decl is Function || decl is Field) )
@ -806,7 +791,7 @@ namespace CppSharp.Generators.CSharp
if (decl is Function) if (decl is Function)
{ {
var function = decl as Function; var function = decl as Function;
if (isAbstract && Driver.Options.GenerateAbstractImpls) if (isAbstract)
{ {
Write(";"); Write(";");
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
@ -831,7 +816,7 @@ namespace CppSharp.Generators.CSharp
{ {
if (method.OperatorKind == CXXOperatorKind.Subscript) if (method.OperatorKind == CXXOperatorKind.Subscript)
{ {
GenerateIndexerSetter(returnType, method); GenerateIndexerSetter(method);
} }
else else
{ {
@ -917,7 +902,7 @@ namespace CppSharp.Generators.CSharp
return false; return false;
} }
private void GenerateIndexerSetter(QualifiedType returnType, Function function) private void GenerateIndexerSetter(Function function)
{ {
Type type; Type type;
function.Type.IsPointerTo(out type); function.Type.IsPointerTo(out type);
@ -946,7 +931,7 @@ namespace CppSharp.Generators.CSharp
if (decl is Function) if (decl is Function)
{ {
var function = decl as Function; var function = decl as Function;
if (isAbstract && Driver.Options.GenerateAbstractImpls) if (isAbstract)
{ {
Write(";"); Write(";");
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
@ -1159,7 +1144,7 @@ namespace CppSharp.Generators.CSharp
// check if overriding a property from a secondary base // check if overriding a property from a secondary base
if (prop.IsOverride && @class.GetRootBaseProperty(prop, true) != null) if (prop.IsOverride && @class.GetRootBaseProperty(prop, true) != null)
Write("override "); Write("override ");
else if (prop.IsPure && Driver.Options.GenerateAbstractImpls) else if (prop.IsPure)
Write("abstract "); Write("abstract ");
else if (prop.IsVirtual) else if (prop.IsVirtual)
Write("virtual "); Write("virtual ");
@ -1179,7 +1164,7 @@ namespace CppSharp.Generators.CSharp
GeneratePropertyGetter(prop.QualifiedType, prop.Field, @class); GeneratePropertyGetter(prop.QualifiedType, prop.Field, @class);
if (prop.HasSetter) if (prop.HasSetter)
GeneratePropertySetter(prop.Field.QualifiedType, prop.Field, @class); GeneratePropertySetter(prop.Field, @class);
} }
else else
{ {
@ -1187,7 +1172,7 @@ namespace CppSharp.Generators.CSharp
GeneratePropertyGetter(prop.QualifiedType, prop.GetMethod, @class, prop.IsPure); GeneratePropertyGetter(prop.QualifiedType, prop.GetMethod, @class, prop.IsPure);
if (prop.HasSetter) if (prop.HasSetter)
GeneratePropertySetter(prop.QualifiedType, prop.SetMethod, @class, prop.IsPure); GeneratePropertySetter(prop.SetMethod, @class, prop.IsPure);
} }
WriteCloseBraceIndent(); WriteCloseBraceIndent();
@ -1212,7 +1197,7 @@ namespace CppSharp.Generators.CSharp
GeneratePropertyGetter(variable.QualifiedType, variable, @class); GeneratePropertyGetter(variable.QualifiedType, variable, @class);
if (!variable.QualifiedType.Qualifiers.IsConst) if (!variable.QualifiedType.Qualifiers.IsConst)
GeneratePropertySetter(variable.QualifiedType, variable, @class); GeneratePropertySetter(variable, @class);
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
@ -1420,7 +1405,7 @@ namespace CppSharp.Generators.CSharp
private void GenerateVTableClassSetupCall(Class @class, bool addPointerGuard = false) private void GenerateVTableClassSetupCall(Class @class, bool addPointerGuard = false)
{ {
var entries = GetUniqueVTableMethodEntries(@class); var entries = GetUniqueVTableMethodEntries(@class);
if (Options.GenerateVirtualTables && @class.IsDynamic && entries.Count != 0) if (@class.IsDynamic && entries.Count != 0)
{ {
// called from internal ctors which may have been passed an IntPtr.Zero // called from internal ctors which may have been passed an IntPtr.Zero
if (addPointerGuard) if (addPointerGuard)
@ -1867,23 +1852,24 @@ namespace CppSharp.Generators.CSharp
string className = @class.IsAbstractImpl ? @class.BaseClass.Name : @class.Name; string className = @class.IsAbstractImpl ? @class.BaseClass.Name : @class.Name;
if (!@class.IsAbstract) var ctorCall = string.Format("{0}{1}", @class.Name, @class.IsAbstract ? "Internal" : "");
if (!@class.IsAbstractImpl)
{ {
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
WriteLine("public static {0}{1} {2}(global::System.IntPtr native)", WriteLine("public static {0}{1} {2}(global::System.IntPtr native)",
@class.HasNonIgnoredBase && !@class.BaseClass.IsAbstract ? "new " : string.Empty, @class.HasNonIgnoredBase && !@class.BaseClass.IsAbstract ? "new " : string.Empty,
@class.Name, Helpers.CreateInstanceIdentifier); @class.Name, Helpers.CreateInstanceIdentifier);
WriteStartBraceIndent(); WriteStartBraceIndent();
WriteLine("return new {0}(({1}.Internal*) native);", @class.Name, className); WriteLine("return new {0}(({1}.Internal*) native);", ctorCall, className);
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
GenerateNativeConstructorByValue(@class, className, @class.Name);
} }
GenerateNativeConstructorByValue(@class, className, ctorCall);
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
WriteLine("{0} {1}({2}.Internal* native, bool isInternalImpl = false){3}", WriteLine("{0} {1}({2}.Internal* native, bool isInternalImpl = false){3}",
@class.IsRefType ? "protected" : "private", @class.IsAbstractImpl ? "internal" : (@class.IsRefType ? "protected" : "private"),
@class.Name, className, @class.IsValueType ? " : this()" : string.Empty); @class.Name, className, @class.IsValueType ? " : this()" : string.Empty);
var hasBaseClass = @class.HasBaseClass && @class.BaseClass.IsRefType; var hasBaseClass = @class.HasBaseClass && @class.BaseClass.IsRefType;
@ -1910,16 +1896,19 @@ namespace CppSharp.Generators.CSharp
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
} }
private void GenerateNativeConstructorByValue(Class @class, string className, string safeIdentifier) private void GenerateNativeConstructorByValue(Class @class, string className, string ctorCall)
{
if (!@class.IsAbstractImpl)
{ {
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
WriteLine("public static {0} {1}({0}.Internal native)", className, Helpers.CreateInstanceIdentifier); WriteLine("public static {0} {1}({0}.Internal native)", className, Helpers.CreateInstanceIdentifier);
WriteStartBraceIndent(); WriteStartBraceIndent();
WriteLine("return new {0}(native);", safeIdentifier); WriteLine("return new {0}(native);", ctorCall);
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
}
if (@class.IsRefType) if (@class.IsRefType && !@class.IsAbstract)
{ {
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
WriteLine("private static {0}.Internal* __CopyValue({0}.Internal native)", className); WriteLine("private static {0}.Internal* __CopyValue({0}.Internal native)", className);
@ -1949,8 +1938,11 @@ namespace CppSharp.Generators.CSharp
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
} }
if (!@class.IsAbstract)
{
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
WriteLine("private {0}({1}.Internal native)", safeIdentifier, className); WriteLine("{0} {1}({2}.Internal native)",
@class.IsAbstractImpl ? "internal" : "private", @class.Name, className);
WriteLineIndent(@class.IsRefType ? ": this(__CopyValue(native))" : ": this()"); WriteLineIndent(@class.IsRefType ? ": this(__CopyValue(native))" : ": this()");
WriteStartBraceIndent(); WriteStartBraceIndent();
if (@class.IsRefType) if (@class.IsRefType)
@ -1965,8 +1957,9 @@ namespace CppSharp.Generators.CSharp
WriteCloseBraceIndent(); WriteCloseBraceIndent();
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
} }
}
private bool GenerateClassConstructorBase(Class @class, Method method) private void GenerateClassConstructorBase(Class @class, Method method)
{ {
var hasBase = @class.HasBaseClass; var hasBase = @class.HasBaseClass;
@ -1975,10 +1968,7 @@ namespace CppSharp.Generators.CSharp
PushIndent(); PushIndent();
Write(": this("); Write(": this(");
if (method != null) Write(method != null ? "(Internal*) null" : "native");
Write("(Internal*) null");
else
Write("native");
WriteLine(")"); WriteLine(")");
PopIndent(); PopIndent();
@ -1986,8 +1976,6 @@ namespace CppSharp.Generators.CSharp
if (@class.IsValueType) if (@class.IsValueType)
WriteLineIndent(": this()"); WriteLineIndent(": this()");
return hasBase;
} }
#endregion #endregion
@ -2024,8 +2012,7 @@ namespace CppSharp.Generators.CSharp
// check if overriding a function from a secondary base // check if overriding a function from a secondary base
var isOverride = method.IsOverride && @class.GetRootBaseMethod(method, true) != null; var isOverride = method.IsOverride && @class.GetRootBaseMethod(method, true) != null;
if (method.IsVirtual && !isOverride && !method.IsOperator && if (method.IsVirtual && !isOverride && !method.IsOperator && !method.IsPure)
(!Driver.Options.GenerateAbstractImpls || !method.IsPure))
Write("virtual "); Write("virtual ");
var isBuiltinOperator = method.IsOperator && var isBuiltinOperator = method.IsOperator &&
@ -2041,7 +2028,7 @@ namespace CppSharp.Generators.CSharp
Write("override "); Write("override ");
} }
if (Driver.Options.GenerateAbstractImpls && method.IsPure) if (method.IsPure)
Write("abstract "); Write("abstract ");
var functionName = GetMethodIdentifier(method); var functionName = GetMethodIdentifier(method);
@ -2062,8 +2049,7 @@ namespace CppSharp.Generators.CSharp
Write(")"); Write(")");
if (method.SynthKind == FunctionSynthKind.DefaultValueOverload && method.IsConstructor && if (method.SynthKind == FunctionSynthKind.DefaultValueOverload && method.IsConstructor && !method.IsPure)
!(Driver.Options.GenerateAbstractImpls && method.IsPure))
{ {
Write(" : this({0})", Write(" : this({0})",
string.Join(", ", string.Join(", ",
@ -2072,7 +2058,7 @@ namespace CppSharp.Generators.CSharp
p => p.Ignore ? p.DefaultArgument.String : p.Name))); p => p.Ignore ? p.DefaultArgument.String : p.Name)));
} }
if (Driver.Options.GenerateAbstractImpls && method.IsPure) if (method.IsPure)
{ {
Write(";"); Write(";");
PopBlock(NewLineKind.BeforeNextBlock); PopBlock(NewLineKind.BeforeNextBlock);
@ -2113,7 +2099,7 @@ namespace CppSharp.Generators.CSharp
} }
else if (method.IsOperator) else if (method.IsOperator)
{ {
GenerateOperator(method, @class); GenerateOperator(method);
} }
else if (method.SynthKind == FunctionSynthKind.AbstractImplCall) else if (method.SynthKind == FunctionSynthKind.AbstractImplCall)
{ {
@ -2132,7 +2118,7 @@ namespace CppSharp.Generators.CSharp
} }
else if (method.IsOperator) else if (method.IsOperator)
{ {
GenerateOperator(method, @class); GenerateOperator(method);
} }
else else
{ {
@ -2230,7 +2216,7 @@ namespace CppSharp.Generators.CSharp
return virtualCallBuilder.ToString(); return virtualCallBuilder.ToString();
} }
private void GenerateOperator(Method method, Class @class) private void GenerateOperator(Method method)
{ {
if (method.SynthKind == FunctionSynthKind.ComplementOperator) if (method.SynthKind == FunctionSynthKind.ComplementOperator)
{ {
@ -2398,7 +2384,7 @@ namespace CppSharp.Generators.CSharp
if (needsInstance) if (needsInstance)
{ {
var instanceIndex = GetInstanceParamIndex(function); var instanceIndex = GetInstanceParamIndex(method);
if (needsFixedThis) if (needsFixedThis)
{ {
@ -2482,10 +2468,8 @@ namespace CppSharp.Generators.CSharp
WriteCloseBraceIndent(); WriteCloseBraceIndent();
} }
private int GetInstanceParamIndex(Function function) private int GetInstanceParamIndex(Method method)
{ {
var method = function as Method;
if (Options.IsMicrosoftAbi) if (Options.IsMicrosoftAbi)
return 0; return 0;
@ -2839,8 +2823,7 @@ namespace CppSharp.Generators.CSharp
if (method != null && method.IsConstructor) if (method != null && method.IsConstructor)
{ {
var @class = method.Namespace as Class; if (Options.IsMicrosoftAbi && ((Class) method.Namespace).Layout.HasVirtualBases)
if (Options.IsMicrosoftAbi && @class.Layout.HasVirtualBases)
@params.Add("int " + GeneratedIdentifier("forBases")); @params.Add("int " + GeneratedIdentifier("forBases"));
} }

2
src/Generator/Options.cs
Unescape View File

@ -92,8 +92,6 @@ namespace CppSharp
public bool GenerateLibraryNamespace; public bool GenerateLibraryNamespace;
public bool GenerateFunctionTemplates; public bool GenerateFunctionTemplates;
public bool GeneratePartialClasses; public bool GeneratePartialClasses;
public bool GenerateVirtualTables;
public bool GenerateAbstractImpls;
public bool GenerateInterfacesForMultipleInheritance; public bool GenerateInterfacesForMultipleInheritance;
public bool GenerateInternalImports; public bool GenerateInternalImports;
public bool GenerateClassMarshals; public bool GenerateClassMarshals;

3
tests/Basic/Basic.cs
Unescape View File

@ -22,9 +22,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
if (driver.Options.IsCSharpGenerator)
driver.Options.GenerateAbstractImpls = true;
driver.Options.GenerateVirtualTables = true;
driver.Options.GenerateCopyConstructors = true; driver.Options.GenerateCopyConstructors = true;
driver.Options.MarshalCharAsManagedChar = true; driver.Options.MarshalCharAsManagedChar = true;
driver.Options.GenerateProperties = true; driver.Options.GenerateProperties = true;

2
tests/CSharpTemp/CSharpTemp.cs
Unescape View File

@ -106,10 +106,8 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
driver.Options.GenerateAbstractImpls = true;
driver.Options.GenerateInterfacesForMultipleInheritance = true; driver.Options.GenerateInterfacesForMultipleInheritance = true;
driver.Options.GeneratePropertiesAdvanced = true; driver.Options.GeneratePropertiesAdvanced = true;
driver.Options.GenerateVirtualTables = true;
driver.Options.GenerateCopyConstructors = true; driver.Options.GenerateCopyConstructors = true;
// To ensure that calls to constructors in conversion operators // To ensure that calls to constructors in conversion operators
// are not ambiguous with multiple inheritance pass enabled. // are not ambiguous with multiple inheritance pass enabled.

6
tests/NamespacesBase/NamespacesBase.h
Unescape View File

@ -32,3 +32,9 @@ public:
private: private:
int b; int b;
}; };
class DLL_API Abstract
{
public:
virtual void abstractFunction() = 0;
};

5
tests/NamespacesDerived/NamespacesDerived.cpp
Unescape View File

@ -62,3 +62,8 @@ void Derived2::setNestedNSComponent(OverlappingNamespace::InDerivedLib c)
void Derived2::defaultEnumValueFromDependency(OverlappingNamespace::ColorsEnum c) void Derived2::defaultEnumValueFromDependency(OverlappingNamespace::ColorsEnum c)
{ {
} }
Abstract* Derived2::getAbstract()
{
return 0;
}

2
tests/NamespacesDerived/NamespacesDerived.h
Unescape View File

@ -57,4 +57,6 @@ public:
OverlappingNamespace::InDerivedLib getNestedNSComponent(); OverlappingNamespace::InDerivedLib getNestedNSComponent();
void setNestedNSComponent(OverlappingNamespace::InDerivedLib); void setNestedNSComponent(OverlappingNamespace::InDerivedLib);
void defaultEnumValueFromDependency(OverlappingNamespace::ColorsEnum c = OverlappingNamespace::ColorsEnum::black); void defaultEnumValueFromDependency(OverlappingNamespace::ColorsEnum c = OverlappingNamespace::ColorsEnum::black);
Abstract* getAbstract();
}; };

3
tests/TypeMaps/TypeMaps.cs
Unescape View File

@ -15,9 +15,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
if (driver.Options.IsCSharpGenerator)
driver.Options.GenerateAbstractImpls = true;
driver.Options.GenerateVirtualTables = true;
driver.Options.GenerateCopyConstructors = true; driver.Options.GenerateCopyConstructors = true;
driver.Options.MarshalCharAsManagedChar = true; driver.Options.MarshalCharAsManagedChar = true;
driver.Options.GenerateProperties = true; driver.Options.GenerateProperties = true;

1
tests/VTables/VTables.cs
Unescape View File

@ -14,7 +14,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
driver.Options.GenerateVirtualTables = true;
driver.TranslationUnitPasses.RenameDeclsUpperCase(RenameTargets.Any); driver.TranslationUnitPasses.RenameDeclsUpperCase(RenameTargets.Any);
driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass()); driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass());
} }

Write Preview
Loading…
Cancel
Save