Added octal numbers recognition (danmar#172)

o-bolshakov · danmar · commit b00c8e7fcf66 · 2019-07-24T21:46:22.000+02:00
* Added octal numbers recognition

* More strict octal numbers recognition. constFold() is extended to check octals.
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -45,6 +45,11 @@ static bool isHex(const std::string &s)
     return s.size()>2 && (s.compare(0,2,"0x")==0 || s.compare(0,2,"0X")==0);
 }
 
+static bool isOct(const std::string &s)
+{
+    return s.size()>1 && (s[0]=='0') && (s[1] >= '0') && (s[1] < '8');
+}
+
 
 static const simplecpp::TokenString DEFINE("define");
 static const simplecpp::TokenString UNDEF("undef");
@@ -76,9 +81,12 @@ static long long stringToLL(const std::string &s)
 {
     long long ret;
     const bool hex = isHex(s);
-    std::istringstream istr(hex ? s.substr(2) : s);
+    const bool oct = isOct(s);
+    std::istringstream istr(hex ? s.substr(2) : oct ? s.substr(1) : s);
     if (hex)
         istr >> std::hex;
+    else if (oct)
+        istr >> std::oct;
     istr >> ret;
     return ret;
 }
@@ -87,9 +95,12 @@ static unsigned long long stringToULL(const std::string &s)
 {
     unsigned long long ret;
     const bool hex = isHex(s);
-    std::istringstream istr(hex ? s.substr(2) : s);
+    const bool oct = isOct(s);
+    std::istringstream istr(hex ? s.substr(2) : oct ? s.substr(1) : s);
     if (hex)
         istr >> std::hex;
+    else if (oct)
+        istr >> std::oct;
     istr >> ret;
     return ret;
 }
@@ -765,7 +776,7 @@ void simplecpp::TokenList::combineOperators()
         }
         // match: [0-9.]+E [+-] [0-9]+
         const char lastChar = tok->str()[tok->str().size() - 1];
-        if (tok->number && !isHex(tok->str()) && (lastChar == 'E' || lastChar == 'e') && tok->next && tok->next->isOneOf("+-") && tok->next->next && tok->next->next->number) {
+        if (tok->number && !isHex(tok->str()) && !isOct(tok->str()) && (lastChar == 'E' || lastChar == 'e') && tok->next && tok->next->isOneOf("+-") && tok->next->next && tok->next->next->number) {
             tok->setstr(tok->str() + tok->next->op + tok->next->next->str());
             deleteToken(tok->next);
             deleteToken(tok->next);
diff --git a/test.cpp b/test.cpp
@@ -204,6 +204,8 @@ static void constFold()
     ASSERT_EQUALS("29", testConstFold("13 ^ 16"));
     ASSERT_EQUALS("25", testConstFold("24 | 1"));
     ASSERT_EQUALS("2", testConstFold("1?2:3"));
+    ASSERT_EQUALS("24", testConstFold("010+020"));
+    ASSERT_EQUALS("1", testConstFold("010==8"));
     ASSERT_EQUALS("exception", testConstFold("!1 ? 2 :"));
     ASSERT_EQUALS("exception", testConstFold("?2:3"));
 }

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,8 @@ static void constFold()`
`204`	`204`	`ASSERT_EQUALS("29", testConstFold("13 ^ 16"));`
`205`	`205`	`ASSERT_EQUALS("25", testConstFold("24 \| 1"));`
`206`	`206`	`ASSERT_EQUALS("2", testConstFold("1?2:3"));`
	`207`	`+ ASSERT_EQUALS("24", testConstFold("010+020"));`
	`208`	`+ ASSERT_EQUALS("1", testConstFold("010==8"));`
`207`	`209`	`ASSERT_EQUALS("exception", testConstFold("!1 ? 2 :"));`
`208`	`210`	`ASSERT_EQUALS("exception", testConstFold("?2:3"));`
`209`	`211`	`}`