Merge pull request #613 from andreasfertig/fixIssue610

Fixed #610: Visualization of a `const_cast` from a C-style cast.

Author: andreasfertig

CodeGenerator.cpp

@@ -90,12 +90,16 @@ static std::string AccessToStringWithColon(const AccessSpecifier& access)
 
 using namespace asthelpers;
 
-static std::string_view GetCastName(const CastKind castKind)
+static std::string_view GetCastName(const CastKind castKind, bool constnessChange = false)
 {
     if(is{castKind}.any_of(CastKind::CK_BitCast, CastKind::CK_IntegralToPointer, CastKind::CK_PointerToIntegral)) {
         return kwReinterpretCast;
     }
 
+    if((CastKind::CK_NoOp == castKind) and constnessChange) {
+        return "const_cast"sv;
+    }
+
     return kwStaticCast;
 }
 //-----------------------------------------------------------------------------
@@ -2482,11 +2486,26 @@ void CodeGenerator::InsertArg(const ForStmt* stmt)
 }
 //-----------------------------------------------------------------------------
 
+static bool IsConstQualifiedType(QualType type)
+{
+    if(not type.isNull()) {
+        if(auto* typePtr = type.getTypePtrOrNull()) {
+            if(auto pointee = typePtr->getPointeeType(); not pointee.isNull()) {
+                return pointee.isConstQualified();
+            }
+        }
+    }
+
+    return false;
+}
+//-----------------------------------------------------------------------------
+
 void CodeGenerator::InsertArg(const CStyleCastExpr* stmt)
 {
     const auto     castKind     = stmt->getCastKind();
-    const auto     castName     = GetCastName(castKind);
     const QualType castDestType = stmt->getType().getCanonicalType();
+    const auto     castName     = GetCastName(
+        castKind, IsConstQualifiedType(castDestType) != IsConstQualifiedType(stmt->getSubExpr()->getType()));
 
     FormatCast(castName, castDestType, stmt->getSubExpr(), castKind);
 }

tests/Issue610.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+#include <limits.h>
+
+int main (int argc, char *argv[]) {
+  const int a = 10;
+  int *p = (int *)&a;
+  return 0;
+}

tests/Issue610.expect

@@ -0,0 +1,10 @@
+#include <iostream>
+#include <limits.h>
+
+int main(int argc, char ** argv)
+{
+  const int a = 10;
+  int * p = const_cast<int *>(&a);
+  return 0;
+}
+