fixed some clang-tidy and CLion inspection warnings (#165)

firewave · danmar · commit ad8599f78ab3 · 2019-05-05T09:52:58.000+02:00
diff --git a/main.cpp b/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
                 if (std::strncmp(arg, "-include=",9)==0)
                     dui.includes.push_back(arg+9);
                 break;
-            };
+            }
         } else {
             filename = arg;
         }
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -149,17 +149,17 @@ void simplecpp::Location::adjust(const std::string &str)
 
 bool simplecpp::Token::isOneOf(const char ops[]) const
 {
-    return (op != '\0') && (std::strchr(ops, op) != 0);
+    return (op != '\0') && (std::strchr(ops, op) != NULL);
 }
 
 bool simplecpp::Token::startsWithOneOf(const char c[]) const
 {
-    return std::strchr(c, string[0]) != 0;
+    return std::strchr(c, string[0]) != NULL;
 }
 
 bool simplecpp::Token::endsWithOneOf(const char c[]) const
 {
-    return std::strchr(c, string[string.size() - 1U]) != 0;
+    return std::strchr(c, string[string.size() - 1U]) != NULL;
 }
 
 void simplecpp::Token::printAll() const
@@ -2685,7 +2685,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 } else if (pragmaOnce.find(header2) == pragmaOnce.end()) {
                     includetokenstack.push(gotoNextLine(rawtok));
                     const TokenList *includetokens = filedata.find(header2)->second;
-                    rawtok = includetokens ? includetokens->cfront() : 0;
+                    rawtok = includetokens ? includetokens->cfront() : NULL;
                     continue;
                 }
             } else if (rawtok->str() == IF || rawtok->str() == IFDEF || rawtok->str() == IFNDEF || rawtok->str() == ELIF) {
diff --git a/simplecpp.h b/simplecpp.h
@@ -179,7 +179,7 @@ namespace simplecpp {
     class SIMPLECPP_LIB TokenList {
     public:
         explicit TokenList(std::vector<std::string> &filenames);
-        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = 0);
+        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = NULL);
         TokenList(const TokenList &other);
 #if __cplusplus >= 201103L
         TokenList(TokenList &&other);
@@ -199,7 +199,7 @@ namespace simplecpp {
         void dump() const;
         std::string stringify() const;
 
-        void readfile(std::istream &istr, const std::string &filename=std::string(), OutputList *outputList = 0);
+        void readfile(std::istream &istr, const std::string &filename=std::string(), OutputList *outputList = NULL);
         void constFold();
 
         void removeComments();
@@ -264,7 +264,7 @@ namespace simplecpp {
         void constFoldLogicalOp(Token *tok);
         void constFoldQuestionOp(Token **tok1);
 
-        std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList, unsigned int bom);
+        std::string readUntil(std::istream &istr, const Location &location, char start, char end, OutputList *outputList, unsigned int bom);
         void lineDirective(unsigned int fileIndex, unsigned int line, Location *location);
 
         std::string lastLine(int maxsize=100000) const;
@@ -297,7 +297,7 @@ namespace simplecpp {
         std::list<std::string> includes;
     };
 
-    SIMPLECPP_LIB std::map<std::string, TokenList*> load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = 0);
+    SIMPLECPP_LIB std::map<std::string, TokenList*> load(const TokenList &rawtokens, std::vector<std::string> &filenames, const DUI &dui, OutputList *outputList = NULL);
 
     /**
      * Preprocess
@@ -310,7 +310,7 @@ namespace simplecpp {
      * @param outputList output: list that will receive output messages
      * @param macroUsage output: macro usage
      */
-    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, TokenList*> &filedata, const DUI &dui, OutputList *outputList = 0, std::list<MacroUsage> *macroUsage = 0);
+    SIMPLECPP_LIB void preprocess(TokenList &output, const TokenList &rawtokens, std::vector<std::string> &files, std::map<std::string, TokenList*> &filedata, const DUI &dui, OutputList *outputList = NULL, std::list<MacroUsage> *macroUsage = NULL);
 
     /**
      * Deallocate data
diff --git a/test.cpp b/test.cpp
@@ -1060,7 +1060,7 @@ static void missingHeader2()
     std::istringstream istr("#include \"foo.h\"\n"); // this file exists
     std::vector<std::string> files;
     std::map<std::string, simplecpp::TokenList*> filedata;
-    filedata["foo.h"] = 0;
+    filedata["foo.h"] = NULL;
     simplecpp::OutputList outputList;
     simplecpp::TokenList tokens2(files);
     simplecpp::preprocess(tokens2, simplecpp::TokenList(istr,files), files, filedata, dui, &outputList);

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ int main(int argc, char **argv)`
`32`	`32`	`if (std::strncmp(arg, "-include=",9)==0)`
`33`	`33`	`dui.includes.push_back(arg+9);`
`34`	`34`	`break;`
`35`		`- };`
	`35`	`+ }`
`36`	`36`	`} else {`
`37`	`37`	`filename = arg;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,17 +149,17 @@ void simplecpp::Location::adjust(const std::string &str)`
`149`	`149`
`150`	`150`	`bool simplecpp::Token::isOneOf(const char ops[]) const`
`151`	`151`	`{`
`152`		`- return (op != '\0') && (std::strchr(ops, op) != 0);`
	`152`	`+ return (op != '\0') && (std::strchr(ops, op) != NULL);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`bool simplecpp::Token::startsWithOneOf(const char c[]) const`
`156`	`156`	`{`
`157`		`- return std::strchr(c, string[0]) != 0;`
	`157`	`+ return std::strchr(c, string[0]) != NULL;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`bool simplecpp::Token::endsWithOneOf(const char c[]) const`
`161`	`161`	`{`
`162`		`- return std::strchr(c, string[string.size() - 1U]) != 0;`
	`162`	`+ return std::strchr(c, string[string.size() - 1U]) != NULL;`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`void simplecpp::Token::printAll() const`
`@@ -2685,7 +2685,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL`
`2685`	`2685`	`} else if (pragmaOnce.find(header2) == pragmaOnce.end()) {`
`2686`	`2686`	`includetokenstack.push(gotoNextLine(rawtok));`
`2687`	`2687`	`const TokenList *includetokens = filedata.find(header2)->second;`
`2688`		`- rawtok = includetokens ? includetokens->cfront() : 0;`
	`2688`	`+ rawtok = includetokens ? includetokens->cfront() : NULL;`
`2689`	`2689`	`continue;`
`2690`	`2690`	`}`
`2691`	`2691`	`} else if (rawtok->str() == IF \|\| rawtok->str() == IFDEF \|\| rawtok->str() == IFNDEF \|\| rawtok->str() == ELIF) {`