From 52b5446d863121fe8bd9f892e52abb7796bd7133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 20 Nov 2015 10:23:38 +0100
Subject: [PATCH] Improve handling of various standard character constants

---
 lib/mathlib.cpp | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 635025d62..7932a1109 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -367,15 +367,42 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
         char c;
         if (str.size() == 3U)
             c = str[1];
-        else if (str == "\'\\0\'")
-            c = '\0';
-        else if (str == "\'\\n\'")
-            c = '\n';
-        else if (str == "\'\\r\'")
-            c = '\r';
-        else if (str == "\'\\t\'")
-            c = '\t';
-        else
+        else if (str[1] == '\\' && str.size() == 4U) {
+            switch (str[2]) {
+            case '0':
+                c = '\0';
+                break;
+            case 'a':
+                c = '\a';
+                break;
+            case 'b':
+                c = '\b';
+                break;
+            case 'f':
+                c = '\f';
+                break;
+            case 'n':
+                c = '\n';
+                break;
+            case 'r':
+                c = '\r';
+                break;
+            case 't':
+                c = '\t';
+                break;
+            case 'v':
+                c = '\v';
+                break;
+            case '\\':
+            case '\?':
+            case '\'':
+            case '\"':
+                c = str[2];
+                break;
+            default:
+                throw InternalError(0, "MathLib::toLongNumber: Unhandled char constant " + str);
+            }
+        } else
             throw InternalError(0, "MathLib::toLongNumber: Unhandled char constant " + str);
         return c & 0xff;
     }