From cd54a0ed3b6e2f022035b6e56ccce052b78c4e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 9 Mar 2009 20:29:25 +0100 Subject: [PATCH] Fixed ticket 147 (Invalid line number for error message) --- src/preprocessor.cpp | 9 ++++++++- test/testpreprocessor.cpp | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/preprocessor.cpp b/src/preprocessor.cpp index fdc525566..6a9a5cbe4 100644 --- a/src/preprocessor.cpp +++ b/src/preprocessor.cpp @@ -806,6 +806,9 @@ std::string Preprocessor::expandMacros(std::string code) std::string::size_type pos2 = pos1 + macro.name().length(); if (macro.params().size() && pos2 >= code.length()) continue; + + unsigned int numberOfNewlines = 0; + if (macro.params().size()) { if (code[pos2] != '(') @@ -850,6 +853,10 @@ std::string Preprocessor::expandMacros(std::string code) par += code[pos2]; continue; } + else if (code[pos2] == '\n') + { + ++numberOfNewlines; + } if (parlevel == 1 && code[pos2] == ',') { @@ -868,7 +875,7 @@ std::string Preprocessor::expandMacros(std::string code) continue; // Create macro code.. - const std::string macrocode(macro.code(params)); + const std::string macrocode(std::string(numberOfNewlines, '\n') + macro.code(params)); // Insert macro code.. if (!macro.params().empty()) diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp index da571f235..d2932e866 100644 --- a/test/testpreprocessor.cpp +++ b/test/testpreprocessor.cpp @@ -95,7 +95,7 @@ private: TEST_CASE(macro_simple7); TEST_CASE(macro_simple8); TEST_CASE(macro_mismatch); - // TODO TEST_CASE(macro_linenumbers); + TEST_CASE(macro_linenumbers); TEST_CASE(string1); TEST_CASE(string2); TEST_CASE(preprocessor_undef);