do not default simplecpp::Location::line to 1

firewave · firewave · commit d37900d91031 · 2025-12-04T15:09:53.000+01:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -565,6 +565,7 @@ std::string simplecpp::TokenList::stringify(bool linenrs) const
 {
     std::ostringstream ret;
     Location loc(files);
+    loc.line = 1;
     bool filechg = true;
     for (const Token *tok = cfront(); tok; tok = tok->next) {
         if (tok->location.line < loc.line || tok->location.fileIndex != loc.fileIndex) {
diff --git a/simplecpp.h b/simplecpp.h
@@ -110,7 +110,7 @@ namespace simplecpp {
 
         const std::vector<std::string> &files;
         unsigned int fileIndex{};
-        unsigned int line{1};
+        unsigned int line{};
         unsigned int col{};
     private:
         static const std::string emptyFileName;
diff --git a/test.cpp b/test.cpp
@@ -2732,7 +2732,7 @@ static void readfile_file_not_found()
     simplecpp::OutputList outputList;
     std::vector<std::string> files;
     (void)simplecpp::TokenList("NotAFile", files, &outputList);
-    ASSERT_EQUALS("file0,1,file_not_found,File is missing: NotAFile\n", toString(outputList));
+    ASSERT_EQUALS("file0,0,file_not_found,File is missing: NotAFile\n", toString(outputList));
 }
 
 static void stringify1()

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,7 @@ std::string simplecpp::TokenList::stringify(bool linenrs) const`
`565`	`565`	`{`
`566`	`566`	`std::ostringstream ret;`
`567`	`567`	`Location loc(files);`
	`568`	`+ loc.line = 1;`
`568`	`569`	`bool filechg = true;`
`569`	`570`	`for (const Token *tok = cfront(); tok; tok = tok->next) {`
`570`	`571`	`if (tok->location.line < loc.line \|\| tok->location.fileIndex != loc.fileIndex) {`
Original file line number	Diff line number	Diff line change
`@@ -2732,7 +2732,7 @@ static void readfile_file_not_found()`
`2732`	`2732`	`simplecpp::OutputList outputList;`
`2733`	`2733`	`std::vector<std::string> files;`
`2734`	`2734`	`(void)simplecpp::TokenList("NotAFile", files, &outputList);`
`2735`		`- ASSERT_EQUALS("file0,1,file_not_found,File is missing: NotAFile\n", toString(outputList));`
	`2735`	`+ ASSERT_EQUALS("file0,0,file_not_found,File is missing: NotAFile\n", toString(outputList));`
`2736`	`2736`	`}`
`2737`	`2737`
`2738`	`2738`	`static void stringify1()`