Convert the visiting options to an enum

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
5 years ago · 0e38947e07
32 changed files with 130 additions and 350 deletions
--- a/src/AST/ASTVisitor.cs
+++ b/src/AST/ASTVisitor.cs
@ -1,4 +1,5 @@
				@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;

 namespace CppSharp.AST
@ -17,25 +18,68 @@ namespace CppSharp.AST
				@@ -17,25 +18,68 @@ namespace CppSharp.AST
        AstVisitorOptions VisitOptions { get; }
    }

+    [Flags]
+    public enum VisitFlags
+    {
+        /// <summary>
+        /// We always visit classes, functions and declaration contexts.
+        /// </summary>
+        Default = 0,
+
+        ClassBases = 1 << 0,
+        ClassFields = 1 << 1,
+        ClassProperties = 1 << 2,
+        ClassMethods = 1 << 3,
+        ClassTemplateSpecializations = 1 << 4,
+        PropertyAccessors = 1 << 5,
+
+        NamespaceEnums = 1 << 6,
+        NamespaceTemplates = 1 << 7,
+        NamespaceTypedefs = 1 << 8,
+        NamespaceEvents = 1 << 9,
+        NamespaceVariables = 1 << 10,
+
+        FunctionReturnType = 1 << 11,
+        FunctionParameters = 1 << 12,
+        EventParameters = 1 << 13,
+        TemplateArguments = 1 << 14,
+
+        Any = ClassBases | ClassFields | ClassProperties | ClassMethods |
+            ClassTemplateSpecializations | PropertyAccessors |
+            NamespaceEnums | NamespaceTemplates | NamespaceTypedefs |
+            NamespaceEvents | NamespaceVariables |
+            FunctionReturnType | FunctionParameters |
+            EventParameters | TemplateArguments
+    }
+
    public class AstVisitorOptions
    {
-        public bool VisitClassBases = true;
-        public bool VisitClassFields = true;
-        public bool VisitClassProperties = true;
-        public bool VisitClassMethods = true;
-        public bool VisitClassTemplateSpecializations { get; set; } = true;
-        public bool VisitPropertyAccessors = false;
-
-        public bool VisitNamespaceEnums = true;
-        public bool VisitNamespaceTemplates = true;
-        public bool VisitNamespaceTypedefs = true;
-        public bool VisitNamespaceEvents = true;
-        public bool VisitNamespaceVariables = true;
-
-        public bool VisitFunctionReturnType = true;
-        public bool VisitFunctionParameters = true;
-        public bool VisitEventParameters = true;
-        public bool VisitTemplateArguments = true;
+        public AstVisitorOptions(VisitFlags flags)
+            => this.flags = flags;
+
+        public bool VisitClassBases => (flags & VisitFlags.ClassBases) != 0;
+        public bool VisitClassFields => (flags & VisitFlags.ClassFields) != 0;
+        public bool VisitClassProperties => (flags & VisitFlags.ClassProperties) != 0;
+        public bool VisitClassMethods => (flags & VisitFlags.ClassMethods) != 0;
+        public bool VisitClassTemplateSpecializations => (flags & VisitFlags.ClassTemplateSpecializations) != 0;
+        public bool VisitPropertyAccessors => (flags & VisitFlags.PropertyAccessors) != 0;
+
+        public bool VisitNamespaceEnums => (flags & VisitFlags.NamespaceEnums) != 0;
+        public bool VisitNamespaceTemplates => (flags & VisitFlags.NamespaceTemplates) != 0;
+        public bool VisitNamespaceTypedefs => (flags & VisitFlags.NamespaceTypedefs) != 0;
+        public bool VisitNamespaceEvents => (flags & VisitFlags.NamespaceEvents) != 0;
+        public bool VisitNamespaceVariables => (flags & VisitFlags.NamespaceVariables) != 0;
+
+        public bool VisitFunctionReturnType => (flags & VisitFlags.FunctionReturnType) != 0;
+        public bool VisitFunctionParameters => (flags & VisitFlags.FunctionParameters) != 0;
+        public bool VisitEventParameters => (flags & VisitFlags.EventParameters) != 0;
+        public bool VisitTemplateArguments => (flags & VisitFlags.TemplateArguments) != 0;
+
+        public void SetFlags(VisitFlags flags) => this.flags |= flags;
+        public void ResetFlags(VisitFlags flags) => this.flags = flags;
+        public void ClearFlags(VisitFlags flags) => this.flags &= ~flags;
+
+        private VisitFlags flags;
    }

    /// <summary>
