Fixed the wrapping of virtual members when changing access in overrides.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

src/AST/ClassExtensions.cs

@@ -89,10 +89,10 @@ namespace CppSharp.AST
             return null;
         }
 
-        public static bool HasNonAbstractBaseMethodInPrimaryBase(this Class @class, Method method)
+        public static bool HasCallableBaseMethodInPrimaryBase(this Class @class, Method method)
         {
             var baseMethod = @class.GetBaseMethod(method, true, true);
-            return baseMethod != null && !baseMethod.IsPure &&
+            return baseMethod != null && !baseMethod.IsPure && baseMethod.IsGenerated &&
                 !((Class) baseMethod.OriginalNamespace).IsInterface;
         }
 

src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@@ -2209,7 +2209,7 @@ namespace CppSharp.Generators.CSharp
             Method rootBaseMethod;
             var isOverride = method.IsOverride &&
                 (rootBaseMethod = @class.GetBaseMethod(method, true)) != null &&
-                (rootBaseMethod.IsVirtual || rootBaseMethod.IsPure);
+                rootBaseMethod.IsGenerated && rootBaseMethod.IsVirtual;
 
             if (method.IsVirtual && !isOverride && !method.IsOperator && !method.IsPure)
                 Write("virtual ");
@@ -2443,18 +2443,21 @@ namespace CppSharp.Generators.CSharp
 
         private static AccessSpecifier GetValidMethodAccess(Method method)
         {
-            return method.IsOverride
+            if (!method.IsOverride)
-                ? ((Class) method.Namespace).GetBaseMethod(method).Access
+                return method.Access;
-                : method.Access;
+            var baseMethod = ((Class) method.Namespace).GetBaseMethod(method);
+            return baseMethod.IsGenerated ? baseMethod.Access : method.Access;
         }
 
         private static AccessSpecifier GetValidPropertyAccess(Property property)
         {
             if (property.Access == AccessSpecifier.Public)
                 return AccessSpecifier.Public;
-            return property.IsOverride
+            if (!property.IsOverride)
-                ? ((Class) property.Namespace).GetBaseProperty(property).Access
+                return property.Access;
-                : property.Access;
+            var baseProperty = ((Class) property.Namespace).GetBaseProperty(property);
+            // access can be changed from private to other while overriding in C++
+            return baseProperty != null ? baseProperty.Access : property.Access;
         }
 
         private void GenerateVirtualPropertyCall(Method method, Class @class,
@@ -2480,7 +2483,7 @@ namespace CppSharp.Generators.CSharp
         {
             if (!forceVirtualCall && method.IsOverride && !method.IsPure &&
                 method.SynthKind != FunctionSynthKind.AbstractImplCall &&
-                @class.HasNonAbstractBaseMethodInPrimaryBase(method))
+                @class.HasCallableBaseMethodInPrimaryBase(method))
             {
                 GenerateManagedCall(method, true);
             }

src/Generator/Passes/CheckIgnoredDecls.cs

@@ -12,17 +12,22 @@ namespace CppSharp.Passes
 
             switch (decl.Access)
             {
-            case AccessSpecifier.Public:
+                case AccessSpecifier.Public:
-                return true;
+                    return true;
-            case AccessSpecifier.Protected:
+                case AccessSpecifier.Protected:
-                var @class = decl.Namespace as Class;
+                    var @class = decl.Namespace as Class;
-                if (@class != null && @class.IsValueType)
+                    if (@class != null && @class.IsValueType)
-                    return false;
+                        return false;
-                return generateNonPublicDecls;
+                    return generateNonPublicDecls;
-            case AccessSpecifier.Private:
+                case AccessSpecifier.Private:
-                var method = decl as Method;
+                    var method = decl as Method;
-                var isOverride = method != null && method.IsOverride;
+                    var isOverride = false;
-                return generateNonPublicDecls && (isOverride || decl.IsExplicitlyGenerated);
+                    if (method != null && method.IsOverride)
+                    {
+                        var baseMethod = ((Class) method.Namespace).GetBaseMethod(method);
+                        isOverride = baseMethod.IsGenerated;
+                    }
+                    return generateNonPublicDecls && (isOverride || decl.IsExplicitlyGenerated);
             }
 
             return true;
@@ -178,20 +183,6 @@ namespace CppSharp.Passes
                     method.ExplicitlyIgnore();
                     return false;
                 }
-
-                if (method.IsOverride)
-                {
-                    var baseOverride = @class.GetBaseMethod(method);
-                    if (baseOverride != null && !baseOverride.IsDeclared)
-                    {
-                        Log.Debug(
-                            "Virtual method '{0}' was ignored due to ignored override '{1}'",
-                            method.QualifiedOriginalName, baseOverride.Name);
-
-                        method.ExplicitlyIgnore();
-                        return false;
-                    }
-                }
             }
 
             return true;

src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs

@@ -113,7 +113,7 @@ namespace CppSharp.Passes
             private static string GetReadWritePropertyName(INamedDecl getter, string afterSet)
             {
                 string name = GetPropertyName(getter.Name);
-                if (name != afterSet && name.StartsWith("is"))
+                if (name != afterSet && name.StartsWith("is", StringComparison.Ordinal))
                 {
                     name = char.ToLowerInvariant(name[2]) + name.Substring(3);
                 }
@@ -152,7 +152,11 @@ namespace CppSharp.Passes
                     if (getter.IsOverride || (setter != null && setter.IsOverride))
                     {
                         var baseVirtualProperty = type.GetBaseProperty(property, getTopmost: true);
-                        if (baseVirtualProperty.SetMethod == null)
+                        if (baseVirtualProperty == null && type.GetBaseMethod(getter, getTopmost: true).IsGenerated)
+                            throw new Exception(string.Format(
+                                "Property {0} has a base property null but its getter has a generated base method.",
+                                getter.QualifiedOriginalName));
+                        if (baseVirtualProperty != null && baseVirtualProperty.SetMethod == null)
                             setter = null;
                     }
                     property.GetMethod = getter;

src/Generator/Passes/verbs.txt

@@ -1924,6 +1924,7 @@ divulse
 divvies
 dizen
 dizzy
+do
 doat
 does
 doest

tests/CSharp/CSharp.h

@@ -894,3 +894,22 @@ namespace NamespaceB
 		void Function(CS_OUT NamespaceA::A &a);
 	};
 }
+
+class HasPrivateVirtualProperty
+{
+private:
+    virtual int property();
+    virtual void protectedAbstractMethod() = 0;
+    virtual void protectedMethod();
+    virtual int protectedProperty() = 0;
+};
+
+class HasPrivateOverriddenProperty : public HasPrivateVirtualProperty
+{
+protected:
+    virtual void protectedAbstractMethod();
+    virtual void protectedMethod();
+    virtual int protectedProperty();
+private:
+    virtual int property();
+};