Browse Source

Removed the option for abstract impls thus enabling them by default.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/502/head
Dimitar Dobrev 10 years ago
parent
commit
451278cb10
  1. 3
      src/Generator/Driver.cs
  2. 6
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  3. 1
      src/Generator/Options.cs
  4. 1
      tests/Basic/Basic.cs
  5. 1
      tests/CSharpTemp/CSharpTemp.cs
  6. 1
      tests/TypeMaps/TypeMaps.cs
  7. 1
      tests/VTables/VTables.cs

3
src/Generator/Driver.cs

@ -274,8 +274,7 @@ 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)
TranslationUnitPasses.AddPass(new GetterSetterToPropertyPass()); TranslationUnitPasses.AddPass(new GetterSetterToPropertyPass());

6
src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@ -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:
@ -498,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);
@ -1405,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)

1
src/Generator/Options.cs

@ -92,7 +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 GenerateInterfacesForMultipleInheritance; public bool GenerateInterfacesForMultipleInheritance;
public bool GenerateInternalImports; public bool GenerateInternalImports;
public bool GenerateClassMarshals; public bool GenerateClassMarshals;

1
tests/Basic/Basic.cs

@ -22,7 +22,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
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/CSharpTemp/CSharpTemp.cs

@ -108,7 +108,6 @@ namespace CppSharp.Tests
{ {
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.

1
tests/TypeMaps/TypeMaps.cs

@ -15,7 +15,6 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
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

@ -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());
} }

Loading…
Cancel
Save