walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix template debug output line numbers (#2938)

This commit is contained in:
IOBYTE 2020-12-08 04:35:13 -05:00 committed by GitHub
parent 6103da59be
commit 8161baf1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/token.cpp
View File

@ -1258,6 +1258,14 @@ std::string Token::stringifyList(const stringifyOptions& options, const std::vec
ret << tok->linenr() << ": ";
} else if (this == tok && options.linenumbers) {
ret << tok->linenr() << ": ";
} else if (lineNumber > tok->linenr()) {
lineNumber = tok->linenr();
ret << '\n';
if (options.linenumbers) {
ret << lineNumber << ':';
if (lineNumber == tok->linenr())
ret << ' ';
}
} else {
while (lineNumber < tok->linenr()) {
++lineNumber;
@ -1273,7 +1281,7 @@ std::string Token::stringifyList(const stringifyOptions& options, const std::vec
}
tok->stringify(ret, options); // print token
if (tok->next() != end && (!options.linebreaks || (tok->next()->linenr() <= tok->linenr() && tok->next()->fileIndex() == tok->fileIndex())))
if (tok->next() != end && (!options.linebreaks || (tok->next()->linenr() == tok->linenr() && tok->next()->fileIndex() == tok->fileIndex())))
ret << ' ';
}
if (options.linebreaks && (options.files || options.linenumbers))

4
lib/tokenize.cpp
View File

@ -6519,6 +6519,10 @@ void Tokenizer::simplifyFunctionParameters()
//since there are changes to tokens, put tok where tok1 is
tok = declEnd->next();
//fix up line number
if (tok->str() == ",")
tok->linenr(tok->previous()->linenr());
}
//goto forward and continue
tok = tok->next()->link();

32
test/testtokenize.cpp
View File

@ -882,7 +882,8 @@ private:
"2:\n"
"|\n"
"5:\n"
"6: Container<int> intContainer@1 ; struct Container<int> {\n"
"6: Container<int> intContainer@1 ;\n"
"1: struct Container<int> {\n"
"2: Container<int> ( ) ;\n"
"3: int * mElements@2 ;\n"
"4: } ;\n"
@ -4012,9 +4013,8 @@ private:
"}\n";
ASSERT_EQUALS("void func (\n"
"int in ,\n"
"int r ,\n"
"int m )\n"
"int in , int r , int m\n"
")\n"
"{\n"
"}", tokenizeAndStringify(code));
}
@ -4025,7 +4025,8 @@ private:
"}\n";
ASSERT_EQUALS("void f (\n"
"char * r )\n"
"char * r\n"
")\n"
"\n"
"{\n"
"}", tokenizeAndStringify(code));
@ -4046,7 +4047,8 @@ private:
"}\n";
ASSERT_EQUALS("void f (\n"
"char * r )\n"
"char * r\n"
")\n"
"\n"
"{\n"
"}", tokenizeAndStringify(code));
@ -4060,8 +4062,8 @@ private:
ASSERT_EQUALS("void f (\n"
"char * r ,\n"
"\n"
"char * s )\n"
"char * s\n"
")\n"
"\n"
"\n"
"{\n"
@ -4074,9 +4076,8 @@ private:
"}\n";
ASSERT_EQUALS("void f (\n"
"char * r ,\n"
"char * s ,\n"
"char * t )\n"
"char * r , char * s , char * t\n"
")\n"
"\n"
"{\n"
"}", tokenizeAndStringify(code));
@ -5321,7 +5322,8 @@ private:
"int main ( )\n"
"{\n"
"fn2<int> ( ) ;\n"
"} void fn2<int> ( int t = [ ] { return 1 ; } ( ) )\n"
"}\n"
"void fn2<int> ( int t = [ ] { return 1 ; } ( ) )\n"
"{ }", tokenizeAndStringify(code));
}
@ -5340,7 +5342,8 @@ private:
ASSERT_EQUALS("struct S<int,(int)0> ;\n"
"\n"
"\n"
"S<int,(int)0> s ; struct S<int,(int)0>\n"
"S<int,(int)0> s ;\n"
"struct S<int,(int)0>\n"
"{ } ;",
tokenizeAndStringify(code));
}
@ -8725,7 +8728,8 @@ private:
"2: int a ; a = 1 ;\n"
"3: void f ( ) { g<int> ( 1 ) ; }\n"
"4: void g<int> ( int x ) ;\n"
"5: } ; void A :: g<int> ( int x ) { a = 2 ; }\n",
"5: } ;\n"
"4: void A :: g<int> ( int x ) { a = 2 ; }\n",
checkHeaders(code, true));
ASSERT_EQUALS("\n\n##file 1\n\n"