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

astyle formatting

This commit is contained in:
Daniel Marjamäki 2009-07-26 22:13:08 +02:00
parent 6c022798ea
commit b4a6d74e42
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/tokenize.cpp
View File

@ -3238,11 +3238,15 @@ bool Tokenizer::simplifyComma()
Token *endAt = NULL; // first ";" token after "; return"
// find "; return" pattern before comma
for (Token *tok2 = tok; tok2; tok2 = tok2->previous()) {
if (Token::Match(tok2, "[;{}]")) {
for (Token *tok2 = tok; tok2; tok2 = tok2->previous())
{
if (Token::Match(tok2, "[;{}]"))
{
break;
} else if (tok2->str() == "return" && Token::Match(tok2->previous(), "[;{}]")) {
}
else if (tok2->str() == "return" && Token::Match(tok2->previous(), "[;{}]"))
{
inReturn = true;
startFrom = tok2->next();
break;
@ -3250,44 +3254,61 @@ bool Tokenizer::simplifyComma()
}
// find token where return ends and also count commas
if (inReturn) {
if (inReturn)
{
size_t commaCounter = 0;
size_t indentlevel = 0;
for (Token *tok2 = startFrom; tok2; tok2 = tok2->next()) {
if (tok2->str() == ";") {
for (Token *tok2 = startFrom; tok2; tok2 = tok2->next())
{
if (tok2->str() == ";")
{
endAt = tok2;
break;
} else if (tok2->str() == "(") {
}
else if (tok2->str() == "(")
{
++indentlevel;
} else if (tok2->str() == ")") {
}
else if (tok2->str() == ")")
{
--indentlevel;
} else if (tok2->str() == "," && indentlevel == 0) {
}
else if (tok2->str() == "," && indentlevel == 0)
{
++commaCounter;
}
}
if (commaCounter) {
if (commaCounter)
{
indentlevel = 0;
// change tokens:
// "; return a ( ) , b ( ) , c ;"
// to
// "; return a ( ) ; b ( ) ; c ;"
for (Token *tok2 = startFrom; tok2 != endAt; tok2 = tok2->next()) {
if (tok2->str() == "(") {
for (Token *tok2 = startFrom; tok2 != endAt; tok2 = tok2->next())
{
if (tok2->str() == "(")
{
++indentlevel;
} else if (tok2->str() == ")") {
}
else if (tok2->str() == ")")
{
--indentlevel;
} else if (tok2->str() == "," && indentlevel == 0) {
}
else if (tok2->str() == "," && indentlevel == 0)
{
tok2->str(";");
--commaCounter;
if (commaCounter == 0) {
if (commaCounter == 0)
{
tok2->insertToken("return");
}
}

6
test/testsimplifytokens.cpp
View File

@ -1063,9 +1063,9 @@ private:
" {"
" if ( something )"
" {"
" a ( 2 , c ( 3 , 4 ) ) ;"
" b ( 3 ) ;"
" return 10 ;"
" a ( 2 , c ( 3 , 4 ) ) ;"
" b ( 3 ) ;"
" return 10 ;"
" }"
" a ( ) ;"
" b ( 0 , 0 , 0 ) ;"