Tokenizer: Do not remove 'constexpr'

danmar · danmar · commit 2f400b40ba00 · 2018-11-02T20:32:12.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9102,8 +9102,8 @@ void Tokenizer::simplifyKeyword()
         }
 
         if (isCPP() && mSettings->standards.cpp >= Standards::CPP11) {
-            while (tok->str() == "constexpr") {
-                tok->deleteThis();
+            if (tok->str() == "constexpr") {
+                tok->str("const");
             }
 
             // final:
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -3272,7 +3272,7 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }", true));
         ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }", true));
         ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }", true));
-        ASSERT_EQUALS("int foo ( ) { }", tok("constexpr int foo() { }", true));
+        ASSERT_EQUALS("", tok("constexpr int x = 3;", true));
         ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }", true));
         ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", "test.c"));
         ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", "test.c"));

Original file line number	Diff line number	Diff line change
`@@ -9102,8 +9102,8 @@ void Tokenizer::simplifyKeyword()`
`9102`	`9102`	`}`
`9103`	`9103`
`9104`	`9104`	`if (isCPP() && mSettings->standards.cpp >= Standards::CPP11) {`
`9105`		`- while (tok->str() == "constexpr") {`
`9106`		`- tok->deleteThis();`
	`9105`	`+ if (tok->str() == "constexpr") {`
	`9106`	`+ tok->str("const");`
`9107`	`9107`	`}`
`9108`	`9108`
`9109`	`9109`	`// final:`