simplecpp.cpp: Issue error when an explicitly included file is not found (cppcheck-opensource#184)

versat · danmar · commit c27e5d46dced · 2019-12-07T21:25:11.000+01:00
* simplecpp.cpp: Issue error when an explicitly included file is not found If a file is explicitly included for example via command line option `-include=` but can not be opened this error message is issued now. Example: $ ./simplecpp -include=blah.h foo.c int main ( ) { return 0 ; } foo.c:1: missing header: Can not open include file 'blah.h' that is explicitly included for all files. Fixes cppcheck-opensource#183 * Change `error.type` from `MISSING_HEADER` header to `ERROR` `MISSING_HEADER` is only meant as an information to the user, nothing really relevant while this issue reveals a problem with the command line options that should get fixed. * simplecpp.cpp: Fix error message * Add new output error type EXPLICIT_INCLUDE_NOT_FOUND
diff --git a/main.cpp b/main.cpp
@@ -86,6 +86,9 @@ int main(int argc, char **argv)
         case simplecpp::Output::UNHANDLED_CHAR_ERROR:
             std::cerr << "unhandled char error: ";
             break;
+        case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+            std::cerr << "explicit include not found: ";
+            break;
         }
         std::cerr << output.msg << std::endl;
     }
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -2426,8 +2426,16 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
             continue;
 
         std::ifstream fin(filename.c_str());
-        if (!fin.is_open())
+        if (!fin.is_open()) {
+            if (outputList) {
+                simplecpp::Output err(fileNumbers);
+                err.type = simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND;
+                err.location = Location(fileNumbers);
+                err.msg = "Can not open include file '" + filename + "' that is explicitly included.";
+                outputList->push_back(err);
+            }
             continue;
+        }
 
         TokenList *tokenlist = new TokenList(fin, fileNumbers, filename, outputList);
         if (!tokenlist->front()) {
diff --git a/simplecpp.h b/simplecpp.h
@@ -167,7 +167,8 @@ namespace simplecpp {
             INCLUDE_NESTED_TOO_DEEPLY,
             SYNTAX_ERROR,
             PORTABILITY_BACKSLASH,
-            UNHANDLED_CHAR_ERROR
+            UNHANDLED_CHAR_ERROR,
+            EXPLICIT_INCLUDE_NOT_FOUND
         } type;
         Location location;
         std::string msg;
diff --git a/test.cpp b/test.cpp
@@ -92,6 +92,9 @@ static std::string toString(const simplecpp::OutputList &outputList)
             break;
         case simplecpp::Output::Type::UNHANDLED_CHAR_ERROR:
             ostr << "unhandled_char_error,";
+            break;
+        case simplecpp::Output::Type::EXPLICIT_INCLUDE_NOT_FOUND:
+            ostr << "explicit_include_not_found,";
         }
 
         ostr << output.msg << '\n';

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ int main(int argc, char **argv)`
`86`	`86`	`case simplecpp::Output::UNHANDLED_CHAR_ERROR:`
`87`	`87`	`std::cerr << "unhandled char error: ";`
`88`	`88`	`break;`
	`89`	`+ case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:`
	`90`	`+ std::cerr << "explicit include not found: ";`
	`91`	`+ break;`
`89`	`92`	`}`
`90`	`93`	`std::cerr << output.msg << std::endl;`
`91`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ static std::string toString(const simplecpp::OutputList &outputList)`
`92`	`92`	`break;`
`93`	`93`	`case simplecpp::Output::Type::UNHANDLED_CHAR_ERROR:`
`94`	`94`	`ostr << "unhandled_char_error,";`
	`95`	`+ break;`
	`96`	`+ case simplecpp::Output::Type::EXPLICIT_INCLUDE_NOT_FOUND:`
	`97`	`+ ostr << "explicit_include_not_found,";`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`ostr << output.msg << '\n';`