Add support for C++ character literals (u, U, L) (#1434)

src/CppParser/Parser.cpp

@@ -3654,13 +3654,30 @@ AST::ExpressionObsolete* Parser::WalkExpressionObsolete(const clang::Expr* Expr)
         break;
     }
 
-    clang::Expr::EvalResult integer;
+    if (!Expr->isValueDependent())
-    if (Expr->getStmtClass() != clang::Stmt::CharacterLiteralClass &&
+    {
-        Expr->getStmtClass() != clang::Stmt::CXXBoolLiteralExprClass &&
+        clang::Expr::EvalResult integer;
-        Expr->getStmtClass() != clang::Stmt::UnaryExprOrTypeTraitExprClass &&
+        if (Expr->getStmtClass() == clang::Stmt::CharacterLiteralClass)
-        !Expr->isValueDependent() &&
+        {
-        Expr->EvaluateAsInt(integer, c->getASTContext()))
+            auto result = GetStringFromStatement(Expr);
-        return new AST::ExpressionObsolete(integer.Val.getInt().toString(10));
+            if (!result.empty() && 
+                result.front() != '\'' && 
+                Expr->EvaluateAsInt(integer, c->getASTContext()))
+            {
+                result = integer.Val.getInt().toString(10);
+            }
+
+            return new AST::ExpressionObsolete(result);
+        }
+        else if (Expr->getStmtClass() != clang::Stmt::CXXBoolLiteralExprClass &&
+            Expr->getStmtClass() != clang::Stmt::UnaryExprOrTypeTraitExprClass &&
+            Expr->EvaluateAsInt(integer, c->getASTContext())
+            )
+        {
+            return new AST::ExpressionObsolete(integer.Val.getInt().toString(10));
+        }
+    }
+
     return new AST::ExpressionObsolete(GetStringFromStatement(Expr));
 }
 

tests/CSharp/CSharp.cpp

@@ -638,7 +638,7 @@ void MethodsWithDefaultValues::defaultValueType(QGenericArgument valueType)
 {
 }
 
-void MethodsWithDefaultValues::defaultChar(char c)
+void MethodsWithDefaultValues::defaultChar(char c, char uc, char Uc, char Lc)
 {
 }
 

tests/CSharp/CSharp.h

@@ -433,7 +433,7 @@ public:
     void defaultVoidStar(void* ptr = 0);
     void defaultFunctionPointer(void(*functionPtr)(int p) = nullptr);
     void defaultValueType(QGenericArgument valueType = QGenericArgument());
-    void defaultChar(char c = 'a');
+    void defaultChar(char c = 'a', char uc = u'u', char Uc = U'U', char Lc = L'L');
     void defaultEmptyChar(char c = 0);
     void defaultEmptyEnum(Empty e = Empty(-1));
     void defaultRefTypeBeforeOthers(Foo foo = Foo(), int i = 5, Bar::Items item = Bar::Item2);