From 37572dc1091511618dcb03999c915465b3030e57 Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Thu, 10 Dec 2015 15:47:46 +0100
Subject: [PATCH] Small refactorizations: - Improved formatting of
 unhandled-char-constant message (Side-effect: fixes #7206) - Replace nr="-1"
 by nr="any" in windows.cfg

---
 cfg/windows.cfg | 2 +-
 lib/mathlib.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 693397532..79f117654 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1771,7 +1771,7 @@ HFONT CreateFont(
 -->
   <function name="CreateFont">
     <noreturn>false</noreturn>
-    <arg nr="-1">
+    <arg nr="any">
       <not-uninit/>
     </arg>
     <arg nr="14"/>
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 714528b69..0d55414b7 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -400,7 +400,7 @@ MathLib::bigint MathLib::characterLiteralToLongNumber(const std::string& str)
                 c = str[1];
                 break;
             default:
-                throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant " + str);
+                throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant '" + str + "'.");
             }
             return c & 0xff;
         case 2:
@@ -413,7 +413,7 @@ MathLib::bigint MathLib::characterLiteralToLongNumber(const std::string& str)
     }
     }
 
-    throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant " + str);
+    throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant '" + str + "'.");
 }
 
 MathLib::bigint MathLib::toLongNumber(const std::string & str)