Merge pull request #50 from ddobrev/master

Ignored private types

src/AST/Class.cs

@@ -15,8 +15,6 @@ namespace CppSharp.AST
     // A C++ access specifier declaration.
     public class AccessSpecifierDecl : Declaration
     {
-        public AccessSpecifier Access;
-
         public override T Visit<T>(IDeclVisitor<T> visitor)
         {
             throw new NotImplementedException();

src/AST/Declaration.cs

@@ -169,6 +169,8 @@ namespace CppSharp.AST
             }
         }
 
+        public AccessSpecifier Access { get; set; }
+
         // Contains debug text about the declaration.
         public string DebugText;
 

src/AST/Field.cs

@@ -8,7 +8,6 @@ namespace CppSharp.AST
         public Type Type { get { return QualifiedType.Type; } }
         public QualifiedType QualifiedType { get; set; }
 
-        public AccessSpecifier Access { get; set; }
         public uint Offset { get; set; }
         public Class Class { get; set; }
 

src/AST/Method.cs

@@ -74,7 +74,6 @@ namespace CppSharp.AST
             Access = AccessSpecifier.Public;
         }
 
-        public AccessSpecifier Access { get; set; }
         public AccessSpecifierDecl AccessDecl { get; set; }
 
         public bool IsVirtual { get; set; }

src/AST/Variable.cs

@@ -8,8 +8,6 @@ namespace CppSharp.AST
             return visitor.VisitVariableDecl(this);
         }
 
-        public AccessSpecifier Access { get; set; }
-
         public Type Type { get { return QualifiedType.Type; } }
         public QualifiedType QualifiedType { get; set; }
 

src/Generator/Passes/CheckIgnoredDecls.cs

@@ -24,6 +24,16 @@ namespace CppSharp.Passes
             return true;
         }
 
+        public override bool VisitClassDecl(Class @class)
+        {
+            if (@class.Access == AccessSpecifier.Private)
+            {
+                @class.ExplicityIgnored = true;
+                return false;
+            }
+            return base.VisitClassDecl(@class);
+        }
+
         public override bool VisitFieldDecl(Field field)
         {
             if (!VisitDeclaration(field))
@@ -86,7 +96,7 @@ namespace CppSharp.Passes
             if (!VisitDeclaration(method))
                 return false;
 
-            if (method.Access != AccessSpecifier.Public)
+            if (method.Access == AccessSpecifier.Private)
             {
                 method.ExplicityIgnored = true;
                 return false;

src/Parser/Parser.cpp

@@ -2086,6 +2086,7 @@ CppSharp::AST::Declaration^ Parser::WalkDeclaration(clang::Decl* D,
 
         if (const ValueDecl *VD = dyn_cast_or_null<ValueDecl>(D))
             Decl->IsDependent = VD->getType()->isDependentType();
+        Decl->Access = ConvertToAccess(D->getAccess());
     }
 
     return Decl;

tests/Basic/Basic.h

@@ -49,12 +49,17 @@ enum Enum
 
 class DLL_API Hello
 {
-    union {
+    union NestedPrivate {
         int i;
-        float b;
+        float f;
     };
 
 public:
+    union NestedPublic {
+        int j;
+        float g;
+    };
+
     Hello ();
 
     void PrintHello(const char* s);