Fixed fix for cppcheck-opensource#7042 - support hexadecimal digits

PKEuS · PKEuS · commit 52be380ef022 · 2015-10-18T16:37:33.000+02:00
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -662,7 +662,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
             }
 
             // C++14 digit separators
-            if (ch == '\'' && std::isdigit(previous))
+            if (ch == '\'' && std::isxdigit(previous))
                 ; // Just skip it.
 
             // String or char constants..
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
@@ -338,8 +338,10 @@ class TestPreprocessor : public TestFixture {
     }
 
     void readCode5() {
-        const char code[] = "int i = 0x1000'00;";
-        ASSERT_EQUALS("int i = 0x100000;", preprocessorRead(code));
+        ASSERT_EQUALS("int i = 0x100000;", preprocessorRead("int i = 0x1000'00;"));
+        ASSERT_EQUALS("", errout.str());
+
+        ASSERT_EQUALS("int i = 0x0F0FFFFF;", preprocessorRead("int i = 0x0F0F'FFFF;"));
         ASSERT_EQUALS("", errout.str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`// C++14 digit separators`
`665`		`- if (ch == '\'' && std::isdigit(previous))`
	`665`	`+ if (ch == '\'' && std::isxdigit(previous))`
`666`	`666`	`; // Just skip it.`
`667`	`667`
`668`	`668`	`// String or char constants..`
Original file line number	Diff line number	Diff line change
`@@ -338,8 +338,10 @@ class TestPreprocessor : public TestFixture {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`void readCode5() {`
`341`		`- const char code[] = "int i = 0x1000'00;";`
`342`		`- ASSERT_EQUALS("int i = 0x100000;", preprocessorRead(code));`
	`341`	`+ ASSERT_EQUALS("int i = 0x100000;", preprocessorRead("int i = 0x1000'00;"));`
	`342`	`+ ASSERT_EQUALS("", errout.str());`
	`343`	`+`
	`344`	`+ ASSERT_EQUALS("int i = 0x0F0FFFFF;", preprocessorRead("int i = 0x0F0F'FFFF;"));`
`343`	`345`	`ASSERT_EQUALS("", errout.str());`
`344`	`346`	`}`
`345`	`347`