Removed unused STD enumerations from generation.

ddobrev · ddobrev · commit ae6a37359af1 · 2017-10-14T05:01:51.000+03:00
Signed-off-by: Dimitar Dobrev &lt;dpldobrev@protonmail.com&gt;
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs
@@ -495,31 +495,6 @@ public partial struct __Internal
 
     public unsafe partial class BasicString<_CharT, _Traits, _Allocator> : IDisposable
     {
-        internal enum ShortMask
-        {
-            ShortMask = 0
-        }
-
-        internal enum LongMask
-        {
-            LongMask = 0
-        }
-
-        internal enum MinCap
-        {
-            MinCap = 0
-        }
-
-        internal enum NWords
-        {
-            NWords = 0
-        }
-
-        internal enum Alignment
-        {
-            Alignment = 0
-        }
-
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs
@@ -641,15 +641,6 @@ public partial struct __Internal
 
     public unsafe partial class StringVal<_Val_types>
     {
-        public enum BUF_SIZE
-        {
-            BUF_SIZE = 0
-        }
-
-        public enum ALLOC_MASK
-        {
-            ALLOC_MASK = 0
-        }
     }
 }
 
@@ -711,11 +702,6 @@ public unsafe partial struct __Internal
 
     public unsafe partial class TreeVal<_Val_types>
     {
-        public enum Redbl
-        {
-            Red = 0,
-            Black = 0
-        }
     }
 }
 
@@ -736,16 +722,6 @@ public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
     }
 }
 
-namespace Std
-{
-    [Flags]
-    public enum CodecvtMode
-    {
-        ConsumeHeader = 4,
-        GenerateHeader = 2
-    }
-}
-
 namespace Std
 {
 }
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs
@@ -495,31 +495,6 @@ public partial struct __Internal
 
     public unsafe partial class BasicString<_CharT, _Traits, _Allocator> : IDisposable
     {
-        internal enum ShortMask
-        {
-            ShortMask = 0
-        }
-
-        internal enum LongMask
-        {
-            LongMask = 0
-        }
-
-        internal enum MinCap
-        {
-            MinCap = 0
-        }
-
-        internal enum NWords
-        {
-            NWords = 0
-        }
-
-        internal enum Alignment
-        {
-            Alignment = 0
-        }
-
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs
@@ -483,11 +483,6 @@ public partial struct __Internal
 
     public unsafe partial class BasicString<_CharT, _Traits, _Alloc> : IDisposable
     {
-        internal enum S_localCapacity
-        {
-            S_localCapacity = 0
-        }
-
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs
@@ -641,15 +641,6 @@ public partial struct __Internal
 
     public unsafe partial class StringVal<_Val_types>
     {
-        public enum BUF_SIZE
-        {
-            BUF_SIZE = 0
-        }
-
-        public enum ALLOC_MASK
-        {
-            ALLOC_MASK = 0
-        }
     }
 }
 
@@ -711,11 +702,6 @@ public unsafe partial struct __Internal
 
     public unsafe partial class TreeVal<_Val_types>
     {
-        public enum Redbl
-        {
-            Red = 0,
-            Black = 0
-        }
     }
 }
 
@@ -736,16 +722,6 @@ public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
     }
 }
 
-namespace Std
-{
-    [Flags]
-    public enum CodecvtMode
-    {
-        ConsumeHeader = 4,
-        GenerateHeader = 2
-    }
-}
-
 namespace Std
 {
 }
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -3007,7 +3007,7 @@ public override bool VisitTypedefNameDecl(TypedefNameDecl typedef)
 
         public override bool VisitEnumDecl(Enumeration @enum)
         {
-            if (@enum.IsIncomplete)
+            if (@enum.IsIncomplete || @enum.Ignore)
                 return true;
 
             PushBlock(BlockKind.Enum);
diff --git a/src/Generator/Passes/CleanCommentsPass.cs b/src/Generator/Passes/CleanCommentsPass.cs
@@ -71,7 +71,7 @@ public bool VisitParagraphCommand(ParagraphComment comment)
                 var textComment = (TextComment) item;
 
                 if (textComment.Text.StartsWith("<", StringComparison.Ordinal))
-                    textComment.Text = $"{textComment.Text}{">"}";
+                    textComment.Text = $"{textComment.Text}>";
                 else if (textComment.Text.StartsWith(">", StringComparison.Ordinal))
                     textComment.Text = textComment.Text.Substring(1);
             }
diff --git a/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs b/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
@@ -16,7 +16,6 @@ public IgnoreSystemDeclarationsPass()
             VisitOptions.VisitClassProperties = false;
             VisitOptions.VisitFunctionParameters = false;
             VisitOptions.VisitFunctionReturnType = false;
-            VisitOptions.VisitNamespaceEnums = false;
             VisitOptions.VisitNamespaceEvents = false;
             VisitOptions.VisitNamespaceTemplates = false;
             VisitOptions.VisitNamespaceTypedefs = false;
