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

Rename AstVisitor.Options to VisitOptions.

pull/696/head
Joao Matos 10 years ago
parent
b710e62f37
commit
a44da437e6
12 changed files with 71 additions and 71 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. 36
      src/AST/ASTVisitor.cs
  2. 4
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  3. 2
      src/Generator/Passes/CheckStaticClass.cs
  4. 12
      src/Generator/Passes/DelegatesPass.cs
  5. 16
      src/Generator/Passes/FindSymbolsPass.cs
  6. 6
      src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
  7. 18
      src/Generator/Passes/GetterSetterToPropertyPass.cs
  8. 2
      src/Generator/Passes/HandleDefaultParamValuesPass.cs
  9. 20
      src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
  10. 16
      src/Generator/Passes/MultipleInheritancePass.cs
  11. 6
      src/Generator/Passes/RenamePass.cs
  12. 4
      src/Generator/Types/Types.cs

36
src/AST/ASTVisitor.cs
Unescape View File

@ -45,12 +45,12 @@ namespace CppSharp.AST
public abstract class AstVisitor : IAstVisitor<bool>, IAstVisited public abstract class AstVisitor : IAstVisitor<bool>, IAstVisited
{ {
public ISet<object> Visited { get; private set; } public ISet<object> Visited { get; private set; }
public AstVisitorOptions Options { get; private set; } public AstVisitorOptions VisitOptions { get; private set; }
protected AstVisitor() protected AstVisitor()
{ {
Visited = new HashSet<object>(); Visited = new HashSet<object>();
Options = new AstVisitorOptions(); VisitOptions = new AstVisitorOptions();
} }
public bool AlreadyVisited(Type type) public bool AlreadyVisited(Type type)
@ -98,7 +98,7 @@ namespace CppSharp.AST
if (function.ReturnType.Type != null) if (function.ReturnType.Type != null)
function.ReturnType.Visit(this); function.ReturnType.Visit(this);
if (Options.VisitFunctionParameters) if (VisitOptions.VisitFunctionParameters)
foreach (var param in function.Parameters) foreach (var param in function.Parameters)
param.Visit(this); param.Visit(this);
@ -163,7 +163,7 @@ namespace CppSharp.AST
if (!VisitType(template, quals)) if (!VisitType(template, quals))
return false; return false;
if (Options.VisitTemplateArguments) if (VisitOptions.VisitTemplateArguments)
{ {
foreach (var arg in template.Arguments) foreach (var arg in template.Arguments)
{ {
@ -194,7 +194,7 @@ namespace CppSharp.AST
if (!VisitType(template, quals)) if (!VisitType(template, quals))
return false; return false;
if (Options.VisitTemplateArguments) if (VisitOptions.VisitTemplateArguments)
{ {
foreach (var arg in template.Arguments) foreach (var arg in template.Arguments)
{ {
@ -293,20 +293,20 @@ namespace CppSharp.AST
if (!VisitDeclarationContext(@class)) if (!VisitDeclarationContext(@class))
return false; return false;
if (Options.VisitClassBases) if (VisitOptions.VisitClassBases)
foreach (var baseClass in @class.Bases) foreach (var baseClass in @class.Bases)
if (baseClass.IsClass) if (baseClass.IsClass)
baseClass.Class.Visit(this); baseClass.Class.Visit(this);
if (Options.VisitClassFields) if (VisitOptions.VisitClassFields)
foreach (var field in @class.Fields) foreach (var field in @class.Fields)
VisitFieldDecl(field); VisitFieldDecl(field);
if (Options.VisitClassProperties) if (VisitOptions.VisitClassProperties)
foreach (var property in @class.Properties) foreach (var property in @class.Properties)
VisitProperty(property); VisitProperty(property);
if (Options.VisitClassMethods) if (VisitOptions.VisitClassMethods)
{ {
var methods = @class.Methods.ToArray(); var methods = @class.Methods.ToArray();
foreach (var method in methods) foreach (var method in methods)
@ -329,7 +329,7 @@ namespace CppSharp.AST
if (!VisitDeclaration(property)) if (!VisitDeclaration(property))
return false; return false;
if (Options.VisitFunctionReturnType) if (VisitOptions.VisitFunctionReturnType)
return property.Type.Visit(this); return property.Type.Visit(this);
return true; return true;
@ -349,10 +349,10 @@ namespace CppSharp.AST
return false; return false;
var retType = function.ReturnType; var retType = function.ReturnType;
if (Options.VisitFunctionReturnType && retType.Type != null) if (VisitOptions.VisitFunctionReturnType && retType.Type != null)
retType.Type.Visit(this, retType.Qualifiers); retType.Type.Visit(this, retType.Qualifiers);
if (Options.VisitFunctionParameters) if (VisitOptions.VisitFunctionParameters)
foreach (var param in function.Parameters) foreach (var param in function.Parameters)
param.Visit(this); param.Visit(this);
@ -513,23 +513,23 @@ namespace CppSharp.AST
foreach (var decl in context.Functions) foreach (var decl in context.Functions)
decl.Visit(this); decl.Visit(this);
if (Options.VisitNamespaceEnums) if (VisitOptions.VisitNamespaceEnums)
foreach (var decl in context.Enums) foreach (var decl in context.Enums)
decl.Visit(this); decl.Visit(this);
if (Options.VisitNamespaceTemplates) if (VisitOptions.VisitNamespaceTemplates)
foreach (var decl in context.Templates) foreach (var decl in context.Templates)
decl.Visit(this); decl.Visit(this);
if (Options.VisitNamespaceTypedefs) if (VisitOptions.VisitNamespaceTypedefs)
foreach (var decl in context.Typedefs) foreach (var decl in context.Typedefs)
decl.Visit(this); decl.Visit(this);
if (Options.VisitNamespaceVariables) if (VisitOptions.VisitNamespaceVariables)
foreach (var decl in context.Variables) foreach (var decl in context.Variables)
decl.Visit(this); decl.Visit(this);
if (Options.VisitNamespaceEvents) if (VisitOptions.VisitNamespaceEvents)
foreach (var decl in context.Events) foreach (var decl in context.Events)
decl.Visit(this); decl.Visit(this);
@ -544,7 +544,7 @@ namespace CppSharp.AST
if (!VisitDeclaration(@event)) if (!VisitDeclaration(@event))
return false; return false;
if (Options.VisitEventParameters) if (VisitOptions.VisitEventParameters)
foreach (var param in @event.Parameters) foreach (var param in @event.Parameters)
param.Visit(this); param.Visit(this);

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

@ -40,8 +40,8 @@ namespace CppSharp.Generators.CSharp
protected CSharpMarshalPrinter(CSharpMarshalContext context) protected CSharpMarshalPrinter(CSharpMarshalContext context)
: base(context) : base(context)
{ {
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
public override bool VisitMemberPointerType(MemberPointerType member, public override bool VisitMemberPointerType(MemberPointerType member,

2
src/Generator/Passes/CheckStaticClass.cs
Unescape View File

@ -11,7 +11,7 @@ namespace CppSharp.Passes
{ {
public CheckStaticClass() public CheckStaticClass()
{ {
Options.VisitClassBases = false; VisitOptions.VisitClassBases = false;
} }
public override bool VisitDeclaration(Declaration decl) public override bool VisitDeclaration(Declaration decl)

12
src/Generator/Passes/DelegatesPass.cs
Unescape View File

@ -27,12 +27,12 @@ namespace CppSharp.Passes
public DelegatesPass() public DelegatesPass()
{ {
Options.VisitClassBases = false; VisitOptions.VisitClassBases = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitFunctionReturnType = false; VisitOptions.VisitFunctionReturnType = false;
Options.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceEnums = false;
Options.VisitNamespaceTemplates = false; VisitOptions.VisitNamespaceTemplates = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
public override bool VisitLibrary(ASTContext context) public override bool VisitLibrary(ASTContext context)

16
src/Generator/Passes/FindSymbolsPass.cs
Unescape View File

@ -6,14 +6,14 @@ namespace CppSharp.Passes
{ {
public FindSymbolsPass() public FindSymbolsPass()
{ {
Options.VisitClassBases = false; VisitOptions.VisitClassBases = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitFunctionReturnType = false; VisitOptions.VisitFunctionReturnType = false;
Options.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceEnums = false;
Options.VisitNamespaceTemplates = false; VisitOptions.VisitNamespaceTemplates = false;
Options.VisitNamespaceTypedefs = false; VisitOptions.VisitNamespaceTypedefs = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
Options.VisitClassFields = false; VisitOptions.VisitClassFields = false;
} }
public override bool VisitDeclaration(Declaration decl) public override bool VisitDeclaration(Declaration decl)

6
src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
Unescape View File

@ -324,15 +324,15 @@ namespace CppSharp.Passes
public GetterSetterToPropertyAdvancedPass() public GetterSetterToPropertyAdvancedPass()
{ {
Options.VisitClassProperties = false; VisitOptions.VisitClassProperties = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
} }
public override bool VisitClassDecl(Class @class) public override bool VisitClassDecl(Class @class)
{ {
if (VisitDeclarationContext(@class)) if (VisitDeclarationContext(@class))
{ {
if (Options.VisitClassBases) if (VisitOptions.VisitClassBases)
foreach (var baseClass in @class.Bases) foreach (var baseClass in @class.Bases)
if (baseClass.IsClass) if (baseClass.IsClass)
VisitClassDecl(baseClass.Class); VisitClassDecl(baseClass.Class);

18
src/Generator/Passes/GetterSetterToPropertyPass.cs
Unescape View File

@ -13,15 +13,15 @@ namespace CppSharp.Passes
{ {
public GetterSetterToPropertyPass() public GetterSetterToPropertyPass()
{ {
Options.VisitClassFields = false; VisitOptions.VisitClassFields = false;
Options.VisitClassProperties = false; VisitOptions.VisitClassProperties = false;
Options.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceEnums = false;
Options.VisitNamespaceTemplates = false; VisitOptions.VisitNamespaceTemplates = false;
Options.VisitNamespaceTypedefs = false; VisitOptions.VisitNamespaceTypedefs = false;
Options.VisitNamespaceEvents = false; VisitOptions.VisitNamespaceEvents = false;
Options.VisitNamespaceVariables = false; VisitOptions.VisitNamespaceVariables = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
static bool IsSetter(Function method) static bool IsSetter(Function method)

2
src/Generator/Passes/HandleDefaultParamValuesPass.cs
Unescape View File

@ -21,7 +21,7 @@ namespace CppSharp.Passes
public HandleDefaultParamValuesPass() public HandleDefaultParamValuesPass()
{ {
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
} }
public override bool VisitTranslationUnit(TranslationUnit unit) public override bool VisitTranslationUnit(TranslationUnit unit)

20
src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
Unescape View File

@ -8,16 +8,16 @@ namespace CppSharp.Passes
{ {
public IgnoreSystemDeclarationsPass() public IgnoreSystemDeclarationsPass()
{ {
Options.VisitClassBases = false; VisitOptions.VisitClassBases = false;
Options.VisitClassFields = false; VisitOptions.VisitClassFields = false;
Options.VisitClassMethods = false; VisitOptions.VisitClassMethods = false;
Options.VisitClassProperties = false; VisitOptions.VisitClassProperties = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitFunctionReturnType = false; VisitOptions.VisitFunctionReturnType = false;
Options.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceEnums = false;
Options.VisitNamespaceEvents = false; VisitOptions.VisitNamespaceEvents = false;
Options.VisitNamespaceTemplates = false; VisitOptions.VisitNamespaceTemplates = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
public override bool VisitTranslationUnit(TranslationUnit unit) public override bool VisitTranslationUnit(TranslationUnit unit)

16
src/Generator/Passes/MultipleInheritancePass.cs
Unescape View File

@ -17,14 +17,14 @@ namespace CppSharp.Passes
public MultipleInheritancePass() public MultipleInheritancePass()
{ {
Options.VisitClassFields = false; VisitOptions.VisitClassFields = false;
Options.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceEnums = false;
Options.VisitNamespaceVariables = false; VisitOptions.VisitNamespaceVariables = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
Options.VisitClassMethods = false; VisitOptions.VisitClassMethods = false;
Options.VisitClassProperties = false; VisitOptions.VisitClassProperties = false;
Options.VisitFunctionReturnType = false; VisitOptions.VisitFunctionReturnType = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
} }
public override bool VisitTranslationUnit(TranslationUnit unit) public override bool VisitTranslationUnit(TranslationUnit unit)

6
src/Generator/Passes/RenamePass.cs
Unescape View File

@ -30,9 +30,9 @@ namespace CppSharp.Passes
protected RenamePass() protected RenamePass()
{ {
Options.VisitFunctionReturnType = false; VisitOptions.VisitFunctionReturnType = false;
Options.VisitFunctionParameters = false; VisitOptions.VisitFunctionParameters = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
protected RenamePass(RenameTargets targets) protected RenamePass(RenameTargets targets)

4
src/Generator/Types/Types.cs
Unescape View File

@ -15,8 +15,8 @@ namespace CppSharp
public TypeIgnoreChecker(ITypeMapDatabase database) public TypeIgnoreChecker(ITypeMapDatabase database)
{ {
TypeMapDatabase = database; TypeMapDatabase = database;
Options.VisitClassBases = false; VisitOptions.VisitClassBases = false;
Options.VisitTemplateArguments = false; VisitOptions.VisitTemplateArguments = false;
} }
void Ignore() void Ignore()

Write Preview
Loading…
Cancel
Save