fix some cppcheck and compiler warnings (#93)

matthiaskrgr · danmar · commit 48a34f77af90 · 2017-08-09T22:13:38.000+02:00
* fix cppcheck findings:

[simplecpp.h:182] -&gt; [simplecpp.cpp:226]: (style, inconclusive) Function 'push_back' argument 1 names different: declaration 'token' definition 'tok'.
[simplecpp.h:249] -&gt; [simplecpp.cpp:872]: (style, inconclusive) Function 'constFoldQuestionOp' argument 1 names different: declaration 'tok' definition 'tok1'.
[simplecpp.cpp:1643]: (performance, inconclusive) Technically the member function 'simplecpp::Macro::isReplaced' can be static.

* makefile: add -Warning flags that cppcheck uses to simplecpp build.

Namely:
	-Wabi
	-Wcast-qual
	-Wfloat-equal
	-Wmissing-declarations
	-Wmissing-format-attribute
	-Wredundant-decls
	-Wshadow

* fix -Wshadow warning.

Was:

main.cpp:65:35: warning: declaration shadows a local variable [-Wshadow]
    for (const simplecpp::Output &amp;output : outputList) {
                                  ^
main.cpp:60:26: note: previous declaration is here
    simplecpp::TokenList output(files);
                         ^
1 warning generated.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 all:	testrunner simplecpp
 
-CXXFLAGS = -Wall -Wextra -pedantic -g -std=c++0x
+CXXFLAGS = -Wall -Wextra  -Wabi -Wcast-qual -Wfloat-equal -Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls -Wshadow -pedantic -g -std=c++0x
 LDFLAGS = -g
 
 %.o: %.cpp
diff --git a/main.cpp b/main.cpp
@@ -57,11 +57,11 @@ int main(int argc, char **argv)
     std::map<std::string, simplecpp::TokenList*> included = simplecpp::load(rawtokens, files, dui, &outputList);
     for (std::pair<std::string, simplecpp::TokenList *> i : included)
         i.second->removeComments();
-    simplecpp::TokenList output(files);
-    simplecpp::preprocess(output, rawtokens, files, included, dui, &outputList);
+    simplecpp::TokenList outputTokens(files);
+    simplecpp::preprocess(outputTokens, rawtokens, files, included, dui, &outputList);
 
     // Output
-    std::cout << output.stringify() << std::endl;
+    std::cout << outputTokens.stringify() << std::endl;
     for (const simplecpp::Output &output : outputList) {
         std::cerr << output.location.file() << ':' << output.location.line << ": ";
         switch (output.type) {
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1640,7 +1640,7 @@ namespace simplecpp {
             return nextTok;
         }
 
-        bool isReplaced(const std::set<std::string> &expandedmacros) const {
+        static bool isReplaced(const std::set<std::string> &expandedmacros) {
             // return true if size > 1
             std::set<std::string>::const_iterator it = expandedmacros.begin();
             if (it == expandedmacros.end())
diff --git a/simplecpp.h b/simplecpp.h
@@ -179,7 +179,7 @@ namespace simplecpp {
         bool empty() const {
             return !frontToken;
         }
-        void push_back(Token *token);
+        void push_back(Token *tok);
 
         void dump() const;
         std::string stringify() const;
@@ -246,7 +246,7 @@ namespace simplecpp {
         void constFoldComparison(Token *tok);
         void constFoldBitwise(Token *tok);
         void constFoldLogicalOp(Token *tok);
-        void constFoldQuestionOp(Token **tok);
+        void constFoldQuestionOp(Token **tok1);
 
         std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList);
 

Original file line number	Diff line number	Diff line change
`@@ -1640,7 +1640,7 @@ namespace simplecpp {`
`1640`	`1640`	`return nextTok;`
`1641`	`1641`	`}`
`1642`	`1642`
`1643`		`- bool isReplaced(const std::set<std::string> &expandedmacros) const {`
	`1643`	`+ static bool isReplaced(const std::set<std::string> &expandedmacros) {`
`1644`	`1644`	`// return true if size > 1`
`1645`	`1645`	`std::set<std::string>::const_iterator it = expandedmacros.begin();`
`1646`	`1646`	`if (it == expandedmacros.end())`