Use 'normal' checking instead of 'simplified'

danmar · danmar · commit f40a80c349d1 · 2019-03-16T07:19:48.000+01:00
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
@@ -61,8 +61,7 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {
     }
 
-    /** Checks that uses the simplified token list */
-    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
         if (tokenizer->isC())
             return;
 
@@ -75,6 +74,12 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
         checkExceptionSafety.unhandledExceptionSpecification();
     }
 
+    void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+        (void)tokenizer;
+        (void)settings;
+        (void)errorLogger;
+    }
+
     /** Don't throw exceptions in destructors */
     void destructors();
 
diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -82,8 +82,6 @@ class TestBool : public TestFixture {
         // Check...
         CheckBool checkBool(&tokenizer, &settings, this);
         checkBool.runChecks(&tokenizer, &settings, this);
-        tokenizer.simplifyTokenList2();
-        checkBool.runSimplifiedChecks(&tokenizer, &settings, this);
     }
 
 
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -54,8 +54,6 @@ class TestBufferOverrun : public TestFixture {
         // Check for buffer overruns..
         CheckBufferOverrun checkBufferOverrun;
         checkBufferOverrun.runChecks(&tokenizer, &settings0, this);
-        tokenizer.simplifyTokenList2();
-        checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings0, this);
     }
 
     void check(const char code[], const Settings &settings, const char filename[] = "test.cpp") {
@@ -69,8 +67,6 @@ class TestBufferOverrun : public TestFixture {
         // Check for buffer overruns..
         CheckBufferOverrun checkBufferOverrun(&tokenizer, &settings, this);
         checkBufferOverrun.runChecks(&tokenizer, &settings, this);
-        tokenizer.simplifyTokenList2();
-        checkBufferOverrun.runSimplifiedChecks(&tokenizer, &settings, this);
     }
 
     void run() OVERRIDE {
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -140,8 +140,6 @@ class TestCondition : public TestFixture {
         // Run checks..
         CheckCondition checkCondition;
         checkCondition.runChecks(&tokenizer, &settings0, this);
-        tokenizer.simplifyTokenList2();
-        checkCondition.runSimplifiedChecks(&tokenizer, &settings0, this);
     }
 
     void assignAndCompare() {
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -66,7 +66,7 @@ class TestExceptionSafety : public TestFixture {
 
         // Check char variable usage..
         CheckExceptionSafety checkExceptionSafety(&tokenizer, &settings, this);
-        checkExceptionSafety.runSimplifiedChecks(&tokenizer, &settings, this);
+        checkExceptionSafety.runChecks(&tokenizer, &settings, this);
     }
 
     void destructors() {

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,6 @@ class TestBool : public TestFixture {`
`82`	`82`	`// Check...`
`83`	`83`	`CheckBool checkBool(&tokenizer, &settings, this);`
`84`	`84`	`checkBool.runChecks(&tokenizer, &settings, this);`
`85`		`- tokenizer.simplifyTokenList2();`
`86`		`- checkBool.runSimplifiedChecks(&tokenizer, &settings, this);`
`87`	`85`	`}`
`88`	`86`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,6 @@ class TestCondition : public TestFixture {`
`140`	`140`	`// Run checks..`
`141`	`141`	`CheckCondition checkCondition;`
`142`	`142`	`checkCondition.runChecks(&tokenizer, &settings0, this);`
`143`		`- tokenizer.simplifyTokenList2();`
`144`		`- checkCondition.runSimplifiedChecks(&tokenizer, &settings0, this);`
`145`	`143`	`}`
`146`	`144`
`147`	`145`	`void assignAndCompare() {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class TestExceptionSafety : public TestFixture {`
`66`	`66`
`67`	`67`	`// Check char variable usage..`
`68`	`68`	`CheckExceptionSafety checkExceptionSafety(&tokenizer, &settings, this);`
`69`		`- checkExceptionSafety.runSimplifiedChecks(&tokenizer, &settings, this);`
	`69`	`+ checkExceptionSafety.runChecks(&tokenizer, &settings, this);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`void destructors() {`