Merge pull request #244 from esdrubal/internal-fields

Internal fields

src/AST/Declaration.cs

@@ -221,9 +221,7 @@ namespace CppSharp.AST
         {
             get
             {
-                var k = GenerationKind;
+                return GenerationKind == GenerationKind.Internal;
-                return k == GenerationKind.Generate
-                    || k == GenerationKind.Internal;
             }
         }
 

src/Generator/AST/Utils.cs

@@ -60,7 +60,7 @@ namespace CppSharp.AST
             return false;
         }
 
-        public static bool CheckIgnoreField(Field field)
+        public static bool CheckIgnoreField(Field field, bool useInternals = false)
         {
             if (field.Access == AccessSpecifier.Private) 
                 return true;
@@ -68,7 +68,7 @@ namespace CppSharp.AST
             if (field.Class.IsValueType && field.IsDeclared)
                 return false;
 
-            return !field.IsGenerated;
+            return !field.IsGenerated && (!useInternals || !field.IsInternal);
         }
 
         public static bool CheckIgnoreProperty(Property prop)

src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@@ -223,7 +223,7 @@ namespace CppSharp.Generators.CSharp
                 // Generate all the internal function declarations.
                 foreach (var function in context.Functions)
                 {
-                    if (!function.IsInternal) continue;
+                    if (!function.IsGenerated && !function.IsInternal ) continue;
 
                     GenerateInternalFunction(function);
                 }
@@ -315,7 +315,7 @@ namespace CppSharp.Generators.CSharp
 
         public void GenerateClass(Class @class)
         {
-            if (@class.IsIncomplete)
+            if (!@class.IsGenerated || @class.IsIncomplete)
                 return;
 
             PushBlock(CSharpBlockKind.Class);
@@ -331,7 +331,7 @@ namespace CppSharp.Generators.CSharp
                 GenerateClassInternals(@class);
                 GenerateDeclContext(@class);
 
-                if (!@class.IsGenerated || @class.IsDependent)
+                if (@class.IsDependent)
                     goto exit;
 
                 if (ShouldGenerateClassNativeField(@class))
@@ -706,7 +706,7 @@ namespace CppSharp.Generators.CSharp
             if (@class.IsUnion)
                 WriteLine("[StructLayout(LayoutKind.Explicit)]");
 
-            Write(!@class.IsGenerated ? "internal " : Helpers.GetAccess(@class.Access));
+            Write(@class.IsInternal ? "internal " : Helpers.GetAccess(@class.Access));
             Write("unsafe ");
 
             if (Driver.Options.GenerateAbstractImpls && @class.IsAbstract)
@@ -761,7 +761,7 @@ namespace CppSharp.Generators.CSharp
 
             foreach (var field in @class.Fields)
             {
-                if (!nativeFields && ASTUtils.CheckIgnoreField(field)) continue;
+                if (ASTUtils.CheckIgnoreField(field, nativeFields)) continue;
                 action(field);
             }
         }
@@ -788,13 +788,11 @@ namespace CppSharp.Generators.CSharp
             if (field.Expression != null)
             {
                 var fieldValuePrinted = field.Expression.CSharpValue(ExpressionPrinter);
-                Write("{0} {1} {2} = {3};", !field.IsGenerated ? "internal" : "public",
+                Write("public {0} {1} = {2};", fieldTypePrinted.Type, safeIdentifier, fieldValuePrinted);
-                    fieldTypePrinted.Type, safeIdentifier, fieldValuePrinted);
             }
             else
             {
-                Write("{0} {1} {2};", !field.IsGenerated ? "internal" : "public",
+                Write("public {0} {1};", fieldTypePrinted.Type, safeIdentifier);
-                    fieldTypePrinted.Type, safeIdentifier);
             }
 
             PopBlock(NewLineKind.BeforeNextBlock);
@@ -2659,7 +2657,7 @@ namespace CppSharp.Generators.CSharp
 
         public void GenerateInternalFunction(Function function)
         {
-            if (!function.IsInternal || function.IsPure)
+            if (function.IsPure)
                 return;
 
             if (function.OriginalFunction != null)