Format files

src/AST/ASTContext.cs

@@ -144,7 +144,7 @@ namespace CppSharp.AST
         public void SetEnumAsFlags(string name)
         {
             var enums = FindEnum(name);
-            foreach(var @enum in enums)
+            foreach (var @enum in enums)
                 @enum.SetFlags();
         }
 

src/AST/ASTVisitor.cs

@@ -631,7 +631,7 @@ namespace CppSharp.AST
 
             if (VisitOptions.VisitNamespaceEnums)
                 foreach (var decl in context.Enums)
-                  decl.Visit(this);
+                    decl.Visit(this);
 
             if (VisitOptions.VisitNamespaceTemplates)
                 foreach (var decl in context.Templates)

src/AST/ClassExtensions.cs

@@ -39,7 +39,7 @@ namespace CppSharp.AST
             foreach (var @base in @class.Bases)
             {
                 if (!@base.IsClass) continue;
-                foreach(var elem in @base.Class.FindHierarchy(func))
+                foreach (var elem in @base.Class.FindHierarchy(func))
                     yield return elem;
             }
         }

src/AST/Comment.cs

@@ -131,17 +131,17 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.BCPL:
-            case CommentKind.BCPLExcl:
-                return "//";
-            case CommentKind.C:
-            case CommentKind.JavaDoc:
-            case CommentKind.Qt:
-                return " *";
-            case CommentKind.BCPLSlash:
-                return "///";
-            default:
-                throw new ArgumentOutOfRangeException();
+                case CommentKind.BCPL:
+                case CommentKind.BCPLExcl:
+                    return "//";
+                case CommentKind.C:
+                case CommentKind.JavaDoc:
+                case CommentKind.Qt:
+                    return " *";
+                case CommentKind.BCPLSlash:
+                    return "///";
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
 
@@ -149,19 +149,19 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.BCPL:
-            case CommentKind.BCPLSlash:
-                return string.Empty;
-            case CommentKind.C:
-                return "/*";
-            case CommentKind.BCPLExcl:
-                return "//!";
-            case CommentKind.JavaDoc:
-                return "/**";
-            case CommentKind.Qt:
-                return "/*!";
-            default:
-                throw new ArgumentOutOfRangeException();
+                case CommentKind.BCPL:
+                case CommentKind.BCPLSlash:
+                    return string.Empty;
+                case CommentKind.C:
+                    return "/*";
+                case CommentKind.BCPLExcl:
+                    return "//!";
+                case CommentKind.JavaDoc:
+                    return "/**";
+                case CommentKind.Qt:
+                    return "/*!";
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
 
@@ -169,16 +169,16 @@ namespace CppSharp.AST
         {
             switch (kind)
             {
-            case CommentKind.BCPL:
-            case CommentKind.BCPLSlash:
-            case CommentKind.BCPLExcl:
-                return string.Empty;
-            case CommentKind.C:
-            case CommentKind.JavaDoc:
-            case CommentKind.Qt:
-                return " */";
-            default:
-                throw new ArgumentOutOfRangeException();
+                case CommentKind.BCPL:
+                case CommentKind.BCPLSlash:
+                case CommentKind.BCPLExcl:
+                    return string.Empty;
+                case CommentKind.C:
+                case CommentKind.JavaDoc:
+                case CommentKind.Qt:
+                    return " */";
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
     }
@@ -227,7 +227,7 @@ namespace CppSharp.AST
 
         public CommentCommandKind CommandKind
         {
-            get { return (CommentCommandKind) CommandId; }
+            get { return (CommentCommandKind)CommandId; }
         }
 
         public ParagraphComment ParagraphComment { get; set; }
@@ -489,7 +489,7 @@ namespace CppSharp.AST
 
         public CommentCommandKind CommandKind
         {
-            get { return (CommentCommandKind) CommandId; }
+            get { return (CommentCommandKind)CommandId; }
         }
 
         public RenderKind CommentRenderKind;

src/AST/Declaration.cs

@@ -213,7 +213,7 @@ namespace CppSharp.AST
             var currentNamespace = @namespace;
             while (currentNamespace != null)
             {
-                var isInlineNamespace = currentNamespace is Namespace {IsInline: true};
+                var isInlineNamespace = currentNamespace is Namespace { IsInline: true };
                 if (!isInlineNamespace)
                     namespaces.Push(currentNamespace);
                 currentNamespace = currentNamespace.Namespace;

src/AST/DeclarationsList.cs

@@ -82,7 +82,7 @@ namespace CppSharp.AST
             var offset = offsets[kind];
             for (var i = GetStart(kind); i < offset; i++)
             {
-                yield return (T) this[i];
+                yield return (T)this[i];
             }
         }
 
@@ -99,7 +99,7 @@ namespace CppSharp.AST
                 Variable _ => Kind.Variable,
                 Friend _ => Kind.Friend,
                 Event _ => Kind.Event,
-                _ => throw new System.ArgumentOutOfRangeException(nameof(item),  "Unsupported type of declaration.")
+                _ => throw new System.ArgumentOutOfRangeException(nameof(item), "Unsupported type of declaration.")
             };
         }
 

src/AST/Field.cs

@@ -28,7 +28,7 @@ namespace CppSharp.AST
             Access = access;
         }
 
-        public Field(Field field): base(field)
+        public Field(Field field) : base(field)
         {
             QualifiedType = field.QualifiedType;
             Class = field.Class;

src/AST/FunctionExtensions.cs

@@ -20,11 +20,11 @@ namespace CppSharp.AST
                 (!isItaniumLikeAbi || !function.HasIndirectReturnTypeParameter))
             {
                 @params.Add(new Parameter
-                    {
-                        QualifiedType = pointer,
-                        Name = "__instance",
-                        Namespace = function
-                    });
+                {
+                    QualifiedType = pointer,
+                    Name = "__instance",
+                    Namespace = function
+                });
             }
 
             var i = 0;
@@ -32,40 +32,40 @@ namespace CppSharp.AST
                 p => p.Kind != ParameterKind.OperatorParameter && p.Kind != ParameterKind.Extension))
             {
                 @params.Add(new Parameter
-                    {
-                        QualifiedType = universalDelegate &&
+                {
+                    QualifiedType = universalDelegate &&
                             (param.Kind == ParameterKind.IndirectReturnType ||
                              param.Type.Desugar().IsPointerTo(out FunctionType functionType)) ?
                             pointer : param.QualifiedType,
-                        Kind = param.Kind,
-                        Usage = param.Usage,
-                        Name = universalDelegate ? $"arg{++i}": param.Name,
-                        Namespace = param.Namespace
-                    });
+                    Kind = param.Kind,
+                    Usage = param.Usage,
+                    Name = universalDelegate ? $"arg{++i}" : param.Name,
+                    Namespace = param.Namespace
+                });
 
                 if (param.Kind == ParameterKind.IndirectReturnType &&
                     isInstanceMethod && isItaniumLikeAbi)
                 {
                     @params.Add(new Parameter
-                        {
-                            QualifiedType = pointer,
-                            Name = "__instance",
-                            Namespace = function
-                        });
+                    {
+                        QualifiedType = pointer,
+                        Name = "__instance",
+                        Namespace = function
+                    });
                 }
             }
 
             if (method != null && method.IsConstructor)
             {
-                var @class = (Class) method.Namespace;
+                var @class = (Class)method.Namespace;
                 if (!isItaniumLikeAbi && @class.Layout.HasVirtualBases)
                 {
                     @params.Add(new Parameter
-                        {
-                            QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.Int)),
-                            Name = "__forBases",
-                            Namespace = function
-                        });
+                    {
+                        QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.Int)),
+                        Name = "__forBases",
+                        Namespace = function
+                    });
                 }
             }
 
@@ -95,7 +95,7 @@ namespace CppSharp.AST
 
         public static bool NeedsSymbol(this Method method)
         {
-            Class @class = (Class) (method.OriginalFunction ?? method).Namespace;
+            Class @class = (Class)(method.OriginalFunction ?? method).Namespace;
             // virtual functions cannot really be inlined and
             // we don't need their symbols anyway as we call them through the v-table
             return (!method.IsVirtual && !method.IsSynthetized &&

src/AST/Namespace.cs

@@ -116,10 +116,10 @@ namespace CppSharp.AST
             if (@namespace == null)
             {
                 @namespace = new Namespace
-                    {
-                        Name = name,
-                        Namespace = this,
-                    };
+                {
+                    Name = name,
+                    Namespace = this,
+                };
 
                 Declarations.Add(@namespace);
             }
@@ -218,7 +218,7 @@ namespace CppSharp.AST
                 Namespaces.Select(n => n.FindClass(name, stringComparison)).FirstOrDefault(c => c != null);
             if (@class != null)
                 return @class.CompleteDeclaration == null ?
-                    @class : (Class) @class.CompleteDeclaration;
+                    @class : (Class)@class.CompleteDeclaration;
             return null;
         }
 

src/AST/PropertyExtensions.cs

@@ -6,7 +6,7 @@ namespace CppSharp.AST
     {
         public static bool IsInRefTypeAndBackedByValueClassField(this Property p)
         {
-            if (p.Field == null || ((Class) p.Namespace).IsRefType)
+            if (p.Field == null || ((Class)p.Namespace).IsRefType)
                 return false;
 
             Type type;

src/AST/Template.cs

@@ -210,7 +210,7 @@ namespace CppSharp.AST
             get => TemplatedDecl != null ? TemplatedClass.Name : base.Name;
             set
             {
-                if(TemplatedDecl != null) 
+                if (TemplatedDecl != null)
                     TemplatedClass.Name = value;
                 else
                     base.Name = value;
@@ -222,7 +222,7 @@ namespace CppSharp.AST
             get => TemplatedDecl != null ? TemplatedClass.OriginalName : base.OriginalName;
             set
             {
-                if(TemplatedDecl != null) 
+                if (TemplatedDecl != null)
                     TemplatedClass.OriginalName = value;
                 else
                     base.OriginalName = value;

src/AST/Type.cs

@@ -92,7 +92,7 @@ namespace CppSharp.AST
         {
             if (!(obj is QualifiedType)) return false;
 
-            var type = (QualifiedType) obj;
+            var type = (QualifiedType)obj;
             return Type.Equals(type.Type) && Qualifiers.Equals(type.Qualifiers);
         }
 
@@ -190,7 +190,7 @@ namespace CppSharp.AST
         public ArrayType(ArrayType type)
             : base(type)
         {
-            QualifiedType = new QualifiedType((Type) type.QualifiedType.Type.Clone(),
+            QualifiedType = new QualifiedType((Type)type.QualifiedType.Type.Clone(),
                 type.QualifiedType.Qualifiers);
             SizeType = type.SizeType;
             Size = type.Size;
@@ -264,7 +264,7 @@ namespace CppSharp.AST
         public FunctionType(FunctionType type)
             : base(type)
         {
-            ReturnType = new QualifiedType((Type) type.ReturnType.Type.Clone(), type.ReturnType.Qualifiers);
+            ReturnType = new QualifiedType((Type)type.ReturnType.Type.Clone(), type.ReturnType.Qualifiers);
             Parameters.AddRange(type.Parameters.Select(p => new Parameter(p)));
             CallingConvention = type.CallingConvention;
             IsDependent = type.IsDependent;
@@ -326,7 +326,7 @@ namespace CppSharp.AST
         public PointerType(PointerType type)
             : base(type)
         {
-            QualifiedPointee = new QualifiedType((Type) type.QualifiedPointee.Type.Clone(),
+            QualifiedPointee = new QualifiedType((Type)type.QualifiedPointee.Type.Clone(),
                 type.QualifiedPointee.Qualifiers);
             Modifier = type.Modifier;
         }
@@ -341,7 +341,7 @@ namespace CppSharp.AST
         }
 
         public QualifiedType QualifiedPointee;
-        public Type Pointee { get { return QualifiedPointee.Type;  } }
+        public Type Pointee { get { return QualifiedPointee.Type; } }
 
         public TypeModifier Modifier;
 
@@ -382,7 +382,7 @@ namespace CppSharp.AST
         public MemberPointerType(MemberPointerType type)
             : base(type)
         {
-            QualifiedPointee = new QualifiedType((Type) type.QualifiedPointee.Type.Clone(),
+            QualifiedPointee = new QualifiedType((Type)type.QualifiedPointee.Type.Clone(),
                 type.QualifiedPointee.Qualifiers);
         }
 
@@ -481,8 +481,8 @@ namespace CppSharp.AST
         public AttributedType(AttributedType type)
             : base(type)
         {
-            Modified = new QualifiedType((Type) type.Modified.Type.Clone(), type.Modified.Qualifiers);
-            Equivalent = new QualifiedType((Type) type.Equivalent.Type.Clone(), type.Equivalent.Qualifiers);
+            Modified = new QualifiedType((Type)type.Modified.Type.Clone(), type.Modified.Qualifiers);
+            Equivalent = new QualifiedType((Type)type.Equivalent.Type.Clone(), type.Equivalent.Qualifiers);
         }
 
         public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals = new TypeQualifiers())
@@ -495,8 +495,8 @@ namespace CppSharp.AST
             return new AttributedType
             {
                 IsDependent = IsDependent,
-                Modified = new QualifiedType((Type) Modified.Type.Clone(), Modified.Qualifiers),
-                Equivalent = new QualifiedType((Type) Equivalent.Type.Clone(), Equivalent.Qualifiers)
+                Modified = new QualifiedType((Type)Modified.Type.Clone(), Modified.Qualifiers),
+                Equivalent = new QualifiedType((Type)Equivalent.Type.Clone(), Equivalent.Qualifiers)
             };
         }
 
@@ -529,11 +529,11 @@ namespace CppSharp.AST
         public DecayedType(DecayedType type)
             : base(type)
         {
-            Decayed = new QualifiedType((Type) type.Decayed.Type.Clone(),
+            Decayed = new QualifiedType((Type)type.Decayed.Type.Clone(),
                 type.Decayed.Qualifiers);
-            Original = new QualifiedType((Type) type.Original.Type.Clone(),
+            Original = new QualifiedType((Type)type.Original.Type.Clone(),
                 type.Original.Qualifiers);
-            Pointee = new QualifiedType((Type) type.Pointee.Type.Clone(),
+            Pointee = new QualifiedType((Type)type.Pointee.Type.Clone(),
                 type.Pointee.Qualifiers);
         }
 
@@ -608,22 +608,22 @@ namespace CppSharp.AST
         public override bool Equals(object obj)
         {
             if (!(obj is TemplateArgument)) return false;
-            var arg = (TemplateArgument) obj;
+            var arg = (TemplateArgument)obj;
 
             if (Kind != arg.Kind) return false;
 
             switch (Kind)
             {
-            case ArgumentKind.Type:
-                return Type.Equals(arg.Type);
-            case ArgumentKind.Declaration:
-                return Declaration.Equals(arg.Declaration);
-            case ArgumentKind.Integral:
-                return Integral.Equals(arg.Integral);
-            case ArgumentKind.Expression:
-                return true;
-            default:
-                throw new Exception("Unknown TemplateArgument Kind");
+                case ArgumentKind.Type:
+                    return Type.Equals(arg.Type);
+                case ArgumentKind.Declaration:
+                    return Declaration.Equals(arg.Declaration);
+                case ArgumentKind.Integral:
+                    return Integral.Equals(arg.Integral);
+                case ArgumentKind.Expression:
+                    return true;
+                default:
+                    throw new Exception("Unknown TemplateArgument Kind");
             }
         }
 
@@ -669,11 +669,11 @@ namespace CppSharp.AST
                     Declaration = t.Declaration,
                     Integral = t.Integral,
                     Kind = t.Kind,
-                    Type = new QualifiedType((Type) t.Type.Type.Clone(), t.Type.Qualifiers)
+                    Type = new QualifiedType((Type)t.Type.Type.Clone(), t.Type.Qualifiers)
                 }).ToList();
             Template = type.Template;
             if (type.Desugared.Type != null)
-                Desugared = new QualifiedType((Type) type.Desugared.Type.Clone(),
+                Desugared = new QualifiedType((Type)type.Desugared.Type.Clone(),
                     type.Desugared.Qualifiers);
         }
 
@@ -749,9 +749,9 @@ namespace CppSharp.AST
                     Declaration = t.Declaration,
                     Integral = t.Integral,
                     Kind = t.Kind,
-                    Type = new QualifiedType((Type) t.Type.Type.Clone(), t.Type.Qualifiers)
+                    Type = new QualifiedType((Type)t.Type.Type.Clone(), t.Type.Qualifiers)
                 }).ToList();
-            Desugared = new QualifiedType((Type) type.Desugared.Type.Clone(), type.Desugared.Qualifiers);
+            Desugared = new QualifiedType((Type)type.Desugared.Type.Clone(), type.Desugared.Qualifiers);
         }
 
         public List<TemplateArgument> Arguments;
@@ -860,8 +860,8 @@ namespace CppSharp.AST
         public TemplateParameterSubstitutionType(TemplateParameterSubstitutionType type)
             : base(type)
         {
-            Replacement = new QualifiedType((Type) type.Replacement.Type.Clone(), type.Replacement.Qualifiers);
-            ReplacedParameter = (TemplateParameterType) type.ReplacedParameter.Clone();
+            Replacement = new QualifiedType((Type)type.Replacement.Type.Clone(), type.Replacement.Qualifiers);
+            ReplacedParameter = (TemplateParameterType)type.ReplacedParameter.Clone();
         }
 
         public override T Visit<T>(ITypeVisitor<T> visitor,
@@ -905,9 +905,9 @@ namespace CppSharp.AST
             : base(type)
         {
             if (type.TemplateSpecialization != null)
-                TemplateSpecialization = (TemplateSpecializationType) type.TemplateSpecialization.Clone();
+                TemplateSpecialization = (TemplateSpecializationType)type.TemplateSpecialization.Clone();
             InjectedSpecializationType = new QualifiedType(
-                (Type) type.InjectedSpecializationType.Type.Clone(),
+                (Type)type.InjectedSpecializationType.Type.Clone(),
                 type.InjectedSpecializationType.Qualifiers);
             Class = type.Class;
         }
@@ -1227,13 +1227,13 @@ namespace CppSharp.AST
             {
                 switch (Type)
                 {
-                case PrimitiveType.Bool:
-                case PrimitiveType.UChar:
-                case PrimitiveType.UShort:
-                case PrimitiveType.UInt:
-                case PrimitiveType.ULong:
-                case PrimitiveType.ULongLong:
-                    return true;
+                    case PrimitiveType.Bool:
+                    case PrimitiveType.UChar:
+                    case PrimitiveType.UShort:
+                    case PrimitiveType.UInt:
+                    case PrimitiveType.ULong:
+                    case PrimitiveType.ULongLong:
+                        return true;
                 }
 
                 return false;

src/AST/TypeExtensions.cs

@@ -131,20 +131,20 @@
                             type.Desugared.Type.TryGetDeclaration(out decl, value);
                             return decl != null;
                         case ClassTemplate classTemplate:
-                        {
-                            var templatedClass = classTemplate.TemplatedClass;
-                            decl = templatedClass.CompleteDeclaration == null
-                                ? templatedClass as T
-                                : (T) templatedClass.CompleteDeclaration;
+                            {
+                                var templatedClass = classTemplate.TemplatedClass;
+                                decl = templatedClass.CompleteDeclaration == null
+                                    ? templatedClass as T
+                                    : (T)templatedClass.CompleteDeclaration;
 
-                            if (decl == null)
-                                return false;
+                                if (decl == null)
+                                    return false;
 
-                            if (value != null)
-                                type.Template = new ClassTemplate { TemplatedDecl = value };
+                                if (value != null)
+                                    type.Template = new ClassTemplate { TemplatedDecl = value };
 
-                            return true;
-                        }
+                                return true;
+                            }
                         case TemplateTemplateParameter templateTemplateParameter:
                             return (decl = templateTemplateParameter.TemplatedDecl as T) != null;
                     }

src/CLI/CLI.cs

@@ -16,30 +16,30 @@ namespace CppSharp
             var showHelp = false;
 
             optionSet.Add("I=", "the {PATH} of a folder to search for include files", (i) => { AddIncludeDirs(i, errorMessages); });
-            optionSet.Add("l=", "{LIBRARY} that that contains the symbols of the generated code", l => options.Libraries.Add(l) );
-            optionSet.Add("L=", "the {PATH} of a folder to search for additional libraries", l => options.LibraryDirs.Add(l) );
-            optionSet.Add("D:", "additional define with (optional) value to add to be used while parsing the given header files", (n, v) => AddDefine(n, v, errorMessages) );
-            optionSet.Add("A=", "additional Clang arguments to pass to the compiler while parsing the given header files", (v) => AddArgument(v, errorMessages) );
+            optionSet.Add("l=", "{LIBRARY} that that contains the symbols of the generated code", l => options.Libraries.Add(l));
+            optionSet.Add("L=", "the {PATH} of a folder to search for additional libraries", l => options.LibraryDirs.Add(l));
+            optionSet.Add("D:", "additional define with (optional) value to add to be used while parsing the given header files", (n, v) => AddDefine(n, v, errorMessages));
+            optionSet.Add("A=", "additional Clang arguments to pass to the compiler while parsing the given header files", (v) => AddArgument(v, errorMessages));
 
-            optionSet.Add("o=|output=", "the {PATH} for the generated bindings file (doesn't need the extension since it will depend on the generator)", v => HandleOutputArg(v, errorMessages) );
-            optionSet.Add("on=|outputnamespace=", "the {NAMESPACE} that will be used for the generated code", on => options.OutputNamespace = on );
+            optionSet.Add("o=|output=", "the {PATH} for the generated bindings file (doesn't need the extension since it will depend on the generator)", v => HandleOutputArg(v, errorMessages));
+            optionSet.Add("on=|outputnamespace=", "the {NAMESPACE} that will be used for the generated code", on => options.OutputNamespace = on);
 
             optionSet.Add("m=|module=", "the name for the generated {MODULE}", a => { options.OutputFileName = a; });
 
-            optionSet.Add("iln=|inputlibraryname=|inputlib=", "the {NAME} of the shared library that contains the symbols of the generated code", iln => options.InputLibraryName = iln );
+            optionSet.Add("iln=|inputlibraryname=|inputlib=", "the {NAME} of the shared library that contains the symbols of the generated code", iln => options.InputLibraryName = iln);
             optionSet.Add("d|debug", "enables debug mode which generates more verbose code to aid debugging", v => options.Debug = true);
             optionSet.Add("c|compile", "enables automatic compilation of the generated code", v => options.Compile = true);
-            optionSet.Add("g=|gen=|generator=", "the {TYPE} of generated code: 'csharp' or 'cli' ('cli' supported only for Windows)", g => { GetGeneratorKind(g, errorMessages); } );
-            optionSet.Add("p=|platform=", "the {PLATFORM} that the generated code will target: 'win', 'osx' or 'linux'", p => { GetDestinationPlatform(p, errorMessages); } );
-            optionSet.Add("a=|arch=", "the {ARCHITECTURE} that the generated code will target: 'x86' or 'x64'", a => { GetDestinationArchitecture(a, errorMessages); } );
+            optionSet.Add("g=|gen=|generator=", "the {TYPE} of generated code: 'csharp' or 'cli' ('cli' supported only for Windows)", g => { GetGeneratorKind(g, errorMessages); });
+            optionSet.Add("p=|platform=", "the {PLATFORM} that the generated code will target: 'win', 'osx' or 'linux'", p => { GetDestinationPlatform(p, errorMessages); });
+            optionSet.Add("a=|arch=", "the {ARCHITECTURE} that the generated code will target: 'x86' or 'x64'", a => { GetDestinationArchitecture(a, errorMessages); });
             optionSet.Add("prefix=", "sets a string prefix to the names of generated files", a => { options.Prefix = a; });
 
             optionSet.Add("exceptions", "enables support for C++ exceptions in the parser", v => { options.EnableExceptions = true; });
             optionSet.Add("rtti", "enables support for C++ RTTI in the parser", v => { options.EnableRTTI = true; });
 
-            optionSet.Add("c++11", "enables GCC C++ 11 compilation (valid only for Linux platform)", cpp11 => { options.Cpp11ABI = (cpp11 != null); } );
-            optionSet.Add("cs|checksymbols", "enable the symbol check for the generated code", cs => { options.CheckSymbols = (cs != null); } );
-            optionSet.Add("ub|unitybuild|unity", "enable unity build", ub => { options.UnityBuild = (ub != null); } );
+            optionSet.Add("c++11", "enables GCC C++ 11 compilation (valid only for Linux platform)", cpp11 => { options.Cpp11ABI = (cpp11 != null); });
+            optionSet.Add("cs|checksymbols", "enable the symbol check for the generated code", cs => { options.CheckSymbols = (cs != null); });
+            optionSet.Add("ub|unitybuild|unity", "enable unity build", ub => { options.UnityBuild = (ub != null); });
 
             optionSet.Add("v|verbose", "enables verbose mode", v => { options.Verbose = true; });
             optionSet.Add("h|help", "shows the help", hl => { showHelp = (hl != null); });
@@ -63,7 +63,7 @@ namespace CppSharp
                 return false;
             }
 
-            foreach(string s in additionalArguments)
+            foreach (string s in additionalArguments)
                 HandleAdditionalArgument(s, errorMessages);
 
             return true;
@@ -117,7 +117,7 @@ namespace CppSharp
                 var dir = Path.HasExtension(arg) ? Path.GetDirectoryName(arg) : Path.GetFullPath(arg);
                 options.OutputDir = dir;
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 errorMessages.Add(e.Message);
 
@@ -159,7 +159,7 @@ namespace CppSharp
                     errorMessages.Add($"File '{args}' could not be found.");
                 }
             }
-            catch(Exception)
+            catch (Exception)
             {
                 errorMessages.Add($"Error while looking for files inside path '{args}'. Ignoring.");
             }
@@ -278,23 +278,23 @@ namespace CppSharp
             List<string> errorMessages = new List<string>();
             bool helpShown = false;
 
-                if (!ParseCommandLineArgs(args, errorMessages, ref helpShown))
-                {
-                    PrintErrorMessages(errorMessages);
+            if (!ParseCommandLineArgs(args, errorMessages, ref helpShown))
+            {
+                PrintErrorMessages(errorMessages);
 
-                    // Don't need to show the help since if ParseCommandLineArgs returns false the help has already been shown
-                    return;
-                }
+                // Don't need to show the help since if ParseCommandLineArgs returns false the help has already been shown
+                return;
+            }
 
-                Generator gen = new Generator(options);
+            Generator gen = new Generator(options);
 
-                bool validOptions = gen.ValidateOptions(errorMessages);
-                PrintErrorMessages(errorMessages);
+            bool validOptions = gen.ValidateOptions(errorMessages);
+            PrintErrorMessages(errorMessages);
 
-                if (errorMessages.Any() || !validOptions)
-                    Environment.Exit(1);
+            if (errorMessages.Any() || !validOptions)
+                Environment.Exit(1);
 
-                gen.Run();
+            gen.Run();
         }
     }
 }

src/CLI/Generator.cs

@@ -45,7 +45,7 @@ namespace CppSharp
 
             if (options.Architecture == TargetArchitecture.x64)
                 tripleBuilder.Append("x86_64-");
-            else if(options.Architecture == TargetArchitecture.x86)
+            else if (options.Architecture == TargetArchitecture.x86)
                 tripleBuilder.Append("i686-");
 
             if (options.Platform == TargetPlatform.Windows)
@@ -63,7 +63,7 @@ namespace CppSharp
                 tripleBuilder.Append("linux-gnu");
                 abi = CppAbi.Itanium;
 
-                if(options.Cpp11ABI)
+                if (options.Cpp11ABI)
                     tripleBuilder.Append("-cxx11abi");
             }
 
@@ -118,7 +118,7 @@ namespace CppSharp
             driverOptions.GeneratorKind = options.Kind;
             var module = driverOptions.AddModule(options.OutputFileName);
 
-            if(!string.IsNullOrEmpty(options.InputLibraryName))
+            if (!string.IsNullOrEmpty(options.InputLibraryName))
                 module.SharedLibraryName = options.InputLibraryName;
 
             module.Headers.AddRange(options.HeaderFiles);
@@ -143,7 +143,7 @@ namespace CppSharp
 
             foreach (KeyValuePair<string, string> d in options.Defines)
             {
-                if(string.IsNullOrEmpty(d.Value))
+                if (string.IsNullOrEmpty(d.Value))
                     parserOptions.AddDefines(d.Key);
                 else
                     parserOptions.AddDefines(d.Key + "=" + d.Value);

src/Core/Compilation.cs

@@ -29,5 +29,5 @@ namespace CppSharp
         // If true, will force the generation of debug metadata for the native
         // and managed code.
         public bool DebugMode;
-	}
+    }
 }

src/Core/Diagnostics.cs

@@ -120,7 +120,7 @@ namespace CppSharp
             var currentIndentation = Indents.Sum();
             var message = new string(' ', currentIndentation) + info.Message;
 
-            if(info.Kind == DiagnosticKind.Error)
+            if (info.Kind == DiagnosticKind.Error)
             {
                 Console.Error.WriteLine(message);
             }

src/Core/Toolchains/MSVCToolchain.cs

@@ -55,7 +55,7 @@ namespace CppSharp
             switch (vsVersion)
             {
                 case VisualStudioVersion.VS2012:
-                    clVersion = new Version { Major = 17, Minor = 0};
+                    clVersion = new Version { Major = 17, Minor = 0 };
                     break;
                 case VisualStudioVersion.VS2013:
                     clVersion = new Version { Major = 18, Minor = 0 };
@@ -108,7 +108,7 @@ namespace CppSharp
             int windowsSdkMajorVer, List<ToolchainVersion> windowsSdks)
         {
             var majorWindowsSdk = windowsSdks.Find(
-                version => (int) Math.Floor(version.Version) == windowsSdkMajorVer);
+                version => (int)Math.Floor(version.Version) == windowsSdkMajorVer);
             var windowsSdkDirs = majorWindowsSdk.Directory != null ?
                 new[] { majorWindowsSdk.Directory } :
                 windowsSdks.Select(w => w.Directory).Reverse();

src/Core/Toolchains/ManagedToolchain.cs

