fixed cppcheck-opensource#24 - warn about <backslash><whitespace><newline>

danmar · danmar · commit 0e22d0b92042 · 2016-09-03T11:12:46.000+02:00
diff --git a/main.cpp b/main.cpp
@@ -79,6 +79,9 @@ int main(int argc, char **argv) {
         case simplecpp::Output::SYNTAX_ERROR:
             std::cerr << "syntax error: ";
             break;
+        case simplecpp::Output::PORTABILITY_BACKSLASH:
+            std::cerr << "portability: ";
+            break;
         }
         std::cerr << output.msg << std::endl;
     }
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -342,6 +342,16 @@ static std::string escapeString(const std::string &str) {
     return ostr.str();
 }
 
+static void portabilityBackslash(simplecpp::OutputList *outputList, const std::vector<std::string> &files, const simplecpp::Location &location) {
+    if (!outputList)
+        return;
+    simplecpp::Output err(files);
+    err.type = simplecpp::Output::PORTABILITY_BACKSLASH;
+    err.location = location;
+    err.msg = "Combination 'backslash space newline' is not portable.";
+    outputList->push_back(err);
+}
+
 void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList)
 {
     std::stack<simplecpp::Location> loc;
@@ -363,6 +373,8 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
 
         if (ch == '\n') {
             if (cback() && cback()->op == '\\') {
+                if (location.col > cback()->location.col + 1U)
+                    portabilityBackslash(outputList, files, cback()->location);
                 ++multiline;
                 deleteToken(back());
             } else {
@@ -415,6 +427,9 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
                 currentToken += ch;
                 ch = readChar(istr, bom);
             }
+            const std::string::size_type pos = currentToken.find_last_not_of(" \t");
+            if (pos < currentToken.size() - 1U && currentToken[pos] == '\\')
+                portabilityBackslash(outputList, files, location);
             if (currentToken[currentToken.size() - 1U] == '\\') {
                 ++multiline;
                 currentToken.erase(currentToken.size() - 1U);
diff --git a/simplecpp.h b/simplecpp.h
@@ -158,7 +158,8 @@ struct SIMPLECPP_LIB Output {
         WARNING, /* #warning */
         MISSING_HEADER,
         INCLUDE_NESTED_TOO_DEEPLY,
-        SYNTAX_ERROR
+        SYNTAX_ERROR,
+        PORTABILITY_BACKSLASH
     } type;
     Location location;
     std::string msg;
diff --git a/test.cpp b/test.cpp
@@ -39,10 +39,10 @@ static void testcase(const std::string &name, void (*f)(), int argc, char **argv
 
 
 
-static std::string readfile(const char code[], int sz=-1) {
+static std::string readfile(const char code[], int sz=-1, simplecpp::OutputList *outputList=nullptr) {
     std::istringstream istr(sz == -1 ? std::string(code) : std::string(code,sz));
     std::vector<std::string> files;
-    return simplecpp::TokenList(istr,files).stringify();
+    return simplecpp::TokenList(istr,files,std::string(),outputList).stringify();
 }
 
 static std::string preprocess(const char code[], const simplecpp::DUI &dui, simplecpp::OutputList *outputList = NULL) {
@@ -81,13 +81,32 @@ static std::string toString(const simplecpp::OutputList &outputList) {
         case simplecpp::Output::Type::SYNTAX_ERROR:
             ostr << "syntax_error,";
             break;
+        case simplecpp::Output::Type::PORTABILITY_BACKSLASH:
+            ostr << "portability_backslash,";
+            break;
         }
 
         ostr << output.msg << '\n';
     }
     return ostr.str();
 }
 
+void backslash() {
+    // <backslash><space><newline> preprocessed differently
+    simplecpp::OutputList outputList;
+
+    readfile("//123 \\\n456", -1, &outputList);
+    ASSERT_EQUALS("", toString(outputList));
+    readfile("//123 \\ \n456", -1, &outputList);
+    ASSERT_EQUALS("file0,1,portability_backslash,Combination 'backslash space newline' is not portable.\n", toString(outputList));
+
+    outputList.clear();
+    readfile("#define A \\\n123", -1, &outputList);
+    ASSERT_EQUALS("", toString(outputList));
+    readfile("#define A \\ \n123", -1, &outputList);
+    ASSERT_EQUALS("file0,1,portability_backslash,Combination 'backslash space newline' is not portable.\n", toString(outputList));
+}
+
 void builtin() {
     ASSERT_EQUALS("\"\" 1 0", preprocess("__FILE__ __LINE__ __COUNTER__"));
     ASSERT_EQUALS("\n\n3", preprocess("\n\n__LINE__"));
@@ -965,6 +984,8 @@ void simplifyPath() {
 
 
 int main(int argc, char **argv) {
+    TEST_CASE(backslash);
+
     TEST_CASE(builtin);
 
     TEST_CASE(combineOperators_floatliteral);

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ int main(int argc, char **argv) {`
`79`	`79`	`case simplecpp::Output::SYNTAX_ERROR:`
`80`	`80`	`std::cerr << "syntax error: ";`
`81`	`81`	`break;`
	`82`	`+ case simplecpp::Output::PORTABILITY_BACKSLASH:`
	`83`	`+ std::cerr << "portability: ";`
	`84`	`+ break;`
`82`	`85`	`}`
`83`	`86`	`std::cerr << output.msg << std::endl;`
`84`	`87`	`}`