Browse Source

Removed the generation of protected members of interfaces.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
pull/68/head
Dimitar Dobrev 13 years ago
parent
commit
6ef578cd6a
  1. 2
      src/Generator/Driver.cs
  2. 8
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs

2
src/Generator/Driver.cs

@ -144,7 +144,6 @@ namespace CppSharp
TranslationUnitPasses.AddPass(new CheckAmbiguousFunctions()); TranslationUnitPasses.AddPass(new CheckAmbiguousFunctions());
TranslationUnitPasses.AddPass(new CheckOperatorsOverloadsPass()); TranslationUnitPasses.AddPass(new CheckOperatorsOverloadsPass());
TranslationUnitPasses.AddPass(new CheckVirtualOverrideReturnCovariance()); TranslationUnitPasses.AddPass(new CheckVirtualOverrideReturnCovariance());
TranslationUnitPasses.AddPass(new MultipleInheritancePass());
Generator.SetupPasses(); Generator.SetupPasses();
TranslationUnitPasses.AddPass(new FieldToPropertyPass()); TranslationUnitPasses.AddPass(new FieldToPropertyPass());
@ -154,6 +153,7 @@ namespace CppSharp
TranslationUnitPasses.AddPass(new CheckDuplicatedNamesPass()); TranslationUnitPasses.AddPass(new CheckDuplicatedNamesPass());
if (Options.GenerateAbstractImpls) if (Options.GenerateAbstractImpls)
TranslationUnitPasses.AddPass(new GenerateAbstractImplementationsPass()); TranslationUnitPasses.AddPass(new GenerateAbstractImplementationsPass());
TranslationUnitPasses.AddPass(new MultipleInheritancePass());
} }
public void ProcessCode() public void ProcessCode()

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

@ -387,7 +387,8 @@ namespace CppSharp.Generators.CSharp
GenerateDeclContext(@class); GenerateDeclContext(@class);
foreach (var method in @class.Methods.Where(m => !ASTUtils.CheckIgnoreMethod(m))) foreach (var method in @class.Methods.Where(m => !ASTUtils.CheckIgnoreMethod(m) &&
m.Access == AccessSpecifier.Public))
{ {
PushBlock(CSharpBlockKind.Method); PushBlock(CSharpBlockKind.Method);
GenerateDeclarationCommon(method); GenerateDeclarationCommon(method);
@ -1034,7 +1035,7 @@ namespace CppSharp.Generators.CSharp
private string GetPropertyName(Property prop) private string GetPropertyName(Property prop)
{ {
return prop.Parameters.Count == 0 ? SafeIdentifier(prop.Name) return prop.Parameters.Count == 0 ? SafeIdentifier(prop.Name)
: string.Format("this[{0}]", this.FormatMethodParameters(prop.Parameters)); : string.Format("this[{0}]", FormatMethodParameters(prop.Parameters));
} }
private void GenerateVariable(Class @class, Type type, Variable variable) private void GenerateVariable(Class @class, Type type, Variable variable)
@ -1627,8 +1628,7 @@ namespace CppSharp.Generators.CSharp
if (Driver.Options.GenerateAbstractImpls && method.IsPure) if (Driver.Options.GenerateAbstractImpls && method.IsPure)
Write("abstract "); Write("abstract ");
var functionName = method.IsOperator ? var functionName = GetFunctionIdentifier(method);
Operators.GetOperatorIdentifier(method.OperatorKind) : method.Name;
if (method.IsConstructor || method.IsDestructor) if (method.IsConstructor || method.IsDestructor)
Write("{0}(", functionName); Write("{0}(", functionName);

Loading…
Cancel
Save