@@ -10,18 +10,18 @@ namespace CppSharp
     {
         public static string ReadMonoPathFromWindowsRegistry(bool prefer64bits = false)
         {
-            using (var baseKey = RegistryKey.OpenBaseKey (RegistryHive.LocalMachine,
+            using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine,
                 prefer64bits ? RegistryView.Registry64 : RegistryView.Registry32))
             {
                 if (baseKey == null)
                     return null;
 
-                using (var subKey = baseKey.OpenSubKey (@"SOFTWARE\Mono"))
+                using (var subKey = baseKey.OpenSubKey(@"SOFTWARE\Mono"))
                 {
                     if (subKey == null)
                         return null;
 
-                    return (string)subKey.GetValue ("SdkInstallRoot", "");
+                    return (string)subKey.GetValue("SdkInstallRoot", "");
                 }
             }
         }
@@ -33,7 +33,7 @@ namespace CppSharp
                 // Try to lookup the Mono SDK path from registry.
                 string path = ReadMonoPathFromWindowsRegistry(prefer64bits);
                 if (!string.IsNullOrEmpty(path))
-                   return path;
+                    return path;
 
                 // If that fails, then lets try a default location.
                 return @"C:\Program Files (x86)\Mono";

src/Core/Toolchains/XcodeToolchain.cs

@@ -72,20 +72,23 @@ namespace CppSharp
         {
             try
             {
-                var xcodeSelect = Process.Start(new ProcessStartInfo("xcode-select", "--print-path") {
+                var xcodeSelect = Process.Start(new ProcessStartInfo("xcode-select", "--print-path")
+                {
                     RedirectStandardOutput = true,
                     UseShellExecute = false
                 });
 
                 var result = xcodeSelect.StandardOutput.ReadToEnd();
 
-                if(!string.IsNullOrEmpty(result)) 
+                if (!string.IsNullOrEmpty(result))
                 {
                     var extraStuffIndex = result.LastIndexOf("/Contents/Developer");
-                    if(extraStuffIndex >= 0)
+                    if (extraStuffIndex >= 0)
                         return result.Remove(extraStuffIndex);
                 }
-            } catch {
+            }
+            catch
+            {
                 // TODO: Log exception?
             }
             return null;

src/Generator.Tests/AST/TestAST.cs

@@ -251,11 +251,11 @@ namespace CppSharp.Generator.Tests.AST
             Assert.IsInstanceOf<TemplateParameterType>(twoParamMethod.Parameters[0].Type);
             Assert.IsInstanceOf<TemplateParameterType>(twoParamMethod.Parameters[1].Type);
             Assert.AreEqual(twoParamMethodTemplate.Parameters[0],
-                ((TemplateParameterType) twoParamMethod.Parameters[0].Type).Parameter);
+                ((TemplateParameterType)twoParamMethod.Parameters[0].Type).Parameter);
             Assert.AreEqual(twoParamMethodTemplate.Parameters[1],
-                ((TemplateParameterType) twoParamMethod.Parameters[1].Type).Parameter);
-            Assert.AreEqual(0, ((TemplateParameterType) twoParamMethod.Parameters[0].Type).Index);
-            Assert.AreEqual(1, ((TemplateParameterType) twoParamMethod.Parameters[1].Type).Index);
+                ((TemplateParameterType)twoParamMethod.Parameters[1].Type).Parameter);
+            Assert.AreEqual(0, ((TemplateParameterType)twoParamMethod.Parameters[0].Type).Index);
+            Assert.AreEqual(1, ((TemplateParameterType)twoParamMethod.Parameters[1].Type).Index);
         }
 
         [Test]
@@ -436,20 +436,20 @@ namespace CppSharp.Generator.Tests.AST
             Assert.IsTrue(constExpr.IsConstExpr);
 
             var noExcept = AstContext.FindFunction("noExcept").First();
-            Assert.That(((FunctionType) noExcept.FunctionType.Type).ExceptionSpecType,
+            Assert.That(((FunctionType)noExcept.FunctionType.Type).ExceptionSpecType,
                 Is.EqualTo(ExceptionSpecType.BasicNoexcept));
 
             var noExceptTrue = AstContext.FindFunction("noExceptTrue").First();
-            Assert.That(((FunctionType) noExceptTrue.FunctionType.Type).ExceptionSpecType,
+            Assert.That(((FunctionType)noExceptTrue.FunctionType.Type).ExceptionSpecType,
                 Is.EqualTo(ExceptionSpecType.NoexceptTrue));
 
             var noExceptFalse = AstContext.FindFunction("noExceptFalse").First();
-            Assert.That(((FunctionType) noExceptFalse.FunctionType.Type).ExceptionSpecType,
+            Assert.That(((FunctionType)noExceptFalse.FunctionType.Type).ExceptionSpecType,
                 Is.EqualTo(ExceptionSpecType.NoexceptFalse));
 
             var regular = AstContext.FindFunction("testSignature").First();
             Assert.IsFalse(regular.IsConstExpr);
-            var regularFunctionType = (FunctionType) regular.FunctionType.Type;
+            var regularFunctionType = (FunctionType)regular.FunctionType.Type;
             Assert.That(regularFunctionType.ExceptionSpecType,
                 Is.EqualTo(ExceptionSpecType.None));
         }

src/Generator.Tests/ReadNativeSymbolsTest.cs

@@ -106,7 +106,7 @@ namespace CppSharp.Generator.Tests
         {
             var symbols = GetSymbols("linux", "libexpat");
             Assert.That(symbols, Is.EquivalentTo(
-                new []
+                new[]
                 {
                     ".init",
                     "free",

src/Generator/AST/ASTRecord.cs

@@ -21,7 +21,7 @@ namespace CppSharp.Generators.AST
             if (!(v is T))
                 return false;
 
-            @out = (T) v;
+            @out = (T)v;
             return true;
         }
 
@@ -55,7 +55,7 @@ namespace CppSharp.Generators.AST
 
     public class ASTRecord<T> : ASTRecord
     {
-        public T Value => (T) Object;
+        public T Value => (T)Object;
 
         public override string ToString()
         {
@@ -132,7 +132,7 @@ namespace CppSharp.Generators.AST
         public static bool IsFieldValueType(this ASTRecord record)
         {
             var ancestors = new Stack<object>();
-            if(!record.GetAncestors<Field>(ref ancestors))
+            if (!record.GetAncestors<Field>(ref ancestors))
                 return false;
 
             var field = (Field)ancestors.Pop();
@@ -154,7 +154,7 @@ namespace CppSharp.Generators.AST
         public static bool FunctionReturnsClassByValue(this ASTRecord record)
         {
             var ancestors = new Stack<object>();
-            if(!record.GetAncestors<Function>(ref ancestors))
+            if (!record.GetAncestors<Function>(ref ancestors))
                 return false;
 
             var function = (Function)ancestors.Pop();
@@ -231,5 +231,5 @@ namespace CppSharp.Generators.AST
             // translation unit is encountered.
             return decl.Namespace.TranslationUnit == translationUnit;
         }
-     }
+    }
 }

src/Generator/AST/Utils.cs

@@ -132,7 +132,7 @@ namespace CppSharp.AST
                 template = specialization.TemplatedDecl.TemplatedClass;
             else
             {
-                template = (Class) method.Namespace;
+                template = (Class)method.Namespace;
                 if (!template.IsDependent)
                     return false;
             }
@@ -219,7 +219,7 @@ namespace CppSharp.AST
     {
         public static CXXOperatorArity ClassifyOperator(Function function)
         {
-            switch(function.Parameters.Count)
+            switch (function.Parameters.Count)
             {
                 case 0: return CXXOperatorArity.Zero;
                 case 1: return CXXOperatorArity.Unary;

src/Generator/AST/VTables.cs

@@ -12,10 +12,10 @@ namespace CppSharp.AST
         {
             switch (@class.Layout.ABI)
             {
-            case CppAbi.Microsoft:
-                return GatherVTableMethodsMS(@class);
-            case CppAbi.Itanium:
-                return GatherVTableMethodsItanium(@class);
+                case CppAbi.Microsoft:
+                    return GatherVTableMethodsMS(@class);
+                case CppAbi.Itanium:
+                    return GatherVTableMethodsItanium(@class);
             }
 
             throw new NotSupportedException(
@@ -57,7 +57,7 @@ namespace CppSharp.AST
 
         public static int GetVTableIndex(Function function)
         {
-            var @class = (Class) function.Namespace;
+            var @class = (Class)function.Namespace;
             switch (@class.Layout.ABI)
             {
                 case CppAbi.Microsoft:
@@ -77,7 +77,7 @@ namespace CppSharp.AST
             return entry.Method != null &&
                    (entry.Method.IsOperator ||
                     (!entry.Method.IsDeclared &&
-                     ((Class) entry.Method.Namespace).GetPropertyByConstituentMethod(entry.Method) == null));
+                     ((Class)entry.Method.Namespace).GetPropertyByConstituentMethod(entry.Method) == null));
         }
     }
 }

src/Generator/Generator.cs

@@ -115,7 +115,7 @@ namespace CppSharp.Generators
                     }
                 }
 
-                var generateSystemModule = Context.Options.SystemModule != null  &&
+                var generateSystemModule = Context.Options.SystemModule != null &&
                     Context.Options.GeneratorKind == GeneratorKind.CSharp;
                 if (generateSystemModule)
                 {

src/Generator/Generators/C/CCodeGenerator.cs

@@ -402,9 +402,9 @@ namespace CppSharp.Generators.C
             if (isDeclaration)
             {
                 if (method.IsPure)
-                  Write(" = 0");
+                    Write(" = 0");
                 else if (method.IsOverride)
-                  Write(" override");
+                    Write(" override");
             }
         }
 
@@ -440,7 +440,7 @@ namespace CppSharp.Generators.C
                 GeneratePropertySetter(property.SetMethod);
 
             //if (Options.GenerateMSDeclspecProperties)
-                //GenerateMSDeclspecProperty(property);
+            //GenerateMSDeclspecProperty(property);
 
             return true;
         }

src/Generator/Generators/C/CppHeaders.cs

@@ -302,7 +302,7 @@ namespace CppSharp.Generators.Cpp
                 return false;
 
             //if (@class.IsOpaque)
-             //   return false;
+            //   return false;
 
             PushBlock(BlockKind.Class, @class);
 
@@ -392,8 +392,8 @@ namespace CppSharp.Generators.Cpp
                 Name = Generator.GeneratedIdentifier("ExternalData"),
                 QualifiedType = new QualifiedType(new ArrayType
                 {
-                    QualifiedType =  new QualifiedType(voidPtrType),
-                    SizeType =  ArrayType.ArraySize.Constant,
+                    QualifiedType = new QualifiedType(voidPtrType),
+                    SizeType = ArrayType.ArraySize.Constant,
                     Size = 2
                 }),
                 Namespace = @class
@@ -567,7 +567,7 @@ namespace CppSharp.Generators.Cpp
 
             Indent();
 
-            var @class = (Class) methods[0].Namespace;
+            var @class = (Class)methods[0].Namespace;
 
             if (@class.IsValueType)
                 foreach (var @base in @class.Bases.Where(b => b.IsClass && !b.Class.Ignore))
@@ -591,7 +591,7 @@ namespace CppSharp.Generators.Cpp
                 method.Visit(this);
             }
 
-            foreach(var method in staticMethods)
+            foreach (var method in staticMethods)
                 method.Visit(this);
 
             Unindent();

src/Generator/Generators/C/CppMarshal.cs

@@ -36,13 +36,13 @@ namespace CppSharp.Generators.Cpp
         {
             switch (array.SizeType)
             {
-            case ArrayType.ArraySize.Constant:
-            case ArrayType.ArraySize.Incomplete:
-            case ArrayType.ArraySize.Variable:
-                Context.Return.Write("nullptr");
-                break;
-            default:
-                throw new System.NotImplementedException();
+                case ArrayType.ArraySize.Constant:
+                case ArrayType.ArraySize.Incomplete:
+                case ArrayType.ArraySize.Variable:
+                    Context.Return.Write("nullptr");
+                    break;
+                default:
+                    throw new System.NotImplementedException();
             }
 
             return true;
@@ -76,7 +76,7 @@ namespace CppSharp.Generators.Cpp
                     Context.ReturnType.Qualifiers.IsConst)
                 {
                     var nativeTypePrinter = new CppTypePrinter(Context.Context)
-                        { PrintTypeQualifiers = false };
+                    { PrintTypeQualifiers = false };
                     var returnType = Context.ReturnType.Type.Desugar();
                     var constlessPointer = new PointerType()
                     {
@@ -137,28 +137,28 @@ namespace CppSharp.Generators.Cpp
         {
             switch (primitive)
             {
-            case PrimitiveType.Void:
-                return true;
-            case PrimitiveType.Bool:
-            case PrimitiveType.Char:
-            case PrimitiveType.Char16:
-            case PrimitiveType.WideChar:
-            case PrimitiveType.SChar:
-            case PrimitiveType.UChar:
-            case PrimitiveType.Short:
-            case PrimitiveType.UShort:
-            case PrimitiveType.Int:
-            case PrimitiveType.UInt:
-            case PrimitiveType.Long:
-            case PrimitiveType.ULong:
-            case PrimitiveType.LongLong:
-            case PrimitiveType.ULongLong:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-            case PrimitiveType.Null:
-                Context.Return.Write(Context.ReturnVarName);
-                return true;
+                case PrimitiveType.Void:
+                    return true;
+                case PrimitiveType.Bool:
+                case PrimitiveType.Char:
+                case PrimitiveType.Char16:
+                case PrimitiveType.WideChar:
+                case PrimitiveType.SChar:
+                case PrimitiveType.UChar:
+                case PrimitiveType.Short:
+                case PrimitiveType.UShort:
+                case PrimitiveType.Int:
+                case PrimitiveType.UInt:
+                case PrimitiveType.Long:
+                case PrimitiveType.ULong:
+                case PrimitiveType.LongLong:
+                case PrimitiveType.ULongLong:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                case PrimitiveType.Null:
+                    Context.Return.Write(Context.ReturnVarName);
+                    return true;
             }
 
             throw new NotSupportedException();
@@ -363,9 +363,9 @@ namespace CppSharp.Generators.Cpp
 
             switch (array.SizeType)
             {
-            default:
-                Context.Return.Write("nullptr");
-                break;
+                default:
+                    Context.Return.Write("nullptr");
+                    break;
             }
 
             return true;
@@ -447,26 +447,26 @@ namespace CppSharp.Generators.Cpp
         {
             switch (primitive)
             {
-            case PrimitiveType.Void:
-                return true;
-            case PrimitiveType.Bool:
-            case PrimitiveType.Char:
-            case PrimitiveType.UChar:
-            case PrimitiveType.Short:
-            case PrimitiveType.UShort:
-            case PrimitiveType.Int:
-            case PrimitiveType.UInt:
-            case PrimitiveType.Long:
-            case PrimitiveType.ULong:
-            case PrimitiveType.LongLong:
-            case PrimitiveType.ULongLong:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.WideChar:
-                Context.Return.Write(Context.Parameter.Name);
-                return true;
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Void:
+                    return true;
+                case PrimitiveType.Bool:
+                case PrimitiveType.Char:
+                case PrimitiveType.UChar:
+                case PrimitiveType.Short:
+                case PrimitiveType.UShort:
+                case PrimitiveType.Int:
+                case PrimitiveType.UInt:
+                case PrimitiveType.Long:
+                case PrimitiveType.ULong:
+                case PrimitiveType.LongLong:
+                case PrimitiveType.ULongLong:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.WideChar:
+                    Context.Return.Write(Context.Parameter.Name);
+                    return true;
+                default:
+                    throw new NotImplementedException();
             }
         }
 

src/Generator/Generators/C/CppSources.cs

@@ -114,7 +114,7 @@ namespace CppSharp.Generators.Cpp
                 }
             }
 
-            foreach(var childNamespace in context.Namespaces)
+            foreach (var childNamespace in context.Namespaces)
                 VisitDeclContext(childNamespace);
 
             PopBlock();
@@ -521,10 +521,10 @@ namespace CppSharp.Generators.Cpp
                 WriteLine(");");
             }
 
-            foreach(var paramInfo in @params)
+            foreach (var paramInfo in @params)
             {
                 var param = paramInfo.Param;
-                if(param.Usage != ParameterUsage.Out && param.Usage != ParameterUsage.InOut)
+                if (param.Usage != ParameterUsage.Out && param.Usage != ParameterUsage.InOut)
                     continue;
 
                 if (param.Type.IsPointer() && !param.Type.GetFinalPointee().IsPrimitiveType())

src/Generator/Generators/C/CppTypePrinter.cs

@@ -94,16 +94,16 @@ namespace CppSharp.Generators.C
             string arraySuffix;
             switch (array.SizeType)
             {
-            case ArrayType.ArraySize.Constant:
-                arraySuffix = $"[{array.Size}]";
-                break;
-            case ArrayType.ArraySize.Variable:
-            case ArrayType.ArraySize.Dependent:
-            case ArrayType.ArraySize.Incomplete:
-                arraySuffix = $"{(PrintVariableArrayAsPointers ? "*" : "[]")}";
-                break;
-            default:
-                throw new NotImplementedException();
+                case ArrayType.ArraySize.Constant:
+                    arraySuffix = $"[{array.Size}]";
+                    break;
+                case ArrayType.ArraySize.Variable:
+                case ArrayType.ArraySize.Dependent:
+                case ArrayType.ArraySize.Incomplete:
+                    arraySuffix = $"{(PrintVariableArrayAsPointers ? "*" : "[]")}";
+                    break;
+                default:
+                    throw new NotImplementedException();
             }
 
             return new TypePrinterResult
@@ -199,32 +199,32 @@ namespace CppSharp.Generators.C
                     return PrintFlavorKind == CppTypePrintFlavorKind.Cpp ?
                         "std::nullptr_t" : "NULL";
                 case PrimitiveType.String:
-                {
-                    switch (PrintFlavorKind)
                     {
-                    case CppTypePrintFlavorKind.C:
-                        return "const char*";
-                    case CppTypePrintFlavorKind.Cpp:
-                        return "std::string";
-                    case CppTypePrintFlavorKind.ObjC:
-                        return "NSString";
-                    default:
-                        throw new ArgumentOutOfRangeException();
+                        switch (PrintFlavorKind)
+                        {
+                            case CppTypePrintFlavorKind.C:
+                                return "const char*";
+                            case CppTypePrintFlavorKind.Cpp:
+                                return "std::string";
+                            case CppTypePrintFlavorKind.ObjC:
+                                return "NSString";
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
                     }
-                }
                 case PrimitiveType.Decimal:
-                {
-                    switch (PrintFlavorKind)
                     {
-                    case CppTypePrintFlavorKind.C:
-                    case CppTypePrintFlavorKind.Cpp:
-                        return "_Decimal32";
-                    case CppTypePrintFlavorKind.ObjC:
-                        return "NSDecimalNumber";
-                    default:
-                        throw new ArgumentOutOfRangeException();
+                        switch (PrintFlavorKind)
+                        {
+                            case CppTypePrintFlavorKind.C:
+                            case CppTypePrintFlavorKind.Cpp:
+                                return "_Decimal32";
+                            case CppTypePrintFlavorKind.ObjC:
+                                return "NSDecimalNumber";
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
                     }
-                }
             }
 
             throw new NotSupportedException();
@@ -237,8 +237,12 @@ namespace CppSharp.Generators.C
             if (ResolveTypedefs && !typedef.Declaration.Type.IsPointerTo(out FunctionType _))
             {
                 TypePrinterResult type = typedef.Declaration.QualifiedType.Visit(this);
-                return new TypePrinterResult { Type = $"{qual}{type.Type}",
-                    NamePrefix = type.NamePrefix, NameSuffix = type.NameSuffix };
+                return new TypePrinterResult
+                {
+                    Type = $"{qual}{type.Type}",
+                    NamePrefix = type.NamePrefix,
+                    NameSuffix = type.NameSuffix
+                };
             }
 
             var result = typedef.Declaration.Visit(this);
@@ -469,59 +473,59 @@ namespace CppSharp.Generators.C
         {
             switch (scope)
             {
-            case TypePrintScopeKind.Local:
-            {
-                if (ContextKind == TypePrinterContextKind.Managed)
-                {
-                    return PrintLogicalNames ? declaration.LogicalName : declaration.Name;
-                }
+                case TypePrintScopeKind.Local:
+                    {
+                        if (ContextKind == TypePrinterContextKind.Managed)
+                        {
+                            return PrintLogicalNames ? declaration.LogicalName : declaration.Name;
+                        }
 
-                if (PrefixSpecialFunctions)
-                {
-                    if (declaration is Function {IsOperator: true} function)
-                        return $"operator_{function.OperatorKind}";
-                }
+                        if (PrefixSpecialFunctions)
+                        {
+                            if (declaration is Function { IsOperator: true } function)
+                                return $"operator_{function.OperatorKind}";
+                        }
 
-                return PrintLogicalNames ? declaration.LogicalOriginalName
-                    : declaration.OriginalName;
-            }
-            case TypePrintScopeKind.Qualified:
-            {
-                if (ContextKind == TypePrinterContextKind.Managed)
-                {
-                    var outputNamespace = GlobalNamespace(declaration);
-                    if (!string.IsNullOrEmpty(outputNamespace))
-                    {
-                        return $"{outputNamespace}{NamespaceSeparator}{declaration.QualifiedName}";
+                        return PrintLogicalNames ? declaration.LogicalOriginalName
+                            : declaration.OriginalName;
                     }
+                case TypePrintScopeKind.Qualified:
+                    {
+                        if (ContextKind == TypePrinterContextKind.Managed)
+                        {
+                            var outputNamespace = GlobalNamespace(declaration);
+                            if (!string.IsNullOrEmpty(outputNamespace))
+                            {
+                                return $"{outputNamespace}{NamespaceSeparator}{declaration.QualifiedName}";
+                            }
 
-                    return declaration.QualifiedName;
-                }
+                            return declaration.QualifiedName;
+                        }
 
-                if (declaration.Namespace is Class)
-                {
-                    var declName = GetDeclName(declaration, TypePrintScopeKind.Local);
-                    bool printTags = PrintTags;
-                    PrintTags = false;
-                    TypePrinterResult declContext = declaration.Namespace.Visit(this);
-                    PrintTags = printTags;
-                    return $"{declContext}{NamespaceSeparator}{declName}";
-                }
+                        if (declaration.Namespace is Class)
+                        {
+                            var declName = GetDeclName(declaration, TypePrintScopeKind.Local);
+                            bool printTags = PrintTags;
+                            PrintTags = false;
+                            TypePrinterResult declContext = declaration.Namespace.Visit(this);
+                            PrintTags = printTags;
+                            return $"{declContext}{NamespaceSeparator}{declName}";
+                        }
 
-                return PrintLogicalNames ? declaration.QualifiedLogicalOriginalName
-                    : declaration.QualifiedOriginalName;
-            }
-            case TypePrintScopeKind.GlobalQualified:
-            {
-                var name = (ContextKind == TypePrinterContextKind.Managed) ?
-                            declaration.Name : declaration.OriginalName;
+                        return PrintLogicalNames ? declaration.QualifiedLogicalOriginalName
+                            : declaration.QualifiedOriginalName;
+                    }
+                case TypePrintScopeKind.GlobalQualified:
+                    {
+                        var name = (ContextKind == TypePrinterContextKind.Managed) ?
+                                    declaration.Name : declaration.OriginalName;
 
-                if (declaration.Namespace is Class)
-                    return $"{declaration.Namespace.Visit(this)}{NamespaceSeparator}{name}";
+                        if (declaration.Namespace is Class)
+                            return $"{declaration.Namespace.Visit(this)}{NamespaceSeparator}{name}";
 
-                var qualifier = HasGlobalNamespacePrefix ? NamespaceSeparator : string.Empty;
-                return qualifier + GetDeclName(declaration, TypePrintScopeKind.Qualified);
-            }
+                        var qualifier = HasGlobalNamespacePrefix ? NamespaceSeparator : string.Empty;
+                        return qualifier + GetDeclName(declaration, TypePrintScopeKind.Qualified);
+                    }
             }
 
             throw new NotSupportedException();
@@ -619,7 +623,7 @@ namespace CppSharp.Generators.C
             FunctionType functionType;
             CppSharp.AST.Type desugared = function.FunctionType.Type.Desugar();
             if (!desugared.IsPointerTo(out functionType))
-                functionType = (FunctionType) desugared;
+                functionType = (FunctionType)desugared;
             string exceptionType = Print(functionType.ExceptionSpecType);
 
             var @return = function.OriginalReturnType.Visit(this);

src/Generator/Generators/CLI/CLIHeaders.cs

@@ -70,7 +70,7 @@ namespace CppSharp.Generators.CLI
                 if (unit != null && !unit.IsDeclared)
                     continue;
 
-                if(!string.IsNullOrEmpty(include.File) && include.InHeader)
+                if (!string.IsNullOrEmpty(include.File) && include.InHeader)
                     includes.Add(include.ToString());
             }
 
@@ -507,7 +507,7 @@ namespace CppSharp.Generators.CLI
 
             Indent();
 
-            var @class = (Class) methods[0].Namespace;
+            var @class = (Class)methods[0].Namespace;
 
             if (@class.IsValueType)
                 foreach (var @base in @class.Bases.Where(b => b.IsClass && !b.Class.Ignore))
@@ -531,7 +531,7 @@ namespace CppSharp.Generators.CLI
                 GenerateMethod(method);
             }
 
-            foreach(var method in staticMethods)
+            foreach (var method in staticMethods)
                 GenerateMethod(method);
 
             Unindent();
@@ -541,7 +541,7 @@ namespace CppSharp.Generators.CLI
         {
             Indent();
 
-            foreach(var variable in @class.Variables)
+            foreach (var variable in @class.Variables)
             {
                 if (!variable.IsGenerated) continue;
 
@@ -720,7 +720,7 @@ namespace CppSharp.Generators.CLI
 
             if (method.OperatorKind == CXXOperatorKind.EqualEqual)
             {
-                GenerateEquals(method, (Class) method.Namespace);
+                GenerateEquals(method, (Class)method.Namespace);
             }
 
             PopBlock(NewLineKind.BeforeNextBlock);

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -521,7 +521,7 @@ namespace CppSharp.Generators.CLI
                     Context.Parameter.Usage == ParameterUsage.Out ||
                     Context.Parameter.Usage == ParameterUsage.InOut;
 
-                if(!isRef)
+                if (!isRef)
                 {
                     ArgumentPrefix.Write("&");
                 }
@@ -759,7 +759,7 @@ namespace CppSharp.Generators.CLI
                 MarshalValueClassProperties(@base.Class, marshalVar);
             }
 
-            foreach (var property in @class.Properties.Where( p => !ASTUtils.CheckIgnoreProperty(p)))
+            foreach (var property in @class.Properties.Where(p => !ASTUtils.CheckIgnoreProperty(p)))
             {
                 if (property.Field == null)
                     continue;
@@ -773,11 +773,11 @@ namespace CppSharp.Generators.CLI
             var fieldRef = $"{Context.Parameter.Name}.{property.Name}";
 
             var marshalCtx = new MarshalContext(Context.Context, Context.Indentation)
-                                 {
-                                     ArgName = fieldRef,
-                                     ParameterIndex = Context.ParameterIndex++,
-                                     ReturnVarName = $"{marshalVar}.{property.Field.OriginalName}"
-                                 };
+            {
+                ArgName = fieldRef,
+                ParameterIndex = Context.ParameterIndex++,
+                ReturnVarName = $"{marshalVar}.{property.Field.OriginalName}"
+            };
 
             var marshal = new CLIMarshalManagedToNativePrinter(marshalCtx);
             property.Visit(marshal);
@@ -812,10 +812,10 @@ namespace CppSharp.Generators.CLI
         public override bool VisitFieldDecl(Field field)
         {
             Context.Parameter = new Parameter
-                {
-                    Name = Context.ArgName,
-                    QualifiedType = field.QualifiedType
-                };
+            {
+                Name = Context.ArgName,
+                QualifiedType = field.QualifiedType
+            };
 
             return field.Type.Visit(this);
         }
@@ -823,10 +823,10 @@ namespace CppSharp.Generators.CLI
         public override bool VisitProperty(Property property)
         {
             Context.Parameter = new Parameter
-                {
-                    Name = Context.ArgName,
-                    QualifiedType = property.QualifiedType
-                };
+            {
+                Name = Context.ArgName,
+                QualifiedType = property.QualifiedType
+            };
 
             return base.VisitProperty(property);
         }

src/Generator/Generators/CLI/CLISources.cs

@@ -64,7 +64,7 @@ namespace CppSharp.Generators.CLI
                     continue;
 
                 var include = typeRef.Include;
-                if(!string.IsNullOrEmpty(include.File) && !include.InHeader)
+                if (!string.IsNullOrEmpty(include.File) && !include.InHeader)
                     includes.Add(include.ToString());
             }
 
@@ -113,7 +113,7 @@ namespace CppSharp.Generators.CLI
                 }
             }
 
-            foreach(var childNamespace in @namespace.Namespaces)
+            foreach (var childNamespace in @namespace.Namespaces)
                 GenerateDeclContext(childNamespace);
 
             PopBlock();
@@ -593,10 +593,10 @@ namespace CppSharp.Generators.CLI
             foreach (var param in @event.Parameters)
             {
                 var ctx = new MarshalContext(Context, CurrentIndentation)
-                    {
-                        ReturnVarName = param.Name,
-                        ReturnType = param.QualifiedType
-                    };
+                {
+                    ReturnVarName = param.Name,
+                    ReturnType = param.QualifiedType
+                };
 
                 var marshal = new CLIMarshalNativeToManagedPrinter(ctx);
                 param.Visit(marshal);
@@ -849,12 +849,12 @@ namespace CppSharp.Generators.CLI
             foreach (var param in method.Parameters)
             {
                 var ctx = new MarshalContext(Context, CurrentIndentation)
-                              {
-                                  Function = method,
-                                  Parameter = param,
-                                  ArgName = param.Name,
-                                  ParameterIndex = paramIndex++
-                              };
+                {
+                    Function = method,
+                    Parameter = param,
+                    ArgName = param.Name,
+                    ParameterIndex = paramIndex++
+                };
 
                 var marshal = new CLIMarshalManagedToNativePrinter(ctx);
                 param.Visit(marshal);
@@ -885,10 +885,10 @@ namespace CppSharp.Generators.CLI
                 var varName = $"_native.{property.Field.OriginalName}";
 
                 var ctx = new MarshalContext(Context, CurrentIndentation)
-                    {
-                        ReturnVarName = varName,
-                        ReturnType = property.QualifiedType
-                    };
+                {
+                    ReturnVarName = varName,
+                    ReturnType = property.QualifiedType
+                };
 
                 var marshal = new CLIMarshalNativeToManagedPrinter(ctx);
                 property.Visit(marshal);
@@ -959,11 +959,11 @@ namespace CppSharp.Generators.CLI
             {
                 WriteLine($"auto {valueMarshalName} = {typePrinter.PrintTag(@class)}::{@class.QualifiedOriginalName}();");
 
-                var param = new Parameter { Name = "(*this)" , Namespace = function.Namespace };
+                var param = new Parameter { Name = "(*this)", Namespace = function.Namespace };
                 var ctx = new MarshalContext(Context, CurrentIndentation)
-                    {
-                        Parameter = param
-                    };
+                {
+                    Parameter = param
+                };
                 ctx.VarPrefix.Write(valueMarshalName);
 
                 var marshal = new CLIMarshalManagedToNativePrinter(ctx);
@@ -996,12 +996,12 @@ namespace CppSharp.Generators.CLI
 
                 switch (Operators.ClassifyOperator(function))
                 {
-                case CXXOperatorArity.Unary:
-                    WriteLine("{0} {1};", opName, @params[0].Name);
-                    break;
-                case CXXOperatorArity.Binary:
-                    WriteLine("{0} {1} {2};", @params[0].Name, opName, @params[1].Name);
-                    break;
+                    case CXXOperatorArity.Unary:
+                        WriteLine("{0} {1};", opName, @params[0].Name);
+                        break;
+                    case CXXOperatorArity.Binary:
+                        WriteLine("{0} {1} {2};", @params[0].Name, opName, @params[1].Name);
+                        break;
                 }
             }
             else
@@ -1023,10 +1023,10 @@ namespace CppSharp.Generators.CLI
                 WriteLine(");");
             }
 
-            foreach(var paramInfo in @params)
+            foreach (var paramInfo in @params)
             {
                 var param = paramInfo.Param;
-                if(param.Usage != ParameterUsage.Out && param.Usage != ParameterUsage.InOut)
+                if (param.Usage != ParameterUsage.Out && param.Usage != ParameterUsage.InOut)
                     continue;
 
                 if (param.Type.IsPointer() && !param.Type.GetFinalPointee().IsPrimitiveType())
@@ -1035,11 +1035,11 @@ namespace CppSharp.Generators.CLI
                 var nativeVarName = paramInfo.Name;
 
                 var ctx = new MarshalContext(Context, CurrentIndentation)
-                    {
-                        ArgName = nativeVarName,
-                        ReturnVarName = nativeVarName,
-                        ReturnType = param.QualifiedType
-                    };
+                {
+                    ArgName = nativeVarName,
+                    ReturnVarName = nativeVarName,
+                    ReturnType = param.QualifiedType
+                };
 
                 var marshal = new CLIMarshalNativeToManagedPrinter(ctx);
                 param.Visit(marshal);
@@ -1047,7 +1047,7 @@ namespace CppSharp.Generators.CLI
                 if (!string.IsNullOrWhiteSpace(marshal.Context.Before))
                     Write(marshal.Context.Before);
 
-                WriteLine("{0} = {1};",param.Name,marshal.Context.Return);
+                WriteLine("{0} = {1};", param.Name, marshal.Context.Return);
             }
 
             if (isValueType && !IsNativeFunctionOrStaticMethod(function))
@@ -1104,7 +1104,7 @@ namespace CppSharp.Generators.CLI
                     // C++/CLI can actually handle char -> sbyte in all case, this is for compatibility with the C# generator
                     WriteLineIndent(
                         "throw gcnew ::System::OverflowException(\"{0} must be in the range {1} - {2}.\");",
-                        param.Name, (int) char.MinValue, sbyte.MaxValue);
+                        param.Name, (int)char.MinValue, sbyte.MaxValue);
                 }
             }
         }

src/Generator/Generators/CLI/CLITemplate.cs

@@ -28,7 +28,7 @@ namespace CppSharp.Generators.CLI
 
             if (method.IsConstructor || method.IsDestructor)
             {
-                var @class = (Class) method.Namespace;
+                var @class = (Class)method.Namespace;
                 return @class.Name;
             }
 

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -74,14 +74,14 @@ namespace CppSharp.Generators.CLI
             Parameter = null;
 
             var str = string.Empty;
-            if(param.Usage == ParameterUsage.Out)
+            if (param.Usage == ParameterUsage.Out)
                 str += "[::System::Runtime::InteropServices::Out] ";
             else if (param.Usage == ParameterUsage.InOut)
                 str += "[::System::Runtime::InteropServices::In, ::System::Runtime::InteropServices::Out] ";
 
             str += type;
 
-            if(param.Usage == ParameterUsage.Out ||
+            if (param.Usage == ParameterUsage.Out ||
                param.Usage == ParameterUsage.InOut)
                 str += "%";
 

src/Generator/Generators/CLI/CLITypeReferences.cs

@@ -131,7 +131,7 @@ namespace CppSharp.Generators.CLI
             }
 
             var typeRef = GetTypeReference(decl);
-            if(typeRef != null)
+            if (typeRef != null)
             {
                 typeRef.Include.InHeader |= IsIncludeInHeader(record);
             }
@@ -176,7 +176,7 @@ namespace CppSharp.Generators.CLI
                 return false;
 
             if (@class.IsIncomplete && @class.CompleteDeclaration != null)
-                @class = (Class) @class.CompleteDeclaration;
+                @class = (Class)@class.CompleteDeclaration;
 
             if (@class.TranslationUnit == TranslationUnit)
                 GeneratedDeclarations.Add(@class);

src/Generator/Generators/CSharp/CSharpCommentPrinter.cs

@@ -23,12 +23,12 @@ namespace CppSharp.Generators.CSharp
             switch (comment.Kind)
             {
                 case DocumentationCommentKind.FullComment:
-                    var fullComment = (FullComment) comment;
+                    var fullComment = (FullComment)comment;
                     foreach (var block in fullComment.Blocks)
                         block.GetCommentSections(sections);
                     break;
                 case DocumentationCommentKind.BlockCommandComment:
-                    var blockCommandComment = (BlockCommandComment) comment;
+                    var blockCommandComment = (BlockCommandComment)comment;
                     if (blockCommandComment.ParagraphComment == null)
                         break;
                     switch (blockCommandComment.CommandKind)
@@ -58,7 +58,7 @@ namespace CppSharp.Generators.CSharp
 
                     break;
                 case DocumentationCommentKind.ParamCommandComment:
-                    var paramCommandComment = (ParamCommandComment) comment;
+                    var paramCommandComment = (ParamCommandComment)comment;
                     var param = new Section(CommentElement.Param);
                     sections.Add(param);
                     if (paramCommandComment.Arguments.Count > 0)
@@ -82,7 +82,7 @@ namespace CppSharp.Generators.CSharp
                     break;
                 case DocumentationCommentKind.ParagraphComment:
                     var summaryParagraph = sections.Count == 1;
-                    var paragraphComment = (ParagraphComment) comment;
+                    var paragraphComment = (ParagraphComment)comment;
                     var lastParagraphSection = sections.Last();
                     foreach (var inlineContentComment in paragraphComment.Content)
                     {
@@ -117,7 +117,7 @@ namespace CppSharp.Generators.CSharp
                     break;
                 case DocumentationCommentKind.InlineCommandComment:
                     var lastInlineSection = sections.Last();
-                    var inlineCommand = (InlineCommandComment) comment;
+                    var inlineCommand = (InlineCommandComment)comment;
 
                     if (inlineCommand.CommandKind == CommentCommandKind.B)
                     {
@@ -132,7 +132,7 @@ namespace CppSharp.Generators.CSharp
 
         private static string GetText(Comment comment, bool trim = false)
         {
-            var textComment = ((TextComment) comment);
+            var textComment = ((TextComment)comment);
             var text = textComment.Text;
             if (trim)
                 text = text.Trim();

src/Generator/Generators/CSharp/CSharpExpressionPrinter.cs

@@ -40,7 +40,7 @@ namespace CppSharp.Generators.CSharp
             switch (expr.Class)
             {
                 case StatementClass.Call:
-                    var callExpr = (CallExprObsolete) expr;
+                    var callExpr = (CallExprObsolete)expr;
                     switch (callExpr.Declaration.GenerationKind)
                     {
                         case GenerationKind.Generate:
@@ -48,7 +48,7 @@ namespace CppSharp.Generators.CSharp
                             return $"{typePrinter.VisitDeclaration(callExpr.Declaration.Namespace)}.{callExpr.Declaration.Name}({args})";
                         case GenerationKind.Internal:
                             // a non-ctor can only be internal if it's been converted to a property
-                            var property = ((Class) callExpr.Declaration.Namespace).Properties.First(
+                            var property = ((Class)callExpr.Declaration.Namespace).Properties.First(
                                 p => p.GetMethod == callExpr.Declaration);
                             return $"{typePrinter.VisitDeclaration(callExpr.Declaration.Namespace)}.{property.Name}";
                         default:
@@ -59,7 +59,7 @@ namespace CppSharp.Generators.CSharp
                         return expr.Declaration.Visit(typePrinter).Type;
                     goto default;
                 case StatementClass.BinaryOperator:
-                    var binaryOperator = (BinaryOperatorObsolete) expr;
+                    var binaryOperator = (BinaryOperatorObsolete)expr;
 
                     var lhsResult = binaryOperator.LHS.String;
                     if (binaryOperator.LHS.Declaration is Enumeration.Item)
@@ -71,7 +71,7 @@ namespace CppSharp.Generators.CSharp
 
                     return $"{lhsResult} {binaryOperator.OpcodeStr} {rhsResult}";
                 case StatementClass.ConstructorReference:
-                    var constructorExpr = (CXXConstructExprObsolete) expr;
+                    var constructorExpr = (CXXConstructExprObsolete)expr;
                     if (constructorExpr.Arguments.Count == 1 &&
                         constructorExpr.Arguments[0].Declaration is Enumeration.Item)
                         return constructorExpr.Arguments[0].Declaration.Visit(typePrinter).Type;

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -228,7 +228,7 @@ namespace CppSharp.Generators.CSharp
 
             GenerateNamespaceFunctionsAndVariables(context);
 
-            foreach(var childNamespace in context.Namespaces)
+            foreach (var childNamespace in context.Namespaces)
                 childNamespace.Visit(this);
 
             return true;
@@ -512,7 +512,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
 
             if (@class.IsDynamic)
                 GenerateVTable(@class);
-        exit:
+            exit:
             UnindentAndWriteCloseBrace();
             PopBlock(NewLineKind.BeforeNextBlock);
 
@@ -568,7 +568,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
                 PushBlock(BlockKind.Property);
                 var type = prop.Type;
                 if (prop.Parameters.Count > 0 && prop.Type.IsPointerToPrimitiveType())
-                    type = ((PointerType) prop.Type).Pointee;
+                    type = ((PointerType)prop.Type).Pointee;
                 GenerateDeclarationCommon(prop);
                 Write($"{type} {GetPropertyName(prop)} {{ ");
                 if (prop.HasGetter)
@@ -916,7 +916,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             PopBlock(NewLineKind.BeforeNextBlock);
         }
 
-#endregion
+        #endregion
 
         private void GeneratePropertySetter<T>(T decl,
             Class @class, bool isAbstract = false, Property property = null)
@@ -1063,11 +1063,12 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             }
             else
             {
-                var name = ((Class) field.Namespace).Layout.Fields.First(
+                var name = ((Class)field.Namespace).Layout.Fields.First(
                     f => f.FieldPtr == field.OriginalPtr).Name;
                 if (@class.IsValueType)
                     returnVar = $"{Helpers.InstanceField}.{name}";
-                else {
+                else
+                {
                     var typeName = TypePrinter.PrintNative(@class);
                     if (IsInternalClassNested(field.Class))
                         typeName.RemoveNamespace();
@@ -1141,7 +1142,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             else
                 type = originalType.ToString();
 
-            var name = ((Class) field.Namespace).Layout.Fields.First(
+            var name = ((Class)field.Namespace).Layout.Fields.First(
                 f => f.FieldPtr == field.OriginalPtr).Name;
             WriteLine(string.Format("fixed ({0} {1} = {2}.{3})",
                 type, arrPtr, Helpers.InstanceField, name));
@@ -1276,7 +1277,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             {
                 NewLine();
                 WriteOpenBraceAndIndent();
-                var to = ((Class) property.OriginalNamespace).OriginalClass;
+                var to = ((Class)property.OriginalNamespace).OriginalClass;
                 var baseOffset = GetOffsetToBase(@class, to);
                 WriteLine("return {0} + {1};", Helpers.InstanceIdentifier, baseOffset);
                 UnindentAndWriteCloseBrace();
@@ -1415,7 +1416,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
 
         private void GenerateFieldGetter(Field field, Class @class, QualifiedType returnType)
         {
-            var name = ((Class) field.Namespace).Layout.Fields.First(
+            var name = ((Class)field.Namespace).Layout.Fields.First(
                 f => f.FieldPtr == field.OriginalPtr).Name;
             string returnVar;
             Type fieldType = field.Type.Desugar();
@@ -1473,9 +1474,9 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
                       !final.IsPrimitiveType(PrimitiveType.Char16) &&
                       !final.IsPrimitiveType(PrimitiveType.Char32)) ||
                      (!Context.Options.MarshalCharAsManagedChar &&
-                      !((PointerType) fieldType).QualifiedPointee.Qualifiers.IsConst)) &&
+                      !((PointerType)fieldType).QualifiedPointee.Qualifiers.IsConst)) &&
                     templateSubstitution == null) ||
-                    (!((PointerType) fieldType).QualifiedPointee.Qualifiers.IsConst &&
+                    (!((PointerType)fieldType).QualifiedPointee.Qualifiers.IsConst &&
                       (final.IsPrimitiveType(PrimitiveType.WideChar) ||
                        final.IsPrimitiveType(PrimitiveType.Char16) ||
                        final.IsPrimitiveType(PrimitiveType.Char32))))
@@ -1512,7 +1513,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             if (methods.Count == 0)
                 return;
 
-            var @class = (Class) methods[0].Namespace;
+            var @class = (Class)methods[0].Namespace;
 
             if (@class.IsValueType)
                 foreach (var @base in @class.Bases.Where(b => b.IsClass && !b.Class.Ignore))
@@ -1649,7 +1650,8 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             if (!isIndexer)
                 return prop.Name;
 
-            var @params = prop.Parameters.Select(param => {
+            var @params = prop.Parameters.Select(param =>
+            {
                 var p = new Parameter(param);
                 p.Usage = ParameterUsage.In;
                 return p;
@@ -1671,7 +1673,8 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
 
             if (variable.Initializer != null && !string.IsNullOrWhiteSpace(variable.Initializer.String))
                 GeneratePropertyGetterForVariableWithInitializer(variable, signature);
-            else {
+            else
+            {
                 WriteLine(signature);
                 WriteOpenBraceAndIndent();
 
@@ -1687,7 +1690,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             PopBlock(NewLineKind.BeforeNextBlock);
         }
 
-#region Virtual Tables
+        #region Virtual Tables
 
         public List<VTableComponent> GetUniqueVTableMethodEntries(Class @class)
         {
@@ -1718,7 +1721,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             // Generate a delegate type for each method.
             foreach (var method in wrappedEntries.Select(e => e.Method).Where(m => !m.Ignore))
                 GenerateVTableMethodDelegates(containingClass, method.Namespace.IsDependent ?
-                   (Method) method.InstantiatedFrom : method);
+                   (Method)method.InstantiatedFrom : method);
 
             var hasVirtualDtor = wrappedEntries.Any(e => e.Method.IsDestructor);
             bool hasDynamicBase = @class.NeedsBase && @class.BaseClass.IsDynamic;
@@ -1839,7 +1842,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             {{
                 if (__VTables.IsTransient)
                     __VTables = VTableLoader.SetupVTables(__Instance, destructorOnly);
-            }}", trimIndentation : true);
+            }}", trimIndentation: true);
 
             WriteLine("#endregion");
             PopBlock(NewLineKind.BeforeNextBlock);
@@ -1974,7 +1977,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             Type returnType = method.OriginalReturnType.Type.Desugar();
             bool isPrimitive = returnType.IsPrimitiveType();
             bool isVoid = returnType.IsPrimitiveType(PrimitiveType.Void);
-            var property = ((Class) method.Namespace).Properties.Find(
+            var property = ((Class)method.Namespace).Properties.Find(
                 p => p.GetMethod == method || p.SetMethod == method);
             bool isSetter = property != null && property.SetMethod == method;
             var hasReturn = !isVoid && !isSetter;
@@ -2097,9 +2100,9 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             return @class.IsGenerated && @class.IsDynamic && GetUniqueVTableMethodEntries(@class).Count > 0;
         }
 
-#endregion
+        #endregion
 
-#region Events
+        #region Events
 
         public override bool VisitEvent(Event @event)
         {
@@ -2207,9 +2210,9 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
             UnindentAndWriteCloseBrace();
         }
 
-#endregion
+        #endregion
 
-#region Constructors
+        #region Constructors
 
         public void GenerateClassConstructors(Class @class)
         {
@@ -2394,7 +2397,7 @@ internal static bool {Helpers.TryGetNativeToManagedMappingIdentifier}(IntPtr nat
 
         private bool GenerateDestructorCall(Method dtor)
         {
-            var @class = (Class) dtor.Namespace;
+            var @class = (Class)dtor.Namespace;
             GenerateVirtualFunctionCall(dtor, true);
             if (@class.IsAbstract)
             {
@@ -2605,9 +2608,9 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                 WriteLineIndent(": this()");
         }
 
-#endregion
+        #endregion
 
-#region Methods / Functions
+        #region Methods / Functions
 
         public void GenerateFunction(Function function, string parentName)
         {
@@ -2732,7 +2735,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                     c, method, method.OriginalReturnType));
             }
 
-            SkipImpl:
+        SkipImpl:
 
             UnindentAndWriteCloseBrace();
 
@@ -2829,7 +2832,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
         {
             if (function.OriginalFunction.GenerationKind == GenerationKind.Internal)
             {
-                var property = ((Class) function.Namespace).Properties.First(
+                var property = ((Class)function.Namespace).Properties.First(
                     p => p.SetMethod == function.OriginalFunction);
                 WriteLine($@"{property.Name} = {ExpressionPrinter.VisitParameter(
                     function.Parameters.First(p => p.Kind == ParameterKind.Regular))};");
@@ -2844,7 +2847,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                     parameter.Type.IsPointerToPrimitiveType(out primitiveType) &&
                     parameter.Usage == ParameterUsage.InOut && parameter.HasDefaultValue)
                 {
-                    var pointeeType = ((PointerType) parameter.Type).Pointee.ToString();
+                    var pointeeType = ((PointerType)parameter.Type).Pointee.ToString();
                     WriteLine($@"{pointeeType} param{j++} = {
                         (primitiveType == PrimitiveType.Bool ? "false" : "0")};");
                 }
@@ -2927,16 +2930,16 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
         {
             Function @virtual = method;
             if (method.OriginalFunction != null &&
-                !((Class) method.OriginalFunction.Namespace).IsInterface)
+                !((Class)method.OriginalFunction.Namespace).IsInterface)
                 @virtual = method.OriginalFunction;
 
             var i = VTables.GetVTableIndex(@virtual);
             int vtableIndex = 0;
-            var @class = (Class) method.Namespace;
+            var @class = (Class)method.Namespace;
             var thisParam = method.Parameters.Find(
                 p => p.Kind == ParameterKind.Extension);
             if (thisParam != null)
-                @class = (Class) method.OriginalFunction.Namespace;
+                @class = (Class)method.OriginalFunction.Namespace;
 
             if (Context.ParserOptions.IsMicrosoftAbi)
                 vtableIndex = @class.Layout.VFTables.IndexOf(@class.Layout.VFTables.First(
@@ -3094,7 +3097,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
             Parameter operatorParam = null;
             if (method != null)
             {
-                var @class = (Class) method.Namespace;
+                var @class = (Class)method.Namespace;
                 isValueType = @class.IsValueType;
 
                 operatorParam = method.Parameters.FirstOrDefault(
@@ -3186,7 +3189,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                 if (operatorParam == null)
                 {
                     WriteLine($@"fixed ({Helpers.InternalStruct}{
-                        Helpers.GetSuffixForInternal((Class) originalFunction.Namespace)}* __instancePtr = &{
+                        Helpers.GetSuffixForInternal((Class)originalFunction.Namespace)}* __instancePtr = &{
                         Helpers.InstanceField})");
                     WriteOpenBraceAndIndent();
                 }
@@ -3200,10 +3203,10 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                 Write("var {0} = ", Helpers.ReturnIdentifier);
 
             if (method != null && !method.IsConstructor && method.OriginalFunction != null &&
-                ((Method) method.OriginalFunction).IsConstructor)
+                ((Method)method.OriginalFunction).IsConstructor)
             {
                 WriteLine($@"Marshal.AllocHGlobal({
-                    ((Class) method.OriginalNamespace).Layout.Size});");
+                    ((Class)method.OriginalNamespace).Layout.Size});");
                 names.Insert(0, Helpers.ReturnIdentifier);
             }
             WriteLine("{0}({1});", functionName, string.Join(", ", names));
@@ -3241,19 +3244,19 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                 UnindentAndWriteCloseBrace();
 
             var numFixedBlocks = @params.Count(param => param.HasUsingBlock);
-            for(var i = 0; i < numFixedBlocks; ++i)
+            for (var i = 0; i < numFixedBlocks; ++i)
                 UnindentAndWriteCloseBrace();
         }
 
         private string GetInstanceParam(Function function)
         {
-            var from = (Class) function.Namespace;
+            var from = (Class)function.Namespace;
             var to = (function.OriginalFunction == null ||
                 // we don't need to offset the instance with Itanium if there's an existing interface impl
                 (Context.ParserOptions.IsItaniumLikeAbi &&
-                 !((Class) function.OriginalNamespace).IsInterface)) &&
+                 !((Class)function.OriginalNamespace).IsInterface)) &&
                  function.SynthKind != FunctionSynthKind.AbstractImplCall ?
-                @from.BaseClass : (Class) function.OriginalFunction.Namespace;
+                @from.BaseClass : (Class)function.OriginalFunction.Namespace;
 
             var baseOffset = 0u;
             if (to != null)
@@ -3320,7 +3323,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
         {
             // Do not delete instance in MS ABI.
             var name = param.Name;
-            var function = (Function) param.Namespace;
+            var function = (Function)param.Namespace;
             param.Name = param.Kind == ParameterKind.ImplicitDestructorParameter ? "0" :
                 ActiveBlock.Parent.Kind != BlockKind.Property ||
                 function.OperatorKind == CXXOperatorKind.Subscript ? name : "value";
@@ -3377,7 +3380,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
             return TypePrinter.VisitParameters(@params, true).Type;
         }
 
-#endregion
+        #endregion
 
         public override bool VisitTypedefNameDecl(TypedefNameDecl typedef)
         {
@@ -3394,7 +3397,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
                 var attributedType = typedef.Type.GetPointee() as AttributedType;
                 var callingConvention = attributedType == null
                     ? functionType.CallingConvention
-                    : ((FunctionType) attributedType.Equivalent.Type).CallingConvention;
+                    : ((FunctionType)attributedType.Equivalent.Type).CallingConvention;
                 TypePrinter.PushContext(TypePrinterContextKind.Native);
                 var interopCallConv = callingConvention.ToInteropCallConv();
                 if (interopCallConv == System.Runtime.InteropServices.CallingConvention.Winapi)
@@ -3555,7 +3558,7 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty
             string libName = declaration.TranslationUnit.Module.SharedLibraryName;
 
             NativeLibrary library;
-            Context.Symbols.FindLibraryBySymbol(((IMangledDecl) declaration).Mangled, out library);
+            Context.Symbols.FindLibraryBySymbol(((IMangledDecl)declaration).Mangled, out library);
 
             if (library != null)
                 libName = Path.GetFileNameWithoutExtension(library.FileName);

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -303,7 +303,7 @@ namespace CppSharp.Generators.CSharp
                     template.Arguments.All(IsValid))
                 {
                     List<TemplateArgument> args = template.Arguments;
-                    var @class = (Class) template.Template.TemplatedDecl;
+                    var @class = (Class)template.Template.TemplatedDecl;
                     TemplateArgument lastArg = args.Last();
                     TypePrinterResult typePrinterResult = VisitDeclaration(decl);
                     typePrinterResult.NameSuffix.Append($@"<{string.Join(", ",
@@ -467,16 +467,20 @@ namespace CppSharp.Generators.CSharp
                 case PrimitiveType.LongLong:
                 case PrimitiveType.ULongLong:
                     return GetIntString(primitive, Context.TargetInfo);
-                case PrimitiveType.Int128: return new TypePrinterResult("fixed byte",
-                    "[16]"); // The type is always 128 bits wide
-                case PrimitiveType.UInt128: return new TypePrinterResult("fixed byte",
-                    "[16]"); // The type is always 128 bits wide
-                case PrimitiveType.Half: return new TypePrinterResult("fixed byte",
-                    $"[{Context.TargetInfo.HalfWidth}]");
+                case PrimitiveType.Int128:
+                    return new TypePrinterResult("fixed byte",
+"[16]"); // The type is always 128 bits wide
+                case PrimitiveType.UInt128:
+                    return new TypePrinterResult("fixed byte",
+"[16]"); // The type is always 128 bits wide
+                case PrimitiveType.Half:
+                    return new TypePrinterResult("fixed byte",
+$"[{Context.TargetInfo.HalfWidth}]");
                 case PrimitiveType.Float: return "float";
                 case PrimitiveType.Double: return "double";
-                case PrimitiveType.LongDouble: return new TypePrinterResult("fixed byte",
-                    $"[{Context.TargetInfo.LongDoubleWidth}]");
+                case PrimitiveType.LongDouble:
+                    return new TypePrinterResult("fixed byte",
+$"[{Context.TargetInfo.LongDoubleWidth}]");
                 case PrimitiveType.IntPtr: return IntPtrType;
                 case PrimitiveType.UIntPtr: return QualifiedType("System.UIntPtr");
                 case PrimitiveType.Null: return "void*";
@@ -766,7 +770,7 @@ namespace CppSharp.Generators.CSharp
 
         private void AddContextName(Stack<string> names, Declaration ctx)
         {
-            var isInlineNamespace = ctx is Namespace && ((Namespace) ctx).IsInline;
+            var isInlineNamespace = ctx is Namespace && ((Namespace)ctx).IsInline;
             if (string.IsNullOrWhiteSpace(ctx.Name) || isInlineNamespace)
                 return;
 

src/Generator/Generators/ITypePrinter.cs

@@ -52,7 +52,7 @@ namespace CppSharp.AST
         {
             if (Kind == TypePrinterContextKind.Template)
             {
-                var template = (Template) Declaration;
+                var template = (Template)Declaration;
                 return string.Join(", ", template.Parameters.Select(p => p.Name));
             }
 
@@ -63,12 +63,12 @@ namespace CppSharp.AST
                 templateArgs = templateSpecializationType.Arguments;
             else
             {
-                var declaration = ((TagType) type).Declaration;
+                var declaration = ((TagType)type).Declaration;
                 var specialization = declaration as ClassTemplateSpecialization;
                 if (specialization == null)
                     return string.Join(", ",
-                        ((Class) declaration).TemplateParameters.Select(t => t.Name));
-                templateArgs = ((ClassTemplateSpecialization) declaration).Arguments;
+                        ((Class)declaration).TemplateParameters.Select(t => t.Name));
+                templateArgs = ((ClassTemplateSpecialization)declaration).Arguments;
             }
 
             var paramsList = new List<string>();

src/Generator/Generators/NAPI/NAPIMarshal.cs

@@ -37,13 +37,13 @@ namespace CppSharp.Generators.NAPI
         {
             switch (array.SizeType)
             {
-            case ArrayType.ArraySize.Constant:
-            case ArrayType.ArraySize.Incomplete:
-            case ArrayType.ArraySize.Variable:
-                Context.Return.Write("nullptr");
-                break;
-            default:
-                throw new System.NotImplementedException();
+                case ArrayType.ArraySize.Constant:
+                case ArrayType.ArraySize.Incomplete:
+                case ArrayType.ArraySize.Variable:
+                    Context.Return.Write("nullptr");
+                    break;
+                default:
+                    throw new System.NotImplementedException();
             }
 
             return true;
@@ -81,48 +81,48 @@ namespace CppSharp.Generators.NAPI
 
         public static (string type, string func) GetNAPIPrimitiveType(PrimitiveType type)
         {
-            switch(type)
+            switch (type)
             {
-            case PrimitiveType.Bool:
-                return ("napi_boolean", "napi_get_boolean");
-            case PrimitiveType.WideChar:
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.Short:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-                return ("napi_number", "napi_create_int32");
-            case PrimitiveType.UChar:
-            case PrimitiveType.UShort:
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-                return ("napi_number", "napi_create_uint32");
-            case PrimitiveType.LongLong:
-                return ("napi_number", "napi_create_bigint_int64");
-            case PrimitiveType.ULongLong:
-                return ("napi_number", "napi_create_bigint_uint64");
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-                return ("napi_number", "napi_create_double");
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-                return ("napi_bigint", "napi_create_bigint_words");
-            case PrimitiveType.String:
-                return ("napi_string", "napi_create_string_latin1");
-            case PrimitiveType.Null:
-                return ("napi_null", "napi_get_null");
-            case PrimitiveType.Void:
-                return ("napi_undefined", "napi_get_undefined");
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-            case PrimitiveType.Decimal:
-            default:
-                throw new ArgumentOutOfRangeException(nameof(type), type, null);
+                case PrimitiveType.Bool:
+                    return ("napi_boolean", "napi_get_boolean");
+                case PrimitiveType.WideChar:
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.Short:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                    return ("napi_number", "napi_create_int32");
+                case PrimitiveType.UChar:
+                case PrimitiveType.UShort:
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                    return ("napi_number", "napi_create_uint32");
+                case PrimitiveType.LongLong:
+                    return ("napi_number", "napi_create_bigint_int64");
+                case PrimitiveType.ULongLong:
+                    return ("napi_number", "napi_create_bigint_uint64");
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                    return ("napi_number", "napi_create_double");
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                    return ("napi_bigint", "napi_create_bigint_words");
+                case PrimitiveType.String:
+                    return ("napi_string", "napi_create_string_latin1");
+                case PrimitiveType.Null:
+                    return ("napi_null", "napi_get_null");
+                case PrimitiveType.Void:
+                    return ("napi_undefined", "napi_get_undefined");
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                case PrimitiveType.Decimal:
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type), type, null);
             }
         }
 
@@ -133,55 +133,55 @@ namespace CppSharp.Generators.NAPI
 
             switch (primitive)
             {
-            case PrimitiveType.Bool:
-            case PrimitiveType.WideChar:
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.Short:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-            case PrimitiveType.UChar:
-            case PrimitiveType.UShort:
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-            case PrimitiveType.LongLong:
-            case PrimitiveType.ULongLong:
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-                Context.Before.WriteLine($"napi_value {result};");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, &{result});");
-                Context.Before.WriteLine("assert(status == napi_ok);");
-                Context.Return.Write(result);
-                return true;
-
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-                return true;
-
-            case PrimitiveType.String:
-                Context.Before.WriteLine($"napi_value {result};");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, NAPI_AUTO_LENGTH, &{result});");
-                Context.Before.WriteLine("assert(status == napi_ok);");
-                Context.Return.Write(result);
-                return true;
-
-            case PrimitiveType.Null:
-                Context.Before.WriteLine($"napi_value {result};");
-                Context.Before.WriteLine($"status = {func}(env, &{result});");
-                Context.Before.WriteLine("assert(status == napi_ok);");
-                Context.Return.Write(result);
-                return true;
-
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-            case PrimitiveType.Decimal:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Bool:
+                case PrimitiveType.WideChar:
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.Short:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                case PrimitiveType.UChar:
+                case PrimitiveType.UShort:
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                case PrimitiveType.LongLong:
+                case PrimitiveType.ULongLong:
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                    Context.Before.WriteLine($"napi_value {result};");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, &{result});");
+                    Context.Before.WriteLine("assert(status == napi_ok);");
+                    Context.Return.Write(result);
+                    return true;
+
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                    return true;
+
+                case PrimitiveType.String:
+                    Context.Before.WriteLine($"napi_value {result};");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, NAPI_AUTO_LENGTH, &{result});");
+                    Context.Before.WriteLine("assert(status == napi_ok);");
+                    Context.Return.Write(result);
+                    return true;
+
+                case PrimitiveType.Null:
+                    Context.Before.WriteLine($"napi_value {result};");
+                    Context.Before.WriteLine($"status = {func}(env, &{result});");
+                    Context.Before.WriteLine("assert(status == napi_ok);");
+                    Context.Return.Write(result);
+                    return true;
+
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                case PrimitiveType.Decimal:
+                default:
+                    throw new NotImplementedException();
             }
         }
 
@@ -255,15 +255,15 @@ namespace CppSharp.Generators.NAPI
             Context.Before.WriteLine("assert(status == napi_ok);");
             Context.Before.NewLine();
 
-/*
-            var refId = $"__{Context.ReturnVarName}_ref";
-            Context.Before.WriteLine($"napi_ref {refId};");
+            /*
+                        var refId = $"__{Context.ReturnVarName}_ref";
+                        Context.Before.WriteLine($"napi_ref {refId};");
 
-            var dtorId = $"dtor_{NAPISources.GetCIdentifier(Context.Context, ctor)}";
-            Context.Before.WriteLine($"status = napi_wrap(env, _this, {instanceId}, {dtorId}" +
-                                     $", nullptr, &{refId});");
-            Context.Before.WriteLine("assert(status == napi_ok);");
-*/
+                        var dtorId = $"dtor_{NAPISources.GetCIdentifier(Context.Context, ctor)}";
+                        Context.Before.WriteLine($"status = napi_wrap(env, _this, {instanceId}, {dtorId}" +
+                                                 $", nullptr, &{refId});");
+                        Context.Before.WriteLine("assert(status == napi_ok);");
+            */
             Context.Return.Write($"{instanceId}");
 
             return true;
@@ -365,9 +365,9 @@ namespace CppSharp.Generators.NAPI
 
             switch (array.SizeType)
             {
-            default:
-                Context.Return.Write("nullptr");
-                break;
+                default:
+                    Context.Return.Write("nullptr");
+                    break;
             }
 
             return true;
@@ -450,54 +450,54 @@ namespace CppSharp.Generators.NAPI
 
         public static (string func, string type, string cast) GetNAPIPrimitiveGetter(PrimitiveType type)
         {
-            switch(type)
+            switch (type)
             {
-            case PrimitiveType.Bool:
-                return ("napi_get_value_bool", "bool", "bool");
-            case PrimitiveType.WideChar:
-                return ("napi_get_value_int32", "int32_t", "wchar_t");
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-                return ("napi_get_value_int32", "int32_t", "char");
-            case PrimitiveType.Char16:
-                return ("napi_get_value_int32", "int32_t", "char16_t");
-            case PrimitiveType.Char32:
-                return ("napi_get_value_int32", "int32_t", "char32_t");
-            case PrimitiveType.Short:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-                return ("napi_get_value_int32", "int32_t", null);
-            case PrimitiveType.UChar:
-            case PrimitiveType.UShort:
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-                return ("napi_get_value_uint32", "uint32_t", null);
-            case PrimitiveType.LongLong:
-                return ("napi_get_value_bigint_int64", "int64_t", null);
-            case PrimitiveType.ULongLong:
-                return ("napi_get_value_bigint_uint64", "uint64_t", null);
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-                return ("napi_get_value_double", "double", "float");
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-                return ("napi_get_value_double", "double", null);
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-                return (null, null, null);
-            case PrimitiveType.String:
-                return ("napi_get_value_string_utf8", "char*", null);
-            case PrimitiveType.Null:
-                return ("napi_get_null", null, null);
-            case PrimitiveType.Void:
-                return (null, null, null);
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-                return (null, null, null);
-            case PrimitiveType.Decimal:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Bool:
+                    return ("napi_get_value_bool", "bool", "bool");
+                case PrimitiveType.WideChar:
+                    return ("napi_get_value_int32", "int32_t", "wchar_t");
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                    return ("napi_get_value_int32", "int32_t", "char");
+                case PrimitiveType.Char16:
+                    return ("napi_get_value_int32", "int32_t", "char16_t");
+                case PrimitiveType.Char32:
+                    return ("napi_get_value_int32", "int32_t", "char32_t");
+                case PrimitiveType.Short:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                    return ("napi_get_value_int32", "int32_t", null);
+                case PrimitiveType.UChar:
+                case PrimitiveType.UShort:
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                    return ("napi_get_value_uint32", "uint32_t", null);
+                case PrimitiveType.LongLong:
+                    return ("napi_get_value_bigint_int64", "int64_t", null);
+                case PrimitiveType.ULongLong:
+                    return ("napi_get_value_bigint_uint64", "uint64_t", null);
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                    return ("napi_get_value_double", "double", "float");
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                    return ("napi_get_value_double", "double", null);
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                    return (null, null, null);
+                case PrimitiveType.String:
+                    return ("napi_get_value_string_utf8", "char*", null);
+                case PrimitiveType.Null:
+                    return ("napi_get_null", null, null);
+                case PrimitiveType.Void:
+                    return (null, null, null);
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                    return (null, null, null);
+                case PrimitiveType.Decimal:
+                default:
+                    throw new NotImplementedException();
             }
         }
 
@@ -507,79 +507,79 @@ namespace CppSharp.Generators.NAPI
 
             switch (primitive)
             {
-            case PrimitiveType.Bool:
-            case PrimitiveType.WideChar:
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.Short:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-            case PrimitiveType.UChar:
-            case PrimitiveType.UShort:
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-                Context.Before.WriteLine($"{type} {Context.Parameter.Name};");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}," +
-                                         $" &{Context.Parameter.Name});");
-
-                if (!string.IsNullOrEmpty(cast))
-                    Context.Return.Write($"({cast})");
-
-                Context.Return.Write($"{Context.Parameter.Name}");
-                return true;
-
-            case PrimitiveType.LongLong:
-            case PrimitiveType.ULongLong:
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-                Context.Before.WriteLine($"{type} {Context.Parameter.Name};");
-                Context.Before.WriteLine("bool lossless;");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}," +
-                                         $" &{Context.Parameter.Name}, &lossless);");
-
-                if (!string.IsNullOrEmpty(cast))
-                    Context.Return.Write($"({cast})");
-
-                Context.Return.Write($"{Context.Parameter.Name}");
-                return true;
-
-            case PrimitiveType.String:
-                var size = $"_{Context.Parameter.Name}_size";
-                Context.Before.WriteLine($"size_t {size};");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, " +
-                                         $"nullptr, 0, &{size});");
-                Context.Before.NewLine();
-
-                var buf = $"{Context.Parameter.Name}";
-                Context.Before.WriteLine($"char* {buf} = (char*) malloc({size});");
-                Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, " +
-                                         $"nullptr, 0, &{size});");
-                Context.Before.WriteLine("assert(status == napi_ok);");
-
-                Context.Cleanup.WriteLine($"free({buf});");
-                Context.Return.Write($"{buf}");
-                return true;
-
-            case PrimitiveType.Null:
-                return true;
-
-            case PrimitiveType.Void:
-                return true;
-
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-                return true;
-
-            case PrimitiveType.Decimal:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Bool:
+                case PrimitiveType.WideChar:
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.Short:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                case PrimitiveType.UChar:
+                case PrimitiveType.UShort:
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                    Context.Before.WriteLine($"{type} {Context.Parameter.Name};");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}," +
+                                             $" &{Context.Parameter.Name});");
+
+                    if (!string.IsNullOrEmpty(cast))
+                        Context.Return.Write($"({cast})");
+
+                    Context.Return.Write($"{Context.Parameter.Name}");
+                    return true;
+
+                case PrimitiveType.LongLong:
+                case PrimitiveType.ULongLong:
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                    Context.Before.WriteLine($"{type} {Context.Parameter.Name};");
+                    Context.Before.WriteLine("bool lossless;");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}," +
+                                             $" &{Context.Parameter.Name}, &lossless);");
+
+                    if (!string.IsNullOrEmpty(cast))
+                        Context.Return.Write($"({cast})");
+
+                    Context.Return.Write($"{Context.Parameter.Name}");
+                    return true;
+
+                case PrimitiveType.String:
+                    var size = $"_{Context.Parameter.Name}_size";
+                    Context.Before.WriteLine($"size_t {size};");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, " +
+                                             $"nullptr, 0, &{size});");
+                    Context.Before.NewLine();
+
+                    var buf = $"{Context.Parameter.Name}";
+                    Context.Before.WriteLine($"char* {buf} = (char*) malloc({size});");
+                    Context.Before.WriteLine($"status = {func}(env, {Context.ArgName}, " +
+                                             $"nullptr, 0, &{size});");
+                    Context.Before.WriteLine("assert(status == napi_ok);");
+
+                    Context.Cleanup.WriteLine($"free({buf});");
+                    Context.Return.Write($"{buf}");
+                    return true;
+
+                case PrimitiveType.Null:
+                    return true;
+
+                case PrimitiveType.Void:
+                    return true;
+
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                    return true;
+
+                case PrimitiveType.Decimal:
+                default:
+                    throw new NotImplementedException();
             }
         }
 
