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

Building Statement List: CONTINUE, BREAK

This commit is contained in:
Daniel Marjamäki 2007-05-19 17:01:42 +00:00
parent a21ca7e6f6
commit 0d5d4f299a
4 changed files with 85 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internaltesting.bat
View File

@ -15,3 +15,8 @@ hydfc internaltesting\testuse.out internaltesting\testuse.msg
cppcheck --debug internaltesting\testif.cpp > internaltesting\testif.msg
hydfc internaltesting\testif.out internaltesting\testif.msg
cppcheck --debug internaltesting\testloop.cpp > internaltesting\testloop.msg
hydfc internaltesting\testloop.out internaltesting\testloop.msg

13
internaltesting/testloop.cpp Normal file
View File

@ -0,0 +1,13 @@
void f()
{
for (int i = 0; i < j; i++)
{
if (condition)
continue;
break;
}
}

13
internaltesting/testloop.out Normal file
View File

@ -0,0 +1,13 @@
4 : {
5 : assign i
5 : use i
5 : use i
5 : use j
5 : use i
6 : {
7 : if
7 : use condition
8 : continue
10 : break
11 : }
12 : }

69
main.cpp
View File

@ -29,7 +29,13 @@ void Tokenize(const char FileName[]);
std::vector<std::string> VariableNames;
struct STATEMENT
{
enum etype {OBRACE, EBRACE, DECL, ASSIGN, MALLOC, FREE, NEW, DELETE, NEWARRAY, DELETEARRAY, USE, RETURN, IF, ELSE, ELSEIF};
enum etype {OBRACE, EBRACE,
DECL, ASSIGN, USE,
MALLOC, FREE,
NEW, DELETE,
NEWARRAY, DELETEARRAY,
IF, ELSE, ELSEIF,
RETURN, CONTINUE, BREAK};
etype Type;
unsigned int VarIndex;
TOKEN *Token;
@ -556,7 +562,7 @@ TOKEN *GotoNextStatement(TOKEN *tok)
parlevel--;
if (strchr("{}", tok->str[0]))
break;
if (tok->str[0] == ';')
if (parlevel==0 && tok->str[0] == ';')
{
while (tok && tok->str[0] == ';')
tok = tok->next;
@ -730,7 +736,7 @@ void CreateStatementList()
int parlevel = 0;
for (TOKEN *tok2 = tok; tok2; tok2 = tok2->next)
{
if (strchr("{};", tok2->str[0]))
if (parlevel==0 && strchr("{};", tok2->str[0]))
break;
if (tok2->str[0] == '(')
@ -747,25 +753,50 @@ void CreateStatementList()
{
std::string varname = "";
GetVariableName(tok2, varname);
if (!varname.empty())
AppendStatement(STATEMENT::USE, tok2, varname);
if (tok2->str[0]==';')
if (!varname.empty() &&
varname!="continue" &&
varname!="break" &&
varname!="return")
{
AppendStatement(STATEMENT::USE, tok2, varname);
}
if (tok2->str[0] == ')')
parlevel--;
if (parlevel==0 && tok2->str[0]==';')
break;
}
}
// Return..
// Return, continue, break..
for (TOKEN *tok2 = tok; tok2; tok2 = tok2->next)
{
if (strchr("{};", tok2->str[0]))
break;
if (strcmp(tok2->str,"return")==0 &&
IsName(getstr(tok2,1)) &&
strcmp(getstr(tok2,2),";")==0)
if (strcmp(tok2->str,"continue")==0)
{
AppendStatement(STATEMENT::RETURN, tok2, getstr(tok2,1));
AppendStatement(STATEMENT::CONTINUE, tok2);
break;
}
if (strcmp(tok2->str,"break")==0)
{
AppendStatement(STATEMENT::BREAK, tok2);
break;
}
if (strcmp(tok2->str,"return")==0)
{
if (IsName(getstr(tok2,1)) && strcmp(getstr(tok2,2),";")==0)
AppendStatement(STATEMENT::RETURN, tok2, getstr(tok2,1));
else
AppendStatement(STATEMENT::RETURN, tok2, ";");
break;
}
}
}
@ -824,10 +855,6 @@ void CreateStatementList()
std::cout << "use " << VariableNames[s.VarIndex];
break;
case STATEMENT::RETURN:
std::cout << "return " << VariableNames[s.VarIndex];
break;
case STATEMENT::IF:
std::cout << "if";
break;
@ -841,6 +868,18 @@ void CreateStatementList()
break;
case STATEMENT::RETURN:
std::cout << "return " << VariableNames[s.VarIndex];
break;
case STATEMENT::CONTINUE:
std::cout << "continue";
break;
case STATEMENT::BREAK:
std::cout << "break";
break;
default:
std::cout << "ERROR. Unknown code!!";
break;