Fix a regression with headers named after keywords

Fixes #1212. Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
mono · Apr 28, 2019 · 39d5828 · 39d5828
1 parent a9bfe1c
commit 39d5828
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -244,7 +244,7 @@ public virtual void GenerateNamespaceFunctionsAndVariables(DeclarationContext co
                 return;
 
             PushBlock(BlockKind.Functions);
-            var parentName = context.TranslationUnit.FileNameWithoutExtension;
+            var parentName = SafeIdentifier(context.TranslationUnit.FileNameWithoutExtension);
 
             var keyword = "class";
             var classes = EnumerateClasses().ToList();
@@ -740,10 +740,9 @@ public override void GenerateClassSpecifier(Class @class)
                 }
             }
 
-            if (@class.IsGenerated && isBindingGen)
+            if (@class.IsGenerated && isBindingGen && @class.IsRefType && !@class.IsOpaque)
             {
-                if (@class.IsRefType && !@class.IsOpaque)
-                    bases.Add("IDisposable");
+                bases.Add("IDisposable");
             }
 
             if (bases.Count > 0 && !@class.IsStatic)

diff --git a/tests/Common/interface.h b/tests/Common/interface.h
@@ -0,0 +1 @@
+void Func();