@@ -672,15 +672,15 @@ namespace CppSharp.Generators.NAPI
         {
             var type = Context.Parameter.Type.Desugar();
 
-/*
-            TypeMap typeMap;
-            if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) &&
-                typeMap.DoesMarshalling)
-            {
-                typeMap.NAPIMarshalToNative(Context);
-                return;
-            }
-*/
+            /*
+                        TypeMap typeMap;
+                        if (Context.Context.TypeMaps.FindTypeMap(type, out typeMap) &&
+                            typeMap.DoesMarshalling)
+                        {
+                            typeMap.NAPIMarshalToNative(Context);
+                            return;
+                        }
+            */
             var instance = $"{Context.Parameter.Name}_instance";
             Context.Before.WriteLine($"{@class.QualifiedOriginalName}* {instance};");
             Context.Before.WriteLine($"status = napi_unwrap(env, _this, (void**) &{instance});");

src/Generator/Generators/NAPI/NAPISources.cs

@@ -804,9 +804,9 @@ namespace CppSharp.Generators.Cpp
                 .Select(p => p.Type).Distinct().ToList();
 
             // Consider the alphabet as sequential ordered numbers, one per type.
-            var Sigma = Enumerable.Range(0, uniqueTypes.Count).Select(i => (char) i).ToArray();
+            var Sigma = Enumerable.Range(0, uniqueTypes.Count).Select(i => (char)i).ToArray();
 
-            var Q = new List<string> {"S"};
+            var Q = new List<string> { "S" };
 
             var overloadStates = Enumerable.Range(0, functionGroup.Count).Select(i => $"F{i}")
                 .ToArray();
@@ -831,12 +831,12 @@ namespace CppSharp.Generators.Cpp
                     if (!isLastTransition)
                         Q.Add(nextState);
 
-                    Delta.Add(new Transition(curState, (char) typeIndex, nextState));
+                    Delta.Add(new Transition(curState, (char)typeIndex, nextState));
                     curState = nextState;
                 }
             }
 
-            var Q0 = new List<string> {"S"};
+            var Q0 = new List<string> { "S" };
             var F = overloadStates;
 
             var NDFSM = new NDFSM(Q, Sigma, Delta, Q0, F);

src/Generator/Generators/NAPI/NAPITypeCheckGen.cs

@@ -25,50 +25,50 @@ namespace CppSharp.Generators.Cpp
             var condition = string.Empty;
             switch (primitive)
             {
-            case PrimitiveType.Bool:
-                condition = $"NAPI_IS_BOOL(types[{ParameterIndex}])";
-                break;
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-            case PrimitiveType.UChar:
-            case PrimitiveType.WideChar:
-            case PrimitiveType.Short:
-            case PrimitiveType.UShort:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-            case PrimitiveType.ULong:
-                condition = $"NAPI_IS_INT32(types[{ParameterIndex}], args[{ParameterIndex}])";
-                break;
-            case PrimitiveType.UInt:
-                condition = $"NAPI_IS_UINT32(types[{ParameterIndex}], args[{ParameterIndex}])";
-                break;
-            case PrimitiveType.LongLong:
-                condition = $"NAPI_IS_INT64(types[{ParameterIndex}], args[{ParameterIndex}])";
-                break;
-            case PrimitiveType.ULongLong:
-                condition = $"NAPI_IS_UINT64(types[{ParameterIndex}], args[{ParameterIndex}])";
-                break;
-            case PrimitiveType.Null:
-                condition = $"NAPI_IS_NULL(types[{ParameterIndex}])";
-                break;
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-            case PrimitiveType.LongDouble:
-                condition = $"NAPI_IS_NUMBER(types[{ParameterIndex}])";
-                break;
-            case PrimitiveType.Void:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-            case PrimitiveType.String:
-            case PrimitiveType.Decimal:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Bool:
+                    condition = $"NAPI_IS_BOOL(types[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                case PrimitiveType.UChar:
+                case PrimitiveType.WideChar:
+                case PrimitiveType.Short:
+                case PrimitiveType.UShort:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                case PrimitiveType.ULong:
+                    condition = $"NAPI_IS_INT32(types[{ParameterIndex}], args[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.UInt:
+                    condition = $"NAPI_IS_UINT32(types[{ParameterIndex}], args[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.LongLong:
+                    condition = $"NAPI_IS_INT64(types[{ParameterIndex}], args[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.ULongLong:
+                    condition = $"NAPI_IS_UINT64(types[{ParameterIndex}], args[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.Null:
+                    condition = $"NAPI_IS_NULL(types[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                case PrimitiveType.LongDouble:
+                    condition = $"NAPI_IS_NUMBER(types[{ParameterIndex}])";
+                    break;
+                case PrimitiveType.Void:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                case PrimitiveType.String:
+                case PrimitiveType.Decimal:
+                default:
+                    throw new NotImplementedException();
             }
 
             Write(condition);

src/Generator/Generators/NAPI/NAPITypeCheckPass.cs

@@ -32,19 +32,19 @@ namespace CppSharp.Generators.C
         {
             switch (primitive)
             {
-            case PrimitiveType.LongDouble:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-            case PrimitiveType.Float128:
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-            case PrimitiveType.Decimal:
-                Diagnostics.Warning($"Unsupported decl: {decl.QualifiedName}");
-                return false;
-            default:
-                return true;
+                case PrimitiveType.LongDouble:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                case PrimitiveType.Float128:
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                case PrimitiveType.Decimal:
+                    Diagnostics.Warning($"Unsupported decl: {decl.QualifiedName}");
+                    return false;
+                default:
+                    return true;
             }
         }
 

