Merge pull request #698 from andreasfertig/harmonize

Harmonize floating point formatting.
andreasfertig · Jan 28, 2025 · be2c95f · be2c95f
2 parents 5b73fd8 + 4df4724
commit be2c95f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/CodeGenerator.cpp b/CodeGenerator.cpp
@@ -747,8 +747,7 @@ void CodeGenerator::InsertArg(const IntegerLiteral* stmt)
 
 void CodeGenerator::InsertArg(const FloatingLiteral* stmt)
 {
-    // FIXME: not working correctly
-    mOutputFormatHelper.Append(EvaluateAsFloat(*stmt));
+    mOutputFormatHelper.Append(stmt->getValue());
     InsertSuffix(stmt->getType());
 }
 //-----------------------------------------------------------------------------

diff --git a/InsightsHelpers.cpp b/InsightsHelpers.cpp
@@ -309,23 +309,6 @@ const QualType GetDesugarType(const QualType& QT)
 }
 //-----------------------------------------------------------------------------
 
-const std::string EvaluateAsFloat(const FloatingLiteral& expr)
-{
-    // return std::to_string(expr.getValueAsApproximateDouble());
-
-    SmallString<16> str{};
-    expr.getValue().toString(str);
-
-    if(std::string::npos == str.find('.')) {
-        /* in case it is a number like 10.0 toString() seems to leave out the .0. However, as this distinguished
-         * between an integer and a floating point literal we need that dot. */
-        str.append(".0"sv);
-    }
-
-    return std::string{str.str()};
-}
-//-----------------------------------------------------------------------------
-
 static const VarDecl* GetVarDeclFromDeclRefExpr(const DeclRefExpr& declRefExpr)
 {
     const auto* valueDecl = declRefExpr.getDecl();

diff --git a/InsightsHelpers.h b/InsightsHelpers.h
@@ -189,7 +189,6 @@ std::string GetDeclContext(const DeclContext*     ctx,
                            WithTemplateParameters withTemplateParameters = WithTemplateParameters::No);
 //-----------------------------------------------------------------------------
 
-const std::string      EvaluateAsFloat(const FloatingLiteral& expr);
 const std::string      GetNoExcept(const FunctionDecl& decl);
 const std::string_view GetConst(const FunctionDecl& decl);
 //-----------------------------------------------------------------------------

diff --git a/InsightsStrCat.h b/InsightsStrCat.h
@@ -51,26 +51,29 @@ inline std::string Normalize(const llvm::APSInt& arg)
 }
 //-----------------------------------------------------------------------------
 
-inline std::string Normalize(const APValue& arg)
+inline std::string Normalize(const llvm::APFloat& arg)
 {
-    switch(arg.getKind()) {
-        case APValue::Int: return Normalize(arg.getInt());
-        case APValue::Float: {
-            std::string                str{};
-            ::llvm::raw_string_ostream stream{str};
+    std::string                str{};
+    ::llvm::raw_string_ostream stream{str};
 
-            arg.getFloat().print(stream);
-            str.pop_back();
+    arg.print(stream);
+    str.pop_back();
 
-            if(std::string::npos == str.find('.')) {
-                /* in case it is a number like 10.0 toString() seems to leave out the .0. However, as this distinguished
-                 * between an integer and a floating point literal we need that dot. */
-                str.append(".0");
-            }
+    if(std::string::npos == str.find('.')) {
+        /* in case it is a number like 10.0 toString() seems to leave out the .0. However, as this distinguished
+         * between an integer and a floating point literal we need that dot. */
+        str.append(".0");
+    }
 
-            return str;
-        }
+    return str;
+}
+//-----------------------------------------------------------------------------
 
+inline std::string Normalize(const APValue& arg)
+{
+    switch(arg.getKind()) {
+        case APValue::Int: return Normalize(arg.getInt());
+        case APValue::Float: return Normalize(arg.getFloat());
         default: break;
     }