@ -46,14 +90,9 @@ namespace CppSharp.AST
				@@ -46,14 +90,9 @@ namespace CppSharp.AST
    /// </summary>
    public abstract partial class AstVisitor : IAstVisitor<bool>, IAstVisited
    {
-        public ISet<object> Visited { get; private set; }
+        public ISet<object> Visited { get; private set; } = new HashSet<object>();
        public AstVisitorOptions VisitOptions { get; private set; }
-
-        protected AstVisitor()
-        {
-            Visited = new HashSet<object>();
-            VisitOptions = new AstVisitorOptions();
-        }
+            = new AstVisitorOptions(VisitFlags.Any & ~VisitFlags.PropertyAccessors);

        public bool AlreadyVisited(Type type)
        {
--- a/src/Generator/Generators/C/CCodeGenerator.cs
+++ b/src/Generator/Generators/C/CCodeGenerator.cs
@ -1,5 +1,4 @@
				@@ -1,5 +1,4 @@
 using CppSharp.AST;
-using CppSharp.AST.Extensions;
 using System.Collections.Generic;
 using System.Linq;

@ -32,7 +31,7 @@ namespace CppSharp.Generators.C
				@@ -32,7 +31,7 @@ namespace CppSharp.Generators.C
            IEnumerable<TranslationUnit> units = null)
            : base(context, units)
        {
-            VisitOptions.VisitPropertyAccessors = true;
+            VisitOptions.SetFlags(VisitFlags.PropertyAccessors);
            typePrinter = new CppTypePrinter(context);
        }

--- a/src/Generator/Generators/CSharp/CSharpMarshal.cs
+++ b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@ -1,6 +1,4 @@
				@@ -1,6 +1,4 @@
-using System;
 using System.Linq;
-using System.Text;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
 using CppSharp.Generators.C;
@ -28,8 +26,8 @@ namespace CppSharp.Generators.CSharp
				@@ -28,8 +26,8 @@ namespace CppSharp.Generators.CSharp
        protected CSharpMarshalPrinter(CSharpMarshalContext context)
            : base(context)
        {
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitTemplateArguments = false;
+            VisitOptions.ClearFlags(VisitFlags.FunctionParameters |
+                VisitFlags.TemplateArguments);
        }

        public override bool VisitMemberPointerType(MemberPointerType member,
--- a/src/Generator/Generators/CodeGenerator.cs
+++ b/src/Generator/Generators/CodeGenerator.cs
@ -45,8 +45,8 @@ namespace CppSharp.Generators
				@@ -45,8 +45,8 @@ namespace CppSharp.Generators
        public virtual CommentKind DocumentationCommentKind => CommentKind.BCPLSlash;

        public ISet<object> Visited { get; } = new HashSet<object>();
-
-        public AstVisitorOptions VisitOptions { get; } = new AstVisitorOptions();
+        public AstVisitorOptions VisitOptions { get; }
+            = new AstVisitorOptions(VisitFlags.Any & ~VisitFlags.PropertyAccessors);

        protected CodeGenerator(BindingContext context)
        {
--- a/src/Generator/Passes/CheckFlagEnumsPass.cs
+++ b/src/Generator/Passes/CheckFlagEnumsPass.cs
@ -9,20 +9,9 @@ namespace CppSharp.Passes
				@@ -9,20 +9,9 @@ namespace CppSharp.Passes
    public class CheckFlagEnumsPass : TranslationUnitPass
    {
        public CheckFlagEnumsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.NamespaceEnums);

-        static bool IsFlagEnum(Enumeration @enum)
+        private static bool IsFlagEnum(Enumeration @enum)
        {
            // If the enumeration only has power of two values, assume it's
            // a flags enum.
--- a/src/Generator/Passes/CheckOperatorsOverloads.cs
+++ b/src/Generator/Passes/CheckOperatorsOverloads.cs
@ -10,20 +10,9 @@ namespace CppSharp.Passes
				@@ -10,20 +10,9 @@ namespace CppSharp.Passes
    /// </summary>
    public class CheckOperatorsOverloadsPass : TranslationUnitPass
    {
-        public CheckOperatorsOverloadsPass() =>
-            VisitOptions.VisitClassBases =
-            VisitOptions.VisitClassFields =
-            VisitOptions.VisitEventParameters =
-            VisitOptions.VisitFunctionParameters =
-            VisitOptions.VisitFunctionReturnType =
-            VisitOptions.VisitClassMethods =
-            VisitOptions.VisitNamespaceEnums =
-            VisitOptions.VisitNamespaceEvents =
-            VisitOptions.VisitNamespaceTemplates =
-            VisitOptions.VisitNamespaceTypedefs =
-            VisitOptions.VisitNamespaceVariables =
-            VisitOptions.VisitPropertyAccessors =
-            VisitOptions.VisitTemplateArguments = false;
+        public CheckOperatorsOverloadsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassProperties |
+            VisitFlags.ClassTemplateSpecializations);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/CheckStaticClass.cs
+++ b/src/Generator/Passes/CheckStaticClass.cs
@ -10,9 +10,7 @@ namespace CppSharp.Passes
				@@ -10,9 +10,7 @@ namespace CppSharp.Passes
    public class CheckStaticClass : TranslationUnitPass
    {
        public CheckStaticClass()
-        {
-            VisitOptions.VisitClassBases = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.ClassMethods);

        public override bool VisitDeclaration(Declaration decl)
        {
--- a/src/Generator/Passes/CleanCommentsPass.cs
+++ b/src/Generator/Passes/CleanCommentsPass.cs
@ -7,12 +7,9 @@ namespace CppSharp.Passes
				@@ -7,12 +7,9 @@ namespace CppSharp.Passes
 {
    public class CleanCommentsPass : TranslationUnitPass, ICommentVisitor<bool>
    {
-        public CleanCommentsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public CleanCommentsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassBases | VisitFlags.FunctionReturnType |
+            VisitFlags.TemplateArguments);

        public bool VisitBlockCommand(BlockCommandComment comment) => true;

--- a/src/Generator/Passes/CleanInvalidDeclNamesPass.cs
+++ b/src/Generator/Passes/CleanInvalidDeclNamesPass.cs
@ -9,13 +9,9 @@ namespace CppSharp.Passes
				@@ -9,13 +9,9 @@ namespace CppSharp.Passes
 {
    public class CleanInvalidDeclNamesPass : TranslationUnitPass
    {
-        public CleanInvalidDeclNamesPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public CleanInvalidDeclNamesPass() => VisitOptions.ClearFlags(
+            VisitFlags.ClassBases | VisitFlags.EventParameters |
+            VisitFlags.FunctionReturnType | VisitFlags.TemplateArguments);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/DelegatesPass.cs
+++ b/src/Generator/Passes/DelegatesPass.cs
@ -9,14 +9,10 @@ namespace CppSharp.Passes
				@@ -9,14 +9,10 @@ namespace CppSharp.Passes
 {
    public class DelegatesPass : TranslationUnitPass
    {
-        public DelegatesPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public DelegatesPass() => VisitOptions.ClearFlags(
+            VisitFlags.ClassBases | VisitFlags.FunctionReturnType |
+            VisitFlags.NamespaceEnums | VisitFlags.NamespaceTemplates |
+            VisitFlags.TemplateArguments);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/EqualiseAccessOfOverrideAndBasePass.cs
+++ b/src/Generator/Passes/EqualiseAccessOfOverrideAndBasePass.cs
@ -6,19 +6,8 @@ namespace CppSharp.Passes
				@@ -6,19 +6,8 @@ namespace CppSharp.Passes
 {
    public class EqualiseAccessOfOverrideAndBasePass : TranslationUnitPass
    {
-        public EqualiseAccessOfOverrideAndBasePass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public EqualiseAccessOfOverrideAndBasePass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassTemplateSpecializations);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/FieldToPropertyPass.cs
+++ b/src/Generator/Passes/FieldToPropertyPass.cs
@ -8,20 +8,8 @@ namespace CppSharp.Passes
				@@ -8,20 +8,8 @@ namespace CppSharp.Passes
 {
    public class FieldToPropertyPass : TranslationUnitPass
    {
-        public FieldToPropertyPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public FieldToPropertyPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassFields | VisitFlags.ClassTemplateSpecializations);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/FindSymbolsPass.cs
+++ b/src/Generator/Passes/FindSymbolsPass.cs
@ -6,18 +6,8 @@ namespace CppSharp.Passes
				@@ -6,18 +6,8 @@ namespace CppSharp.Passes
 {
    public class FindSymbolsPass : TranslationUnitPass
    {
-        public FindSymbolsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitTemplateArguments = false;
-            VisitOptions.VisitClassFields = false;
-        }
+        public FindSymbolsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassProperties);

        public bool Wait
        {
--- a/src/Generator/Passes/FlattenAnonymousTypesToFields.cs
+++ b/src/Generator/Passes/FlattenAnonymousTypesToFields.cs
@ -11,22 +11,8 @@ namespace CppSharp.Passes
				@@ -11,22 +11,8 @@ namespace CppSharp.Passes
    /// </summary>
    public class FlattenAnonymousTypesToFields : TranslationUnitPass
    {
-        public FlattenAnonymousTypesToFields()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitPropertyAccessors = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public FlattenAnonymousTypesToFields() =>
+            VisitOptions.ResetFlags(VisitFlags.ClassTemplateSpecializations);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/GenerateAbstractImplementationsPass.cs
+++ b/src/Generator/Passes/GenerateAbstractImplementationsPass.cs
@ -13,21 +13,7 @@ namespace CppSharp.Passes
				@@ -13,21 +13,7 @@ namespace CppSharp.Passes
    public class GenerateAbstractImplementationsPass : TranslationUnitPass
    {
        public GenerateAbstractImplementationsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.Default);

        /// <summary>
        /// Collects all internal implementations in a unit to be added at
--- a/src/Generator/Passes/GenerateSymbolsPass.cs
+++ b/src/Generator/Passes/GenerateSymbolsPass.cs
@ -11,19 +11,9 @@ namespace CppSharp.Passes
				@@ -11,19 +11,9 @@ namespace CppSharp.Passes
 {
    public class GenerateSymbolsPass : TranslationUnitPass
    {
-        public GenerateSymbolsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public GenerateSymbolsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassProperties |
+            VisitFlags.ClassTemplateSpecializations | VisitFlags.NamespaceVariables);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/GetterSetterToPropertyPass.cs
+++ b/src/Generator/Passes/GetterSetterToPropertyPass.cs
@ -43,19 +43,7 @@ namespace CppSharp.Passes
				@@ -43,19 +43,7 @@ namespace CppSharp.Passes
        }

        public GetterSetterToPropertyPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.ClassTemplateSpecializations);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/HandleDefaultParamValuesPass.cs
+++ b/src/Generator/Passes/HandleDefaultParamValuesPass.cs
@ -12,9 +12,7 @@ namespace CppSharp.Passes
				@@ -12,9 +12,7 @@ namespace CppSharp.Passes
            new Dictionary<DeclarationContext, List<Function>>();

        public HandleDefaultParamValuesPass()
-        {
-            VisitOptions.VisitFunctionParameters = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.ClassMethods);

        public override bool VisitTranslationUnit(TranslationUnit unit)
        {
--- a/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
+++ b/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
@ -1,5 +1,4 @@
				@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;

@ -8,19 +7,7 @@ namespace CppSharp.Passes
				@@ -8,19 +7,7 @@ namespace CppSharp.Passes
    public class IgnoreSystemDeclarationsPass : TranslationUnitPass
    {
        public IgnoreSystemDeclarationsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.NamespaceEnums);

        public override bool VisitTranslationUnit(TranslationUnit unit)
        {
--- a/src/Generator/Passes/MakeProtectedNestedTypesPublicPass.cs
+++ b/src/Generator/Passes/MakeProtectedNestedTypesPublicPass.cs
@ -7,20 +7,7 @@ namespace CppSharp.Passes
				@@ -7,20 +7,7 @@ namespace CppSharp.Passes
    public class MakeProtectedNestedTypesPublicPass : TranslationUnitPass
    {
        public MakeProtectedNestedTypesPublicPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.Default);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/MarkUsedClassInternalsPass.cs
+++ b/src/Generator/Passes/MarkUsedClassInternalsPass.cs
@ -8,20 +8,7 @@ namespace CppSharp.Passes
				@@ -8,20 +8,7 @@ namespace CppSharp.Passes
    public class MarkUsedClassInternalsPass : TranslationUnitPass
    {
        public MarkUsedClassInternalsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.ClassTemplateSpecializations);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/MarshalPrimitivePointersAsRefTypePass.cs
+++ b/src/Generator/Passes/MarshalPrimitivePointersAsRefTypePass.cs
@ -7,21 +7,8 @@ namespace CppSharp.Passes
				@@ -7,21 +7,8 @@ namespace CppSharp.Passes
 {
    public class MarshalPrimitivePointersAsRefTypePass : TranslationUnitPass
    {
-        public MarshalPrimitivePointersAsRefTypePass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public MarshalPrimitivePointersAsRefTypePass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassTemplateSpecializations);

        public override bool VisitFunctionDecl(Function function)
        {
--- a/src/Generator/Passes/MoveFunctionToClassPass.cs
+++ b/src/Generator/Passes/MoveFunctionToClassPass.cs
@ -6,16 +6,7 @@ namespace CppSharp.Passes
				@@ -6,16 +6,7 @@ namespace CppSharp.Passes
    public class MoveFunctionToClassPass : TranslationUnitPass
    {
        public MoveFunctionToClassPass()
-        {
-            VisitOptions.VisitClassBases = VisitOptions.VisitClassFields =
-            VisitOptions.VisitClassMethods = VisitOptions.VisitClassProperties =
-            VisitOptions.VisitClassTemplateSpecializations = VisitOptions.VisitEventParameters =
-            VisitOptions.VisitFunctionParameters = VisitOptions.VisitFunctionReturnType =
-            VisitOptions.VisitNamespaceEnums = VisitOptions.VisitNamespaceEvents =
-            VisitOptions.VisitNamespaceTemplates = VisitOptions.VisitNamespaceTypedefs =
-            VisitOptions.VisitNamespaceVariables = VisitOptions.VisitPropertyAccessors =
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.Default);

        public override bool VisitFunctionDecl(Function function)
        {
--- a/src/Generator/Passes/MultipleInheritancePass.cs
+++ b/src/Generator/Passes/MultipleInheritancePass.cs
@ -16,21 +16,12 @@ namespace CppSharp.Passes
				@@ -16,21 +16,12 @@ namespace CppSharp.Passes
        private readonly HashSet<Class> interfaces = new HashSet<Class>();

        /// <summary>
-        /// Change and implement secondaryy bases at the end to avoid processing implementations.
+        /// Change and implement secondary bases at the end to avoid processing implementations.
        /// </summary>
        private readonly HashSet<Class> classesWithSecondaryBases = new HashSet<Class>();

        public MultipleInheritancePass()
-        {
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitFunctionParameters = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.Default);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/ParamTypeToInterfacePass.cs
+++ b/src/Generator/Passes/ParamTypeToInterfacePass.cs
@ -11,20 +11,9 @@ namespace CppSharp.Passes
				@@ -11,20 +11,9 @@ namespace CppSharp.Passes
    /// </summary>
    public class ParamTypeToInterfacePass : TranslationUnitPass
    {
-        public ParamTypeToInterfacePass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public ParamTypeToInterfacePass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassProperties |
+            VisitFlags.ClassTemplateSpecializations);

        public override bool VisitFunctionDecl(Function function)
        {
--- a/src/Generator/Passes/RenamePass.cs
+++ b/src/Generator/Passes/RenamePass.cs
@ -28,16 +28,12 @@ namespace CppSharp.Passes
				@@ -28,16 +28,12 @@ namespace CppSharp.Passes

        public RenameTargets Targets = RenameTargets.Any;

-        protected RenamePass()
-        {
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitTemplateArguments = false;
+        protected RenamePass() => VisitOptions.ClearFlags(
+            VisitFlags.FunctionParameters | VisitFlags.FunctionReturnType |
+            VisitFlags.TemplateArguments |
            // these need to be visited but in a different order (see VisitClassDecl) so disable the default order
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitNamespaceEvents = false;
-        }
+            VisitFlags.ClassProperties | VisitFlags.ClassMethods |
+            VisitFlags.NamespaceEvents);

        protected RenamePass(RenameTargets targets)
            : this()
--- a/src/Generator/Passes/ResolveIncompleteDeclsPass.cs
+++ b/src/Generator/Passes/ResolveIncompleteDeclsPass.cs
@ -6,11 +6,8 @@ namespace CppSharp.Passes
				@@ -6,11 +6,8 @@ namespace CppSharp.Passes
 {
    public class ResolveIncompleteDeclsPass : TranslationUnitPass
    {
-        public ResolveIncompleteDeclsPass()
-        {
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitClassMethods = false;
-        }
+        public ResolveIncompleteDeclsPass() => VisitOptions.ClearFlags(
+            VisitFlags.FunctionParameters | VisitFlags.ClassMethods);

        public override bool VisitClassDecl(Class @class)
        {
--- a/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
+++ b/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
@ -26,22 +26,7 @@ namespace CppSharp.Passes
				@@ -26,22 +26,7 @@ namespace CppSharp.Passes
    public class SpecializationMethodsWithDependentPointersPass : TranslationUnitPass
    {
        public SpecializationMethodsWithDependentPointersPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassFields = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+            => VisitOptions.ResetFlags(VisitFlags.Default);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/StripUnusedSystemTypesPass.cs
+++ b/src/Generator/Passes/StripUnusedSystemTypesPass.cs
@ -7,19 +7,9 @@ namespace CppSharp.Passes
				@@ -7,19 +7,9 @@ namespace CppSharp.Passes
 {
    public class StripUnusedSystemTypesPass : TranslationUnitPass
    {
-        public StripUnusedSystemTypesPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassMethods = false;
-            VisitOptions.VisitClassProperties = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceVariables = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public StripUnusedSystemTypesPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassFields | VisitFlags.ClassTemplateSpecializations |
+            VisitFlags.NamespaceTemplates | VisitFlags.NamespaceTypedefs);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/TrimSpecializationsPass.cs
+++ b/src/Generator/Passes/TrimSpecializationsPass.cs
@ -1,28 +1,16 @@
				@@ -1,28 +1,16 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using CppSharp.AST;
 using CppSharp.AST.Extensions;
-using CppSharp.Types;
 using CppSharp.Utils;

 namespace CppSharp.Passes
 {
    public class TrimSpecializationsPass : TranslationUnitPass
    {
-        public TrimSpecializationsPass()
-        {
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitClassTemplateSpecializations = false;
-            VisitOptions.VisitEventParameters = false;
-            VisitOptions.VisitFunctionParameters = false;
-            VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
-            VisitOptions.VisitNamespaceEvents = false;
-            VisitOptions.VisitNamespaceTemplates = false;
-            VisitOptions.VisitNamespaceTypedefs = false;
-            VisitOptions.VisitTemplateArguments = false;
-        }
+        public TrimSpecializationsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassFields | VisitFlags.ClassMethods |
+            VisitFlags.ClassProperties | VisitFlags.NamespaceVariables);

        public override bool VisitASTContext(ASTContext context)
        {
--- a/src/Generator/Passes/ValidateOperatorsPass.cs
+++ b/src/Generator/Passes/ValidateOperatorsPass.cs
@ -10,19 +10,9 @@ namespace CppSharp.Passes
				@@ -10,19 +10,9 @@ namespace CppSharp.Passes
    /// </summary>
    public class ValidateOperatorsPass : TranslationUnitPass
    {
-        public ValidateOperatorsPass() =>
-            VisitOptions.VisitClassBases =
-            VisitOptions.VisitClassFields =
-            VisitOptions.VisitEventParameters =
-            VisitOptions.VisitFunctionParameters =
-            VisitOptions.VisitFunctionReturnType =
-            VisitOptions.VisitNamespaceEnums =
-            VisitOptions.VisitNamespaceEvents =
-            VisitOptions.VisitNamespaceTemplates =
-            VisitOptions.VisitNamespaceTypedefs =
-            VisitOptions.VisitNamespaceVariables =
-            VisitOptions.VisitPropertyAccessors =
-            VisitOptions.VisitTemplateArguments = false;
+        public ValidateOperatorsPass() => VisitOptions.ResetFlags(
+            VisitFlags.ClassMethods | VisitFlags.ClassProperties |
+            VisitFlags.ClassTemplateSpecializations);

        public override bool VisitMethodDecl(Method method)
        {
--- a/src/Generator/Types/TypeIgnoreChecker.cs
+++ b/src/Generator/Types/TypeIgnoreChecker.cs
@ -17,8 +17,7 @@ namespace CppSharp
				@@ -17,8 +17,7 @@ namespace CppSharp
            GeneratorKind generatorKind = GeneratorKind.CSharp)
        {
            TypeMapDatabase = database;
-            VisitOptions.VisitClassBases = false;
-            VisitOptions.VisitTemplateArguments = false;
+            VisitOptions.ClearFlags(VisitFlags.ClassBases | VisitFlags.TemplateArguments);
            this.generatorKind = generatorKind;
        }