src/Generator/Generators/QuickJS/QuickJSMarshal.cs

@@ -36,13 +36,13 @@ namespace CppSharp.Generators.Cpp
         {
             switch (array.SizeType)
             {
-            case ArrayType.ArraySize.Constant:
-            case ArrayType.ArraySize.Incomplete:
-            case ArrayType.ArraySize.Variable:
-                Context.Return.Write("nullptr");
-                break;
-            default:
-                throw new System.NotImplementedException();
+                case ArrayType.ArraySize.Constant:
+                case ArrayType.ArraySize.Incomplete:
+                case ArrayType.ArraySize.Variable:
+                    Context.Return.Write("nullptr");
+                    break;
+                default:
+                    throw new System.NotImplementedException();
             }
 
             return true;
@@ -78,7 +78,7 @@ namespace CppSharp.Generators.Cpp
                     Context.ReturnType.Qualifiers.IsConst)
                 {
                     var nativeTypePrinter = new CppTypePrinter(Context.Context)
-                        { PrintTypeQualifiers = false };
+                    { PrintTypeQualifiers = false };
                     var returnType = Context.ReturnType.Type.Desugar();
                     var constlessPointer = new PointerType()
                     {
@@ -148,53 +148,53 @@ namespace CppSharp.Generators.Cpp
 
             switch (primitive)
             {
-            case PrimitiveType.Void:
-                return true;
-
-            case PrimitiveType.Bool:
-                Context.Before.WriteLine($"JS_NewBool(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.Char:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.WideChar:
-            case PrimitiveType.SChar:
-            case PrimitiveType.UChar:
-            case PrimitiveType.Short:
-            case PrimitiveType.UShort:
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-                Context.Before.WriteLine($"JS_NewInt32(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-                Context.Before.WriteLine($"JS_NewUint32(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.LongLong:
-                Context.Before.WriteLine($"JS_NewBigInt64(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.ULongLong:
-                Context.Before.WriteLine($"JS_NewBigUint64(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-                Context.Before.WriteLine($"JS_NewFloat64(ctx, {Context.ArgName});");
-                break;
-
-            case PrimitiveType.LongDouble:
-                throw new NotImplementedException();
-
-            case PrimitiveType.Null:
-                Context.Before.WriteLine($"JS_NULL;");
-                break;
-
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Void:
+                    return true;
+
+                case PrimitiveType.Bool:
+                    Context.Before.WriteLine($"JS_NewBool(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.Char:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.WideChar:
+                case PrimitiveType.SChar:
+                case PrimitiveType.UChar:
+                case PrimitiveType.Short:
+                case PrimitiveType.UShort:
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                    Context.Before.WriteLine($"JS_NewInt32(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                    Context.Before.WriteLine($"JS_NewUint32(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.LongLong:
+                    Context.Before.WriteLine($"JS_NewBigInt64(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.ULongLong:
+                    Context.Before.WriteLine($"JS_NewBigUint64(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                    Context.Before.WriteLine($"JS_NewFloat64(ctx, {Context.ArgName});");
+                    break;
+
+                case PrimitiveType.LongDouble:
+                    throw new NotImplementedException();
+
+                case PrimitiveType.Null:
+                    Context.Before.WriteLine($"JS_NULL;");
+                    break;
+
+                default:
+                    throw new NotImplementedException();
             }
 
             Context.Return.Write(retName);
@@ -407,9 +407,9 @@ namespace CppSharp.Generators.Cpp
 
             switch (array.SizeType)
             {
-            default:
-                Context.Return.Write("nullptr");
-                break;
+                default:
+                    Context.Return.Write("nullptr");
+                    break;
             }
 
             return true;
@@ -496,82 +496,82 @@ namespace CppSharp.Generators.Cpp
 
             switch (primitive)
             {
-            case PrimitiveType.Void:
-                return true;
-
-            case PrimitiveType.Bool:
-                Context.Before.WriteLine($"{argName} = JS_ToBool(ctx, argv[{Context.ParameterIndex}]);");
-                Context.Before.WriteLine($"if ({argName} == -1)");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-            case PrimitiveType.UChar:
-                Context.Before.WriteLine($"int32_t _{argName};");
-                Context.Before.WriteLine($"if (JS_ToInt32(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Before.WriteLine($"{argName} = ({type})_{argName};");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.Short:
-            case PrimitiveType.UShort:
-                Context.Before.WriteLine($"int32_t _{argName};");
-                Context.Before.WriteLine($"if (JS_ToInt32(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Before.WriteLine($"{argName} = ({type})_{argName};");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-                Context.Before.WriteLine($"if (JS_ToInt32(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.UInt:
-            case PrimitiveType.ULong:
-                Context.Before.WriteLine($"if (JS_ToUint32(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.LongLong:
-                Context.Before.WriteLine($"int64_t _{argName};");
-                Context.Before.WriteLine($"if (JS_ToInt64Ext(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Before.WriteLine($"{argName} = ({type})_{argName};");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.ULongLong:
-                Context.Before.WriteLine($"int64_t _{argName};");
-                Context.Before.WriteLine($"if (JS_ToInt64Ext(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Before.WriteLine($"{argName} = ({type})_{argName};");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.Float:
-                Context.Before.WriteLine($"double _{argName};");
-                Context.Before.WriteLine($"if (JS_ToFloat64(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Before.WriteLine($"{argName} = ({type})_{argName};");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.Double:
-                Context.Before.WriteLine($"if (JS_ToFloat64(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
-                Context.Before.WriteLineIndent("return JS_EXCEPTION;");
-                Context.Return.Write($"{argName}");
-                return true;
-
-            case PrimitiveType.WideChar:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Void:
+                    return true;
+
+                case PrimitiveType.Bool:
+                    Context.Before.WriteLine($"{argName} = JS_ToBool(ctx, argv[{Context.ParameterIndex}]);");
+                    Context.Before.WriteLine($"if ({argName} == -1)");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                case PrimitiveType.UChar:
+                    Context.Before.WriteLine($"int32_t _{argName};");
+                    Context.Before.WriteLine($"if (JS_ToInt32(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Before.WriteLine($"{argName} = ({type})_{argName};");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.Short:
+                case PrimitiveType.UShort:
+                    Context.Before.WriteLine($"int32_t _{argName};");
+                    Context.Before.WriteLine($"if (JS_ToInt32(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Before.WriteLine($"{argName} = ({type})_{argName};");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                    Context.Before.WriteLine($"if (JS_ToInt32(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.UInt:
+                case PrimitiveType.ULong:
+                    Context.Before.WriteLine($"if (JS_ToUint32(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.LongLong:
+                    Context.Before.WriteLine($"int64_t _{argName};");
+                    Context.Before.WriteLine($"if (JS_ToInt64Ext(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Before.WriteLine($"{argName} = ({type})_{argName};");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.ULongLong:
+                    Context.Before.WriteLine($"int64_t _{argName};");
+                    Context.Before.WriteLine($"if (JS_ToInt64Ext(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Before.WriteLine($"{argName} = ({type})_{argName};");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.Float:
+                    Context.Before.WriteLine($"double _{argName};");
+                    Context.Before.WriteLine($"if (JS_ToFloat64(ctx, &_{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Before.WriteLine($"{argName} = ({type})_{argName};");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.Double:
+                    Context.Before.WriteLine($"if (JS_ToFloat64(ctx, &{argName}, argv[{Context.ParameterIndex}]))");
+                    Context.Before.WriteLineIndent("return JS_EXCEPTION;");
+                    Context.Return.Write($"{argName}");
+                    return true;
+
+                case PrimitiveType.WideChar:
+                default:
+                    throw new NotImplementedException();
             }
         }
 

src/Generator/Generators/QuickJS/QuickJSSources.cs

@@ -289,7 +289,7 @@ namespace CppSharp.Generators.Cpp
 
                     //WriteLine($"printf(\"Calling finalizer for {@class.QualifiedOriginalName}\\n\");");
 
-                    if(ClassNeedsExtraData(@class))
+                    if (ClassNeedsExtraData(@class))
                     {
                         // Remove the event connection from the delegate.
                         // var invokeId = $"event_invoke_{@event.OriginalName}";
@@ -456,19 +456,19 @@ namespace CppSharp.Generators.Cpp
 
                 //WriteLine($"{@class.QualifiedOriginalName}* instance = data->instance;");
 
-/*
+                /*
 
-                if (!isVoidReturn)
-                {
-                    CTypePrinter.PushContext(TypePrinterContextKind.Native);
-                    var returnType = function.ReturnType.Visit(CTypePrinter);
-                    CTypePrinter.PopContext();
+                                if (!isVoidReturn)
+                                {
+                                    CTypePrinter.PushContext(TypePrinterContextKind.Native);
+                                    var returnType = function.ReturnType.Visit(CTypePrinter);
+                                    CTypePrinter.PopContext();
 
-                    Write($"{returnType} {Helpers.ReturnIdentifier} = ");
-                }
+                                    Write($"{returnType} {Helpers.ReturnIdentifier} = ");
+                                }
 
-                var @class = function.Namespace as Class;
-*/
+                                var @class = function.Namespace as Class;
+                */
 
                 UnindentAndWriteCloseBrace();
             }
@@ -783,7 +783,7 @@ namespace CppSharp.Generators.Cpp
                 {
                     WriteLine($"{@class.QualifiedOriginalName}* instance;");
                 }
-                else if(QuickJSRegister.ClassNeedsExtraData(@class))
+                else if (QuickJSRegister.ClassNeedsExtraData(@class))
                 {
                     var classDataId = $"data_{GetCIdentifier(Context, @class)}";
                     WriteLine($"auto data = ({classDataId}*) JS_GetOpaque(this_val, 0);");

src/Generator/Generators/QuickJS/QuickJSTypeCheckGen.cs

@@ -29,64 +29,64 @@ namespace CppSharp.Generators.Cpp
             var arg = $"argv[{ParameterIndex}]";
             switch (primitive)
             {
-            case PrimitiveType.Bool:
-                condition = $"JS_IsBool({arg})";
-                break;
-            case PrimitiveType.Char:
-            case PrimitiveType.SChar:
-                condition = $"JS_IsInt8({arg})";
-                break;
-            case PrimitiveType.UChar:
-                condition = $"JS_IsUInt8({arg})";
-                break;
-            case PrimitiveType.WideChar:
-                condition = $"JS_IsUInt16({arg})";
-                break;
-            case PrimitiveType.Short:
-                condition = $"JS_IsInt16({arg})";
-                break;
-            case PrimitiveType.UShort:
-                condition = $"JS_IsUInt16({arg})";
-                break;
-            case PrimitiveType.Int:
-            case PrimitiveType.Long:
-                condition = $"JS_IsInt32({arg})";
-                break;
-            case PrimitiveType.ULong:
-            case PrimitiveType.UInt:
-                condition = $"JS_IsUInt32({arg})";
-                break;
-            case PrimitiveType.LongLong:
-            case PrimitiveType.ULongLong:
-            case PrimitiveType.Int128:
-            case PrimitiveType.UInt128:
-                condition = $"JS_IsBigInt(ctx, {arg})";
-                break;
-            case PrimitiveType.Half:
-            case PrimitiveType.Float:
-            case PrimitiveType.Double:
-                condition = $"JS_IsFloat({arg})";
-                break;
-            case PrimitiveType.LongDouble:
-            case PrimitiveType.Float128:
-                condition = $"JS_IsBigFloat({arg})";
-                break;
-            case PrimitiveType.String:
-                condition = $"JS_IsString({arg}) || JS_IsNull({arg})";
-                break;
-            case PrimitiveType.Decimal:
-                condition = $"JS_IsBigDecimal({arg})";
-                break;
-            case PrimitiveType.Null:
-                condition = $"JS_IsNull({arg})";
-                break;
-            case PrimitiveType.Void:
-            case PrimitiveType.Char16:
-            case PrimitiveType.Char32:
-            case PrimitiveType.IntPtr:
-            case PrimitiveType.UIntPtr:
-            default:
-                throw new NotImplementedException();
+                case PrimitiveType.Bool:
+                    condition = $"JS_IsBool({arg})";
+                    break;
+                case PrimitiveType.Char:
+                case PrimitiveType.SChar:
+                    condition = $"JS_IsInt8({arg})";
+                    break;
+                case PrimitiveType.UChar:
+                    condition = $"JS_IsUInt8({arg})";
+                    break;
+                case PrimitiveType.WideChar:
+                    condition = $"JS_IsUInt16({arg})";
+                    break;
+                case PrimitiveType.Short:
+                    condition = $"JS_IsInt16({arg})";
+                    break;
+                case PrimitiveType.UShort:
+                    condition = $"JS_IsUInt16({arg})";
+                    break;
+                case PrimitiveType.Int:
+                case PrimitiveType.Long:
+                    condition = $"JS_IsInt32({arg})";
+                    break;
+                case PrimitiveType.ULong:
+                case PrimitiveType.UInt:
+                    condition = $"JS_IsUInt32({arg})";
+                    break;
+                case PrimitiveType.LongLong:
+                case PrimitiveType.ULongLong:
+                case PrimitiveType.Int128:
+                case PrimitiveType.UInt128:
+                    condition = $"JS_IsBigInt(ctx, {arg})";
+                    break;
+                case PrimitiveType.Half:
+                case PrimitiveType.Float:
+                case PrimitiveType.Double:
+                    condition = $"JS_IsFloat({arg})";
+                    break;
+                case PrimitiveType.LongDouble:
+                case PrimitiveType.Float128:
+                    condition = $"JS_IsBigFloat({arg})";
+                    break;
+                case PrimitiveType.String:
+                    condition = $"JS_IsString({arg}) || JS_IsNull({arg})";
+                    break;
+                case PrimitiveType.Decimal:
+                    condition = $"JS_IsBigDecimal({arg})";
+                    break;
+                case PrimitiveType.Null:
+                    condition = $"JS_IsNull({arg})";
+                    break;
+                case PrimitiveType.Void:
+                case PrimitiveType.Char16:
+                case PrimitiveType.Char32:
+                case PrimitiveType.IntPtr:
+                case PrimitiveType.UIntPtr:
+                default:
+                    throw new NotImplementedException();
             }
 
             Write(condition);

src/Generator/Generators/TS/TSSources.cs

@@ -146,7 +146,7 @@ namespace CppSharp.Generators.TS
                 return false;
 
             //if (@class.IsOpaque)
-             //   return false;
+            //   return false;
 
             PushBlock(BlockKind.Class, @class);
 
@@ -240,7 +240,7 @@ namespace CppSharp.Generators.TS
 
             Indent();
 
-            var @class = (Class) methods[0].Namespace;
+            var @class = (Class)methods[0].Namespace;
 
             if (@class.IsValueType)
                 foreach (var @base in @class.Bases.Where(b => b.IsClass && !b.Class.Ignore))
@@ -267,7 +267,7 @@ namespace CppSharp.Generators.TS
                 method.Visit(this);
             }
 
-            foreach(var method in staticMethods)
+            foreach (var method in staticMethods)
                 method.Visit(this);
 
             Unindent();

src/Generator/Generators/TS/TSTypePrinter.cs

@@ -24,7 +24,7 @@ namespace CppSharp.Generators.TS
             return declaration.TranslationUnit?.Module?.LibraryName;
         }
 
-        public override TypePrinterResult GetDeclName(Declaration declaration,  TypePrintScopeKind scope)
+        public override TypePrinterResult GetDeclName(Declaration declaration, TypePrintScopeKind scope)
         {
             var result = base.GetDeclName(declaration, scope);
             result.Type = result.Type.Replace("::", NamespaceSeparator);
@@ -41,7 +41,7 @@ namespace CppSharp.Generators.TS
             return VisitPrimitiveType(builtin.Type);
         }
 
-        public override TypePrinterResult VisitPrimitiveType(PrimitiveType primitive,  TypeQualifiers quals)
+        public override TypePrinterResult VisitPrimitiveType(PrimitiveType primitive, TypeQualifiers quals)
         {
             return VisitPrimitiveType(primitive);
         }
@@ -142,23 +142,23 @@ namespace CppSharp.Generators.TS
 
             result.Name = param.Name;
 
-/*
-            if (param.DefaultArgument != null && Options.GenerateDefaultValuesForArguments)
-            {
-                try
-                {
-                    var expressionPrinter = new CSharpExpressionPrinter(this);
-                    var defaultValue = expressionPrinter.VisitParameter(param);
-                    return $"{result} = {defaultValue}";
-                }
-                catch (Exception)
-                {
-                    var function = param.Namespace as Function;
-                    Diagnostics.Warning($"Error printing default argument expression: " +
-                                        $"{function.QualifiedOriginalName}({param.OriginalName})");
-                }
-            }
-*/
+            /*
+                        if (param.DefaultArgument != null && Options.GenerateDefaultValuesForArguments)
+                        {
+                            try
+                            {
+                                var expressionPrinter = new CSharpExpressionPrinter(this);
+                                var defaultValue = expressionPrinter.VisitParameter(param);
+                                return $"{result} = {defaultValue}";
+                            }
+                            catch (Exception)
+                            {
+                                var function = param.Namespace as Function;
+                                Diagnostics.Warning($"Error printing default argument expression: " +
+                                                    $"{function.QualifiedOriginalName}({param.OriginalName})");
+                            }
+                        }
+            */
 
             return $"{result}";
         }

src/Generator/Library.cs

@@ -286,7 +286,7 @@ namespace CppSharp
             {
                 var units = list.Select(item => item.TranslationUnit)
                     .GroupBy(x => x)
-                    .Select(y => new {Element = y.Key, Counter = y.Count()});
+                    .Select(y => new { Element = y.Key, Counter = y.Count() });
 
                 var translationUnit = units.OrderByDescending(u => u.Counter)
                     .FirstOrDefault()?.Element ?? null;
@@ -493,8 +493,8 @@ namespace CppSharp
             string className, string methodName, int parameterCount, int parameterIndex,
             ParameterUsage usage)
         {
-            if (parameterIndex <= 0 )
-                 throw new ArgumentException("parameterIndex");
+            if (parameterIndex <= 0)
+                throw new ArgumentException("parameterIndex");
 
             var @class = context.FindCompleteClass(className);
 
@@ -635,7 +635,7 @@ namespace CppSharp
 
         public static void IgnoreHeadersWithName(this ASTContext context, IEnumerable<string> patterns)
         {
-            foreach(var pattern in patterns)
+            foreach (var pattern in patterns)
                 context.IgnoreHeadersWithName(pattern);
         }
 

src/Generator/Passes/CheckAbiParameters.cs

@@ -33,7 +33,7 @@ namespace CppSharp.Passes
             var isReturnIndirect = function.IsReturnIndirect || (
                     Context.ParserOptions.IsMicrosoftAbi &&
                     function is Method &&
-                    !function.ReturnType.Type.Desugar().IsAddress()  &&
+                    !function.ReturnType.Type.Desugar().IsAddress() &&
                     function.ReturnType.Type.Desugar().TryGetDeclaration(out Class returnTypeDecl) &&
                     returnTypeDecl.IsPOD &&
                     returnTypeDecl.Layout.Size <= 8);
@@ -41,12 +41,12 @@ namespace CppSharp.Passes
             if (isReturnIndirect)
             {
                 var indirectParam = new Parameter()
-                    {
-                        Kind = ParameterKind.IndirectReturnType,
-                        QualifiedType = function.ReturnType,
-                        Name = "return",
-                        Namespace = function
-                    };
+                {
+                    Kind = ParameterKind.IndirectReturnType,
+                    QualifiedType = function.ReturnType,
+                    Name = "return",
+                    Namespace = function
+                };
 
                 function.Parameters.Insert(0, indirectParam);
                 function.ReturnType = new QualifiedType(new BuiltinType(
@@ -59,7 +59,7 @@ namespace CppSharp.Passes
             {
                 // This flag should only be true on methods.
                 var classType = new QualifiedType(new TagType(method.Namespace),
-                    new TypeQualifiers {IsConst = true});
+                    new TypeQualifiers { IsConst = true });
                 function.ReturnType = new QualifiedType(new PointerType(classType));
             }
 

src/Generator/Passes/CheckIgnoredDecls.cs

@@ -145,8 +145,8 @@ namespace CppSharp.Passes
 
         public override bool VisitFunctionTemplateDecl(FunctionTemplate decl)
         {
-             if (!base.VisitFunctionTemplateDecl(decl))
-                 return false;
+            if (!base.VisitFunctionTemplateDecl(decl))
+                return false;
 
             if (decl.TemplatedFunction.IsDependent && !decl.IsExplicitlyGenerated)
             {
@@ -454,7 +454,7 @@ namespace CppSharp.Passes
         /// </summary>
         private bool HasInvalidType(ITypedDecl decl, out string msg)
         {
-            return HasInvalidType(decl.Type, (Declaration) decl, out msg);
+            return HasInvalidType(decl.Type, (Declaration)decl, out msg);
         }
 
         private bool HasInvalidType(Type type, Declaration decl, out string msg)

src/Generator/Passes/CheckMacrosPass.cs

@@ -177,7 +177,7 @@ namespace CppSharp.Passes
                 var quals = field.QualifiedType.Qualifiers;
                 quals.IsConst = true;
 
-                var qualType  = field.QualifiedType;
+                var qualType = field.QualifiedType;
                 qualType.Qualifiers = quals;
 
                 field.QualifiedType = qualType;

src/Generator/Passes/CheckOperatorsOverloads.cs

@@ -81,19 +81,19 @@ namespace CppSharp.Passes
         private void CreateIndexer(Class @class, Method @operator)
         {
             var property = new Property
-                {
-                    Name = "Item",
-                    QualifiedType = @operator.ReturnType,
-                    Access = @operator.Access,
-                    Namespace = @class,
-                    GetMethod = @operator
-                };
+            {
+                Name = "Item",
+                QualifiedType = @operator.ReturnType,
+                Access = @operator.Access,
+                Namespace = @class,
+                GetMethod = @operator
+            };
 
             var returnType = @operator.Type;
             if (returnType.IsAddress() &&
                 !returnType.GetQualifiedPointee().Type.Desugar().IsPrimitiveType(PrimitiveType.Void))
             {
-                var pointer = (PointerType) returnType;
+                var pointer = (PointerType)returnType;
                 var qualifiedPointee = pointer.QualifiedPointee;
                 if (!qualifiedPointee.Qualifiers.IsConst)
                     property.SetMethod = @operator;
@@ -130,14 +130,14 @@ namespace CppSharp.Passes
                     continue;
 
                 var method = new Method()
-                    {
-                        Name = Operators.GetOperatorIdentifier(missingKind),
-                        Namespace = @class,
-                        SynthKind = FunctionSynthKind.ComplementOperator,
-                        Kind = CXXMethodKind.Operator,
-                        OperatorKind = missingKind,
-                        ReturnType = op.ReturnType
-                    };
+                {
+                    Name = Operators.GetOperatorIdentifier(missingKind),
+                    Namespace = @class,
+                    SynthKind = FunctionSynthKind.ComplementOperator,
+                    Kind = CXXMethodKind.Operator,
+                    OperatorKind = missingKind,
+                    ReturnType = op.ReturnType
+                };
 
                 method.Parameters.AddRange(op.Parameters.Select(
                     p => new Parameter(p) { Namespace = method }));

src/Generator/Passes/CheckStaticClass.cs

@@ -58,7 +58,7 @@ namespace CppSharp.Passes
             if (tag == null)
                 return false;
 
-            var @class = (Class) function.Namespace;
+            var @class = (Class)function.Namespace;
             var decl = tag.Declaration;
 
             if (!(decl is Class))

src/Generator/Passes/CleanCommentsPass.cs

@@ -52,14 +52,14 @@ namespace CppSharp.Passes
                     i + 1 < comment.Content.Count &&
                     comment.Content[i + 1].Kind == DocumentationCommentKind.TextComment)
                 {
-                    var textComment = (TextComment) comment.Content[i + 1];
+                    var textComment = (TextComment)comment.Content[i + 1];
                     textComment.Text = Helpers.RegexCommentCommandLeftover.Replace(
                         textComment.Text, string.Empty);
                 }
             }
             foreach (var item in comment.Content.Where(c => c.Kind == DocumentationCommentKind.TextComment))
             {
-                var textComment = (TextComment) item;
+                var textComment = (TextComment)item;
 
                 if (textComment.Text.StartsWith("<", StringComparison.Ordinal))
                     textComment.Text = $"{textComment.Text}>";

src/Generator/Passes/ConstructorToConversionOperatorPass.cs

@@ -82,12 +82,12 @@ namespace CppSharp.Passes
                 FunctionType = method.FunctionType
             };
             conversionOperator.Parameters.Add(new Parameter(parameter)
-                {
-                    Namespace = conversionOperator,
-                    DefaultArgument = null,
-                    OriginalDefaultArgument = null
-                });
-            ((Class) method.Namespace).Methods.Add(conversionOperator);
+            {
+                Namespace = conversionOperator,
+                DefaultArgument = null,
+                OriginalDefaultArgument = null
+            });
+            ((Class)method.Namespace).Methods.Add(conversionOperator);
             return true;
         }
 

src/Generator/Passes/DelegatesPass.cs

@@ -63,11 +63,11 @@ namespace CppSharp.Passes
                 return false;
 
             var functionType = new FunctionType
-                {
-                    CallingConvention = method.CallingConvention,
-                    IsDependent = method.IsDependent,
-                    ReturnType = method.ReturnType
-                };
+            {
+                CallingConvention = method.CallingConvention,
+                IsDependent = method.IsDependent,
+                ReturnType = method.ReturnType
+            };
 
             TypePrinter.PushMarshalKind(MarshalKind.VTableReturnValue);
             functionType.Parameters.AddRange(
@@ -92,7 +92,7 @@ namespace CppSharp.Passes
 
         public override bool VisitParameterDecl(Parameter parameter)
         {
-            if(parameter.Namespace?.TranslationUnit?.Module == null && namespaces.Count > 0)
+            if (parameter.Namespace?.TranslationUnit?.Module == null && namespaces.Count > 0)
                 parameter.Namespace = namespaces.Peek();
 
             if (!base.VisitDeclaration(parameter) || parameter.Namespace == null ||
@@ -170,7 +170,7 @@ namespace CppSharp.Passes
                     existingDelegate.Access = access;
 
                 // Check if there is an existing delegate with a different calling convention
-                if (((FunctionType) existingDelegate.Type.GetPointee()).CallingConvention ==
+                if (((FunctionType)existingDelegate.Type.GetPointee()).CallingConvention ==
                     functionType.CallingConvention)
                     return existingDelegate;
 
@@ -184,13 +184,13 @@ namespace CppSharp.Passes
             var namespaceDelegates = GetDeclContextForDelegates(declarationContext);
             var delegateType = new QualifiedType(new PointerType(new QualifiedType(functionType)));
             existingDelegate = new TypedefDecl
-                {
-                    Access = access,
-                    Name = delegateName,
-                    Namespace = namespaceDelegates,
-                    QualifiedType = delegateType,
-                    IsSynthetized = true
-                };
+            {
+                Access = access,
+                Name = delegateName,
+                Namespace = namespaceDelegates,
+                QualifiedType = delegateType,
+                IsSynthetized = true
+            };
             delegates.Add(existingDelegate);
 
             return existingDelegate;
@@ -235,10 +235,10 @@ namespace CppSharp.Passes
                 parent = module.Units.Last(u => u.IsGenerated);
 
             var namespaceDelegates = new Namespace
-                {
-                    Name = "Delegates",
-                    Namespace = parent
-                };
+            {
+                Name = "Delegates",
+                Namespace = parent
+            };
             namespacesDelegates.Add(module, namespaceDelegates);
 
             return namespaceDelegates;

src/Generator/Passes/FlattenAnonymousTypesToFields.cs

@@ -77,13 +77,13 @@ namespace CppSharp.Passes
             {
                 LayoutField nestedLayoutField = fieldType.Layout.Fields[j];
                 var layoutField = new LayoutField
-                    {
-                        Expression = nestedLayoutField.Expression,
-                        FieldPtr = nestedLayoutField.FieldPtr,
-                        Name = nestedLayoutField.Name,
-                        Offset = nestedLayoutField.Offset + offset,
-                        QualifiedType = nestedLayoutField.QualifiedType
-                    };
+                {
+                    Expression = nestedLayoutField.Expression,
+                    FieldPtr = nestedLayoutField.FieldPtr,
+                    Name = nestedLayoutField.Name,
+                    Offset = nestedLayoutField.Offset + offset,
+                    QualifiedType = nestedLayoutField.QualifiedType
+                };
                 @class.Layout.Fields.Insert(i + j, layoutField);
             }
         }

src/Generator/Passes/FunctionToInstanceMethodPass.cs

@@ -46,21 +46,21 @@ namespace CppSharp.Passes
 
             // Create a new fake method so it acts as an instance method.
             var method = new Method
-                {
-                    Namespace = @class,
-                    OriginalNamespace = function.Namespace,
-                    Name = function.Name,
-                    OriginalName = function.OriginalName,
-                    Mangled = function.Mangled,
-                    Access = AccessSpecifier.Public,
-                    Kind = CXXMethodKind.Normal,
-                    ReturnType = function.ReturnType,
-                    CallingConvention = function.CallingConvention,
-                    IsVariadic = function.IsVariadic,
-                    IsInline = function.IsInline,
-                    Conversion = MethodConversionKind.FunctionToInstanceMethod,
-                    FunctionType = function.FunctionType
-                };
+            {
+                Namespace = @class,
+                OriginalNamespace = function.Namespace,
+                Name = function.Name,
+                OriginalName = function.OriginalName,
+                Mangled = function.Mangled,
+                Access = AccessSpecifier.Public,
+                Kind = CXXMethodKind.Normal,
+                ReturnType = function.ReturnType,
+                CallingConvention = function.CallingConvention,
+                IsVariadic = function.IsVariadic,
+                IsInline = function.IsInline,
+                Conversion = MethodConversionKind.FunctionToInstanceMethod,
+                FunctionType = function.FunctionType
+            };
 
             method.Parameters.AddRange(function.Parameters.Select(
                 p => new Parameter(p) { Namespace = method }));

src/Generator/Passes/GenerateAbstractImplementationsPass.cs

@@ -64,13 +64,13 @@ namespace CppSharp.Passes
             foreach (var abstractMethod in abstractMethods)
             {
                 var impl = new Method(abstractMethod)
-                    {
-                        Namespace = internalImpl,
-                        OriginalFunction = abstractMethod,
-                        IsPure = false,
-                        SynthKind = abstractMethod.SynthKind == FunctionSynthKind.DefaultValueOverload ?
+                {
+                    Namespace = internalImpl,
+                    OriginalFunction = abstractMethod,
+                    IsPure = false,
+                    SynthKind = abstractMethod.SynthKind == FunctionSynthKind.DefaultValueOverload ?
                             FunctionSynthKind.DefaultValueOverload : FunctionSynthKind.AbstractImplCall
-                    };
+                };
                 impl.OverriddenMethods.Clear();
                 impl.OverriddenMethods.Add(abstractMethod);
                 if (abstractMethod.OriginalReturnType.Type.IsDependentPointer() ||
@@ -90,11 +90,11 @@ namespace CppSharp.Passes
         private static T GetInternalImpl<T>(T @class) where T : Class, new()
         {
             var internalImpl = new T
-                                {
-                                    Name = @class.Name + "Internal",
-                                    Access = AccessSpecifier.Private,
-                                    Namespace = @class.Namespace
-                                };
+            {
+                Name = @class.Name + "Internal",
+                Access = AccessSpecifier.Private,
+                Namespace = @class.Namespace
+            };
             if (@class.IsDependent)
             {
                 internalImpl.IsDependent = true;

src/Generator/Passes/GenerateSymbolsPass.cs

@@ -237,7 +237,7 @@ namespace CppSharp.Passes
                         Diagnostics.Error(errorMessage);
                     else
                         compiledLibraries[module] = new CompiledLibrary
-                            { OutputDir = outputDir, Library = module.SymbolsLibraryName };
+                        { OutputDir = outputDir, Library = module.SymbolsLibraryName };
                     RemainingCompilationTasks--;
                 }).Start();
         }

src/Generator/Passes/GetterSetterToPropertyPass.cs

@@ -119,7 +119,7 @@ namespace CppSharp.Passes
             string name, QualifiedType type, bool isSetter = false)
         {
             Type underlyingType = GetUnderlyingType(type);
-            Class @class = (Class) method.Namespace;
+            Class @class = (Class)method.Namespace;
 
             Property property = properties.Find(
                 p => p.Field == null &&
@@ -144,9 +144,9 @@ namespace CppSharp.Passes
                 property.QualifiedType = method.OriginalReturnType;
             }
 
-            property.Access = (AccessSpecifier) Math.Max(
-                (int) (property.GetMethod ?? property.SetMethod).Access,
-                (int) method.Access);
+            property.Access = (AccessSpecifier)Math.Max(
+                (int)(property.GetMethod ?? property.SetMethod).Access,
+                (int)method.Access);
 
             if (method.ExplicitInterfaceImpl != null)
                 property.ExplicitInterfaceImpl = method.ExplicitInterfaceImpl;

src/Generator/Passes/HandleDefaultParamValuesPass.cs

@@ -80,7 +80,7 @@ namespace CppSharp.Passes
                             overload.Parameters[i].DefaultArgument = null;
 
                 if (method != null)
-                    ((Class) function.Namespace).Methods.Add((Method) overload);
+                    ((Class)function.Namespace).Methods.Add((Method)overload);
                 else
                 {
                     List<Function> functions;

src/Generator/Passes/MakeProtectedNestedTypesPublicPass.cs

@@ -14,7 +14,7 @@ namespace CppSharp.Passes
             if (!base.VisitClassDecl(@class))
                 return false;
 
-            (from d in ((IEnumerable<Declaration>) @class.Classes).Concat(@class.Enums)
+            (from d in ((IEnumerable<Declaration>)@class.Classes).Concat(@class.Enums)
              where d.Access == AccessSpecifier.Protected
              select d).All(d => { d.Access = AccessSpecifier.Public; return true; });
 

src/Generator/Passes/MultipleInheritancePass.cs

@@ -72,7 +72,7 @@ namespace CppSharp.Passes
         protected Class GetInterface(Class @base)
         {
             if (@base.CompleteDeclaration != null)
-                @base = (Class) @base.CompleteDeclaration;
+                @base = (Class)@base.CompleteDeclaration;
 
             return interfaces.FirstOrDefault(i => i.OriginalClass == @base) ??
                 GetNewInterface("I" + @base.Name, @base);
@@ -189,7 +189,7 @@ namespace CppSharp.Passes
                 templatedInterfaces[@base] = @interface;
                 foreach (var spec in @base.Specializations)
                     @interface.Specializations.Add(
-                        (ClassTemplateSpecialization) GetNewInterface(name, spec));
+                        (ClassTemplateSpecialization)GetNewInterface(name, spec));
             }
             return @interface;
         }

src/Generator/Passes/ParamTypeToInterfacePass.cs

@@ -127,7 +127,7 @@ namespace CppSharp.Passes
             if (@interface == null)
                 return;
 
-            type.Type = (Type) type.Type.Clone();
+            type.Type = (Type)type.Type.Clone();
             finalType = (type.Type.GetFinalPointee() ?? type.Type).Desugar();
             finalType.TryGetClass(out @class, @interface);
         }

src/Generator/Passes/Pass.cs

@@ -60,26 +60,26 @@ namespace CppSharp.Passes
 
         public virtual void HandleBlock(Block block)
         {
-            switch(block.Kind)
+            switch (block.Kind)
             {
-            case BlockKind.Class:
-                VisitClass(block);
-                break;
-            case BlockKind.Method:
-                VisitMethod(block);
-                break;
-            case BlockKind.Constructor:
-                VisitConstructor(block);
-                break;
-            case BlockKind.ConstructorBody:
-                VisitConstructorBody(block);
-                break;
-            case BlockKind.Namespace:
-                VisitNamespace(block);
-                break;
-            case BlockKind.Includes:
-                VisitIncludes(block);
-                break;
+                case BlockKind.Class:
+                    VisitClass(block);
+                    break;
+                case BlockKind.Method:
+                    VisitMethod(block);
+                    break;
+                case BlockKind.Constructor:
+                    VisitConstructor(block);
+                    break;
+                case BlockKind.ConstructorBody:
+                    VisitConstructorBody(block);
+                    break;
+                case BlockKind.Namespace:
+                    VisitNamespace(block);
+                    break;
+                case BlockKind.Includes:
+                    VisitIncludes(block);
+                    break;
             }
 
             foreach (var childBlock in block.Blocks)

src/Generator/Passes/RenamePass.cs

@@ -47,7 +47,7 @@ namespace CppSharp.Passes
             {
                 Method rootBaseMethod;
                 if (method.OriginalNamespace is Class @class && @class.IsInterface)
-                    rootBaseMethod = (Method) method.OriginalFunction;
+                    rootBaseMethod = (Method)method.OriginalFunction;
                 else
                     rootBaseMethod = method.GetRootBaseMethod();
                 if (rootBaseMethod != null && rootBaseMethod != method)
@@ -59,7 +59,7 @@ namespace CppSharp.Passes
 
             if (decl is Property property && !property.IsStatic)
             {
-                var rootBaseProperty = ((Class) property.Namespace).GetBasePropertyByName(property);
+                var rootBaseProperty = ((Class)property.Namespace).GetBasePropertyByName(property);
                 if (rootBaseProperty != null && rootBaseProperty != property)
                 {
                     newName = rootBaseProperty.Name;
@@ -121,7 +121,7 @@ namespace CppSharp.Passes
             {
                 if (!Targets.HasFlag(RenameTargets.Field))
                     return false;
-                var fieldProperty = ((Class) field.Namespace).Properties.FirstOrDefault(
+                var fieldProperty = ((Class)field.Namespace).Properties.FirstOrDefault(
                     p => p.Field == field);
                 return (fieldProperty != null &&
                     fieldProperty.IsInRefTypeAndBackedByValueClassField());
@@ -217,7 +217,7 @@ namespace CppSharp.Passes
 
             var enumItem = decl as Enumeration.Item;
             if (enumItem != null)
-                return ((Enumeration) enumItem.Namespace).Items.Any(
+                return ((Enumeration)enumItem.Namespace).Items.Any(
                     i => i != decl && i.Name == newName);
 
             return false;
@@ -228,7 +228,7 @@ namespace CppSharp.Passes
             var method = function as Method;
             if (method != null)
             {
-                return ((Class) method.Namespace).Methods.Where(
+                return ((Class)method.Namespace).Methods.Where(
                     m => !m.Ignore && m.Parameters.SequenceEqual(function.Parameters, new ParameterComparer()));
             }
             return function.Namespace.Functions.Where(
@@ -295,17 +295,17 @@ namespace CppSharp.Passes
     [Flags]
     public enum RenameTargets
     {
-        Class     = 1 << 0,
-        Field     = 1 << 1,
-        Method    = 1 << 2,
-        Function  = 1 << 3,
+        Class = 1 << 0,
+        Field = 1 << 1,
+        Method = 1 << 2,
+        Function = 1 << 3,
         Parameter = 1 << 4,
-        Enum      = 1 << 5,
-        EnumItem  = 1 << 6,
-        Event     = 1 << 7,
-        Property  = 1 << 8,
-        Delegate  = 1 << 9,
-        Variable  = 1 << 10,
+        Enum = 1 << 5,
+        EnumItem = 1 << 6,
+        Event = 1 << 7,
+        Property = 1 << 8,
+        Delegate = 1 << 9,
+        Variable = 1 << 10,
         Any = Function | Method | Parameter | Class | Field | Enum | EnumItem | Event | Property | Delegate | Variable
     }
 

src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs

@@ -141,7 +141,7 @@ namespace CppSharp.Passes
                 var type = qualType.Type.Desugar();
                 while (type.IsAddress())
                 {
-                    var pointee = ((PointerType) type).Pointee.Desugar(
+                    var pointee = ((PointerType)type).Pointee.Desugar(
                         resolveTemplateSubstitution: false);
                     if (pointee.IsAddress())
                         type = pointee;
@@ -149,7 +149,7 @@ namespace CppSharp.Passes
                     {
                         substitution = pointee as TemplateParameterSubstitutionType;
                         if (substitution != null)
-                            ((PointerType) type).QualifiedPointee.Type = substitution.Replacement.Type;
+                            ((PointerType)type).QualifiedPointee.Type = substitution.Replacement.Type;
                         break;
                     }
                 }

src/Generator/Passes/SymbolsCodeGenerator.cs

@@ -45,7 +45,7 @@ namespace CppSharp.Passes
         public override bool VisitMethodDecl(Method method)
         {
             if (method.IsDestructor &&
-                (!((Class) method.Namespace).HasNonTrivialDestructor ||
+                (!((Class)method.Namespace).HasNonTrivialDestructor ||
                  method.Access == AccessSpecifier.Private))
                 return false;
 
@@ -58,7 +58,7 @@ namespace CppSharp.Passes
                 return true;
             }
 
-            Class @class = (Class) method.Namespace;
+            Class @class = (Class)method.Namespace;
             bool needSubclass = (method.Access == AccessSpecifier.Protected ||
                 @class.IsAbstract) && (method.IsConstructor || method.IsDestructor);
             string wrapper = GetWrapper(method);
@@ -159,7 +159,7 @@ namespace CppSharp.Passes
                 Write("extern \"C\" ");
             Write($"{GetExporting()}void {wrapper}({signature}) ");
 
-            bool isAbstract = ((Class) method.Namespace).IsAbstract;
+            bool isAbstract = ((Class)method.Namespace).IsAbstract;
             if (method.Access == AccessSpecifier.Protected || isAbstract)
             {
                 Write($@"{{ ::new ({Helpers.InstanceField}) {
@@ -197,7 +197,7 @@ namespace CppSharp.Passes
             }
 
             bool needSubclass = method.Access == AccessSpecifier.Protected ||
-                ((Class) method.Namespace).IsAbstract;
+                ((Class)method.Namespace).IsAbstract;
             string @namespace = method.Namespace.Visit(cppTypePrinter);
             if (!needSubclass)
                 Write("extern \"C\" ");
@@ -318,7 +318,7 @@ namespace CppSharp.Passes
             string paramTypes, string functionName)
         {
             Stack<string> parentsOpen = GenerateNamespace(function);
-            var functionType = (FunctionType) function.FunctionType.Type;
+            var functionType = (FunctionType)function.FunctionType.Type;
             Write($"{string.Concat(parentsOpen)}");
             if (function.IsConstExpr)
                 Write("constexpr ");

src/Generator/Passes/ValidateOperatorsPass.cs

@@ -74,7 +74,7 @@ namespace CppSharp.Passes
                     returnType = (returnType.GetFinalPointee() ?? returnType).Desugar();
                     return returnType.TryGetClass(out @class) &&
                         @class.GetNonIgnoredRootBase() ==
-                            ((Class) @operator.Namespace).GetNonIgnoredRootBase() &&
+                            ((Class)@operator.Namespace).GetNonIgnoredRootBase() &&
                         @operator.Parameters.Count == 0;
 
                 // Bitwise shift operators can only be overloaded if the second parameter is int

src/Generator/Types/DeclMapDatabase.cs

@@ -44,7 +44,7 @@ namespace CppSharp.Types
                     if (attr.GeneratorKind == 0 ||
                         attr.GeneratorKind == bindingContext.Options.GeneratorKind)
                     {
-                        var declMap = (DeclMap) Activator.CreateInstance(type);
+                        var declMap = (DeclMap)Activator.CreateInstance(type);
                         declMap.Context = bindingContext;
                         declMap.DeclMapDatabase = this;
 

src/Generator/Types/Std/Stdlib.CLI.cs

@@ -135,8 +135,8 @@ namespace CppSharp.Types.Std
                 var type = finalType as TemplateSpecializationType;
                 if (type == null)
                 {
-                    var injectedClassNameType = (InjectedClassNameType) finalType;
-                    type = (TemplateSpecializationType) injectedClassNameType.InjectedSpecializationType.Type;
+                    var injectedClassNameType = (InjectedClassNameType)finalType;
+                    type = (TemplateSpecializationType)injectedClassNameType.InjectedSpecializationType.Type;
                 }
                 var checker = new TypeIgnoreChecker(TypeMapDatabase);
                 type.Arguments[0].Type.Visit(checker);
@@ -182,10 +182,10 @@ namespace CppSharp.Types.Std
                 };
 
                 var elementCtx = new MarshalContext(ctx.Context, ctx.Indentation)
-                                     {
-                                         Parameter = param,
-                                         ArgName = param.Name,
-                                     };
+                {
+                    Parameter = param,
+                    ArgName = param.Name,
+                };
 
                 var marshal = new CLIMarshalManagedToNativePrinter(elementCtx);
                 type.Type.Visit(marshal);
@@ -231,10 +231,10 @@ namespace CppSharp.Types.Std
             ctx.Before.WriteOpenBraceAndIndent();
             {
                 var elementCtx = new MarshalContext(ctx.Context, ctx.Indentation)
-                                     {
-                                         ReturnVarName = "_element",
-                                         ReturnType = type
-                                     };
+                {
+                    ReturnVarName = "_element",
+                    ReturnType = type
+                };
 
                 var marshal = new CLIMarshalNativeToManagedPrinter(elementCtx);
                 type.Type.Visit(marshal);
@@ -315,7 +315,7 @@ namespace CppSharp.Types.Std
 
         public override void CLIMarshalToNative(MarshalContext ctx)
         {
-            var marshal = (CLIMarshalManagedToNativePrinter) ctx.MarshalToNative;
+            var marshal = (CLIMarshalManagedToNativePrinter)ctx.MarshalToNative;
             if (!ctx.Parameter.Type.Desugar().IsPointer())
                 marshal.ArgumentPrefix.Write("*");
             var marshalCtxName = string.Format("ctx_{0}", ctx.Parameter.Name);

src/Generator/Types/Std/Stdlib.CSharp.cs

@@ -355,7 +355,7 @@ namespace CppSharp.Types.Std
             var typePrinter = new CSharpTypePrinter(ctx.Context);
             string qualifiedBasicString = GetQualifiedBasicString(basicString);
             string varBasicString = $"__basicStringRet{ctx.ParameterIndex}";
-            bool usePointer = type.IsAddress() || ctx.MarshalKind == MarshalKind.NativeField  ||
+            bool usePointer = type.IsAddress() || ctx.MarshalKind == MarshalKind.NativeField ||
                 ctx.MarshalKind == MarshalKind.ReturnVariableArray;
             ctx.Before.WriteLine($@"var {varBasicString} = {
                 basicString.Visit(typePrinter)}.{Helpers.CreateInstanceIdentifier}({
@@ -397,7 +397,7 @@ namespace CppSharp.Types.Std
             var templateSpecializationType = template as TemplateSpecializationType;
             if (templateSpecializationType != null)
                 return templateSpecializationType.GetClassTemplateSpecialization();
-            return (ClassTemplateSpecialization) ((TagType) template).Declaration;
+            return (ClassTemplateSpecialization)((TagType)template).Declaration;
         }
     }
 

src/Generator/Types/TypeMap.cs

@@ -55,15 +55,15 @@ namespace CppSharp.Types
         {
             switch (kind)
             {
-            case GeneratorKind.C:
-            case GeneratorKind.CPlusPlus:
-                return CppSignatureType(ctx);
-            case GeneratorKind.CLI:
-                return CLISignatureType(ctx);
-            case GeneratorKind.CSharp:
-                return CSharpSignatureType(ctx);
-            default:
-                throw new System.NotImplementedException();
+                case GeneratorKind.C:
+                case GeneratorKind.CPlusPlus:
+                    return CppSignatureType(ctx);
+                case GeneratorKind.CLI:
+                    return CLISignatureType(ctx);
+                case GeneratorKind.CSharp:
+                    return CSharpSignatureType(ctx);
+                default:
+                    throw new System.NotImplementedException();
             }
         }
 
@@ -71,18 +71,18 @@ namespace CppSharp.Types
         {
             switch (kind)
             {
-            case GeneratorKind.C:
-            case GeneratorKind.CPlusPlus:
-                CppMarshalToNative(ctx);
-                return;
-            case GeneratorKind.CLI:
-                CLIMarshalToNative(ctx);
-                return;
-            case GeneratorKind.CSharp:
-                CSharpMarshalToNative(ctx as CSharpMarshalContext);
-                return;
-            default:
-                throw new System.NotImplementedException();
+                case GeneratorKind.C:
+                case GeneratorKind.CPlusPlus:
+                    CppMarshalToNative(ctx);
+                    return;
+                case GeneratorKind.CLI:
+                    CLIMarshalToNative(ctx);
+                    return;
+                case GeneratorKind.CSharp:
+                    CSharpMarshalToNative(ctx as CSharpMarshalContext);
+                    return;
+                default:
+                    throw new System.NotImplementedException();
             }
         }
 
@@ -90,18 +90,18 @@ namespace CppSharp.Types
         {
             switch (kind)
             {
-            case GeneratorKind.C:
-            case GeneratorKind.CPlusPlus:
-                CppMarshalToManaged(ctx);
-                return;
-            case GeneratorKind.CLI:
-                CLIMarshalToManaged(ctx);
-                return;
-            case GeneratorKind.CSharp:
-                CSharpMarshalToManaged(ctx as CSharpMarshalContext);
-                return;
-            default:
-                throw new System.NotImplementedException();
+                case GeneratorKind.C:
+                case GeneratorKind.CPlusPlus:
+                    CppMarshalToManaged(ctx);
+                    return;
+                case GeneratorKind.CLI:
+                    CLIMarshalToManaged(ctx);
+                    return;
+                case GeneratorKind.CSharp:
+                    CSharpMarshalToManaged(ctx as CSharpMarshalContext);
+                    return;
+                default:
+                    throw new System.NotImplementedException();
             }
         }
 

src/Generator/Types/TypeMapDatabase.cs

@@ -43,7 +43,7 @@ namespace CppSharp.Types
                     if (attr.GeneratorKind == 0 ||
                         attr.GeneratorKind == bindingContext.Options.GeneratorKind)
                     {
-                        var typeMap = (TypeMap) Activator.CreateInstance(type);
+                        var typeMap = (TypeMap)Activator.CreateInstance(type);
                         typeMap.Context = bindingContext;
                         typeMap.TypeMapDatabase = this;
 

src/Generator/Utils/BlockGenerator.cs

@@ -319,7 +319,7 @@ namespace CppSharp
 
             if (trimIndentation)
             {
-                foreach(var line in lines)
+                foreach (var line in lines)
                 {
                     for (int i = 0; i < line.Length; ++i)
                     {

src/Generator/Utils/ExpressionEvaluator.cs

@@ -54,8 +54,8 @@ namespace CodingSeb.ExpressionEvaluator
         protected static readonly Regex initInNewBeginningRegex = new Regex(@"^(?>\s*){", RegexOptions.Compiled);
 
         // Depending on OptionInlineNamespacesEvaluationActive. Initialized in constructor
-        protected string InstanceCreationWithNewKeywordRegexPattern { get { return @"^new(?>\s*)((?<isAnonymous>[{{])|((?<name>[\p{L}_][\p{L}_0-9"+ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) + @"]*)(?>\s*)(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?>\s*)((?<isfunction>[(])|(?<isArray>\[)|(?<isInit>[{{]))?))"; } }
-        protected string CastRegexPattern { get { return @"^\((?>\s*)(?<typeName>[\p{L}_][\p{L}_0-9"+ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) + @"\[\]<>]*[?]?)(?>\s*)\)"; } }
+        protected string InstanceCreationWithNewKeywordRegexPattern { get { return @"^new(?>\s*)((?<isAnonymous>[{{])|((?<name>[\p{L}_][\p{L}_0-9" + (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) + @"]*)(?>\s*)(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?>\s*)((?<isfunction>[(])|(?<isArray>\[)|(?<isInit>[{{]))?))"; } }
+        protected string CastRegexPattern { get { return @"^\((?>\s*)(?<typeName>[\p{L}_][\p{L}_0-9" + (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) + @"\[\]<>]*[?]?)(?>\s*)\)"; } }
 
         // To remove comments in scripts based on https://stackoverflow.com/questions/3524317/regex-to-strip-line-comments-from-c-sharp/3524689#3524689
         protected const string blockComments = @"/\*(.*?)\*/";
@@ -1578,7 +1578,7 @@ namespace CodingSeb.ExpressionEvaluator
         {
             string restOfExpression = expression.Substring(i);
 
-// CPPSHARP
+            // CPPSHARP
             if (restOfExpression.StartsWith("0x", StringComparison.CurrentCultureIgnoreCase))
             {
                 // This is in case the literal contains suffix
@@ -1586,7 +1586,7 @@ namespace CodingSeb.ExpressionEvaluator
                 i += restOfExpression.Length - cleanedUp.Length;
                 restOfExpression = cleanedUp;
             }
-//
+            //
 
             Match numberMatch = Regex.Match(restOfExpression, numberRegexPattern, RegexOptions.IgnoreCase);
             Match otherBaseMatch = otherBasesNumberRegex.Match(restOfExpression);
@@ -1652,7 +1652,7 @@ namespace CodingSeb.ExpressionEvaluator
             }
         }
 
-// CPPSHARP
+        // CPPSHARP
 
         /// <summary>
         /// Heuristically convert <paramref name="numberToParse"/> to an int, uint, long, or ulong
@@ -1688,7 +1688,7 @@ namespace CodingSeb.ExpressionEvaluator
             if (number <= long.MaxValue) return (long)number;
             return number;
         }
-//
+        //
 
         protected virtual bool EvaluateInstanceCreationWithNewKeyword(string expression, Stack<object> stack, ref int i)
         {

src/Generator/Utils/FSM/ConsoleWriter.cs

@@ -1,20 +1,25 @@
 using System;
 
-namespace CppSharp.Utils.FSM{
-   public class ConsoleWriter{
-      public static void Failure(string message){
-         Console.ForegroundColor = ConsoleColor.DarkRed;
-         Write(message);
-      }
+namespace CppSharp.Utils.FSM
+{
+    public class ConsoleWriter
+    {
+        public static void Failure(string message)
+        {
+            Console.ForegroundColor = ConsoleColor.DarkRed;
+            Write(message);
+        }
 
-      public static void Success(string message){
-         Console.ForegroundColor = ConsoleColor.DarkGreen;
-         Write(message);
-      }
+        public static void Success(string message)
+        {
+            Console.ForegroundColor = ConsoleColor.DarkGreen;
+            Write(message);
+        }
 
-      private static void Write(string message){
-         Console.WriteLine(message);
-         Console.ResetColor();
-      }
-   }
+        private static void Write(string message)
+        {
+            Console.WriteLine(message);
+            Console.ResetColor();
+        }
+    }
 }

src/Generator/Utils/FSM/DFSM.cs

@@ -4,136 +4,166 @@ using System.Text;
 
 namespace CppSharp.Utils.FSM
 {
-   public class DFSM{
-      public readonly List<string> Q = new List<string>();
-      public readonly List<char> Sigma = new List<char>();
-      public readonly List<Transition> Delta = new List<Transition>();
-      public List<string> Q0 = new List<string>();
-      public List<string> F = new List<string>();
+    public class DFSM
+    {
+        public readonly List<string> Q = new List<string>();
+        public readonly List<char> Sigma = new List<char>();
+        public readonly List<Transition> Delta = new List<Transition>();
+        public List<string> Q0 = new List<string>();
+        public List<string> F = new List<string>();
 
-      public DFSM(IEnumerable<string> q, IEnumerable<char> sigma, IEnumerable<Transition> delta,
-         IEnumerable<string> q0, IEnumerable<string> f){
-         Q = q.ToList();
-         Sigma = sigma.ToList();
-         AddTransitions(delta);
-         AddInitialStates(q0);
-         AddFinalStates(f);
-      }
+        public DFSM(IEnumerable<string> q, IEnumerable<char> sigma, IEnumerable<Transition> delta,
+           IEnumerable<string> q0, IEnumerable<string> f)
+        {
+            Q = q.ToList();
+            Sigma = sigma.ToList();
+            AddTransitions(delta);
+            AddInitialStates(q0);
+            AddFinalStates(f);
+        }
 
-      private void AddTransitions(IEnumerable<Transition> transitions){
-         foreach (var transition in transitions.Where(ValidTransition)){
-            Delta.Add(transition);
-         }
-      }
+        private void AddTransitions(IEnumerable<Transition> transitions)
+        {
+            foreach (var transition in transitions.Where(ValidTransition))
+            {
+                Delta.Add(transition);
+            }
+        }
 
-      private bool ValidTransition(Transition transition){
-         return Q.Contains(transition.StartState) &&
-                Q.Contains(transition.EndState) &&
-                Sigma.Contains(transition.Symbol) &&
-                !TransitionAlreadyDefined(transition);
-      }
+        private bool ValidTransition(Transition transition)
+        {
+            return Q.Contains(transition.StartState) &&
+                   Q.Contains(transition.EndState) &&
+                   Sigma.Contains(transition.Symbol) &&
+                   !TransitionAlreadyDefined(transition);
+        }
 
-      private bool TransitionAlreadyDefined(Transition transition){
-         return Delta.Any(t => t.StartState == transition.StartState &&
-                               t.Symbol == transition.Symbol);
-      }
+        private bool TransitionAlreadyDefined(Transition transition)
+        {
+            return Delta.Any(t => t.StartState == transition.StartState &&
+                                  t.Symbol == transition.Symbol);
+        }
 
-      private void AddInitialStates(IEnumerable<string> q0){
-         foreach (var startingState in q0.Where(q => q != null && Q.Contains(q))){
-            Q0.Add(startingState);
-         }
-      }
+        private void AddInitialStates(IEnumerable<string> q0)
+        {
+            foreach (var startingState in q0.Where(q => q != null && Q.Contains(q)))
+            {
+                Q0.Add(startingState);
+            }
+        }
 
-      private void AddFinalStates(IEnumerable<string> finalStates){
-         foreach (var finalState in finalStates.Where(finalState => Q.Contains(finalState))){
-            F.Add(finalState);
-         }
-      }
+        private void AddFinalStates(IEnumerable<string> finalStates)
+        {
+            foreach (var finalState in finalStates.Where(finalState => Q.Contains(finalState)))
+            {
+                F.Add(finalState);
+            }
+        }
 
-      public void Accepts(string input){
-         ConsoleWriter.Success("Trying to parse: " + input);
-         if (InvalidInputOrFSM(input)){
-            return;
-         }
-         foreach (var q0 in Q0){
-            var currentState = q0;
-            var steps = new StringBuilder();
-            foreach (var symbol in input.ToCharArray()){
-               var transition = Delta.Find(t => t.StartState == currentState &&
-                                                t.Symbol == symbol);
-               if (transition == null){
-                  ConsoleWriter.Failure("No transitions for current state and symbol");
-                  ConsoleWriter.Failure(steps.ToString());
-                  continue;
-               }
-               currentState = transition.EndState;
-               steps.Append(transition + "\n");
+        public void Accepts(string input)
+        {
+            ConsoleWriter.Success("Trying to parse: " + input);
+            if (InvalidInputOrFSM(input))
+            {
+                return;
             }
-            if (F.Contains(currentState)){
-               ConsoleWriter.Success("Accepted the input with steps:\n" + steps);
-               return;
+            foreach (var q0 in Q0)
+            {
+                var currentState = q0;
+                var steps = new StringBuilder();
+                foreach (var symbol in input.ToCharArray())
+                {
+                    var transition = Delta.Find(t => t.StartState == currentState &&
+                                                     t.Symbol == symbol);
+                    if (transition == null)
+                    {
+                        ConsoleWriter.Failure("No transitions for current state and symbol");
+                        ConsoleWriter.Failure(steps.ToString());
+                        continue;
+                    }
+                    currentState = transition.EndState;
+                    steps.Append(transition + "\n");
+                }
+                if (F.Contains(currentState))
+                {
+                    ConsoleWriter.Success("Accepted the input with steps:\n" + steps);
+                    return;
+                }
+                ConsoleWriter.Failure("Stopped in state " + currentState +
+                                      " which is not a final state.");
+                ConsoleWriter.Failure(steps.ToString());
             }
-            ConsoleWriter.Failure("Stopped in state " + currentState +
-                                  " which is not a final state.");
-            ConsoleWriter.Failure(steps.ToString());
-         }
-      }
+        }
 
-      private bool InvalidInputOrFSM(string input){
-         if (InputContainsNotDefinedSymbols(input)){
-            return true;
-         }
-         if (InitialStateNotSet()){
-            ConsoleWriter.Failure("No initial state has been set");
-            return true;
-         }
-         if (NoFinalStates()){
-            ConsoleWriter.Failure("No final states have been set");
-            return true;
-         }
-         return false;
-      }
+        private bool InvalidInputOrFSM(string input)
+        {
+            if (InputContainsNotDefinedSymbols(input))
+            {
+                return true;
+            }
+            if (InitialStateNotSet())
+            {
+                ConsoleWriter.Failure("No initial state has been set");
+                return true;
+            }
+            if (NoFinalStates())
+            {
+                ConsoleWriter.Failure("No final states have been set");
+                return true;
+            }
+            return false;
+        }
 
-      private bool InputContainsNotDefinedSymbols(string input){
-         foreach (var symbol in input.ToCharArray().Where(symbol => !Sigma.Contains(symbol))){
-            ConsoleWriter.Failure("Could not accept the input since the symbol " + symbol + " is not part of the alphabet");
-            return true;
-         }
-         return false;
-      }
+        private bool InputContainsNotDefinedSymbols(string input)
+        {
+            foreach (var symbol in input.ToCharArray().Where(symbol => !Sigma.Contains(symbol)))
+            {
+                ConsoleWriter.Failure("Could not accept the input since the symbol " + symbol + " is not part of the alphabet");
+                return true;
+            }
+            return false;
+        }
 
-      private bool InitialStateNotSet(){
-         return Q0.Count == 0;
-      }
+        private bool InitialStateNotSet()
+        {
+            return Q0.Count == 0;
+        }
 
-      private bool NoFinalStates(){
-         return F.Count == 0;
-      }
+        private bool NoFinalStates()
+        {
+            return F.Count == 0;
+        }
 
-      public void RemoveUnreachableStates(){
-         var reachableStates = new HashSet<string>(Q0);
-         var newStates = new HashSet<string>(Q0);
-         do{
-            var temp = new HashSet<string>();
-            foreach (var q in newStates){
-               var reachableFromQ = Delta.FindAll(t => t.StartState == q).Select(t => t.EndState);
-               temp.UnionWith(reachableFromQ);
+        public void RemoveUnreachableStates()
+        {
+            var reachableStates = new HashSet<string>(Q0);
+            var newStates = new HashSet<string>(Q0);
+            do
+            {
+                var temp = new HashSet<string>();
+                foreach (var q in newStates)
+                {
+                    var reachableFromQ = Delta.FindAll(t => t.StartState == q).Select(t => t.EndState);
+                    temp.UnionWith(reachableFromQ);
+                }
+                temp.ExceptWith(reachableStates);
+                newStates = temp;
+                reachableStates.UnionWith(newStates);
+            } while (newStates.Count > 0);
+            var unreachableStates = Q.Where(q => !reachableStates.Contains(q));
+            for (int i = Delta.Count - 1; i > 0; i--)
+            {
+                var transition = Delta[i];
+                if (unreachableStates.Contains(transition.EndState) ||
+                    unreachableStates.Contains(transition.StartState))
+                {
+                    Delta.Remove(transition);
+                }
             }
-            temp.ExceptWith(reachableStates);
-            newStates = temp;
-            reachableStates.UnionWith(newStates);
-         } while (newStates.Count > 0);
-         var unreachableStates = Q.Where(q => !reachableStates.Contains(q));
-         for (int i = Delta.Count - 1; i > 0; i--){
-            var transition = Delta[i];
-            if (unreachableStates.Contains(transition.EndState) ||
-                unreachableStates.Contains(transition.StartState)){
-               Delta.Remove(transition);
+            foreach (var unrechableState in unreachableStates)
+            {
+                Q.Remove(unrechableState);
             }
-         }
-         foreach (var unrechableState in unreachableStates){
-            Q.Remove(unrechableState);
-         }
-      }
-   }
+        }
+    }
 }

src/Generator/Utils/FSM/Minimize.cs

@@ -1,71 +1,83 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace CppSharp.Utils.FSM{
-   internal class Minimize{
-      public static DFSM MinimizeDFSM(DFSM fsm){
-         var reversedNDFSM = Reverse(fsm);
-         var reversedDFSM = PowersetConstruction(reversedNDFSM);
-         var NDFSM = Reverse(reversedDFSM);
-         return PowersetConstruction(NDFSM);
-      }
+namespace CppSharp.Utils.FSM
+{
+    internal class Minimize
+    {
+        public static DFSM MinimizeDFSM(DFSM fsm)
+        {
+            var reversedNDFSM = Reverse(fsm);
+            var reversedDFSM = PowersetConstruction(reversedNDFSM);
+            var NDFSM = Reverse(reversedDFSM);
+            return PowersetConstruction(NDFSM);
+        }
 
-      private static NDFSM Reverse(DFSM d){
-         var delta = new List<Transition>();
-         foreach (var transition in d.Delta){
-            delta.Add(new Transition(transition.EndState, transition.Symbol, transition.StartState));
-         }
-         return new NDFSM(d.Q, d.Sigma, delta, d.F, d.Q0);
-      }
+        private static NDFSM Reverse(DFSM d)
+        {
+            var delta = new List<Transition>();
+            foreach (var transition in d.Delta)
+            {
+                delta.Add(new Transition(transition.EndState, transition.Symbol, transition.StartState));
+            }
+            return new NDFSM(d.Q, d.Sigma, delta, d.F, d.Q0);
+        }
 
-      public static DFSM PowersetConstruction(NDFSM ndfsm){
-         var Q = new List<string>();
-         var Sigma = ndfsm.Sigma.ToList();
-         var Delta = new List<Transition>();
-         var Q0 = new List<string> { string.Join(" ", ndfsm.Q0) };
-         var F = new List<string>();
+        public static DFSM PowersetConstruction(NDFSM ndfsm)
+        {
+            var Q = new List<string>();
+            var Sigma = ndfsm.Sigma.ToList();
+            var Delta = new List<Transition>();
+            var Q0 = new List<string> { string.Join(" ", ndfsm.Q0) };
+            var F = new List<string>();
 
-         var processed = new List<string>();
-         var queue = new Queue<string>();
-         queue.Enqueue(string.Join(",", ndfsm.Q0));
+            var processed = new List<string>();
+            var queue = new Queue<string>();
+            queue.Enqueue(string.Join(",", ndfsm.Q0));
 
-         while (queue.Count > 0){
-            var setState = queue.Dequeue();
-            processed.Add(setState);
-            Q.Add(CleanupState(setState));
+            while (queue.Count > 0)
+            {
+                var setState = queue.Dequeue();
+                processed.Add(setState);
+                Q.Add(CleanupState(setState));
 
-            var statesInCurrentSetState = setState.Split(',').ToList();
-            foreach (var state in statesInCurrentSetState){
-               if (ndfsm.F.Contains(state)){
-                  F.Add(CleanupState(setState));
-                  break;
-               }
-            }
-            var symbols = ndfsm.Delta
-               .Where(t => statesInCurrentSetState.Contains(t.StartState))
-               .Select(t => t.Symbol)
-               .Distinct();
-            foreach (var symbol in symbols){
-               var reachableStates =
-                  ndfsm.Delta
-                     .Where(t => t.Symbol == symbol &&
-                                 statesInCurrentSetState.Contains(t.StartState))
-                     .OrderBy(t => t.EndState).
-                     Select(t => t.EndState);
-               var reachableSetState = string.Join(",", reachableStates);
+                var statesInCurrentSetState = setState.Split(',').ToList();
+                foreach (var state in statesInCurrentSetState)
+                {
+                    if (ndfsm.F.Contains(state))
+                    {
+                        F.Add(CleanupState(setState));
+                        break;
+                    }
+                }
+                var symbols = ndfsm.Delta
+                   .Where(t => statesInCurrentSetState.Contains(t.StartState))
+                   .Select(t => t.Symbol)
+                   .Distinct();
+                foreach (var symbol in symbols)
+                {
+                    var reachableStates =
+                       ndfsm.Delta
+                          .Where(t => t.Symbol == symbol &&
+                                      statesInCurrentSetState.Contains(t.StartState))
+                          .OrderBy(t => t.EndState).
+                          Select(t => t.EndState);
+                    var reachableSetState = string.Join(",", reachableStates);
 
-               Delta.Add(new Transition(CleanupState(setState), symbol, CleanupState(reachableSetState)));
+                    Delta.Add(new Transition(CleanupState(setState), symbol, CleanupState(reachableSetState)));
 
-               if (!processed.Contains(reachableSetState)){
-                  queue.Enqueue(reachableSetState);
-               }
+                    if (!processed.Contains(reachableSetState))
+                    {
+                        queue.Enqueue(reachableSetState);
+                    }
+                }
             }
-         }
-         return new DFSM(Q, Sigma, Delta, Q0, F);
-      }
+            return new DFSM(Q, Sigma, Delta, Q0, F);
+        }
 
-      private static string CleanupState(string state){
-         return state.Replace(",", " ");
-      }
-   }
+        private static string CleanupState(string state)
+        {
+            return state.Replace(",", " ");
+        }
+    }
 }

src/Generator/Utils/FSM/NDFSM.cs

@@ -2,78 +2,96 @@
 using System.Linq;
 using System.Text;
 
-namespace CppSharp.Utils.FSM{
-   public class NDFSM{
-      private readonly List<string> Q = new List<string>();
-      public readonly List<char> Sigma = new List<char>();
-      public readonly List<Transition> Delta = new List<Transition>();
-      public List<string> Q0 = new List<string>();
-      public readonly List<string> F = new List<string>();
+namespace CppSharp.Utils.FSM
+{
+    public class NDFSM
+    {
+        private readonly List<string> Q = new List<string>();
+        public readonly List<char> Sigma = new List<char>();
+        public readonly List<Transition> Delta = new List<Transition>();
+        public List<string> Q0 = new List<string>();
+        public readonly List<string> F = new List<string>();
 
-      public NDFSM(IEnumerable<string> q, IEnumerable<char> sigma,
-         IEnumerable<Transition> delta, IEnumerable<string> q0, IEnumerable<string> f){
-         Q = q.ToList();
-         Sigma = sigma.ToList();
-         AddTransitions(delta);
-         AddInitialStates(q0);
-         AddFinalStates(f);
-      }
+        public NDFSM(IEnumerable<string> q, IEnumerable<char> sigma,
+           IEnumerable<Transition> delta, IEnumerable<string> q0, IEnumerable<string> f)
+        {
+            Q = q.ToList();
+            Sigma = sigma.ToList();
+            AddTransitions(delta);
+            AddInitialStates(q0);
+            AddFinalStates(f);
+        }
 
-      private void AddTransitions(IEnumerable<Transition> transitions){
-         foreach (var transition in transitions.Where(ValidTransition)){
-            Delta.Add(transition);
-         }
-      }
+        private void AddTransitions(IEnumerable<Transition> transitions)
+        {
+            foreach (var transition in transitions.Where(ValidTransition))
+            {
+                Delta.Add(transition);
+            }
+        }
 
-      private bool ValidTransition(Transition transition){
-         return Q.Contains(transition.StartState) &&
-                Q.Contains(transition.EndState) &&
-                Sigma.Contains(transition.Symbol);
-      }
+        private bool ValidTransition(Transition transition)
+        {
+            return Q.Contains(transition.StartState) &&
+                   Q.Contains(transition.EndState) &&
+                   Sigma.Contains(transition.Symbol);
+        }
 
-      private void AddInitialStates(IEnumerable<string> q0){
-         foreach (var startingState in q0.Where(q => q != null && Q.Contains(q))){
-            Q0.Add(startingState);
-         }
-      }
+        private void AddInitialStates(IEnumerable<string> q0)
+        {
+            foreach (var startingState in q0.Where(q => q != null && Q.Contains(q)))
+            {
+                Q0.Add(startingState);
+            }
+        }
 
-      private void AddFinalStates(IEnumerable<string> finalStates){
-         foreach (var finalState in finalStates.Where(finalState => Q.Contains(finalState))){
-            F.Add(finalState);
-         }
-      }
+        private void AddFinalStates(IEnumerable<string> finalStates)
+        {
+            foreach (var finalState in finalStates.Where(finalState => Q.Contains(finalState)))
+            {
+                F.Add(finalState);
+            }
+        }
 
-      public void Accepts(string input){
-         ConsoleWriter.Success("Trying to accept: " + input);
-         if (Q0.Any(q0 => Accepts(q0, input, new StringBuilder()))){
-            return;
-         }
-         ConsoleWriter.Failure("Could not accept the input: " + input);
-      }
+        public void Accepts(string input)
+        {
+            ConsoleWriter.Success("Trying to accept: " + input);
+            if (Q0.Any(q0 => Accepts(q0, input, new StringBuilder())))
+            {
+                return;
+            }
+            ConsoleWriter.Failure("Could not accept the input: " + input);
+        }
 
-      private bool Accepts(string currentState, string input, StringBuilder steps){
-         if (input.Length > 0){
-            var transitions = GetAllTransitions(currentState, input[0]);
-            foreach (var transition in transitions){
-               var currentSteps = new StringBuilder(steps.ToString() + transition);
-               if (Accepts(transition.EndState, input.Substring(1), currentSteps)){
-                  return true;
-               }
+        private bool Accepts(string currentState, string input, StringBuilder steps)
+        {
+            if (input.Length > 0)
+            {
+                var transitions = GetAllTransitions(currentState, input[0]);
+                foreach (var transition in transitions)
+                {
+                    var currentSteps = new StringBuilder(steps.ToString() + transition);
+                    if (Accepts(transition.EndState, input.Substring(1), currentSteps))
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            if (F.Contains(currentState))
+            {
+                ConsoleWriter.Success("Successfully accepted the input " + input + " " +
+                                      "in the final state " + currentState +
+                                      " with steps:\n" + steps);
+                return true;
             }
             return false;
-         }
-         if (F.Contains(currentState)){
-            ConsoleWriter.Success("Successfully accepted the input " + input + " " +
-                                  "in the final state " + currentState +
-                                  " with steps:\n" + steps);
-            return true;
-         }
-         return false;
-      }
+        }
 
-      private IEnumerable<Transition> GetAllTransitions(string currentState, char symbol){
-         return Delta.FindAll(t => t.StartState == currentState &&
-                                   t.Symbol == symbol);
-      }
-   }
+        private IEnumerable<Transition> GetAllTransitions(string currentState, char symbol)
+        {
+            return Delta.FindAll(t => t.StartState == currentState &&
+                                      t.Symbol == symbol);
+        }
+    }
 }

src/Generator/Utils/FSM/Program.cs

@@ -1,21 +1,24 @@
 using System.Collections.Generic;
 
-namespace CppSharp.Utils.FSM{
-   internal class Program{
-      private static void Main(string[] args){
-         var Q = new List<string>{"q0", "q1"};
-         var Sigma = new List<char>{'0', '1'};
-         var Delta = new List<Transition>{
+namespace CppSharp.Utils.FSM
+{
+    internal class Program
+    {
+        private static void Main(string[] args)
+        {
+            var Q = new List<string> { "q0", "q1" };
+            var Sigma = new List<char> { '0', '1' };
+            var Delta = new List<Transition>{
             new Transition("q0", '0', "q0"),
             new Transition("q0", '1', "q1"),
             new Transition("q1", '1', "q1"),
             new Transition("q1", '0', "q0")
          };
-         var Q0 = new List<string>{"q0"};
-         var F = new List<string>{"q0", "q1"};
-         var DFSM = new DFSM(Q, Sigma, Delta, Q0, F);
+            var Q0 = new List<string> { "q0" };
+            var F = new List<string> { "q0", "q1" };
+            var DFSM = new DFSM(Q, Sigma, Delta, Q0, F);
 
-         var minimizedDFSM = Minimize.MinimizeDFSM(DFSM);
-      }
-   }
+            var minimizedDFSM = Minimize.MinimizeDFSM(DFSM);
+        }
+    }
 }

src/Generator/Utils/FSM/Transition.cs

@@ -1,18 +1,22 @@
-namespace CppSharp.Utils.FSM{
-   public class Transition{
-      public string StartState { get; private set; }
-      public char Symbol { get; private set; }
-      public string EndState { get; private set; }
+namespace CppSharp.Utils.FSM
+{
+    public class Transition
+    {
+        public string StartState { get; private set; }
+        public char Symbol { get; private set; }
+        public string EndState { get; private set; }
 
-      public Transition(string startState, char symbol, string endState){
-         StartState = startState;
-         Symbol = symbol;
-         EndState = endState;
-      }
+        public Transition(string startState, char symbol, string endState)
+        {
+            StartState = startState;
+            Symbol = symbol;
+            EndState = endState;
+        }
 
-      public override string ToString(){
-         return string.Format("({0}, {1}) -> {2}\n", StartState, Symbol, EndState);
-      }
-   }
+        public override string ToString()
+        {
+            return string.Format("({0}, {1}) -> {2}\n", StartState, Symbol, EndState);
+        }
+    }
 }
 

src/Generator/Utils/HtmlEncoder.cs

@@ -38,483 +38,520 @@ using System.Text;
 
 namespace System.Web.Util
 {
-	public class HtmlEncoder
-	{
-		static SortedDictionary <string, char> entities;
+    public class HtmlEncoder
+    {
+        static SortedDictionary<string, char> entities;
 
-		static HtmlEncoder ()
-		{
-			InitEntities();
-		}
+        static HtmlEncoder()
+        {
+            InitEntities();
+        }
 
-		public static string HtmlEncode (string s) 
-		{
-			if (s == null)
-				return null;
+        public static string HtmlEncode(string s)
+        {
+            if (s == null)
+                return null;
 
-			if (s.Length == 0)
-				return String.Empty;
+            if (s.Length == 0)
+                return String.Empty;
 
-			bool needEncode = s.Any(c => c == '&' || c == '"' || c == '<' || c == '>' || c > 159);
+            bool needEncode = s.Any(c => c == '&' || c == '"' || c == '<' || c == '>' || c > 159);
 
-			if (!needEncode)
-				return s;
+            if (!needEncode)
+                return s;
 
-			StringBuilder output = new StringBuilder ();
-			int len = s.Length;
+            StringBuilder output = new StringBuilder();
+            int len = s.Length;
 
-			for (int i = 0; i < len; i++) {
-				switch (s [i]) {
-					case '&' :
-						output.Append ("&amp;");
-						break;
-					case '>' : 
-						output.Append ("&gt;");
-						break;
-					case '<' :
-						output.Append ("&lt;");
-						break;
-					case '"' :
-						output.Append ("&quot;");
-						break;
-					case '\uff1c':
-						output.Append ("&#65308;");
-						break;
+            for (int i = 0; i < len; i++)
+            {
+                switch (s[i])
+                {
+                    case '&':
+                        output.Append("&amp;");
+                        break;
+                    case '>':
+                        output.Append("&gt;");
+                        break;
+                    case '<':
+                        output.Append("&lt;");
+                        break;
+                    case '"':
+                        output.Append("&quot;");
+                        break;
+                    case '\uff1c':
+                        output.Append("&#65308;");
+                        break;
 
-					case '\uff1e':
-						output.Append ("&#65310;");
-						break;
+                    case '\uff1e':
+                        output.Append("&#65310;");
+                        break;
 
-					default:
-						char ch = s [i];
-						if (ch > 159 && ch < 256) {
-							output.Append ("&#");
-							output.Append (((int) ch).ToString (CultureInfo.InvariantCulture));
-							output.Append (";");
-						} else
-							output.Append (ch);
-						break;
-				}	
-			}
+                    default:
+                        char ch = s[i];
+                        if (ch > 159 && ch < 256)
+                        {
+                            output.Append("&#");
+                            output.Append(((int)ch).ToString(CultureInfo.InvariantCulture));
+                            output.Append(";");
+                        }
+                        else
+                            output.Append(ch);
+                        break;
+                }
+            }
 
-			return output.ToString ();			
-		}
+            return output.ToString();
+        }
 
-		internal static string HtmlAttributeEncode (string s) 
-		{
-			if (s == null) 
-				return null;
+        internal static string HtmlAttributeEncode(string s)
+        {
+            if (s == null)
+                return null;
 
-			if (s.Length == 0)
-				return String.Empty;
-			bool needEncode = s.Any(c => c == '&' || c == '"' || c == '<');
+            if (s.Length == 0)
+                return String.Empty;
+            bool needEncode = s.Any(c => c == '&' || c == '"' || c == '<');
 
-			if (!needEncode)
-				return s;
+            if (!needEncode)
+                return s;
 
-			StringBuilder output = new StringBuilder ();
-			int len = s.Length;
-			for (int i = 0; i < len; i++)
-				switch (s [i]) {
-				case '&' : 
-					output.Append ("&amp;");
-					break;
-				case '"' :
-					output.Append ("&quot;");
-					break;
-				case '<':
-					output.Append ("&lt;");
-					break;
-				default:
-					output.Append (s [i]);
-					break;
-				}
+            StringBuilder output = new StringBuilder();
+            int len = s.Length;
+            for (int i = 0; i < len; i++)
+                switch (s[i])
+                {
+                    case '&':
+                        output.Append("&amp;");
+                        break;
+                    case '"':
+                        output.Append("&quot;");
+                        break;
+                    case '<':
+                        output.Append("&lt;");
+                        break;
+                    default:
+                        output.Append(s[i]);
+                        break;
+                }
 
-			return output.ToString();
-		}
+            return output.ToString();
+        }
 
-		public static string HtmlDecode (string s)
-		{
-			if (s == null)
-				return null;
+        public static string HtmlDecode(string s)
+        {
+            if (s == null)
+                return null;
 
-			if (s.Length == 0)
-				return String.Empty;
+            if (s.Length == 0)
+                return String.Empty;
 
-			if (s.IndexOf ('&') == -1)
-				return s;
-			StringBuilder rawEntity = new StringBuilder ();
-			StringBuilder entity = new StringBuilder ();
-			StringBuilder output = new StringBuilder ();
-			int len = s.Length;
-			// 0 -> nothing,
-			// 1 -> right after '&'
-			// 2 -> between '&' and ';' but no '#'
-			// 3 -> '#' found after '&' and getting numbers
-			int state = 0;
-			int number = 0;
-			bool is_hex_value = false;
-			bool have_trailing_digits = false;
+            if (s.IndexOf('&') == -1)
+                return s;
+            StringBuilder rawEntity = new StringBuilder();
+            StringBuilder entity = new StringBuilder();
+            StringBuilder output = new StringBuilder();
+            int len = s.Length;
+            // 0 -> nothing,
+            // 1 -> right after '&'
+            // 2 -> between '&' and ';' but no '#'
+            // 3 -> '#' found after '&' and getting numbers
+            int state = 0;
+            int number = 0;
+            bool is_hex_value = false;
+            bool have_trailing_digits = false;
 
-			for (int i = 0; i < len; i++) {
-				char c = s [i];
-				if (state == 0) {
-					if (c == '&') {
-						entity.Append (c);
-						rawEntity.Append (c);
-						state = 1;
-					} else {
-						output.Append (c);
-					}
-					continue;
-				}
+            for (int i = 0; i < len; i++)
+            {
+                char c = s[i];
+                if (state == 0)
+                {
+                    if (c == '&')
+                    {
+                        entity.Append(c);
+                        rawEntity.Append(c);
+                        state = 1;
+                    }
+                    else
+                    {
+                        output.Append(c);
+                    }
+                    continue;
+                }
 
-				if (c == '&') {
-					state = 1;
-					if (have_trailing_digits) {
-						entity.Append (number.ToString (CultureInfo.InvariantCulture));
-						have_trailing_digits = false;
-					}
+                if (c == '&')
+                {
+                    state = 1;
+                    if (have_trailing_digits)
+                    {
+                        entity.Append(number.ToString(CultureInfo.InvariantCulture));
+                        have_trailing_digits = false;
+                    }
 
-					output.Append (entity);
-					entity.Length = 0;
-					entity.Append ('&');
-					continue;
-				}
+                    output.Append(entity);
+                    entity.Length = 0;
+                    entity.Append('&');
+                    continue;
+                }
 
-				if (state == 1) {
-					if (c == ';') {
-						state = 0;
-						output.Append (entity);
-						output.Append (c);
-						entity.Length = 0;
-					} else {
-						number = 0;
-						is_hex_value = false;
-						state = c != '#' ? 2 : 3;
-						entity.Append (c);
-						rawEntity.Append (c);
-					}
-				} else if (state == 2) {
-					entity.Append (c);
-					if (c == ';') {
-						string key = entity.ToString ();
-						if (key.Length > 1 && entities.ContainsKey (key.Substring (1, key.Length - 2)))
-							key = entities [key.Substring (1, key.Length - 2)].ToString ();
+                if (state == 1)
+                {
+                    if (c == ';')
+                    {
+                        state = 0;
+                        output.Append(entity);
+                        output.Append(c);
+                        entity.Length = 0;
+                    }
+                    else
+                    {
+                        number = 0;
+                        is_hex_value = false;
+                        state = c != '#' ? 2 : 3;
+                        entity.Append(c);
+                        rawEntity.Append(c);
+                    }
+                }
+                else if (state == 2)
+                {
+                    entity.Append(c);
+                    if (c == ';')
+                    {
+                        string key = entity.ToString();
+                        if (key.Length > 1 && entities.ContainsKey(key.Substring(1, key.Length - 2)))
+                            key = entities[key.Substring(1, key.Length - 2)].ToString();
 
-						output.Append (key);
-						state = 0;
-						entity.Length = 0;
-						rawEntity.Length = 0;
-					}
-				} else if (state == 3) {
-					if (c == ';') {
-						if (number == 0)
-							output.Append (rawEntity + ";");
-						else if (number > 65535) {
-							output.Append ("&#");
-							output.Append (number.ToString (CultureInfo.InvariantCulture));
-							output.Append (";");
-						} else {
-							output.Append ((char) number);
-						}
-						state = 0;
-						entity.Length = 0;
-						rawEntity.Length = 0;
-						have_trailing_digits = false;
-					} else if (is_hex_value &&  Uri.IsHexDigit(c)) {
-						number = number * 16 + Uri.FromHex(c);
-						have_trailing_digits = true;
-						rawEntity.Append (c);
-					} else if (Char.IsDigit (c)) {
-						number = number * 10 + (c - '0');
-						have_trailing_digits = true;
-						rawEntity.Append (c);
-					} else if (number == 0 && (c == 'x' || c == 'X')) {
-						is_hex_value = true;
-						rawEntity.Append (c);
-					} else {
-						state = 2;
-						if (have_trailing_digits) {
-							entity.Append (number.ToString (CultureInfo.InvariantCulture));
-							have_trailing_digits = false;
-						}
-						entity.Append (c);
-					}
-				}
-			}
+                        output.Append(key);
+                        state = 0;
+                        entity.Length = 0;
+                        rawEntity.Length = 0;
+                    }
+                }
+                else if (state == 3)
+                {
+                    if (c == ';')
+                    {
+                        if (number == 0)
+                            output.Append(rawEntity + ";");
+                        else if (number > 65535)
+                        {
+                            output.Append("&#");
+                            output.Append(number.ToString(CultureInfo.InvariantCulture));
+                            output.Append(";");
+                        }
+                        else
+                        {
+                            output.Append((char)number);
+                        }
+                        state = 0;
+                        entity.Length = 0;
+                        rawEntity.Length = 0;
+                        have_trailing_digits = false;
+                    }
+                    else if (is_hex_value && Uri.IsHexDigit(c))
+                    {
+                        number = number * 16 + Uri.FromHex(c);
+                        have_trailing_digits = true;
+                        rawEntity.Append(c);
+                    }
+                    else if (Char.IsDigit(c))
+                    {
+                        number = number * 10 + (c - '0');
+                        have_trailing_digits = true;
+                        rawEntity.Append(c);
+                    }
+                    else if (number == 0 && (c == 'x' || c == 'X'))
+                    {
+                        is_hex_value = true;
+                        rawEntity.Append(c);
+                    }
+                    else
+                    {
+                        state = 2;
+                        if (have_trailing_digits)
+                        {
+                            entity.Append(number.ToString(CultureInfo.InvariantCulture));
+                            have_trailing_digits = false;
+                        }
+                        entity.Append(c);
+                    }
+                }
+            }
 
-			if (entity.Length > 0) {
-				output.Append (entity);
-			} else if (have_trailing_digits) {
-				output.Append (number.ToString (CultureInfo.InvariantCulture));
-			}
-			return output.ToString ();
-		}
+            if (entity.Length > 0)
+            {
+                output.Append(entity);
+            }
+            else if (have_trailing_digits)
+            {
+                output.Append(number.ToString(CultureInfo.InvariantCulture));
+            }
+            return output.ToString();
+        }
 
-		internal static bool NotEncoded (char c)
-		{
-			return (c == '!' || c == '(' || c == ')' || c == '*' || c == '-' || c == '.' || c == '_');
-		}
+        internal static bool NotEncoded(char c)
+        {
+            return (c == '!' || c == '(' || c == ')' || c == '*' || c == '-' || c == '.' || c == '_');
+        }
 
-		static void InitEntities ()
-		{
-			// Build the hash table of HTML entity references.  This list comes
-			// from the HTML 4.01 W3C recommendation.
-			entities = new SortedDictionary <string, char> (StringComparer.Ordinal);
+        static void InitEntities()
+        {
+            // Build the hash table of HTML entity references.  This list comes
+            // from the HTML 4.01 W3C recommendation.
+            entities = new SortedDictionary<string, char>(StringComparer.Ordinal);
 
-			entities.Add ("nbsp", '\u00A0');
-			entities.Add ("iexcl", '\u00A1');
-			entities.Add ("cent", '\u00A2');
-			entities.Add ("pound", '\u00A3');
-			entities.Add ("curren", '\u00A4');
-			entities.Add ("yen", '\u00A5');
-			entities.Add ("brvbar", '\u00A6');
-			entities.Add ("sect", '\u00A7');
-			entities.Add ("uml", '\u00A8');
-			entities.Add ("copy", '\u00A9');
-			entities.Add ("ordf", '\u00AA');
-			entities.Add ("laquo", '\u00AB');
-			entities.Add ("not", '\u00AC');
-			entities.Add ("shy", '\u00AD');
-			entities.Add ("reg", '\u00AE');
-			entities.Add ("macr", '\u00AF');
-			entities.Add ("deg", '\u00B0');
-			entities.Add ("plusmn", '\u00B1');
-			entities.Add ("sup2", '\u00B2');
-			entities.Add ("sup3", '\u00B3');
-			entities.Add ("acute", '\u00B4');
-			entities.Add ("micro", '\u00B5');
-			entities.Add ("para", '\u00B6');
-			entities.Add ("middot", '\u00B7');
-			entities.Add ("cedil", '\u00B8');
-			entities.Add ("sup1", '\u00B9');
-			entities.Add ("ordm", '\u00BA');
-			entities.Add ("raquo", '\u00BB');
-			entities.Add ("frac14", '\u00BC');
-			entities.Add ("frac12", '\u00BD');
-			entities.Add ("frac34", '\u00BE');
-			entities.Add ("iquest", '\u00BF');
-			entities.Add ("Agrave", '\u00C0');
-			entities.Add ("Aacute", '\u00C1');
-			entities.Add ("Acirc", '\u00C2');
-			entities.Add ("Atilde", '\u00C3');
-			entities.Add ("Auml", '\u00C4');
-			entities.Add ("Aring", '\u00C5');
-			entities.Add ("AElig", '\u00C6');
-			entities.Add ("Ccedil", '\u00C7');
-			entities.Add ("Egrave", '\u00C8');
-			entities.Add ("Eacute", '\u00C9');
-			entities.Add ("Ecirc", '\u00CA');
-			entities.Add ("Euml", '\u00CB');
-			entities.Add ("Igrave", '\u00CC');
-			entities.Add ("Iacute", '\u00CD');
-			entities.Add ("Icirc", '\u00CE');
-			entities.Add ("Iuml", '\u00CF');
-			entities.Add ("ETH", '\u00D0');
-			entities.Add ("Ntilde", '\u00D1');
-			entities.Add ("Ograve", '\u00D2');
-			entities.Add ("Oacute", '\u00D3');
-			entities.Add ("Ocirc", '\u00D4');
-			entities.Add ("Otilde", '\u00D5');
-			entities.Add ("Ouml", '\u00D6');
-			entities.Add ("times", '\u00D7');
-			entities.Add ("Oslash", '\u00D8');
-			entities.Add ("Ugrave", '\u00D9');
-			entities.Add ("Uacute", '\u00DA');
-			entities.Add ("Ucirc", '\u00DB');
-			entities.Add ("Uuml", '\u00DC');
-			entities.Add ("Yacute", '\u00DD');
-			entities.Add ("THORN", '\u00DE');
-			entities.Add ("szlig", '\u00DF');
-			entities.Add ("agrave", '\u00E0');
-			entities.Add ("aacute", '\u00E1');
-			entities.Add ("acirc", '\u00E2');
-			entities.Add ("atilde", '\u00E3');
-			entities.Add ("auml", '\u00E4');
-			entities.Add ("aring", '\u00E5');
-			entities.Add ("aelig", '\u00E6');
-			entities.Add ("ccedil", '\u00E7');
-			entities.Add ("egrave", '\u00E8');
-			entities.Add ("eacute", '\u00E9');
-			entities.Add ("ecirc", '\u00EA');
-			entities.Add ("euml", '\u00EB');
-			entities.Add ("igrave", '\u00EC');
-			entities.Add ("iacute", '\u00ED');
-			entities.Add ("icirc", '\u00EE');
-			entities.Add ("iuml", '\u00EF');
-			entities.Add ("eth", '\u00F0');
-			entities.Add ("ntilde", '\u00F1');
-			entities.Add ("ograve", '\u00F2');
-			entities.Add ("oacute", '\u00F3');
-			entities.Add ("ocirc", '\u00F4');
-			entities.Add ("otilde", '\u00F5');
-			entities.Add ("ouml", '\u00F6');
-			entities.Add ("divide", '\u00F7');
-			entities.Add ("oslash", '\u00F8');
-			entities.Add ("ugrave", '\u00F9');
-			entities.Add ("uacute", '\u00FA');
-			entities.Add ("ucirc", '\u00FB');
-			entities.Add ("uuml", '\u00FC');
-			entities.Add ("yacute", '\u00FD');
-			entities.Add ("thorn", '\u00FE');
-			entities.Add ("yuml", '\u00FF');
-			entities.Add ("fnof", '\u0192');
-			entities.Add ("Alpha", '\u0391');
-			entities.Add ("Beta", '\u0392');
-			entities.Add ("Gamma", '\u0393');
-			entities.Add ("Delta", '\u0394');
-			entities.Add ("Epsilon", '\u0395');
-			entities.Add ("Zeta", '\u0396');
-			entities.Add ("Eta", '\u0397');
-			entities.Add ("Theta", '\u0398');
-			entities.Add ("Iota", '\u0399');
-			entities.Add ("Kappa", '\u039A');
-			entities.Add ("Lambda", '\u039B');
-			entities.Add ("Mu", '\u039C');
-			entities.Add ("Nu", '\u039D');
-			entities.Add ("Xi", '\u039E');
-			entities.Add ("Omicron", '\u039F');
-			entities.Add ("Pi", '\u03A0');
-			entities.Add ("Rho", '\u03A1');
-			entities.Add ("Sigma", '\u03A3');
-			entities.Add ("Tau", '\u03A4');
-			entities.Add ("Upsilon", '\u03A5');
-			entities.Add ("Phi", '\u03A6');
-			entities.Add ("Chi", '\u03A7');
-			entities.Add ("Psi", '\u03A8');
-			entities.Add ("Omega", '\u03A9');
-			entities.Add ("alpha", '\u03B1');
-			entities.Add ("beta", '\u03B2');
-			entities.Add ("gamma", '\u03B3');
-			entities.Add ("delta", '\u03B4');
-			entities.Add ("epsilon", '\u03B5');
-			entities.Add ("zeta", '\u03B6');
-			entities.Add ("eta", '\u03B7');
-			entities.Add ("theta", '\u03B8');
-			entities.Add ("iota", '\u03B9');
-			entities.Add ("kappa", '\u03BA');
-			entities.Add ("lambda", '\u03BB');
-			entities.Add ("mu", '\u03BC');
-			entities.Add ("nu", '\u03BD');
-			entities.Add ("xi", '\u03BE');
-			entities.Add ("omicron", '\u03BF');
-			entities.Add ("pi", '\u03C0');
-			entities.Add ("rho", '\u03C1');
-			entities.Add ("sigmaf", '\u03C2');
-			entities.Add ("sigma", '\u03C3');
-			entities.Add ("tau", '\u03C4');
-			entities.Add ("upsilon", '\u03C5');
-			entities.Add ("phi", '\u03C6');
-			entities.Add ("chi", '\u03C7');
-			entities.Add ("psi", '\u03C8');
-			entities.Add ("omega", '\u03C9');
-			entities.Add ("thetasym", '\u03D1');
-			entities.Add ("upsih", '\u03D2');
-			entities.Add ("piv", '\u03D6');
-			entities.Add ("bull", '\u2022');
-			entities.Add ("hellip", '\u2026');
-			entities.Add ("prime", '\u2032');
-			entities.Add ("Prime", '\u2033');
-			entities.Add ("oline", '\u203E');
-			entities.Add ("frasl", '\u2044');
-			entities.Add ("weierp", '\u2118');
-			entities.Add ("image", '\u2111');
-			entities.Add ("real", '\u211C');
-			entities.Add ("trade", '\u2122');
-			entities.Add ("alefsym", '\u2135');
-			entities.Add ("larr", '\u2190');
-			entities.Add ("uarr", '\u2191');
-			entities.Add ("rarr", '\u2192');
-			entities.Add ("darr", '\u2193');
-			entities.Add ("harr", '\u2194');
-			entities.Add ("crarr", '\u21B5');
-			entities.Add ("lArr", '\u21D0');
-			entities.Add ("uArr", '\u21D1');
-			entities.Add ("rArr", '\u21D2');
-			entities.Add ("dArr", '\u21D3');
-			entities.Add ("hArr", '\u21D4');
-			entities.Add ("forall", '\u2200');
-			entities.Add ("part", '\u2202');
-			entities.Add ("exist", '\u2203');
-			entities.Add ("empty", '\u2205');
-			entities.Add ("nabla", '\u2207');
-			entities.Add ("isin", '\u2208');
-			entities.Add ("notin", '\u2209');
-			entities.Add ("ni", '\u220B');
-			entities.Add ("prod", '\u220F');
-			entities.Add ("sum", '\u2211');
-			entities.Add ("minus", '\u2212');
-			entities.Add ("lowast", '\u2217');
-			entities.Add ("radic", '\u221A');
-			entities.Add ("prop", '\u221D');
-			entities.Add ("infin", '\u221E');
-			entities.Add ("ang", '\u2220');
-			entities.Add ("and", '\u2227');
-			entities.Add ("or", '\u2228');
-			entities.Add ("cap", '\u2229');
-			entities.Add ("cup", '\u222A');
-			entities.Add ("int", '\u222B');
-			entities.Add ("there4", '\u2234');
-			entities.Add ("sim", '\u223C');
-			entities.Add ("cong", '\u2245');
-			entities.Add ("asymp", '\u2248');
-			entities.Add ("ne", '\u2260');
-			entities.Add ("equiv", '\u2261');
-			entities.Add ("le", '\u2264');
-			entities.Add ("ge", '\u2265');
-			entities.Add ("sub", '\u2282');
-			entities.Add ("sup", '\u2283');
-			entities.Add ("nsub", '\u2284');
-			entities.Add ("sube", '\u2286');
-			entities.Add ("supe", '\u2287');
-			entities.Add ("oplus", '\u2295');
-			entities.Add ("otimes", '\u2297');
-			entities.Add ("perp", '\u22A5');
-			entities.Add ("sdot", '\u22C5');
-			entities.Add ("lceil", '\u2308');
-			entities.Add ("rceil", '\u2309');
-			entities.Add ("lfloor", '\u230A');
-			entities.Add ("rfloor", '\u230B');
-			entities.Add ("lang", '\u2329');
-			entities.Add ("rang", '\u232A');
-			entities.Add ("loz", '\u25CA');
-			entities.Add ("spades", '\u2660');
-			entities.Add ("clubs", '\u2663');
-			entities.Add ("hearts", '\u2665');
-			entities.Add ("diams", '\u2666');
-			entities.Add ("quot", '\u0022');
-			entities.Add ("amp", '\u0026');
-			entities.Add ("lt", '\u003C');
-			entities.Add ("gt", '\u003E');
-			entities.Add ("OElig", '\u0152');
-			entities.Add ("oelig", '\u0153');
-			entities.Add ("Scaron", '\u0160');
-			entities.Add ("scaron", '\u0161');
-			entities.Add ("Yuml", '\u0178');
-			entities.Add ("circ", '\u02C6');
-			entities.Add ("tilde", '\u02DC');
-			entities.Add ("ensp", '\u2002');
-			entities.Add ("emsp", '\u2003');
-			entities.Add ("thinsp", '\u2009');
-			entities.Add ("zwnj", '\u200C');
-			entities.Add ("zwj", '\u200D');
-			entities.Add ("lrm", '\u200E');
-			entities.Add ("rlm", '\u200F');
-			entities.Add ("ndash", '\u2013');
-			entities.Add ("mdash", '\u2014');
-			entities.Add ("lsquo", '\u2018');
-			entities.Add ("rsquo", '\u2019');
-			entities.Add ("sbquo", '\u201A');
-			entities.Add ("ldquo", '\u201C');
-			entities.Add ("rdquo", '\u201D');
-			entities.Add ("bdquo", '\u201E');
-			entities.Add ("dagger", '\u2020');
-			entities.Add ("Dagger", '\u2021');
-			entities.Add ("permil", '\u2030');
-			entities.Add ("lsaquo", '\u2039');
-			entities.Add ("rsaquo", '\u203A');
-			entities.Add ("euro", '\u20AC');
-		}
-	}
+            entities.Add("nbsp", '\u00A0');
+            entities.Add("iexcl", '\u00A1');
+            entities.Add("cent", '\u00A2');
+            entities.Add("pound", '\u00A3');
+            entities.Add("curren", '\u00A4');
+            entities.Add("yen", '\u00A5');
+            entities.Add("brvbar", '\u00A6');
+            entities.Add("sect", '\u00A7');
+            entities.Add("uml", '\u00A8');
+            entities.Add("copy", '\u00A9');
+            entities.Add("ordf", '\u00AA');
+            entities.Add("laquo", '\u00AB');
+            entities.Add("not", '\u00AC');
+            entities.Add("shy", '\u00AD');
+            entities.Add("reg", '\u00AE');
+            entities.Add("macr", '\u00AF');
+            entities.Add("deg", '\u00B0');
+            entities.Add("plusmn", '\u00B1');
+            entities.Add("sup2", '\u00B2');
+            entities.Add("sup3", '\u00B3');
+            entities.Add("acute", '\u00B4');
+            entities.Add("micro", '\u00B5');
+            entities.Add("para", '\u00B6');
+            entities.Add("middot", '\u00B7');
+            entities.Add("cedil", '\u00B8');
+            entities.Add("sup1", '\u00B9');
+            entities.Add("ordm", '\u00BA');
+            entities.Add("raquo", '\u00BB');
+            entities.Add("frac14", '\u00BC');
+            entities.Add("frac12", '\u00BD');
+            entities.Add("frac34", '\u00BE');
+            entities.Add("iquest", '\u00BF');
+            entities.Add("Agrave", '\u00C0');
+            entities.Add("Aacute", '\u00C1');
+            entities.Add("Acirc", '\u00C2');
+            entities.Add("Atilde", '\u00C3');
+            entities.Add("Auml", '\u00C4');
+            entities.Add("Aring", '\u00C5');
+            entities.Add("AElig", '\u00C6');
+            entities.Add("Ccedil", '\u00C7');
+            entities.Add("Egrave", '\u00C8');
+            entities.Add("Eacute", '\u00C9');
+            entities.Add("Ecirc", '\u00CA');
+            entities.Add("Euml", '\u00CB');
+            entities.Add("Igrave", '\u00CC');
+            entities.Add("Iacute", '\u00CD');
+            entities.Add("Icirc", '\u00CE');
+            entities.Add("Iuml", '\u00CF');
+            entities.Add("ETH", '\u00D0');
+            entities.Add("Ntilde", '\u00D1');
+            entities.Add("Ograve", '\u00D2');
+            entities.Add("Oacute", '\u00D3');
+            entities.Add("Ocirc", '\u00D4');
+            entities.Add("Otilde", '\u00D5');
+            entities.Add("Ouml", '\u00D6');
+            entities.Add("times", '\u00D7');
+            entities.Add("Oslash", '\u00D8');
+            entities.Add("Ugrave", '\u00D9');
+            entities.Add("Uacute", '\u00DA');
+            entities.Add("Ucirc", '\u00DB');
+            entities.Add("Uuml", '\u00DC');
+            entities.Add("Yacute", '\u00DD');
+            entities.Add("THORN", '\u00DE');
+            entities.Add("szlig", '\u00DF');
+            entities.Add("agrave", '\u00E0');
+            entities.Add("aacute", '\u00E1');
+            entities.Add("acirc", '\u00E2');
+            entities.Add("atilde", '\u00E3');
+            entities.Add("auml", '\u00E4');
+            entities.Add("aring", '\u00E5');
+            entities.Add("aelig", '\u00E6');
+            entities.Add("ccedil", '\u00E7');
+            entities.Add("egrave", '\u00E8');
+            entities.Add("eacute", '\u00E9');
+            entities.Add("ecirc", '\u00EA');
+            entities.Add("euml", '\u00EB');
+            entities.Add("igrave", '\u00EC');
+            entities.Add("iacute", '\u00ED');
+            entities.Add("icirc", '\u00EE');
+            entities.Add("iuml", '\u00EF');
+            entities.Add("eth", '\u00F0');
+            entities.Add("ntilde", '\u00F1');
+            entities.Add("ograve", '\u00F2');
+            entities.Add("oacute", '\u00F3');
+            entities.Add("ocirc", '\u00F4');
+            entities.Add("otilde", '\u00F5');
+            entities.Add("ouml", '\u00F6');
+            entities.Add("divide", '\u00F7');
+            entities.Add("oslash", '\u00F8');
+            entities.Add("ugrave", '\u00F9');
+            entities.Add("uacute", '\u00FA');
+            entities.Add("ucirc", '\u00FB');
+            entities.Add("uuml", '\u00FC');
+            entities.Add("yacute", '\u00FD');
+            entities.Add("thorn", '\u00FE');
+            entities.Add("yuml", '\u00FF');
+            entities.Add("fnof", '\u0192');
+            entities.Add("Alpha", '\u0391');
+            entities.Add("Beta", '\u0392');
+            entities.Add("Gamma", '\u0393');
+            entities.Add("Delta", '\u0394');
+            entities.Add("Epsilon", '\u0395');
+            entities.Add("Zeta", '\u0396');
+            entities.Add("Eta", '\u0397');
+            entities.Add("Theta", '\u0398');
+            entities.Add("Iota", '\u0399');
+            entities.Add("Kappa", '\u039A');
+            entities.Add("Lambda", '\u039B');
+            entities.Add("Mu", '\u039C');
+            entities.Add("Nu", '\u039D');
+            entities.Add("Xi", '\u039E');
+            entities.Add("Omicron", '\u039F');
+            entities.Add("Pi", '\u03A0');
+            entities.Add("Rho", '\u03A1');
+            entities.Add("Sigma", '\u03A3');
+            entities.Add("Tau", '\u03A4');
+            entities.Add("Upsilon", '\u03A5');
+            entities.Add("Phi", '\u03A6');
+            entities.Add("Chi", '\u03A7');
+            entities.Add("Psi", '\u03A8');
+            entities.Add("Omega", '\u03A9');
+            entities.Add("alpha", '\u03B1');
+            entities.Add("beta", '\u03B2');
+            entities.Add("gamma", '\u03B3');
+            entities.Add("delta", '\u03B4');
+            entities.Add("epsilon", '\u03B5');
+            entities.Add("zeta", '\u03B6');
+            entities.Add("eta", '\u03B7');
+            entities.Add("theta", '\u03B8');
+            entities.Add("iota", '\u03B9');
+            entities.Add("kappa", '\u03BA');
+            entities.Add("lambda", '\u03BB');
+            entities.Add("mu", '\u03BC');
+            entities.Add("nu", '\u03BD');
+            entities.Add("xi", '\u03BE');
+            entities.Add("omicron", '\u03BF');
+            entities.Add("pi", '\u03C0');
+            entities.Add("rho", '\u03C1');
+            entities.Add("sigmaf", '\u03C2');
+            entities.Add("sigma", '\u03C3');
+            entities.Add("tau", '\u03C4');
+            entities.Add("upsilon", '\u03C5');
+            entities.Add("phi", '\u03C6');
+            entities.Add("chi", '\u03C7');
+            entities.Add("psi", '\u03C8');
+            entities.Add("omega", '\u03C9');
+            entities.Add("thetasym", '\u03D1');
+            entities.Add("upsih", '\u03D2');
+            entities.Add("piv", '\u03D6');
+            entities.Add("bull", '\u2022');
+            entities.Add("hellip", '\u2026');
+            entities.Add("prime", '\u2032');
+            entities.Add("Prime", '\u2033');
+            entities.Add("oline", '\u203E');
+            entities.Add("frasl", '\u2044');
+            entities.Add("weierp", '\u2118');
+            entities.Add("image", '\u2111');
+            entities.Add("real", '\u211C');
+            entities.Add("trade", '\u2122');
+            entities.Add("alefsym", '\u2135');
+            entities.Add("larr", '\u2190');
+            entities.Add("uarr", '\u2191');
+            entities.Add("rarr", '\u2192');
+            entities.Add("darr", '\u2193');
+            entities.Add("harr", '\u2194');
+            entities.Add("crarr", '\u21B5');
+            entities.Add("lArr", '\u21D0');
+            entities.Add("uArr", '\u21D1');
+            entities.Add("rArr", '\u21D2');
+            entities.Add("dArr", '\u21D3');
+            entities.Add("hArr", '\u21D4');
+            entities.Add("forall", '\u2200');
+            entities.Add("part", '\u2202');
+            entities.Add("exist", '\u2203');
+            entities.Add("empty", '\u2205');
+            entities.Add("nabla", '\u2207');
+            entities.Add("isin", '\u2208');
+            entities.Add("notin", '\u2209');
+            entities.Add("ni", '\u220B');
+            entities.Add("prod", '\u220F');
+            entities.Add("sum", '\u2211');
+            entities.Add("minus", '\u2212');
+            entities.Add("lowast", '\u2217');
+            entities.Add("radic", '\u221A');
+            entities.Add("prop", '\u221D');
+            entities.Add("infin", '\u221E');
+            entities.Add("ang", '\u2220');
+            entities.Add("and", '\u2227');
+            entities.Add("or", '\u2228');
+            entities.Add("cap", '\u2229');
+            entities.Add("cup", '\u222A');
+            entities.Add("int", '\u222B');
+            entities.Add("there4", '\u2234');
+            entities.Add("sim", '\u223C');
+            entities.Add("cong", '\u2245');
+            entities.Add("asymp", '\u2248');
+            entities.Add("ne", '\u2260');
+            entities.Add("equiv", '\u2261');
+            entities.Add("le", '\u2264');
+            entities.Add("ge", '\u2265');
+            entities.Add("sub", '\u2282');
+            entities.Add("sup", '\u2283');
+            entities.Add("nsub", '\u2284');
+            entities.Add("sube", '\u2286');
+            entities.Add("supe", '\u2287');
+            entities.Add("oplus", '\u2295');
+            entities.Add("otimes", '\u2297');
+            entities.Add("perp", '\u22A5');
+            entities.Add("sdot", '\u22C5');
+            entities.Add("lceil", '\u2308');
+            entities.Add("rceil", '\u2309');
+            entities.Add("lfloor", '\u230A');
+            entities.Add("rfloor", '\u230B');
+            entities.Add("lang", '\u2329');
+            entities.Add("rang", '\u232A');
+            entities.Add("loz", '\u25CA');
+            entities.Add("spades", '\u2660');
+            entities.Add("clubs", '\u2663');
+            entities.Add("hearts", '\u2665');
+            entities.Add("diams", '\u2666');
+            entities.Add("quot", '\u0022');
+            entities.Add("amp", '\u0026');
+            entities.Add("lt", '\u003C');
+            entities.Add("gt", '\u003E');
+            entities.Add("OElig", '\u0152');
+            entities.Add("oelig", '\u0153');
+            entities.Add("Scaron", '\u0160');
+            entities.Add("scaron", '\u0161');
+            entities.Add("Yuml", '\u0178');
+            entities.Add("circ", '\u02C6');
+            entities.Add("tilde", '\u02DC');
+            entities.Add("ensp", '\u2002');
+            entities.Add("emsp", '\u2003');
+            entities.Add("thinsp", '\u2009');
+            entities.Add("zwnj", '\u200C');
+            entities.Add("zwj", '\u200D');
+            entities.Add("lrm", '\u200E');
+            entities.Add("rlm", '\u200F');
+            entities.Add("ndash", '\u2013');
+            entities.Add("mdash", '\u2014');
+            entities.Add("lsquo", '\u2018');
+            entities.Add("rsquo", '\u2019');
+            entities.Add("sbquo", '\u201A');
+            entities.Add("ldquo", '\u201C');
+            entities.Add("rdquo", '\u201D');
+            entities.Add("bdquo", '\u201E');
+            entities.Add("dagger", '\u2020');
+            entities.Add("Dagger", '\u2021');
+            entities.Add("permil", '\u2030');
+            entities.Add("lsaquo", '\u2039');
+            entities.Add("rsaquo", '\u203A');
+            entities.Add("euro", '\u20AC');
+        }
+    }
 }

src/Generator/Utils/TextGenerator.cs

@@ -55,7 +55,7 @@ namespace CppSharp
 
             if (IsStartOfLine && !string.IsNullOrWhiteSpace(msg))
                 StringBuilder.Append(new string(' ',
-                    (int) (CurrentIndentation * DefaultIndentation)));
+                    (int)(CurrentIndentation * DefaultIndentation)));
 
             if (msg.Length > 0)
                 IsStartOfLine = msg.EndsWith(Environment.NewLine);

src/Parser/ASTConverter.cs

@@ -41,100 +41,100 @@ namespace CppSharp
             switch (type.Kind)
             {
                 case TypeKind.Tag:
-                {
-                    var _type = TagType.__CreateInstance(type.__Instance);
-                    return VisitTag(_type);
-                }
+                    {
+                        var _type = TagType.__CreateInstance(type.__Instance);
+                        return VisitTag(_type);
+                    }
                 case TypeKind.Array:
-                {
-                    var _type = ArrayType.__CreateInstance(type.__Instance);
-                    return VisitArray(_type);
-                }
+                    {
+                        var _type = ArrayType.__CreateInstance(type.__Instance);
+                        return VisitArray(_type);
+                    }
                 case TypeKind.Function:
-                {
-                    var _type = FunctionType.__CreateInstance(type.__Instance);
-                    return VisitFunction(_type);
-                }
+                    {
+                        var _type = FunctionType.__CreateInstance(type.__Instance);
+                        return VisitFunction(_type);
+                    }
                 case TypeKind.Pointer:
-                {
-                    var _type = PointerType.__CreateInstance(type.__Instance);
-                    return VisitPointer(_type);
-                }
+                    {
+                        var _type = PointerType.__CreateInstance(type.__Instance);
+                        return VisitPointer(_type);
+                    }
                 case TypeKind.MemberPointer:
-                {
-                    var _type = MemberPointerType.__CreateInstance(type.__Instance);
-                    return VisitMemberPointer(_type);
-                }
+                    {
+                        var _type = MemberPointerType.__CreateInstance(type.__Instance);
+                        return VisitMemberPointer(_type);
+                    }
                 case TypeKind.Typedef:
-                {
-                    var _type = TypedefType.__CreateInstance(type.__Instance);
-                    return VisitTypedef(_type);
-                }
+                    {
+                        var _type = TypedefType.__CreateInstance(type.__Instance);
+                        return VisitTypedef(_type);
+                    }
                 case TypeKind.Attributed:
-                {
-                    var _type = AttributedType.__CreateInstance(type.__Instance);
-                    return VisitAttributed(_type);
-                }
+                    {
+                        var _type = AttributedType.__CreateInstance(type.__Instance);
+                        return VisitAttributed(_type);
+                    }
                 case TypeKind.Decayed:
-                {
-                    var _type = DecayedType.__CreateInstance(type.__Instance);
-                    return VisitDecayed(_type);
-                }
+                    {
+                        var _type = DecayedType.__CreateInstance(type.__Instance);
+                        return VisitDecayed(_type);
+                    }
                 case TypeKind.TemplateSpecialization:
-                {
-                    var _type = TemplateSpecializationType.__CreateInstance(type.__Instance);
-                    return VisitTemplateSpecialization(_type);
-                }
+                    {
+                        var _type = TemplateSpecializationType.__CreateInstance(type.__Instance);
+                        return VisitTemplateSpecialization(_type);
+                    }
                 case TypeKind.DependentTemplateSpecialization:
-                {
-                    var _type = DependentTemplateSpecializationType.__CreateInstance(type.__Instance);
-                    return VisitDependentTemplateSpecialization(_type);
-                }
+                    {
+                        var _type = DependentTemplateSpecializationType.__CreateInstance(type.__Instance);
+                        return VisitDependentTemplateSpecialization(_type);
+                    }
                 case TypeKind.TemplateParameter:
-                {
-                    var _type = TemplateParameterType.__CreateInstance(type.__Instance);
-                    return VisitTemplateParameter(_type);
-                }
+                    {
+                        var _type = TemplateParameterType.__CreateInstance(type.__Instance);
+                        return VisitTemplateParameter(_type);
+                    }
                 case TypeKind.TemplateParameterSubstitution:
-                {
-                    var _type = TemplateParameterSubstitutionType.__CreateInstance(type.__Instance);
-                    return VisitTemplateParameterSubstitution(_type);
-                }
+                    {
+                        var _type = TemplateParameterSubstitutionType.__CreateInstance(type.__Instance);
+                        return VisitTemplateParameterSubstitution(_type);
+                    }
                 case TypeKind.InjectedClassName:
-                {
-                    var _type = InjectedClassNameType.__CreateInstance(type.__Instance);
-                    return VisitInjectedClassName(_type);
-                }
+                    {
+                        var _type = InjectedClassNameType.__CreateInstance(type.__Instance);
+                        return VisitInjectedClassName(_type);
+                    }
                 case TypeKind.DependentName:
-                {
-                    var _type = DependentNameType.__CreateInstance(type.__Instance);
-                    return VisitDependentName(_type);
-                }
+                    {
+                        var _type = DependentNameType.__CreateInstance(type.__Instance);
+                        return VisitDependentName(_type);
+                    }
                 case TypeKind.Builtin:
-                {
-                    var _type = BuiltinType.__CreateInstance(type.__Instance);
-                    return VisitBuiltin(_type);
-                }
+                    {
+                        var _type = BuiltinType.__CreateInstance(type.__Instance);
+                        return VisitBuiltin(_type);
+                    }
                 case TypeKind.PackExpansion:
-                {
-                    var _type = PackExpansionType.__CreateInstance(type.__Instance);
-                    return VisitPackExpansion(_type);
-                }
+                    {
+                        var _type = PackExpansionType.__CreateInstance(type.__Instance);
+                        return VisitPackExpansion(_type);
+                    }
                 case TypeKind.UnaryTransform:
-                {
-                    var _type = UnaryTransformType.__CreateInstance(type.__Instance);
-                    return VisitUnaryTransform(_type);
-                }
+                    {
+                        var _type = UnaryTransformType.__CreateInstance(type.__Instance);
+                        return VisitUnaryTransform(_type);
+                    }
                 case TypeKind.UnresolvedUsing:
-                {
-                    var _type = UnresolvedUsingType.__CreateInstance(type.__Instance);
-                    return VisitUnresolvedUsing(_type);
-                }
+                    {
+                        var _type = UnresolvedUsingType.__CreateInstance(type.__Instance);
+                        return VisitUnresolvedUsing(_type);
+                    }
                 case TypeKind.Vector:
-                {
-                    var _type = VectorType.__CreateInstance(type.__Instance);
-                    return VisitVector(_type);
-                }
+                    {
+                        var _type = VectorType.__CreateInstance(type.__Instance);
+                        return VisitVector(_type);
+                    }
             }
 
             throw new ArgumentOutOfRangeException();
@@ -421,14 +421,14 @@ namespace CppSharp
             for (uint i = 0; i < Context.TranslationUnitsCount; ++i)
             {
                 var unit = Context.GetTranslationUnits(i);
-                var _unit = (AST.TranslationUnit) declConverter.Visit(unit);
+                var _unit = (AST.TranslationUnit)declConverter.Visit(unit);
                 _ctx.TranslationUnits.Add(_unit);
             }
 
             for (uint i = 0; i < Context.TranslationUnitsCount; i++)
             {
                 var unit = Context.GetTranslationUnits(i);
-                var _unit = (AST.TranslationUnit) declConverter.Visit(unit);
+                var _unit = (AST.TranslationUnit)declConverter.Visit(unit);
                 declConverter.VisitDeclContext(unit, _unit);
             }
 
@@ -604,7 +604,7 @@ namespace CppSharp
         {
             var _type = new AST.TypedefType();
             VisitType(type, _type);
-            _type.Declaration = (AST.TypedefNameDecl) declConverter.Visit(type.Declaration);
+            _type.Declaration = (AST.TypedefNameDecl)declConverter.Visit(type.Declaration);
             return _type;
         }
 
@@ -705,7 +705,7 @@ namespace CppSharp
         {
             var _type = new AST.TemplateParameterType();
             if (type.Parameter != null)
-                _type.Parameter = (AST.TypeTemplateParameter) declConverter.Visit(type.Parameter);
+                _type.Parameter = (AST.TypeTemplateParameter)declConverter.Visit(type.Parameter);
             _type.Depth = type.Depth;
             _type.Index = type.Index;
             _type.IsParameterPack = type.IsParameterPack;
@@ -717,7 +717,7 @@ namespace CppSharp
         {
             var _type = new AST.TemplateParameterSubstitutionType();
             _type.Replacement = VisitQualified(type.Replacement);
-            _type.ReplacedParameter = (AST.TemplateParameterType) Visit(type.ReplacedParameter);
+            _type.ReplacedParameter = (AST.TemplateParameterType)Visit(type.ReplacedParameter);
             VisitType(type, _type);
             return _type;
         }
@@ -976,7 +976,7 @@ namespace CppSharp
 
         bool CheckForDuplicates(Declaration decl)
         {
-            return decl.OriginalPtr.ToPointer() != (void*) (0x1);
+            return decl.OriginalPtr.ToPointer() != (void*)(0x1);
         }
 
         void VisitDeclaration(Declaration decl, AST.Declaration _decl)
@@ -1105,14 +1105,14 @@ namespace CppSharp
             for (uint i = 0; i < ctx.NamespacesCount; ++i)
             {
                 var decl = ctx.GetNamespaces(i);
-                var _decl = (AST.Namespace) Visit(decl);
+                var _decl = (AST.Namespace)Visit(decl);
                 VisitDeclContext(decl, _decl);
             }
 
             for (uint i = 0; i < ctx.ClassesCount; ++i)
             {
                 var decl = ctx.GetClasses(i);
-                var _decl = (AST.Class) Visit(decl);
+                var _decl = (AST.Class)Visit(decl);
                 if (!_decl.IsIncomplete || _decl.IsOpaque)
                     VisitClass(decl, _decl);
             }
@@ -1161,7 +1161,7 @@ namespace CppSharp
             VisitDeclaration(decl, _typeAlias);
             _typeAlias.QualifiedType = typeConverter.VisitQualified(decl.QualifiedType);
             if (decl.DescribedAliasTemplate != null)
-                _typeAlias.DescribedAliasTemplate = (AST.TypeAliasTemplate) Visit(decl.DescribedAliasTemplate);
+                _typeAlias.DescribedAliasTemplate = (AST.TypeAliasTemplate)Visit(decl.DescribedAliasTemplate);
 
             return _typeAlias;
         }
@@ -1267,7 +1267,7 @@ namespace CppSharp
             _function.Body = function.Body;
             _function.CallingConvention = VisitCallingConvention(function.CallingConvention);
             if (function.InstantiatedFrom != null)
-                _function.InstantiatedFrom = (AST.Function) Visit(function.InstantiatedFrom);
+                _function.InstantiatedFrom = (AST.Function)Visit(function.InstantiatedFrom);
 
             for (uint i = 0; i < function.ParametersCount; ++i)
             {
@@ -1331,7 +1331,7 @@ namespace CppSharp
             for (uint i = 0; i < decl.OverriddenMethodsCount; i++)
             {
                 var @override = decl.GetOverriddenMethods(i);
-                _method.OverriddenMethods.Add((AST.Method) Visit(@override));
+                _method.OverriddenMethods.Add((AST.Method)Visit(@override));
             }
 
             return _method;
@@ -1517,7 +1517,7 @@ namespace CppSharp
         private AST.Enumeration.EnumModifiers VisitEnumModifiers(
             Enumeration.EnumModifiers modifiers)
         {
-            return (AST.Enumeration.EnumModifiers) modifiers;
+            return (AST.Enumeration.EnumModifiers)modifiers;
         }
 
         public override AST.Declaration VisitEnumerationItem(Enumeration.Item decl)
@@ -1650,12 +1650,12 @@ namespace CppSharp
         {
             switch (argAbi)
             {
-            case RecordArgABI.Default:
-                return AST.RecordArgABI.Default;
-            case RecordArgABI.DirectInMemory:
-                return AST.RecordArgABI.DirectInMemory;
-            case RecordArgABI.Indirect:
-                return AST.RecordArgABI.Indirect;
+                case RecordArgABI.Default:
+                    return AST.RecordArgABI.Default;
+                case RecordArgABI.DirectInMemory:
+                    return AST.RecordArgABI.DirectInMemory;
+                case RecordArgABI.Indirect:
+                    return AST.RecordArgABI.Indirect;
             }
 
             throw new NotImplementedException();
@@ -1698,7 +1698,7 @@ namespace CppSharp
                 var @base = layout.GetBases(i);
                 var _base = new AST.LayoutBase();
                 _base.Offset = @base.Offset;
-                _base.Class = (AST.Class) Visit(@base.Class);
+                _base.Class = (AST.Class)Visit(@base.Class);
                 _layout.Bases.Add(_base);
             }
 
@@ -1821,7 +1821,7 @@ namespace CppSharp
             for (uint i = 0; i < decl.SpecializationsCount; ++i)
             {
                 var spec = decl.GetSpecializations(i);
-                var _spec = (AST.ClassTemplateSpecialization) Visit(spec);
+                var _spec = (AST.ClassTemplateSpecialization)Visit(spec);
                 _decl.Specializations.Add(_spec);
             }
             return _decl;
@@ -1841,7 +1841,7 @@ namespace CppSharp
             VisitDeclaration(decl, _decl);
             VisitClass(decl, _decl);
             _decl.SpecializationKind = VisitSpecializationKind(decl.SpecializationKind);
-            _decl.TemplatedDecl = (AST.ClassTemplate) Visit(decl.TemplatedDecl);
+            _decl.TemplatedDecl = (AST.ClassTemplate)Visit(decl.TemplatedDecl);
             for (uint i = 0; i < decl.ArgumentsCount; ++i)
             {
                 var arg = decl.GetArguments(i);
@@ -1935,8 +1935,8 @@ namespace CppSharp
 
             var _spec = new AST.FunctionTemplateSpecialization();
             FunctionTemplateSpecializations.Add(spec.__Instance, _spec);
-            _spec.Template = (AST.FunctionTemplate) Visit(spec.Template);
-            _spec.SpecializedFunction = (AST.Function) Visit(spec.SpecializedFunction);
+            _spec.Template = (AST.FunctionTemplate)Visit(spec.Template);
+            _spec.SpecializedFunction = (AST.Function)Visit(spec.SpecializedFunction);
             _spec.SpecializationKind = VisitSpecializationKind(spec.SpecializationKind);
             for (uint i = 0; i < spec.ArgumentsCount; ++i)
             {
@@ -1954,7 +1954,7 @@ namespace CppSharp
             for (uint i = 0; i < decl.SpecializationsCount; ++i)
             {
                 var spec = decl.GetSpecializations(i);
-                var _spec = (AST.VarTemplateSpecialization) Visit(spec);
+                var _spec = (AST.VarTemplateSpecialization)Visit(spec);
                 _decl.Specializations.Add(_spec);
             }
             return _decl;
@@ -1973,7 +1973,7 @@ namespace CppSharp
         {
             VisitVariable(decl, _decl);
             _decl.SpecializationKind = VisitSpecializationKind(decl.SpecializationKind);
-            _decl.TemplatedDecl = (AST.VarTemplate) Visit(decl.TemplatedDecl);
+            _decl.TemplatedDecl = (AST.VarTemplate)Visit(decl.TemplatedDecl);
             for (uint i = 0; i < decl.ArgumentsCount; ++i)
             {
                 var arg = decl.GetArguments(i);
@@ -2108,7 +2108,7 @@ namespace CppSharp
         {
             var fullComment = new AST.FullComment();
             for (uint i = 0; i < comment.BlocksCount; i++)
-                fullComment.Blocks.Add((AST.BlockContentComment) Visit(comment.GetBlocks(i)));
+                fullComment.Blocks.Add((AST.BlockContentComment)Visit(comment.GetBlocks(i)));
             return fullComment;
         }
 
@@ -2152,7 +2152,7 @@ namespace CppSharp
         {
             var verbatimBlockComment = new AST.VerbatimBlockComment();
             for (uint i = 0; i < comment.LinesCount; i++)
-                verbatimBlockComment.Lines.Add((AST.VerbatimBlockLineComment) Visit(comment.GetLines(i)));
+                verbatimBlockComment.Lines.Add((AST.VerbatimBlockLineComment)Visit(comment.GetLines(i)));
             VisitBlockCommandComment(verbatimBlockComment, comment);
             return verbatimBlockComment;
         }
@@ -2168,7 +2168,7 @@ namespace CppSharp
         {
             var paragraphComment = new AST.ParagraphComment();
             for (uint i = 0; i < comment.ContentCount; i++)
-                paragraphComment.Content.Add((AST.InlineContentComment) Visit(comment.GetContent(i)));
+                paragraphComment.Content.Add((AST.InlineContentComment)Visit(comment.GetContent(i)));
             paragraphComment.IsWhitespace = comment.IsWhitespace;
             return paragraphComment;
         }
@@ -2249,7 +2249,7 @@ namespace CppSharp
         {
             blockCommandComment.CommandId = comment.CommandId;
             if (comment.ParagraphComment != null)
-                blockCommandComment.ParagraphComment = (AST.ParagraphComment) Visit(comment.ParagraphComment);
+                blockCommandComment.ParagraphComment = (AST.ParagraphComment)Visit(comment.ParagraphComment);
             for (uint i = 0; i < comment.ArgumentsCount; i++)
             {
                 var argument = new AST.BlockCommandComment.Argument { Text = comment.GetArguments(i).Text };

src/Parser/Parser.cs

@@ -13,19 +13,19 @@ namespace CppSharp
         /// <summary>
         /// Fired when source files are parsed.
         /// </summary>
-        public static Action<IEnumerable<string>, ParserResult> SourcesParsed = delegate {};
+        public static Action<IEnumerable<string>, ParserResult> SourcesParsed = delegate { };
 
         /// <summary>
         /// Fired when library files are parsed.
         /// </summary>
-        public static Action<string, ParserResult> LibraryParsed = delegate {};
+        public static Action<string, ParserResult> LibraryParsed = delegate { };
 
         /// <summary>
         /// Parses a C++ source file as a translation unit.
         /// </summary>
         public static ParserResult ParseSourceFile(string file, ParserOptions options)
         {
-            return ParseSourceFiles(new [] { file }, options);
+            return ParseSourceFiles(new[] { file }, options);
         }
 
         /// <summary>
@@ -70,7 +70,7 @@ namespace CppSharp
             var newLibrary = new AST.NativeLibrary
             {
                 FileName = library.FileName,
-                ArchType = (ArchType) library.ArchType
+                ArchType = (ArchType)library.ArchType
             };
 
             for (uint i = 0; i < library.SymbolsCount; ++i)

src/Parser/ParserOptions.cs

@@ -11,391 +11,391 @@ using LanguageVersion = CppSharp.Parser.LanguageVersion;
 
 namespace CppSharp.Parser
 {
-	public enum LanguageVersion
-	{
-		/// <summary>
-		/// C programming language (year 1999).
-		/// </summary>
-		C99,
-		/// <summary>
-		/// C programming language (year 1999, GNU variant).
-		/// </summary>
-		C99_GNU,
-		/// <summary>
-		/// C++ programming language (year 1998).
-		/// </summary>
-		CPP98,
-		/// <summary>
-		/// C++ programming language (year 1998, GNU variant).
-		/// </summary>
-		CPP98_GNU,
-		/// <summary>
-		/// C++ programming language (year 2011).
-		/// </summary>
-		CPP11,
-		/// <summary>
-		/// C++ programming language (year 2011, GNU variant).
-		/// </summary>
-		CPP11_GNU,
-		/// <summary>
-		/// C++ programming language (year 2014).
-		/// </summary>
-		CPP14,
-		/// <summary>
-		/// C++ programming language (year 2014, GNU variant).
-		/// </summary>
-		CPP14_GNU,
-		/// <summary>
-		/// C++ programming language (year 2017).
-		/// </summary>
-		CPP17,
-		/// <summary>
-		/// C++ programming language (year 2017, GNU variant).
-		/// </summary>
-		CPP17_GNU,
-		/// <summary>
-		/// C++ programming language (year 2020).
-		/// </summary>
-		CPP20,
-		/// <summary>
-		/// C++ programming language (year 2020, GNU variant).
-		/// </summary>
-		CPP20_GNU,
-		/// <summary>
-		/// C++ programming language (year 2023).
-		/// </summary>
-		CPP23,
-		/// <summary>
-		/// C++ programming language (year 2023, GNU variant).
-		/// </summary>
-		CPP23_GNU,
-	}
-
-	public class ParserOptions : CppParserOptions
-	{
-		public ParserOptions()
-		{
-			MicrosoftMode = !Platform.IsUnixPlatform;
-			AddCompilationOptions("-flto");
-			AddCompilationOptions("-O3");
-			AddCompilationOptions("-fno-use-cxa-atexit");
-		}
-
-		public bool IsItaniumLikeAbi => !IsMicrosoftAbi;
-		public bool IsMicrosoftAbi => TargetTriple.Contains("win32") ||
-				TargetTriple.Contains("windows") || TargetTriple.Contains("msvc");
-
-		public bool EnableRTTI { get; set; }
-		public LanguageVersion? LanguageVersion { get; set; }
-
-		public void BuildForSourceFile(
-				IEnumerable<CppSharp.AST.Module> modules, string file = null)
-		{
-			// This eventually gets passed to Clang's MSCompatibilityVersion, which
-			// is in turn used to derive the value of the built-in define _MSC_VER.
-			// It used to receive a 4-digit based identifier but now expects a full
-			// version MSVC digit, so check if we still have the old version and
-			// convert to the right format.
-
-			if (ToolSetToUse.ToString(CultureInfo.InvariantCulture).Length == 4)
-				ToolSetToUse *= 100000;
-
-			foreach (var module in modules.Where(
-					m => file == null || m.Headers.Contains(file)))
-			{
-				foreach (var include in module.IncludeDirs)
-					AddIncludeDirs(include);
-
-				foreach (var define in module.Defines)
-					AddDefines(define);
-
-				foreach (var undefine in module.Undefines)
-					AddUndefines(undefine);
-			}
-		}
-
-		public void SetupMSVC()
-		{
-			var vsVersion = VisualStudioVersion.Latest;
-
-			// Silence "warning CS0162: Unreachable code detected"
+    public enum LanguageVersion
+    {
+        /// <summary>
+        /// C programming language (year 1999).
+        /// </summary>
+        C99,
+        /// <summary>
+        /// C programming language (year 1999, GNU variant).
+        /// </summary>
+        C99_GNU,
+        /// <summary>
+        /// C++ programming language (year 1998).
+        /// </summary>
+        CPP98,
+        /// <summary>
+        /// C++ programming language (year 1998, GNU variant).
+        /// </summary>
+        CPP98_GNU,
+        /// <summary>
+        /// C++ programming language (year 2011).
+        /// </summary>
+        CPP11,
+        /// <summary>
+        /// C++ programming language (year 2011, GNU variant).
+        /// </summary>
+        CPP11_GNU,
+        /// <summary>
+        /// C++ programming language (year 2014).
+        /// </summary>
+        CPP14,
+        /// <summary>
+        /// C++ programming language (year 2014, GNU variant).
+        /// </summary>
+        CPP14_GNU,
+        /// <summary>
+        /// C++ programming language (year 2017).
+        /// </summary>
+        CPP17,
+        /// <summary>
+        /// C++ programming language (year 2017, GNU variant).
+        /// </summary>
+        CPP17_GNU,
+        /// <summary>
+        /// C++ programming language (year 2020).
+        /// </summary>
+        CPP20,
+        /// <summary>
+        /// C++ programming language (year 2020, GNU variant).
+        /// </summary>
+        CPP20_GNU,
+        /// <summary>
+        /// C++ programming language (year 2023).
+        /// </summary>
+        CPP23,
+        /// <summary>
+        /// C++ programming language (year 2023, GNU variant).
+        /// </summary>
+        CPP23_GNU,
+    }
+
+    public class ParserOptions : CppParserOptions
+    {
+        public ParserOptions()
+        {
+            MicrosoftMode = !Platform.IsUnixPlatform;
+            AddCompilationOptions("-flto");
+            AddCompilationOptions("-O3");
+            AddCompilationOptions("-fno-use-cxa-atexit");
+        }
+
+        public bool IsItaniumLikeAbi => !IsMicrosoftAbi;
+        public bool IsMicrosoftAbi => TargetTriple.Contains("win32") ||
+                TargetTriple.Contains("windows") || TargetTriple.Contains("msvc");
+
+        public bool EnableRTTI { get; set; }
+        public LanguageVersion? LanguageVersion { get; set; }
+
+        public void BuildForSourceFile(
+                IEnumerable<CppSharp.AST.Module> modules, string file = null)
+        {
+            // This eventually gets passed to Clang's MSCompatibilityVersion, which
+            // is in turn used to derive the value of the built-in define _MSC_VER.
+            // It used to receive a 4-digit based identifier but now expects a full
+            // version MSVC digit, so check if we still have the old version and
+            // convert to the right format.
+
+            if (ToolSetToUse.ToString(CultureInfo.InvariantCulture).Length == 4)
+                ToolSetToUse *= 100000;
+
+            foreach (var module in modules.Where(
+                    m => file == null || m.Headers.Contains(file)))
+            {
+                foreach (var include in module.IncludeDirs)
+                    AddIncludeDirs(include);
+
+                foreach (var define in module.Defines)
+                    AddDefines(define);
+
+                foreach (var undefine in module.Undefines)
+                    AddUndefines(undefine);
+            }
+        }
+
+        public void SetupMSVC()
+        {
+            var vsVersion = VisualStudioVersion.Latest;
+
+            // Silence "warning CS0162: Unreachable code detected"
 #pragma warning disable 162
 
-			switch (BuildConfig.Choice)
-			{
-				case "vs2012":
-					vsVersion = VisualStudioVersion.VS2012;
-					break;
-				case "vs2013":
-					vsVersion = VisualStudioVersion.VS2013;
-					break;
-				case "vs2015":
-					vsVersion = VisualStudioVersion.VS2015;
-					break;
-				case "vs2017":
-					vsVersion = VisualStudioVersion.VS2017;
-					break;
-				case "vs2019":
-					vsVersion = VisualStudioVersion.VS2019;
-					break;
+            switch (BuildConfig.Choice)
+            {
+                case "vs2012":
+                    vsVersion = VisualStudioVersion.VS2012;
+                    break;
+                case "vs2013":
+                    vsVersion = VisualStudioVersion.VS2013;
+                    break;
+                case "vs2015":
+                    vsVersion = VisualStudioVersion.VS2015;
+                    break;
+                case "vs2017":
+                    vsVersion = VisualStudioVersion.VS2017;
+                    break;
+                case "vs2019":
+                    vsVersion = VisualStudioVersion.VS2019;
+                    break;
 
 #pragma warning restore 162
 
-			}
+            }
 
-			SetupMSVC(vsVersion);
-		}
+            SetupMSVC(vsVersion);
+        }
 
-		/// <summary>
-		/// Sets up the parser options to work with the given Visual Studio toolchain.
-		/// </summary>
-		/// <param name="vsVersion">The version of Visual Studio to look for.</param>
-		public void SetupMSVC(VisualStudioVersion vsVersion)
-		{
-			MicrosoftMode = true;
-
-			var clVersion = MSVCToolchain.GetCLVersion(vsVersion);
-			ToolSetToUse = clVersion.Major * 10000000 + clVersion.Minor * 100000;
-
-			// do not remove the CppSharp prefix becase the Mono C# compiler breaks
-			if (!LanguageVersion.HasValue)
-				LanguageVersion = CppSharp.Parser.LanguageVersion.CPP14_GNU;
-
-			AddArguments("-fms-extensions");
-			AddArguments("-fms-compatibility");
-			AddArguments("-fdelayed-template-parsing");
-		}
-
-		/// <summary>
-		/// Set to true to opt for Xcode Clang builtin headers
-		/// </summary>
-		public bool UseXcodeBuiltins;
-
-		public void SetupXcode()
-		{
-			var cppIncPath = XcodeToolchain.GetXcodeCppIncludesFolder();
-			AddSystemIncludeDirs(cppIncPath);
-
-			var builtinsPath = XcodeToolchain.GetXcodeBuiltinIncludesFolder();
-			AddSystemIncludeDirs(UseXcodeBuiltins ? builtinsPath : BuiltinsDir);
-
-			var includePath = XcodeToolchain.GetXcodeIncludesFolder();
-			AddSystemIncludeDirs(includePath);
-
-			NoBuiltinIncludes = true;
-			NoStandardIncludes = true;
-
-			AddArguments("-fgnuc-version=4.2.1");
-			AddArguments("-stdlib=libc++");
-		}
-
-		private void GetUnixCompilerInfo(string headersPath, out string compiler,
-				out string longVersion, out string shortVersion)
-		{
-			if (!Platform.IsLinux)
-			{
-				compiler = "gcc";
-
-				// Search for the available GCC versions on the provided headers.
-				var versions = Directory.EnumerateDirectories(Path.Combine(headersPath,
-						"usr", "include", "c++"));
-
-				if (versions.Count() == 0)
-					throw new Exception("No valid GCC version found on system include paths");
-
-				string gccVersionPath = versions.First();
-				longVersion = shortVersion = gccVersionPath.Substring(
-						gccVersionPath.LastIndexOf(Path.DirectorySeparatorChar) + 1);
-
-				return;
-			}
-
-			var info = new ProcessStartInfo(Environment.GetEnvironmentVariable("CXX") ?? "gcc", "-v");
-			info.RedirectStandardError = true;
-			info.CreateNoWindow = true;
-			info.UseShellExecute = false;
-
-			var process = Process.Start(info);
-			if (process == null)
-				throw new SystemException("GCC compiler was not found.");
-
-			process.WaitForExit();
-
-			var output = process.StandardError.ReadToEnd();
-			var match = Regex.Match(output, "(gcc|clang) version (([0-9]+\\.[0-9]+)\\.[0-9]+)");
-			if (!match.Success)
-				throw new SystemException("GCC compiler was not found.");
-
-			compiler = match.Groups[1].ToString();
-			longVersion = match.Groups[2].ToString();
-			shortVersion = match.Groups[3].ToString();
-		}
-
-		public void SetupLinux(string headersPath = "")
-		{
-			MicrosoftMode = false;
-			NoBuiltinIncludes = true;
-			NoStandardIncludes = true;
-
-			string compiler, longVersion, shortVersion;
-			GetUnixCompilerInfo(headersPath, out compiler, out longVersion, out shortVersion);
-
-			AddSystemIncludeDirs(BuiltinsDir);
-			AddArguments($"-fgnuc-version={longVersion}");
-
-			string majorVersion = shortVersion.Split('.')[0];
-			string[] versions = { longVersion, shortVersion, majorVersion };
-			string[] triples = { "x86_64-linux-gnu", "x86_64-pc-linux-gnu" };
-			if (compiler == "gcc")
-			{
-				foreach (var version in versions)
-				{
-					AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}");
-					AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/backward");
-
-					foreach (var triple in triples)
-					{
-						AddSystemIncludeDirs($"{headersPath}/usr/include/{triple}/c++/{version}");
-						AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/{triple}");
-					}
-				}
-			}
-
-			foreach (var triple in triples)
-			{
-				foreach (var version in versions)
-				{
-					AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include");
-					AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include/c++");
-					AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include/c++/{triple}");
-				}
-
-				AddSystemIncludeDirs($"{headersPath}/usr/include/{triple}");
-			}
-
-			AddSystemIncludeDirs($"{headersPath}/usr/include");
-			AddSystemIncludeDirs($"{headersPath}/usr/include/linux");
-		}
-
-		public void Setup()
-		{
-			SetupArguments();
-
-			if (!NoBuiltinIncludes)
-				SetupIncludes();
-		}
-
-		private void SetupArguments()
-		{
-			// do not remove the CppSharp prefix becase the Mono C# compiler breaks
-			if (!LanguageVersion.HasValue)
-				LanguageVersion = CppSharp.Parser.LanguageVersion.CPP14_GNU;
-
-			// As of Clang revision 5e866e411caa we are required to pass "-fgnuc-version="
-			// to get the __GNUC__ symbol defined. macOS and Linux system headers require
-			// this define, so we need explicitly pass it to Clang.
-
-			// Note that this setup is more accurately done in the platform-specific
-			// setup methods, below is generic fallback in case that logic was disabled.
-			if (NoBuiltinIncludes)
-			{
-				switch (Platform.Host)
-				{
-					case TargetPlatform.MacOS:
-					case TargetPlatform.Linux:
-						AddArguments("-fgnuc-version=4.2.1");
-						break;
-				}
-			}
-
-			switch (LanguageVersion)
-			{
-				case CppSharp.Parser.LanguageVersion.C99:
-				case CppSharp.Parser.LanguageVersion.C99_GNU:
-					AddArguments("-xc");
-					break;
-				default:
-					AddArguments("-xc++");
-					break;
-			}
-
-			switch (LanguageVersion)
-			{
-				case CppSharp.Parser.LanguageVersion.C99:
-					AddArguments("-std=c99");
-					break;
-				case CppSharp.Parser.LanguageVersion.C99_GNU:
-					AddArguments("-std=gnu99");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP98:
-					AddArguments("-std=c++98");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP98_GNU:
-					AddArguments("-std=gnu++98");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP11:
-					AddArguments("-std=c++11");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP11_GNU:
-					AddArguments("-std=gnu++11");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP14:
-					AddArguments("-std=c++14");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP14_GNU:
-					AddArguments("-std=gnu++14");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP17:
-					AddArguments("-std=c++17");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP17_GNU:
-					AddArguments("-std=gnu++17");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP20:
-					AddArguments("-std=c++20");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP20_GNU:
-					AddArguments("-std=gnu++20");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP23:
-					AddArguments("-std=c++2b");
-					break;
-				case CppSharp.Parser.LanguageVersion.CPP23_GNU:
-					AddArguments("-std=gnu++2b");
-					break;
-			}
-
-			if (!EnableRTTI)
-				AddArguments("-fno-rtti");
-		}
-
-		public string BuiltinsDir
-		{
-			get
-			{
-				var assemblyDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-				return Path.Combine(assemblyDir, "lib", "clang", ClangVersion, "include");
-			}
-		}
-
-		private void SetupIncludes()
-		{
-			// Check that the builtin includes folder exists.
-			if (!Directory.Exists(BuiltinsDir))
-				throw new Exception($"Clang resource folder 'lib/clang/{ClangVersion}/include' was not found.");
-
-			switch (Platform.Host)
-			{
-				case TargetPlatform.Windows:
-					SetupMSVC();
-					break;
-				case TargetPlatform.MacOS:
-					SetupXcode();
-					break;
-				case TargetPlatform.Linux:
-					SetupLinux();
-					break;
-			}
-		}
-	}
+        /// <summary>
+        /// Sets up the parser options to work with the given Visual Studio toolchain.
+        /// </summary>
+        /// <param name="vsVersion">The version of Visual Studio to look for.</param>
+        public void SetupMSVC(VisualStudioVersion vsVersion)
+        {
+            MicrosoftMode = true;
+
+            var clVersion = MSVCToolchain.GetCLVersion(vsVersion);
+            ToolSetToUse = clVersion.Major * 10000000 + clVersion.Minor * 100000;
+
+            // do not remove the CppSharp prefix becase the Mono C# compiler breaks
+            if (!LanguageVersion.HasValue)
+                LanguageVersion = CppSharp.Parser.LanguageVersion.CPP14_GNU;
+
+            AddArguments("-fms-extensions");
+            AddArguments("-fms-compatibility");
+            AddArguments("-fdelayed-template-parsing");
+        }
+
+        /// <summary>
+        /// Set to true to opt for Xcode Clang builtin headers
+        /// </summary>
+        public bool UseXcodeBuiltins;
+
+        public void SetupXcode()
+        {
+            var cppIncPath = XcodeToolchain.GetXcodeCppIncludesFolder();
+            AddSystemIncludeDirs(cppIncPath);
+
+            var builtinsPath = XcodeToolchain.GetXcodeBuiltinIncludesFolder();
+            AddSystemIncludeDirs(UseXcodeBuiltins ? builtinsPath : BuiltinsDir);
+
+            var includePath = XcodeToolchain.GetXcodeIncludesFolder();
+            AddSystemIncludeDirs(includePath);
+
+            NoBuiltinIncludes = true;
+            NoStandardIncludes = true;
+
+            AddArguments("-fgnuc-version=4.2.1");
+            AddArguments("-stdlib=libc++");
+        }
+
+        private void GetUnixCompilerInfo(string headersPath, out string compiler,
+                out string longVersion, out string shortVersion)
+        {
+            if (!Platform.IsLinux)
+            {
+                compiler = "gcc";
+
+                // Search for the available GCC versions on the provided headers.
+                var versions = Directory.EnumerateDirectories(Path.Combine(headersPath,
+                        "usr", "include", "c++"));
+
+                if (versions.Count() == 0)
+                    throw new Exception("No valid GCC version found on system include paths");
+
+                string gccVersionPath = versions.First();
+                longVersion = shortVersion = gccVersionPath.Substring(
+                        gccVersionPath.LastIndexOf(Path.DirectorySeparatorChar) + 1);
+
+                return;
+            }
+
+            var info = new ProcessStartInfo(Environment.GetEnvironmentVariable("CXX") ?? "gcc", "-v");
+            info.RedirectStandardError = true;
+            info.CreateNoWindow = true;
+            info.UseShellExecute = false;
+
+            var process = Process.Start(info);
+            if (process == null)
+                throw new SystemException("GCC compiler was not found.");
+
+            process.WaitForExit();
+
+            var output = process.StandardError.ReadToEnd();
+            var match = Regex.Match(output, "(gcc|clang) version (([0-9]+\\.[0-9]+)\\.[0-9]+)");
+            if (!match.Success)
+                throw new SystemException("GCC compiler was not found.");
+
+            compiler = match.Groups[1].ToString();
+            longVersion = match.Groups[2].ToString();
+            shortVersion = match.Groups[3].ToString();
+        }
+
+        public void SetupLinux(string headersPath = "")
+        {
+            MicrosoftMode = false;
+            NoBuiltinIncludes = true;
+            NoStandardIncludes = true;
+
+            string compiler, longVersion, shortVersion;
+            GetUnixCompilerInfo(headersPath, out compiler, out longVersion, out shortVersion);
+
+            AddSystemIncludeDirs(BuiltinsDir);
+            AddArguments($"-fgnuc-version={longVersion}");
+
+            string majorVersion = shortVersion.Split('.')[0];
+            string[] versions = { longVersion, shortVersion, majorVersion };
+            string[] triples = { "x86_64-linux-gnu", "x86_64-pc-linux-gnu" };
+            if (compiler == "gcc")
+            {
+                foreach (var version in versions)
+                {
+                    AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}");
+                    AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/backward");
+
+                    foreach (var triple in triples)
+                    {
+                        AddSystemIncludeDirs($"{headersPath}/usr/include/{triple}/c++/{version}");
+                        AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/{triple}");
+                    }
+                }
+            }
+
+            foreach (var triple in triples)
+            {
+                foreach (var version in versions)
+                {
+                    AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include");
+                    AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include/c++");
+                    AddSystemIncludeDirs($"{headersPath}/usr/lib/{compiler}/{triple}/{version}/include/c++/{triple}");
+                }
+
+                AddSystemIncludeDirs($"{headersPath}/usr/include/{triple}");
+            }
+
+            AddSystemIncludeDirs($"{headersPath}/usr/include");
+            AddSystemIncludeDirs($"{headersPath}/usr/include/linux");
+        }
+
+        public void Setup()
+        {
+            SetupArguments();
+
+            if (!NoBuiltinIncludes)
+                SetupIncludes();
+        }
+
+        private void SetupArguments()
+        {
+            // do not remove the CppSharp prefix becase the Mono C# compiler breaks
+            if (!LanguageVersion.HasValue)
+                LanguageVersion = CppSharp.Parser.LanguageVersion.CPP14_GNU;
+
+            // As of Clang revision 5e866e411caa we are required to pass "-fgnuc-version="
+            // to get the __GNUC__ symbol defined. macOS and Linux system headers require
+            // this define, so we need explicitly pass it to Clang.
+
+            // Note that this setup is more accurately done in the platform-specific
+            // setup methods, below is generic fallback in case that logic was disabled.
+            if (NoBuiltinIncludes)
+            {
+                switch (Platform.Host)
+                {
+                    case TargetPlatform.MacOS:
+                    case TargetPlatform.Linux:
+                        AddArguments("-fgnuc-version=4.2.1");
+                        break;
+                }
+            }
+
+            switch (LanguageVersion)
+            {
+                case CppSharp.Parser.LanguageVersion.C99:
+                case CppSharp.Parser.LanguageVersion.C99_GNU:
+                    AddArguments("-xc");
+                    break;
+                default:
+                    AddArguments("-xc++");
+                    break;
+            }
+
+            switch (LanguageVersion)
+            {
+                case CppSharp.Parser.LanguageVersion.C99:
+                    AddArguments("-std=c99");
+                    break;
+                case CppSharp.Parser.LanguageVersion.C99_GNU:
+                    AddArguments("-std=gnu99");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP98:
+                    AddArguments("-std=c++98");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP98_GNU:
+                    AddArguments("-std=gnu++98");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP11:
+                    AddArguments("-std=c++11");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP11_GNU:
+                    AddArguments("-std=gnu++11");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP14:
+                    AddArguments("-std=c++14");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP14_GNU:
+                    AddArguments("-std=gnu++14");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP17:
+                    AddArguments("-std=c++17");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP17_GNU:
+                    AddArguments("-std=gnu++17");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP20:
+                    AddArguments("-std=c++20");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP20_GNU:
+                    AddArguments("-std=gnu++20");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP23:
+                    AddArguments("-std=c++2b");
+                    break;
+                case CppSharp.Parser.LanguageVersion.CPP23_GNU:
+                    AddArguments("-std=gnu++2b");
+                    break;
+            }
+
+            if (!EnableRTTI)
+                AddArguments("-fno-rtti");
+        }
+
+        public string BuiltinsDir
+        {
+            get
+            {
+                var assemblyDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                return Path.Combine(assemblyDir, "lib", "clang", ClangVersion, "include");
+            }
+        }
+
+        private void SetupIncludes()
+        {
+            // Check that the builtin includes folder exists.
+            if (!Directory.Exists(BuiltinsDir))
+                throw new Exception($"Clang resource folder 'lib/clang/{ClangVersion}/include' was not found.");
+
+            switch (Platform.Host)
+            {
+                case TargetPlatform.Windows:
+                    SetupMSVC();
+                    break;
+                case TargetPlatform.MacOS:
+                    SetupXcode();
+                    break;
+                case TargetPlatform.Linux:
+                    SetupLinux();
+                    break;
+            }
+        }
+    }
 }

src/Runtime/SymbolResolver.cs

@@ -33,15 +33,15 @@ namespace CppSharp
         static readonly Func<string, IntPtr> loadImage;
         static readonly Func<IntPtr, string, IntPtr> resolveSymbol;
 
-        static SymbolResolver ()
+        static SymbolResolver()
         {
             switch (Environment.OSVersion.Platform)
             {
-            case PlatformID.Unix:
-            case PlatformID.MacOSX:
-                loadImage = dlopen;
-                resolveSymbol = dlsym;
-                formats = new[] {
+                case PlatformID.Unix:
+                case PlatformID.MacOSX:
+                    loadImage = dlopen;
+                    resolveSymbol = dlsym;
+                    formats = new[] {
                     "{0}",
                     "{0}.so",
                     "{0}.dylib",
@@ -49,16 +49,16 @@ namespace CppSharp
                     "lib{0}.dylib",
                     "{0}.bundle"
                 };
-                break;
-            default:
-                loadImage = LoadLibrary;
-                resolveSymbol = GetProcAddress;
-                formats = new[] { "{0}", "{0}.dll" };
-                break;
+                    break;
+                default:
+                    loadImage = LoadLibrary;
+                    resolveSymbol = GetProcAddress;
+                    formats = new[] { "{0}", "{0}.dll" };
+                    break;
             }
         }
 
-        public static IntPtr LoadImage (ref string name)
+        public static IntPtr LoadImage(ref string name)
         {
             var pathValues = Environment.GetEnvironmentVariable("PATH");
             var paths = new List<string>(pathValues == null ? new string[0] :
@@ -83,7 +83,7 @@ namespace CppSharp
                 if (!File.Exists(attempted))
                     continue;
 
-                var ptr = loadImage (attempted);
+                var ptr = loadImage(attempted);
 
                 if (ptr == IntPtr.Zero)
                     continue;
@@ -95,16 +95,16 @@ namespace CppSharp
             return IntPtr.Zero;
         }
 
-        public static IntPtr ResolveSymbol (string name, string symbol)
+        public static IntPtr ResolveSymbol(string name, string symbol)
         {
             var image = LoadImage(ref name);
             return ResolveSymbol(image, symbol);
         }
 
-        public static IntPtr ResolveSymbol (IntPtr image, string symbol)
+        public static IntPtr ResolveSymbol(IntPtr image, string symbol)
         {
             if (image != IntPtr.Zero)
-                return resolveSymbol (image, symbol);
+                return resolveSymbol(image, symbol);
 
             return IntPtr.Zero;
         }
@@ -113,26 +113,26 @@ namespace CppSharp
 
         private const int RTLD_LAZY = 0x1;
 
-        static IntPtr dlopen (string path)
+        static IntPtr dlopen(string path)
         {
-            return dlopen (path, RTLD_LAZY);
+            return dlopen(path, RTLD_LAZY);
         }
 
-        [DllImport ("dl", CharSet=CharSet.Ansi)]
-        static extern IntPtr dlopen (string path, int flags);
+        [DllImport("dl", CharSet = CharSet.Ansi)]
+        static extern IntPtr dlopen(string path, int flags);
 
-        [DllImport ("dl", CharSet=CharSet.Ansi)]
-        static extern IntPtr dlsym (IntPtr handle, string symbol);
+        [DllImport("dl", CharSet = CharSet.Ansi)]
+        static extern IntPtr dlsym(IntPtr handle, string symbol);
 
         #endregion
 
         #region Win32
 
-        [DllImport("kernel32", SetLastError=true)]
-        static extern IntPtr LoadLibrary (string lpFileName);
+        [DllImport("kernel32", SetLastError = true)]
+        static extern IntPtr LoadLibrary(string lpFileName);
 
-        [DllImport("kernel32", CharSet=CharSet.Ansi, ExactSpelling=true, SetLastError=true)]
-        static extern IntPtr GetProcAddress (IntPtr hModule, string procName);
+        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
+        static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
 
         #endregion
 

src/Runtime/UTF8Marshaller.cs

@@ -25,7 +25,7 @@ namespace CppSharp.Runtime
                     "UTF8Marshaler must be used on a string.");
 
             // not null terminated
-            byte[] strbuf = Encoding.UTF8.GetBytes((string) managedObj);
+            byte[] strbuf = Encoding.UTF8.GetBytes((string)managedObj);
             IntPtr buffer = Marshal.AllocHGlobal(strbuf.Length + 1);
             Marshal.Copy(strbuf, 0, buffer, strbuf.Length);
 
@@ -40,10 +40,10 @@ namespace CppSharp.Runtime
                 return null;
 
             int byteCount = 0;
-            var str8 = (byte*) str;
+            var str8 = (byte*)str;
             while (*(str8++) != 0) byteCount += sizeof(byte);
 
-            return Encoding.UTF8.GetString((byte*) str, byteCount);
+            return Encoding.UTF8.GetString((byte*)str, byteCount);
         }
 
         public static ICustomMarshaler GetInstance(string pstrCookie)

tests/CSharp/CSharp.Gen.cs

@@ -61,10 +61,10 @@ namespace CppSharp.Tests
             ctx.GenerateEnumFromMacros("TestBoolValuedEnums", "TEST_BOOL_VALUED_ENUMS_.*");
 
             enumTest.Namespace = new Namespace()
-                {
-                    Name = "MacroTest",
-                    Namespace = ctx.TranslationUnits.First(u => u.IsValid && !u.IsSystemHeader)
-                };
+            {
+                Name = "MacroTest",
+                Namespace = ctx.TranslationUnits.First(u => u.IsValid && !u.IsSystemHeader)
+            };
 
             // Generate a finalizer for just the one test case.
             driver.Options.GenerateFinalizers = true;
@@ -167,10 +167,10 @@ namespace CppSharp.Tests
             var templateSpecializationType = type as TemplateSpecializationType;
             if (templateSpecializationType != null)
                 return templateSpecializationType.Arguments[0].Type.Type;
-            var declaration = ((TagType) type).Declaration;
+            var declaration = ((TagType)type).Declaration;
             if (declaration.IsDependent)
-                return new TagType(((Class) declaration).TemplateParameters[0]);
-            classTemplateSpecialization = (ClassTemplateSpecialization) declaration;
+                return new TagType(((Class)declaration).TemplateParameters[0]);
+            classTemplateSpecialization = (ClassTemplateSpecialization)declaration;
             return classTemplateSpecialization.Arguments[0].Type.Type;
         }
     }
@@ -208,7 +208,7 @@ namespace CppSharp.Tests
         {
             get
             {
-                var type = (TemplateSpecializationType) Type;
+                var type = (TemplateSpecializationType)Type;
                 var pointeeType = type.Arguments[0].Type;
                 var checker = new TypeIgnoreChecker(TypeMapDatabase);
                 pointeeType.Visit(checker);
@@ -220,7 +220,7 @@ namespace CppSharp.Tests
         {
             if (ctx.Kind == TypePrinterContextKind.Native)
             {
-                var type = (TemplateSpecializationType) ctx.Type.Desugar();
+                var type = (TemplateSpecializationType)ctx.Type.Desugar();
                 var specialization = type.GetClassTemplateSpecialization();
                 var typePrinter = new CSharpTypePrinter(null);
                 typePrinter.PushContext(TypePrinterContextKind.Native);
@@ -239,7 +239,7 @@ namespace CppSharp.Tests
         public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
         {
             // pointless, put just so that the generated code compiles
-            var type = (TemplateSpecializationType) ctx.Parameter.Type.Desugar();
+            var type = (TemplateSpecializationType)ctx.Parameter.Type.Desugar();
             var specialization = type.GetClassTemplateSpecialization();
             var typePrinter = new CSharpTypePrinter(null);
             typePrinter.PushContext(TypePrinterContextKind.Native);

tests/CSharp/CSharp.Tests.cs

@@ -149,7 +149,7 @@ public unsafe class CSharpTests
             foo[0] = 250;
             Assert.That(foo[0], Is.EqualTo(250));
 
-            Assert.That(foo[(uint) 0], Is.EqualTo(15));
+            Assert.That(foo[(uint)0], Is.EqualTo(15));
         }
 
         using (var bar = new Bar())
@@ -168,7 +168,7 @@ public unsafe class CSharpTests
     {
         using (var f = new Foo())
         {
-            foreach(var pod in new[] { f.SmallPodCdecl, f.SmallPodStdcall, f.SmallPodThiscall })
+            foreach (var pod in new[] { f.SmallPodCdecl, f.SmallPodStdcall, f.SmallPodThiscall })
             {
                 Assert.That(pod.A, Is.EqualTo(10000));
                 Assert.That(pod.B, Is.EqualTo(40000));
@@ -189,7 +189,7 @@ public unsafe class CSharpTests
         using (var baz = new Baz())
         {
             Assert.That(baz.Method, Is.EqualTo(1));
-            var bar = (IBar) baz;
+            var bar = (IBar)baz;
             Assert.That(bar.Method, Is.EqualTo(2));
             Assert.That(baz[0], Is.EqualTo(50));
             using (Foo foo = new Foo { A = 1000 })
@@ -222,7 +222,7 @@ public unsafe class CSharpTests
         }
         using (var qux = new Qux())
         {
-            using (var p = new P((IQux) qux) { Value = 20 })
+            using (var p = new P((IQux)qux) { Value = 20 })
             {
                 Assert.That(p.Value, Is.EqualTo(30));
                 p.Prop = 50;
@@ -271,7 +271,7 @@ public unsafe class CSharpTests
             int i = 5;
             array[0] = new IntPtr(&i);
             bar.ArrayOfPrimitivePointers = array;
-            Assert.That(i, Is.EqualTo(*(int*) bar.ArrayOfPrimitivePointers[0]));
+            Assert.That(i, Is.EqualTo(*(int*)bar.ArrayOfPrimitivePointers[0]));
         }
     }
 
@@ -287,7 +287,7 @@ public unsafe class CSharpTests
     [Test]
     public void TestPropertiesConflictingWithMethod()
     {
-        using (var p = new P((IQux) new Qux()) { Test = true })
+        using (var p = new P((IQux)new Qux()) { Test = true })
         {
             Assert.That(p.Test, Is.True);
             p.GetTest();
@@ -463,10 +463,10 @@ public unsafe class CSharpTests
     {
         IntPtr native1;
         IntPtr native2;
-        var hasVirtualDtor1Map = (IDictionary<IntPtr, HasVirtualDtor1>) typeof(
+        var hasVirtualDtor1Map = (IDictionary<IntPtr, HasVirtualDtor1>)typeof(
             HasVirtualDtor1).GetField("NativeToManagedMap",
             BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
-        var hasVirtualDtor2Map = (IDictionary<IntPtr, HasVirtualDtor2>) typeof(
+        var hasVirtualDtor2Map = (IDictionary<IntPtr, HasVirtualDtor2>)typeof(
             HasVirtualDtor2).GetField("NativeToManagedMap",
             BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
         using (var testNativeToManagedMap = new TestNativeToManagedMap())
@@ -487,7 +487,7 @@ public unsafe class CSharpTests
     {
         using (var testNativeToManagedMap = new TestNativeToManagedMap())
         {
-            var quxMap = (IDictionary<IntPtr, IQux>) typeof(
+            var quxMap = (IDictionary<IntPtr, IQux>)typeof(
                 Qux).GetField("NativeToManagedMap",
                 BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
             var bar = new Bar();
@@ -811,7 +811,7 @@ public unsafe class CSharpTests
             })
         {
             var independentFields = internalType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic);
-            var fieldOffset = (FieldOffsetAttribute) independentFields[0].GetCustomAttribute(typeof(FieldOffsetAttribute));
+            var fieldOffset = (FieldOffsetAttribute)independentFields[0].GetCustomAttribute(typeof(FieldOffsetAttribute));
             if (fieldOffset != null)
                 Assert.That(fieldOffset.Value, Is.EqualTo(0));
             Assert.That((int)Marshal.OffsetOf(internalType, independentFields[0].Name), Is.EqualTo(0));
@@ -827,11 +827,11 @@ public unsafe class CSharpTests
         {
             var independentFields = internalType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic);
             Assert.That(independentFields.Length, Is.EqualTo(2));
-            var fieldOffsetKey = (FieldOffsetAttribute) independentFields[0].GetCustomAttribute(typeof(FieldOffsetAttribute));
+            var fieldOffsetKey = (FieldOffsetAttribute)independentFields[0].GetCustomAttribute(typeof(FieldOffsetAttribute));
             if (fieldOffsetKey != null)
                 Assert.That(fieldOffsetKey.Value, Is.EqualTo(0));
             Assert.That((int)Marshal.OffsetOf(internalType, independentFields[0].Name), Is.EqualTo(0));
-            var fieldOffsetValue = (FieldOffsetAttribute) independentFields[1].GetCustomAttribute(typeof(FieldOffsetAttribute));
+            var fieldOffsetValue = (FieldOffsetAttribute)independentFields[1].GetCustomAttribute(typeof(FieldOffsetAttribute));
             if (fieldOffsetValue != null)
                 Assert.That(fieldOffsetValue.Value, Is.EqualTo(Marshal.SizeOf(IntPtr.Zero)));
             Assert.That((int)Marshal.OffsetOf(internalType, independentFields[1].Name), Is.EqualTo(Marshal.SizeOf(IntPtr.Zero)));
@@ -860,7 +860,7 @@ public unsafe class CSharpTests
     [Test]
     public void TestEmbeddedArrayOfStructAccessor()
     {
-        const ulong firstLong =  0xC92EEDE87AAB4FECul;
+        const ulong firstLong = 0xC92EEDE87AAB4FECul;
         const ulong secondLong = 0xAD5FB16491935522ul;
 
         var testStruct = new StructWithEmbeddedArrayOfStructObjectAlignment();
@@ -896,8 +896,8 @@ public unsafe class CSharpTests
         Assert.That(StaticVariables.Int, Is.EqualTo(1020304050));
         Assert.That(StaticVariables.Float, Is.EqualTo(0.5020f));
         Assert.That(StaticVariables.String, Is.EqualTo("Str"));
-        Assert.That(StaticVariables.ChrArray, Is.EqualTo(new[] { 'A', 'B'}));
-        Assert.That(StaticVariables.IntArray, Is.EqualTo(new[] { 1020304050 , 1526374850 }));
+        Assert.That(StaticVariables.ChrArray, Is.EqualTo(new[] { 'A', 'B' }));
+        Assert.That(StaticVariables.IntArray, Is.EqualTo(new[] { 1020304050, 1526374850 }));
         Assert.That(StaticVariables.FloatArray, Is.EqualTo(new[] { 0.5020f, 0.6020f }));
         Assert.That(StaticVariables.BoolArray, Is.EqualTo(new[] { false, true }));
         Assert.That(StaticVariables.VoidPtrArray, Is.EqualTo(new IntPtr[] { new IntPtr(0x10203040), new IntPtr(0x40302010) }));
@@ -1036,7 +1036,7 @@ public unsafe class CSharpTests
             Assert.That(ts.ThirtyTwoBitConst, Is.EqualTo(str));
             Assert.That(OwnsNativeMemory(ts, "__thirtyTwoBitConst_OwnsNativeMemory"), Is.EqualTo(false));
 
-            var x = (uint *)ts.ThirtyTwoBitNonConst;
+            var x = (uint*)ts.ThirtyTwoBitNonConst;
             for (int i = 0; i < otherStr.Length; i++)
             {
                 Assert.That(*x++, Is.EqualTo(otherStr[i]));
@@ -1333,8 +1333,8 @@ public unsafe class CSharpTests
         using (var dependentValueFields = new DependentValueFields<IntPtr>())
         {
             int i = 10;
-            dependentValueFields.DependentValue = (IntPtr) (&i);
-            Assert.That(*(int*) dependentValueFields.DependentValue, Is.EqualTo(10));
+            dependentValueFields.DependentValue = (IntPtr)(&i);
+            Assert.That(*(int*)dependentValueFields.DependentValue, Is.EqualTo(10));
         }
     }
 
@@ -1673,7 +1673,7 @@ public unsafe class CSharpTests
         using (var indexproperty = new TestIndexedProperties())
         {
             uint n = 21;
-            Assert.That(*((int*) indexproperty[n]), Is.EqualTo(21));
+            Assert.That(*((int*)indexproperty[n]), Is.EqualTo(21));
         }
     }
 
@@ -1773,14 +1773,14 @@ public unsafe class CSharpTests
     public void TestRValueReferenceToPointer()
     {
         int value = 5;
-        IntPtr intPtr = CSharp.CSharp.RValueReferenceToPointer((IntPtr*) &value);
-        Assert.That((int) intPtr, Is.EqualTo(value));
+        IntPtr intPtr = CSharp.CSharp.RValueReferenceToPointer((IntPtr*)&value);
+        Assert.That((int)intPtr, Is.EqualTo(value));
     }
 
     [Test]
     public void TakeRefToPointerToObject()
     {
-        using (Foo foo = new Foo { A = 25  })
+        using (Foo foo = new Foo { A = 25 })
         {
             Foo returnedFoo = CSharp.CSharp.TakeReturnReferenceToPointer(foo);
             Assert.That(returnedFoo.A, Is.EqualTo(foo.A));

tests/Common/Common.Tests.cs

@@ -66,7 +66,7 @@ public class CommonTests
         new AmbiguousParamNames(0, 0).Dispose();
         Common.SMallFollowedByCapital();
         Common.IntegerOverload(0);
-        Common.IntegerOverload((uint) 0);
+        Common.IntegerOverload((uint)0);
         Common.TakeVoidStarStar(null);
         Common.OverloadPointer(IntPtr.Zero, 1);
         using (new DerivedFromSecondaryBaseWithIgnoredVirtualMethod()) { }
@@ -198,7 +198,7 @@ public class CommonTests
     {
         using (var hello = new Hello())
         {
-            hello.EnumOut((int) Enum.C, out Enum e);
+            hello.EnumOut((int)Enum.C, out Enum e);
             Assert.That(e, Is.EqualTo(Enum.C));
         }
     }
@@ -208,7 +208,7 @@ public class CommonTests
     {
         using (var hello = new Hello())
         {
-            hello.EnumOutRef((int) Enum.C, out Enum e);
+            hello.EnumOutRef((int)Enum.C, out Enum e);
             Assert.That(e, Is.EqualTo(Enum.C));
         }
     }
@@ -485,16 +485,16 @@ public class CommonTests
             Assert.AreEqual(2, indexedProperties[0]);
             indexedProperties[0f] = 3;
             Assert.AreEqual(3, indexedProperties[0f]);
-            var properties = indexedProperties[(byte) 0];
+            var properties = indexedProperties[(byte)0];
             Assert.AreEqual(0, properties.Field);
             var newProperties = new TestProperties();
             newProperties.Field = 4;
-            indexedProperties[(byte) 0] = newProperties;
-            Assert.AreEqual(4, indexedProperties[(byte) 0].Field);
-            newProperties = indexedProperties[(short) 0];
+            indexedProperties[(byte)0] = newProperties;
+            Assert.AreEqual(4, indexedProperties[(byte)0].Field);
+            newProperties = indexedProperties[(short)0];
             Assert.AreEqual(4, newProperties.Field);
             newProperties.Field = 5;
-            Assert.AreEqual(5, indexedProperties[(byte) 0].Field);
+            Assert.AreEqual(5, indexedProperties[(byte)0].Field);
             newProperties.get();
             newProperties.set(0);
             newProperties.Get();
@@ -503,8 +503,8 @@ public class CommonTests
             var bar = new Bar { A = 5 };
             indexedProperties[0u] = bar;
             Assert.That(bar.A, Is.EqualTo(indexedProperties[0u].A));
-            indexedProperties[(ushort) 0] = bar;
-            Assert.That(bar.A, Is.EqualTo(indexedProperties[(ushort) 0].A));
+            indexedProperties[(ushort)0] = bar;
+            Assert.That(bar.A, Is.EqualTo(indexedProperties[(ushort)0].A));
 
             using (var foo = new Foo())
             {
@@ -649,7 +649,7 @@ public class CommonTests
         {
             ClassB classB = classA;
             Assert.AreEqual(classA.Value, classB.Value);
-            ClassC classC = (ClassC) classB;
+            ClassC classC = (ClassC)classB;
             Assert.AreEqual(classB.Value, classC.Value);
         }
     }
@@ -889,7 +889,7 @@ public class CommonTests
     [Test]
     public void TestPassingNullToValue()
     {
-        Assert.Catch<ArgumentNullException>(() => new Bar((Foo) null));
+        Assert.Catch<ArgumentNullException>(() => new Bar((Foo)null));
     }
 
     [Test]

tests/NamespacesDerived/NamespacesDerived.Tests.cs

@@ -129,7 +129,7 @@ public class NamespaceDerivedTests
             Is.EqualTo(@params[0].Name));
         Assert.That(path.Value, Is.EqualTo("A full or partial name for the process to attach to."));
 
-        XElement wait_for = (XElement) path.NextNode;
+        XElement wait_for = (XElement)path.NextNode;
         Assert.That(wait_for.Attribute("name").Value, Is.EqualTo(@params[1].Name));
         Assert.That(wait_for.Elements("para").Select(p => string.Concat(p.Nodes())),
             Is.EquivalentTo(

tests/StandardLib/StandardLib.Tests.cs

@@ -57,4 +57,3 @@ public class StandardLibTests
         Assert.AreEqual(testString, stringWriter.ToString());
     }
 }
-