Fix clang assert

Author: duckdoom5

src/CppParser/Bootstrap/Bootstrap.cs

@@ -154,7 +154,7 @@ private void GenerateExpr(BindingContext ctx)
             var specifiersUnit = ctx.ASTContext.TranslationUnits.Find(unit =>
                 unit.FileName == "Specifiers.h");
             var nonOdrUseReason = specifiersUnit.FindEnum("clang::NonOdrUseReason");
-            
+
             var apFloatUnit = ctx.ASTContext.TranslationUnits.Find(unit =>
                 unit.FileName == "APFloat.h");
             var floatSemantics = apFloatUnit
@@ -165,7 +165,7 @@ private void GenerateExpr(BindingContext ctx)
             // Move to outer namespace
             floatSemantics.Namespace = floatSemantics.Namespace.Namespace.Namespace;
 
-            var decls = new Declaration[] { 
+            var decls = new Declaration[] {
                     operationKindsUnit, operatorKindsUnit,
                     unaryExprOrTypeTrait, nonOdrUseReason,
                     exprDependence, floatSemantics
@@ -340,7 +340,7 @@ private static void Check(Declaration decl)
 
             if (decl.Name == "EmptyShell")
                 decl.ExplicitlyIgnore();
-            
+
             if (decl.Name == "DecomposedForm")
                 decl.ExplicitlyIgnore();
 
@@ -613,8 +613,7 @@ public override bool VisitClassDecl(Class @class)
                 var iteratorTypeName = GetIteratorTypeName(iteratorType, TypePrinter);
                 var declName = GetDeclName(method, GeneratorKind.CSharp);
 
-                WriteLine($@"public List<{iteratorTypeName}> {
-                    declName} {{ get; private set; }} = new List<{iteratorTypeName}>();");
+                WriteLine($@"public List<{iteratorTypeName}> {declName} {{ get; private set; }} = new List<{iteratorTypeName}>();");
             }
 
             foreach (var property in @class.Properties)
@@ -1192,7 +1191,7 @@ private string GenerateInit(Property property)
         {
             if (property.Type.IsPointer())
                 return "nullptr";
-            
+
             if (property.Type.IsPrimitiveType(PrimitiveType.Bool))
                 return "false";
 
@@ -1202,7 +1201,7 @@ private string GenerateInit(Property property)
 
             if (property.Type.TryGetEnum(out Enumeration @enum))
                 return $"{GetQualifiedName(@enum)}::{@enum.Items.First().Name}";
-            
+
             return "0";
         }
 
@@ -1233,7 +1232,7 @@ public void GenerateParser()
             WriteInclude("Parser.h", CInclude.IncludeKind.Quoted);
             GenerateIncludes();
             NewLine();
-            
+
             WriteLine("namespace CppSharp::CppParser {");
             NewLine();
 
@@ -1259,7 +1258,7 @@ private void GenerateWalkStatement()
             WriteLine(MethodSig);
             WriteOpenBraceAndIndent();
 
-            WriteLine($"if (!{BaseTypeName })");
+            WriteLine($"if (!{BaseTypeName})");
             WriteLineIndent("return nullptr;");
             NewLine();
 
@@ -1401,8 +1400,19 @@ public override bool VisitProperty(Property property)
                 WriteLine($"_S->{fieldName} = static_cast<AST::{typeName}>(" +
                     $"WalkStatement(S->{methodName}()));");
             else if (typeName.Contains("Expr"))
-                WriteLine($"_S->{fieldName} = static_cast<AST::{typeName}>(" +
-                    $"WalkExpression(S->{methodName}()));");
+            {
+                var expr = $"_S->{fieldName} = static_cast<AST::{typeName}>(WalkExpression(S->{methodName}()));";
+
+                if (fieldName == "base")
+                {
+                    WriteLine("if (!S->isImplicitAccess())");
+                    WriteLineIndent(expr);
+                }
+                else
+                {
+                    WriteLine(expr);
+                }
+            }
             else if (fieldName == "guidDecl")
                 WriteLine($"_S->{fieldName} = S->getGuidDecl()->getNameAsString();");
             else if (typeName.Contains("Decl") || typeName.Contains("Method") ||
@@ -1565,18 +1575,18 @@ static class CodeGeneratorHelpers
         public static bool IsAbstractStmt(Class @class) => IsAbstractStmt(@class.Name);
 
         public static bool IsAbstractStmt(string className) =>
-            className is "Stmt" 
-                or "ValueStmt" 
-                or "NoStmt" 
-                or "SwitchCase" 
-                or "AsmStmt" 
-                or "Expr" 
-                or "FullExpr" 
-                or "CastExpr" 
-                or "ExplicitCastExpr" 
-                or "AbstractConditionalOperator" 
-                or "CXXNamedCastExpr" 
-                or "OverloadExpr" 
+            className is "Stmt"
+                or "ValueStmt"
+                or "NoStmt"
+                or "SwitchCase"
+                or "AsmStmt"
+                or "Expr"
+                or "FullExpr"
+                or "CastExpr"
+                or "ExplicitCastExpr"
+                or "AbstractConditionalOperator"
+                or "CXXNamedCastExpr"
+                or "OverloadExpr"
                 or "CoroutineSuspendExpr";
 
         public static bool SkipProperty(Property property, bool skipBaseCheck = false)
@@ -1748,7 +1758,7 @@ public static bool SkipProperty(Property property, bool skipBaseCheck = false)
             // UnresolvedMemberExpr
             if (typeName.Contains("DeclarationName"))
                 return true;
-            
+
             // SubstNonTypeTemplateParmExpr
             // SubstNonTypeTemplateParmPackExpr
             if (typeName.Contains("NonTypeTemplateParmDecl"))
@@ -1780,7 +1790,7 @@ public static bool SkipProperty(Property property, bool skipBaseCheck = false)
             // CXXRewrittenBinaryOperator
             if (typeName.Contains("DecomposedForm"))
                 return true;
-            
+
             if (typeName.Contains("optional"))
                 return true;
 
@@ -1939,9 +1949,9 @@ public static string GetDeclTypeName(AST.Type type,
             var typeResult = declType.Visit(typePrinter);
 
             if (typeResult.Type.Contains("MSGuidDecl"))
-                return typePrinter is CppTypePrinter 
+                return typePrinter is CppTypePrinter
                     ? "std::string" : "string";
-           
+
             var typeName = typeResult.ToString();
             typeName = CleanClangNamespaceFromName(typeName);
 
@@ -1951,7 +1961,7 @@ public static string GetDeclTypeName(AST.Type type,
                 typeName = "UnaryOperatorKind";
             else if (typeName.Contains("BinaryOperator::Opcode"))
                 typeName = "BinaryOperatorKind";
-            
+
             else if (typeName.Contains("Semantics"))
                 typeName = "FloatSemantics";
 
@@ -2037,15 +2047,15 @@ public static string GetIteratorTypeName(AST.Type iteratorType,
 
             if (iteratorTypeName.Contains("ExprIterator"))
                 iteratorTypeName = "Expr";
-            
+
             else if (iteratorTypeName.Contains("StmtIterator"))
                 iteratorTypeName = "Stmt";
 
             else if (iteratorTypeName.Contains("CastIterator"))
             {
                 if (iteratorType is TypedefType typedefType)
                     iteratorType = typedefType.Declaration.Type;
-                
+
                 var templateArg = ((TemplateSpecializationType)iteratorType).Arguments[0];
                 iteratorType = templateArg.Type.Type;
 

src/CppParser/ParseExpr.cpp

@@ -2426,7 +2426,8 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
         _S->refersToMatrixElement = S->refersToMatrixElement();
         _S->hasPlaceholderType = S->hasPlaceholderType();
         _S->isImplicitAccess = S->isImplicitAccess();
-        _S->base = static_cast<AST::Expr*>(WalkExpression(S->getBase()));
+        if (!S->isImplicitAccess())
+            _S->base = static_cast<AST::Expr*>(WalkExpression(S->getBase()));
         _S->baseType = GetQualifiedType(S->getBaseType());
         _S->isArrow = S->isArrow();
         _S->firstQualifierFoundInScope = static_cast<AST::Declaration*>(WalkDeclaration(S->getFirstQualifierFoundInScope()));