@@ -114,6 +113,17 @@ private static IEnumerable<ClassTemplateSpecialization> GetCharSpecializations(C
                 s.Arguments[0].Type.Type.Desugar().IsPrimitiveType(PrimitiveType.Char));
         }
 
+        public override bool VisitEnumDecl(Enumeration @enum)
+        {
+            if (!base.VisitEnumDecl(@enum))
+                return false;
+
+            if (@enum.TranslationUnit.IsSystemHeader)
+                @enum.ExplicitlyIgnore();
+
+            return true;
+        }
+
         public override bool VisitFunctionDecl(Function function)
         {
             if (!base.VisitFunctionDecl(function))
diff --git a/src/Generator/Passes/MarkUsedClassInternalsPass.cs b/src/Generator/Passes/MarkUsedClassInternalsPass.cs
@@ -28,23 +28,28 @@ public override bool VisitClassDecl(Class @class)
             if (!base.VisitClassDecl(@class) || @class.Ignore || @class.IsDependent)
                 return false;
 
-            MarkUsedFieldTypes(@class, new HashSet<Class>());
+            MarkUsedFieldTypes(@class, new HashSet<DeclarationContext>());
 
             return true;
         }
 
-        private static void MarkUsedFieldTypes(Class @class, HashSet<Class> visitedClasses)
+        private static void MarkUsedFieldTypes(DeclarationContext declContext,
+            HashSet<DeclarationContext> visitedDeclarationContexts)
         {
-            if (visitedClasses.Contains(@class))
+            if (visitedDeclarationContexts.Contains(declContext))
                 return;
 
-            visitedClasses.Add(@class);
+            visitedDeclarationContexts.Add(declContext);
+
+            DeclarationContext decl = null;
+            var @class = declContext as Class;
+            if (@class == null)
+                return;
 
-            Class type = null;
             foreach (var field in @class.Layout.Fields.Where(
-                f => f.QualifiedType.Type.TryGetClass(out type)))
+                f => f.QualifiedType.Type.TryGetDeclaration(out decl)))
             {
-                DeclarationContext declarationContext = type;
+                DeclarationContext declarationContext = decl;
                 do
                 {
                     if (declarationContext.Ignore)
@@ -58,7 +63,7 @@ private static void MarkUsedFieldTypes(Class @class, HashSet<Class> visitedClass
                     declarationContext = declarationContext.Namespace;
                 } while (declarationContext != null);
 
-                MarkUsedFieldTypes(type, visitedClasses);
+                MarkUsedFieldTypes(decl, visitedDeclarationContexts);
             }
         }
     }
diff --git a/tests/CSharp/CSharp.cs b/tests/CSharp/CSharp.cs
@@ -40,19 +40,18 @@ public override void Preprocess(Driver driver, ASTContext ctx)
             ctx.SetClassAsValueType("StructTestArrayTypeFromTypedef");
             ctx.IgnoreClassWithName("IgnoredTypeInheritingNonIgnoredWithNoEmptyCtor");
 
-            var macroRegex = new Regex(@"(MY_MACRO_TEST_.*)");
-            List<string> list = new List<string>();
-            foreach (TranslationUnit unit in ctx.TranslationUnits)
-            {
-              if (unit.FilePath == "<invalid>" || unit.FileName == "CSharp.h")
-                foreach (var macro in unit.PreprocessedEntities.OfType<MacroDefinition>())
-                {
-                  Match match = macroRegex.Match(macro.Name);
-                  if (match.Success) list.Add(macro.Name);
-                }
-            }
+            var macroRegex = new Regex("(MY_MACRO_TEST_.*)");
+            var list = (from unit in ctx.TranslationUnits
+                        where !unit.IsValid || unit.FileName == "CSharp.h"
+                        from macro in unit.PreprocessedEntities.OfType<MacroDefinition>()
+                        where macroRegex.IsMatch(macro.Name)
+                        select macro.Name).ToList();
             var enumTest = ctx.GenerateEnumFromMacros("MyMacroTestEnum", list.ToArray());
-              enumTest.Namespace = new Namespace() {Name = "MacroTest"};
+            enumTest.Namespace = new Namespace()
+                {
+                    Name = "MacroTest",
+                    Namespace = ctx.TranslationUnits.First(u => u.IsValid && !u.IsSystemHeader)
+                };
         }
 
         public override void Postprocess(Driver driver, ASTContext ctx)

