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

Cleanup test/testtokenize.cpp a bit by putting duplicate code into a function.

This commit is contained in:
Reijo Tomperi 2010-02-25 22:00:39 +02:00
parent 377d3091a9
commit 23407c7f1d
1 changed files with 228 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

331
test/testtokenize.cpp
View File

@ -1177,10 +1177,24 @@ private:
} }
} }
std::string tokenizeDebugListing(const std::string &code, bool simplify = false)
{
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
if (simplify)
tokenizer.simplifyTokenList();
// result..
return tokenizer.tokens()->stringifyList(true);
}
void varid1() void varid1()
{ {
{ {
const std::string code("static int i = 1;\n" const std::string actual = tokenizeDebugListing(
"static int i = 1;\n"
"void f()\n" "void f()\n"
"{\n" "{\n"
" int i = 2;\n" " int i = 2;\n"
@ -1189,13 +1203,6 @@ private:
" i = 4;\n" " i = 4;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: static int i@1 = 1 ;\n" "1: static int i@1 = 1 ;\n"
"2: void f ( )\n" "2: void f ( )\n"
@ -1210,7 +1217,8 @@ private:
} }
{ {
const std::string code("static int i = 1;\n" const std::string actual = tokenizeDebugListing(
"static int i = 1;\n"
"void f()\n" "void f()\n"
"{\n" "{\n"
" int i = 2;\n" " int i = 2;\n"
@ -1221,13 +1229,6 @@ private:
" i = 4;\n" " i = 4;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: static int i@1 = 1 ;\n" "1: static int i@1 = 1 ;\n"
"2: void f ( )\n" "2: void f ( )\n"
@ -1246,20 +1247,14 @@ private:
void varid2() void varid2()
{ {
const std::string code("void f()\n" const std::string actual = tokenizeDebugListing(
"void f()\n"
"{\n" "{\n"
" struct ABC abc;\n" " struct ABC abc;\n"
" abc.a = 3;\n" " abc.a = 3;\n"
" i = abc.a;\n" " i = abc.a;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( )\n" "1: void f ( )\n"
"2: {\n" "2: {\n"
@ -1273,20 +1268,14 @@ private:
void varid3() void varid3()
{ {
const std::string code("static char str[4];\n" const std::string actual = tokenizeDebugListing(
"static char str[4];\n"
"void f()\n" "void f()\n"
"{\n" "{\n"
" char str[10];\n" " char str[10];\n"
" str[0] = 0;\n" " str[0] = 0;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: static char str@1 [ 4 ] ;\n" "1: static char str@1 [ 4 ] ;\n"
"2: void f ( )\n" "2: void f ( )\n"
@ -1300,19 +1289,12 @@ private:
void varid4() void varid4()
{ {
const std::string code("void f(const unsigned int a[])\n" const std::string actual = tokenizeDebugListing(
"void f(const unsigned int a[])\n"
"{\n" "{\n"
" int i = *(a+10);\n" " int i = *(a+10);\n"
"}\n"); "}\n", true);
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( const int a@1 [ ] )\n" "1: void f ( const int a@1 [ ] )\n"
"2: {\n" "2: {\n"
@ -1324,19 +1306,12 @@ private:
void varid5() void varid5()
{ {
const std::string code("void f()\n" const std::string actual = tokenizeDebugListing(
"void f()\n"
"{\n" "{\n"
" int a,b;\n" " int a,b;\n"
"}\n"); "}\n", true);
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( )\n" "1: void f ( )\n"
"2: {\n" "2: {\n"
@ -1349,19 +1324,12 @@ private:
void varid6() void varid6()
{ {
const std::string code("int f(int a, int b)\n" const std::string actual = tokenizeDebugListing(
"int f(int a, int b)\n"
"{\n" "{\n"
" return a+b;\n" " return a+b;\n"
"}\n"); "}\n", true);
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: int f ( int a@1 , int b@2 )\n" "1: int f ( int a@1 , int b@2 )\n"
"2: {\n" "2: {\n"
@ -1374,7 +1342,8 @@ private:
void varid7() void varid7()
{ {
const std::string code("void func()\n" const std::string actual = tokenizeDebugListing(
"void func()\n"
"{\n" "{\n"
"char a[256] = \"test\";\n" "char a[256] = \"test\";\n"
"{\n" "{\n"
@ -1382,13 +1351,6 @@ private:
"}\n" "}\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void func ( )\n" "1: void func ( )\n"
"2: {\n" "2: {\n"
@ -1404,20 +1366,13 @@ private:
void varidReturn() void varidReturn()
{ {
const std::string code("int f()\n" const std::string actual = tokenizeDebugListing(
"int f()\n"
"{\n" "{\n"
" int a;\n" " int a;\n"
" return a;\n" " return a;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: int f ( )\n" "1: int f ( )\n"
"2: {\n" "2: {\n"
@ -1430,19 +1385,13 @@ private:
void varid8() void varid8()
{ {
const std::string code("void func()\n" const std::string actual = tokenizeDebugListing(
"void func()\n"
"{\n" "{\n"
" std::string str(\"test\");\n" " std::string str(\"test\");\n"
" str.clear();\n" " str.clear();\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void func ( )\n" "1: void func ( )\n"
"2: {\n" "2: {\n"
@ -1455,15 +1404,9 @@ private:
void varid9() void varid9()
{ {
const std::string code("typedef int INT32;\n"); const std::string actual = tokenizeDebugListing(
"typedef int INT32;\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: ;\n"); "1: ;\n");
@ -1472,19 +1415,13 @@ private:
void varid10() void varid10()
{ {
const std::string code("void foo()\n" const std::string actual = tokenizeDebugListing(
"void foo()\n"
"{\n" "{\n"
" int abc;\n" " int abc;\n"
" struct abc abc1;\n" " struct abc abc1;\n"
"}"); "}");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void foo ( )\n" "1: void foo ( )\n"
"2: {\n" "2: {\n"
@ -1497,15 +1434,9 @@ private:
void varid11() void varid11()
{ {
const std::string code("class Foo;\n"); const std::string actual = tokenizeDebugListing(
"class Foo;\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Foo ;\n"); "1: class Foo ;\n");
@ -1514,18 +1445,12 @@ private:
void varid12() void varid12()
{ {
const std::string code("static void a()\n" const std::string actual = tokenizeDebugListing(
"static void a()\n"
"{\n" "{\n"
" class Foo *foo;\n" " class Foo *foo;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: static void a ( )\n" "1: static void a ( )\n"
"2: {\n" "2: {\n"
@ -1537,20 +1462,13 @@ private:
void varid13() void varid13()
{ {
const std::string code("void f()\n" const std::string actual = tokenizeDebugListing(
"void f()\n"
"{\n" "{\n"
" int a; int b;\n" " int a; int b;\n"
" a = a;\n" " a = a;\n"
"}\n"); "}\n", true);
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.simplifyTokenList();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( )\n" "1: void f ( )\n"
"2: {\n" "2: {\n"
@ -1564,20 +1482,14 @@ private:
void varid14() void varid14()
{ {
// Overloaded operator* // Overloaded operator*
const std::string code("void foo()\n" const std::string actual = tokenizeDebugListing(
"void foo()\n"
"{\n" "{\n"
"A a;\n" "A a;\n"
"B b;\n" "B b;\n"
"b * a;\n" "b * a;\n"
"}"); "}");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void foo ( )\n" "1: void foo ( )\n"
"2: {\n" "2: {\n"
@ -1591,7 +1503,8 @@ private:
void varidStl() void varidStl()
{ {
const std::string code("list<int> ints;\n" const std::string actual = tokenizeDebugListing(
"list<int> ints;\n"
"list<int>::iterator it;\n" "list<int>::iterator it;\n"
"std::vector<std::string> dirs;\n" "std::vector<std::string> dirs;\n"
"std::map<int, int> coords;\n" "std::map<int, int> coords;\n"
@ -1602,14 +1515,6 @@ private:
"std::map<int, 1> m;\n" "std::map<int, 1> m;\n"
); );
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: list < int > ints@1 ;\n" "1: list < int > ints@1 ;\n"
"2: list < int > :: iterator it@2 ;\n" "2: list < int > :: iterator it@2 ;\n"
@ -1627,20 +1532,13 @@ private:
void varid_delete() void varid_delete()
{ {
const std::string code("void f()\n" const std::string actual = tokenizeDebugListing(
"void f()\n"
"{\n" "{\n"
" int *a;\n" " int *a;\n"
" delete a;\n" " delete a;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( )\n" "1: void f ( )\n"
"2: {\n" "2: {\n"
@ -1654,17 +1552,10 @@ private:
void varid_functions() void varid_functions()
{ {
{ {
const std::string code("void f();\n" const std::string actual = tokenizeDebugListing(
"void f();\n"
"void f(){}\n"); "void f(){}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( ) ;\n" "1: void f ( ) ;\n"
"2: void f ( ) { }\n"); "2: void f ( ) { }\n");
@ -1673,19 +1564,12 @@ private:
} }
{ {
const std::string code("A f(3);\n" const std::string actual = tokenizeDebugListing(
"A f(3);\n"
"A f2(true);\n" "A f2(true);\n"
"A g();\n" "A g();\n"
"A e(int c);\n"); "A e(int c);\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: A f@1 ( 3 ) ;\n" "1: A f@1 ( 3 ) ;\n"
"2: A f2@2 ( true ) ;\n" "2: A f2@2 ( true ) ;\n"
@ -1696,7 +1580,8 @@ private:
} }
{ {
const std::string code("void f1(int &p)\n" const std::string actual = tokenizeDebugListing(
"void f1(int &p)\n"
"{\n" "{\n"
" p = 0;\n" " p = 0;\n"
"}\n" "}\n"
@ -1709,14 +1594,6 @@ private:
" s.size();\n" " s.size();\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f1 ( int & p@1 )\n" "1: void f1 ( int & p@1 )\n"
"2: {\n" "2: {\n"
@ -1738,21 +1615,14 @@ private:
void varid_reference_to_containers() void varid_reference_to_containers()
{ {
const std::string code("void f()\n" const std::string actual = tokenizeDebugListing(
"void f()\n"
"{\n" "{\n"
" std::vector<int> b;\n" " std::vector<int> b;\n"
" std::vector<int> &a = b;\n" " std::vector<int> &a = b;\n"
" std::vector<int> *c = &b;\n" " std::vector<int> *c = &b;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: void f ( )\n" "1: void f ( )\n"
"2: {\n" "2: {\n"
@ -1766,21 +1636,14 @@ private:
void varid_in_class() void varid_in_class()
{ {
const std::string code("class Foo\n" const std::string actual = tokenizeDebugListing(
"class Foo\n"
"{\n" "{\n"
"public:\n" "public:\n"
" std::string name1;\n" " std::string name1;\n"
" std::string name2;\n" " std::string name2;\n"
"};\n"); "};\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Foo\n" "1: class Foo\n"
"2: {\n" "2: {\n"
@ -1794,20 +1657,13 @@ private:
void varid_operator() void varid_operator()
{ {
const std::string code("class Foo\n" const std::string actual = tokenizeDebugListing(
"class Foo\n"
"{\n" "{\n"
"public:\n" "public:\n"
" void operator=(const Foo &);\n" " void operator=(const Foo &);\n"
"};\n"); "};\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Foo\n" "1: class Foo\n"
"2: {\n" "2: {\n"
@ -1820,7 +1676,8 @@ private:
void varidclass1() void varidclass1()
{ {
const std::string code("class Fred\n" const std::string actual = tokenizeDebugListing(
"class Fred\n"
"{\n" "{\n"
"private:\n" "private:\n"
" int i;\n" " int i;\n"
@ -1837,14 +1694,6 @@ private:
" i = 0;\n" " i = 0;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Fred\n" "1: class Fred\n"
"2: {\n" "2: {\n"
@ -1869,7 +1718,8 @@ private:
void varidclass2() void varidclass2()
{ {
const std::string code("class Fred\n" const std::string actual = tokenizeDebugListing(
"class Fred\n"
"{ void f(); };\n" "{ void f(); };\n"
"\n" "\n"
"void A::foo1()\n" "void A::foo1()\n"
@ -1882,14 +1732,6 @@ private:
" i = 0;\n" " i = 0;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Fred\n" "1: class Fred\n"
"2: { void f ( ) ; } ;\n" "2: { void f ( ) ; } ;\n"
@ -1910,7 +1752,8 @@ private:
void varidclass3() void varidclass3()
{ {
const std::string code("class Fred\n" const std::string actual = tokenizeDebugListing(
"class Fred\n"
"{ int i; void f(); };\n" "{ int i; void f(); };\n"
"\n" "\n"
"void Fred::f()\n" "void Fred::f()\n"
@ -1923,14 +1766,6 @@ private:
" i = 0;\n" " i = 0;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Fred\n" "1: class Fred\n"
"2: { int i@1 ; void f ( ) ; } ;\n" "2: { int i@1 ; void f ( ) ; } ;\n"
@ -1951,7 +1786,8 @@ private:
void varidclass4() void varidclass4()
{ {
const std::string code("class Fred\n" const std::string actual = tokenizeDebugListing(
"class Fred\n"
"{ int i; void f(); };\n" "{ int i; void f(); };\n"
"\n" "\n"
"void Fred::f()\n" "void Fred::f()\n"
@ -1960,14 +1796,6 @@ private:
" i = 0;\n" " i = 0;\n"
"}\n"); "}\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class Fred\n" "1: class Fred\n"
"2: { int i@1 ; void f ( ) ; } ;\n" "2: { int i@1 ; void f ( ) ; } ;\n"
@ -1983,7 +1811,8 @@ private:
void varidclass5() void varidclass5()
{ {
const std::string code("class A { };\n" const std::string actual = tokenizeDebugListing(
"class A { };\n"
"class B\n" "class B\n"
"{\n" "{\n"
" A *a;\n" " A *a;\n"
@ -1991,14 +1820,6 @@ private:
" { }\n" " { }\n"
"};\n"); "};\n");
// tokenize..
Tokenizer tokenizer;
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.setVarId();
// result..
const std::string actual(tokenizer.tokens()->stringifyList(true));
const std::string expected("\n\n##file 0\n" const std::string expected("\n\n##file 0\n"
"1: class A { } ;\n" "1: class A { } ;\n"
"2: class B\n" "2: class B\n"
@ -2011,8 +1832,6 @@ private:
ASSERT_EQUALS(expected, actual); ASSERT_EQUALS(expected, actual);
} }
void file1() void file1()
{ {
const char code[] = "a1\n" const char code[] = "a1\n"