Original file line number	Diff line number	Diff line change
`@@ -641,15 +641,6 @@ public partial struct __Internal`
`641`	`641`
`642`	`642`	`public unsafe partial class StringVal<_Val_types>`
`643`	`643`	`{`
`644`		`- public enum BUF_SIZE`
`645`		`- {`
`646`		`- BUF_SIZE = 0`
`647`		`- }`
`648`		`-`
`649`		`- public enum ALLOC_MASK`
`650`		`- {`
`651`		`- ALLOC_MASK = 0`
`652`		`- }`
`653`	`644`	`}`
`654`	`645`	`}`
`655`	`646`
`@@ -711,11 +702,6 @@ public unsafe partial struct __Internal`
`711`	`702`
`712`	`703`	`public unsafe partial class TreeVal<_Val_types>`
`713`	`704`	`{`
`714`		`- public enum Redbl`
`715`		`- {`
`716`		`- Red = 0,`
`717`		`- Black = 0`
`718`		`- }`
`719`	`705`	`}`
`720`	`706`	`}`
`721`	`707`
`@@ -736,16 +722,6 @@ public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>`
`736`	`722`	`}`
`737`	`723`	`}`
`738`	`724`
`739`		`-namespace Std`
`740`		`-{`
`741`		`- [Flags]`
`742`		`- public enum CodecvtMode`
`743`		`- {`
`744`		`- ConsumeHeader = 4,`
`745`		`- GenerateHeader = 2`
`746`		`- }`
`747`		`-}`
`748`		`-`
`749`	`725`	`namespace Std`
`750`	`726`	`{`
`751`	`727`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3007,7 +3007,7 @@ public override bool VisitTypedefNameDecl(TypedefNameDecl typedef)`
`3007`	`3007`
`3008`	`3008`	`public override bool VisitEnumDecl(Enumeration @enum)`
`3009`	`3009`	`{`
`3010`		`- if (@enum.IsIncomplete)`
	`3010`	`+ if (@enum.IsIncomplete \|\| @enum.Ignore)`
`3011`	`3011`	`return true;`
`3012`	`3012`
`3013`	`3013`	`PushBlock(BlockKind.Enum);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public bool VisitParagraphCommand(ParagraphComment comment)`
`71`	`71`	`var textComment = (TextComment) item;`
`72`	`72`
`73`	`73`	`if (textComment.Text.StartsWith("<", StringComparison.Ordinal))`
`74`		`- textComment.Text = $"{textComment.Text}{">"}";`
	`74`	`+ textComment.Text = $"{textComment.Text}>";`
`75`	`75`	`else if (textComment.Text.StartsWith(">", StringComparison.Ordinal))`
`76`	`76`	`textComment.Text = textComment.Text.Substring(1);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,23 +28,28 @@ public override bool VisitClassDecl(Class @class)`
`28`	`28`	`if (!base.VisitClassDecl(@class) \|\| @class.Ignore \|\| @class.IsDependent)`
`29`	`29`	`return false;`
`30`	`30`
`31`		`- MarkUsedFieldTypes(@class, new HashSet<Class>());`
	`31`	`+ MarkUsedFieldTypes(@class, new HashSet<DeclarationContext>());`
`32`	`32`
`33`	`33`	`return true;`
`34`	`34`	`}`
`35`	`35`
`36`		`- private static void MarkUsedFieldTypes(Class @class, HashSet<Class> visitedClasses)`
	`36`	`+ private static void MarkUsedFieldTypes(DeclarationContext declContext,`
	`37`	`+ HashSet<DeclarationContext> visitedDeclarationContexts)`
`37`	`38`	`{`
`38`		`- if (visitedClasses.Contains(@class))`
	`39`	`+ if (visitedDeclarationContexts.Contains(declContext))`
`39`	`40`	`return;`
`40`	`41`
`41`		`- visitedClasses.Add(@class);`
	`42`	`+ visitedDeclarationContexts.Add(declContext);`
	`43`	`+`
	`44`	`+ DeclarationContext decl = null;`
	`45`	`+ var @class = declContext as Class;`
	`46`	`+ if (@class == null)`
	`47`	`+ return;`
`42`	`48`
`43`		`- Class type = null;`
`44`	`49`	`foreach (var field in @class.Layout.Fields.Where(`
`45`		`- f => f.QualifiedType.Type.TryGetClass(out type)))`
	`50`	`+ f => f.QualifiedType.Type.TryGetDeclaration(out decl)))`
`46`	`51`	`{`
`47`		`- DeclarationContext declarationContext = type;`
	`52`	`+ DeclarationContext declarationContext = decl;`
`48`	`53`	`do`
`49`	`54`	`{`
`50`	`55`	`if (declarationContext.Ignore)`
`@@ -58,7 +63,7 @@ private static void MarkUsedFieldTypes(Class @class, HashSet<Class> visitedClass`
`58`	`63`	`declarationContext = declarationContext.Namespace;`
`59`	`64`	`} while (declarationContext != null);`
`60`	`65`
`61`		`- MarkUsedFieldTypes(type, visitedClasses);`
	`66`	`+ MarkUsedFieldTypes(decl, visitedDeclarationContexts);`
`62`	`67`	`}`
`63`	`68`	`}`
`64`	`69`	`}`