2008-12-18 22:28:57 +01:00
|
|
|
/*
|
2009-01-21 21:04:20 +01:00
|
|
|
* Cppcheck - A tool for static C/C++ code analysis
|
2009-05-30 07:48:12 +02:00
|
|
|
* Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
|
2008-12-18 22:28:57 +01:00
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "testsuite.h"
|
2009-01-06 15:18:36 +01:00
|
|
|
#include "../src/tokenize.h"
|
2009-07-13 19:11:31 +02:00
|
|
|
#include "../src/token.h"
|
2008-12-18 22:28:57 +01:00
|
|
|
#include <sstream>
|
|
|
|
|
|
|
|
extern std::ostringstream errout;
|
|
|
|
|
2009-02-17 20:18:26 +01:00
|
|
|
|
|
|
|
// A test tokenizer where protected functions are made public
|
|
|
|
class OpenTokenizer : public Tokenizer
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
OpenTokenizer(const char code[]) : Tokenizer()
|
|
|
|
{
|
|
|
|
std::istringstream istr(code);
|
|
|
|
tokenize(istr, "test.cpp");
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual ~OpenTokenizer()
|
|
|
|
{ }
|
|
|
|
|
|
|
|
bool elseif_()
|
|
|
|
{
|
|
|
|
return elseif();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-12-18 22:28:57 +01:00
|
|
|
class TestSimplifyTokens : public TestFixture
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
TestSimplifyTokens() : TestFixture("TestSimplifyTokens")
|
|
|
|
{ }
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
void run()
|
|
|
|
{
|
2009-01-05 16:49:57 +01:00
|
|
|
TEST_CASE(cast0);
|
2009-03-09 19:47:21 +01:00
|
|
|
TEST_CASE(cast1);
|
2009-01-05 16:49:57 +01:00
|
|
|
TEST_CASE(iftruefalse);
|
2009-02-08 09:52:03 +01:00
|
|
|
TEST_CASE(combine_strings);
|
2009-02-14 19:44:50 +01:00
|
|
|
TEST_CASE(double_plus);
|
2009-02-14 21:56:08 +01:00
|
|
|
TEST_CASE(redundant_plus);
|
2009-02-15 14:28:54 +01:00
|
|
|
TEST_CASE(parantheses1);
|
2009-02-27 07:07:38 +01:00
|
|
|
TEST_CASE(paranthesesVar); // Remove redundant parantheses around variable .. "( %var% )"
|
2009-02-28 21:40:37 +01:00
|
|
|
TEST_CASE(declareVar);
|
2009-02-17 20:18:26 +01:00
|
|
|
|
2009-06-10 19:36:00 +02:00
|
|
|
TEST_CASE(declareArray);
|
|
|
|
|
2009-05-25 14:21:58 +02:00
|
|
|
TEST_CASE(dontRemoveIncrement);
|
2009-05-25 08:26:11 +02:00
|
|
|
TEST_CASE(removePostIncrement);
|
2009-05-25 08:31:20 +02:00
|
|
|
TEST_CASE(removePreIncrement);
|
2009-05-25 08:26:11 +02:00
|
|
|
|
2009-02-17 20:18:26 +01:00
|
|
|
TEST_CASE(elseif1);
|
2009-02-28 10:09:55 +01:00
|
|
|
|
|
|
|
TEST_CASE(sizeof1);
|
|
|
|
TEST_CASE(sizeof2);
|
|
|
|
TEST_CASE(sizeof3);
|
|
|
|
TEST_CASE(sizeof4);
|
|
|
|
TEST_CASE(sizeof5);
|
|
|
|
TEST_CASE(sizeof6);
|
2009-03-29 16:36:34 +02:00
|
|
|
TEST_CASE(sizeof7);
|
2009-05-31 21:33:44 +02:00
|
|
|
TEST_CASE(sizeof8);
|
2009-03-05 20:32:02 +01:00
|
|
|
TEST_CASE(casting);
|
2009-03-11 19:14:45 +01:00
|
|
|
|
2009-03-11 18:50:24 +01:00
|
|
|
TEST_CASE(template1);
|
2009-03-12 22:17:42 +01:00
|
|
|
TEST_CASE(template2);
|
2009-03-14 21:26:32 +01:00
|
|
|
TEST_CASE(template3);
|
2009-03-15 17:07:05 +01:00
|
|
|
TEST_CASE(template4);
|
2009-03-15 20:03:29 +01:00
|
|
|
TEST_CASE(template5);
|
2009-05-05 20:16:57 +02:00
|
|
|
TEST_CASE(template6);
|
2009-05-05 22:09:15 +02:00
|
|
|
TEST_CASE(template7);
|
2009-05-08 16:19:22 +02:00
|
|
|
TEST_CASE(template8);
|
2009-05-09 08:02:59 +02:00
|
|
|
TEST_CASE(template9);
|
2009-06-14 11:28:25 +02:00
|
|
|
TEST_CASE(template10);
|
2009-06-14 14:57:47 +02:00
|
|
|
TEST_CASE(template11);
|
2009-07-22 13:29:42 +02:00
|
|
|
TEST_CASE(template12);
|
2009-03-14 21:26:32 +01:00
|
|
|
|
2009-03-13 00:07:05 +01:00
|
|
|
TEST_CASE(namespaces);
|
2009-03-23 18:20:56 +01:00
|
|
|
|
|
|
|
// Assignment in condition..
|
|
|
|
TEST_CASE(ifassign1);
|
2009-06-20 13:58:30 +02:00
|
|
|
TEST_CASE(whileAssign);
|
2009-03-24 18:23:21 +01:00
|
|
|
|
|
|
|
// "if(0==x)" => "if(!x)"
|
|
|
|
TEST_CASE(ifnot);
|
2009-04-05 21:21:38 +02:00
|
|
|
TEST_CASE(combine_wstrings);
|
2009-05-31 10:42:27 +02:00
|
|
|
|
|
|
|
// Simplify "not" to "!" (#345)
|
|
|
|
TEST_CASE(not1);
|
2009-06-10 23:12:26 +02:00
|
|
|
TEST_CASE(comma_keyword);
|
2009-07-04 17:06:25 +02:00
|
|
|
TEST_CASE(remove_comma);
|
2009-07-14 12:06:38 +02:00
|
|
|
|
|
|
|
// Simplify "?:"
|
|
|
|
TEST_CASE(conditionOperator);
|
2008-12-18 22:28:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
std::string tok(const char code[])
|
|
|
|
{
|
|
|
|
std::istringstream istr(code);
|
|
|
|
Tokenizer tokenizer;
|
2009-01-05 16:49:57 +01:00
|
|
|
tokenizer.tokenize(istr, "test.cpp");
|
2008-12-18 22:28:57 +01:00
|
|
|
tokenizer.simplifyTokenList();
|
|
|
|
std::string ret;
|
2009-01-05 16:49:57 +01:00
|
|
|
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
|
2008-12-18 22:28:57 +01:00
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
if (tok != tokenizer.tokens())
|
|
|
|
ret += " ";
|
|
|
|
ret += tok->str();
|
2008-12-18 22:28:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void cast0()
|
|
|
|
{
|
|
|
|
const char code1[] = " if ( p == (char *)0 ) ";
|
|
|
|
const char code2[] = " if ( p == 0 ) ";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code1), tok(code2));
|
2008-12-18 22:28:57 +01:00
|
|
|
}
|
|
|
|
|
2009-03-09 19:47:21 +01:00
|
|
|
void cast1()
|
|
|
|
{
|
|
|
|
const char code[] = "return (unsigned char *)str;";
|
|
|
|
const char expected[] = "return str;";
|
|
|
|
ASSERT_EQUALS(tok(expected), tok(code));
|
|
|
|
}
|
|
|
|
|
2008-12-21 16:10:44 +01:00
|
|
|
void iftruefalse()
|
|
|
|
{
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = false; if( use ) { a=0; } else {a=1;} }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = false; {a=1;} }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 16:10:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = true; if( use ) { a=0; } else {a=1;} }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = true; { a=0; } }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 16:10:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; int use = 5; if( use ) { a=0; } else {a=1;} }";
|
|
|
|
const char code2[] = " void f() { int a; int use = 5; { a=0; } }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 16:10:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; int use = 0; if( use ) { a=0; } else {a=1;} }";
|
|
|
|
const char code2[] = " void f() { int a; int use = 0; {a=1;} }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 16:10:44 +01:00
|
|
|
}
|
2008-12-21 22:04:58 +01:00
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = false; if( use ) a=0; else a=1; int c=1; }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = false; { a=1; } int c=1; }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 22:04:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = true; if( use ) a=0; else a=1; int c=1; }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = true; { a=0; } int c=1; }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 22:04:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = false; if( use ) a=0; else if( bb ) a=1; int c=1; }";
|
|
|
|
const char code2[] = " void f ( ) { int a ; bool use ; use = false ; { if ( bb ) { a = 1 ; } } int c ; c = 1 ; }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 22:04:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = true; if( use ) a=0; else if( bb ) a=1; int c=1; }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = true; { a=0;} int c=1; }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-21 22:04:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { int a; bool use = true; if( use ) a=0; else if( bb ) a=1; else if( cc ) a=33; else { gg = 0; } int c=1; }";
|
|
|
|
const char code2[] = " void f() { int a; bool use = true; { a=0; }int c=1; }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-26 13:55:53 +01:00
|
|
|
}
|
2008-12-26 16:42:04 +01:00
|
|
|
|
2008-12-26 15:43:16 +01:00
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { if( aa ) { a=0; } else if( true ) a=1; else { a=2; } }";
|
|
|
|
const char code2[] = " void f ( ) { if ( aa ) { a = 0 ; } else { { a = 1 ; } } }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-26 15:43:16 +01:00
|
|
|
}
|
2008-12-26 16:46:59 +01:00
|
|
|
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code1[] = " void f() { if( aa ) { a=0; } else if( false ) a=1; else { a=2; } }";
|
|
|
|
const char code2[] = " void f ( ) { if ( aa ) { a = 0 ; } else { { a = 2 ; } } }";
|
2009-01-05 16:49:57 +01:00
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
2008-12-26 16:46:59 +01:00
|
|
|
}
|
2008-12-21 16:10:44 +01:00
|
|
|
}
|
2009-02-08 09:52:03 +01:00
|
|
|
|
|
|
|
void combine_strings()
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
"const char *a =\n"
|
|
|
|
"{\n"
|
|
|
|
"\"hello \"\n"
|
|
|
|
"\"world\"\n"
|
|
|
|
"};\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
const char code2[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
"const char *a =\n"
|
|
|
|
"{\n"
|
|
|
|
"\"hello world\"\n"
|
|
|
|
"};\n"
|
2009-04-05 21:21:38 +02:00
|
|
|
"}\n";
|
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
|
|
|
}
|
|
|
|
|
|
|
|
void combine_wstrings()
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
"const wchar_t *a =\n"
|
|
|
|
"{\n"
|
|
|
|
"L\"hello \"\n"
|
|
|
|
"L\"world\"\n"
|
|
|
|
"};\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
const char code2[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
"const wchar_t *a =\n"
|
|
|
|
"{\n"
|
|
|
|
"\"hello world\"\n"
|
|
|
|
"};\n"
|
2009-02-08 09:52:03 +01:00
|
|
|
"}\n";
|
|
|
|
ASSERT_EQUALS(tok(code2), tok(code1));
|
|
|
|
}
|
2009-02-12 21:32:59 +01:00
|
|
|
|
|
|
|
void double_plus()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a )\n"
|
|
|
|
"{\n"
|
|
|
|
"a++;\n"
|
|
|
|
"a--;\n"
|
|
|
|
"++a;\n"
|
|
|
|
"--a;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a ) { a ++ ; a -- ; ++ a ; -- a ; }", tok(code1));
|
2009-02-12 21:32:59 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a+a;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a ) { a = a + a ; }", tok(code1));
|
2009-02-12 21:32:59 +01:00
|
|
|
}
|
2009-02-12 21:49:05 +01:00
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a+++b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a ++ + b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a---b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a -- - b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a--+b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a -- + b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a++-b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a ++ - b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a+--b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a + -- b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a-++b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a - ++ b ; }", tok(code1));
|
2009-02-12 21:49:05 +01:00
|
|
|
}
|
2009-02-12 21:32:59 +01:00
|
|
|
}
|
2009-02-14 21:56:08 +01:00
|
|
|
|
|
|
|
void redundant_plus()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a + + b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a + b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a + + + b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a + b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a + - b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a - b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a - + b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a - b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a - - b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a + b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a - + - b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a + b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
{
|
|
|
|
const char code1[] = "void foo( int a, int b )\n"
|
|
|
|
"{\n"
|
|
|
|
"a=a - - - b;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void foo ( int a , int b ) { a = a - b ; }", tok(code1));
|
2009-02-14 21:56:08 +01:00
|
|
|
}
|
|
|
|
}
|
2009-02-15 14:28:54 +01:00
|
|
|
|
|
|
|
|
|
|
|
void parantheses1()
|
|
|
|
{
|
|
|
|
const char code1[] = "<= (10+100);";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("<= 110 ;", tok(code1));
|
2009-02-15 14:28:54 +01:00
|
|
|
}
|
2009-02-17 20:18:26 +01:00
|
|
|
|
2009-02-27 07:07:38 +01:00
|
|
|
void paranthesesVar()
|
2009-02-25 20:55:24 +01:00
|
|
|
{
|
2009-02-27 07:07:38 +01:00
|
|
|
// remove parantheses..
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("= p ;", tok("= (p);"));
|
|
|
|
ASSERT_EQUALS("if ( a < p ) { }", tok("if(a<(p)){}"));
|
|
|
|
ASSERT_EQUALS("void f ( ) { int p ; if ( p == -1 ) { } }", tok("void f(){int p; if((p)==-1){}}"));
|
|
|
|
ASSERT_EQUALS("void f ( ) { int p ; if ( -1 == p ) { } }", tok("void f(){int p; if(-1==(p)){}}"));
|
|
|
|
ASSERT_EQUALS("void f ( ) { int p ; if ( p ) { } }", tok("void f(){int p; if((p)){}}"));
|
2009-02-27 07:07:38 +01:00
|
|
|
|
|
|
|
// keep parantheses..
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("= a ;", tok("= (char)a;"));
|
|
|
|
ASSERT_EQUALS("cast < char * > ( p )", tok("cast<char *>(p)"));
|
2009-02-25 20:55:24 +01:00
|
|
|
}
|
|
|
|
|
2009-02-28 21:40:37 +01:00
|
|
|
void declareVar()
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code[] = "void f ( ) { char str [ 100 ] = \"100\" ; }";
|
2009-02-28 21:40:37 +01:00
|
|
|
ASSERT_EQUALS(code, tok(code));
|
|
|
|
}
|
2009-02-17 20:18:26 +01:00
|
|
|
|
2009-06-10 19:36:00 +02:00
|
|
|
void declareArray()
|
|
|
|
{
|
2009-07-14 11:37:26 +02:00
|
|
|
const char code[] = "void f ( ) { char str [ ] = \"100\" ; }";
|
|
|
|
const char expected[] = "void f ( ) { char * str ; str = \"100\" ; }";
|
2009-06-10 19:36:00 +02:00
|
|
|
ASSERT_EQUALS(expected, tok(code));
|
|
|
|
}
|
2009-05-25 08:26:11 +02:00
|
|
|
|
2009-05-25 14:21:58 +02:00
|
|
|
void dontRemoveIncrement()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code[] = "void f(int a)\n"
|
|
|
|
"{\n"
|
|
|
|
" if (a > 10)\n"
|
|
|
|
" a = 5;\n"
|
|
|
|
" else\n"
|
|
|
|
" a = 10;\n"
|
|
|
|
" a++;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void f ( int a ) { if ( a > 10 ) { a = 5 ; } else { a = 10 ; } a ++ ; }", tok(code));
|
2009-05-25 14:21:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void f(int a)\n"
|
|
|
|
"{\n"
|
|
|
|
" if (a > 10)\n"
|
|
|
|
" a = 5;\n"
|
|
|
|
" else\n"
|
|
|
|
" a = 10;\n"
|
|
|
|
" ++a;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void f ( int a ) { if ( a > 10 ) { a = 5 ; } else { a = 10 ; } ++ a ; }", tok(code));
|
2009-05-25 14:21:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-25 08:26:11 +02:00
|
|
|
void removePostIncrement()
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" unsigned int c = 0;\n"
|
|
|
|
" c++;\n"
|
|
|
|
" if (c>0) { c++; }\n"
|
|
|
|
" c++;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void f ( ) { int c ; c = 3 ; ; { ; } ; }", tok(code));
|
2009-05-25 08:26:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-05-25 08:31:20 +02:00
|
|
|
void removePreIncrement()
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" unsigned int c = 0;\n"
|
|
|
|
" ++c;\n"
|
|
|
|
" if (c>0) { ++c; }\n"
|
|
|
|
" ++c;\n"
|
|
|
|
"}\n";
|
2009-07-14 11:37:26 +02:00
|
|
|
ASSERT_EQUALS("void f ( ) { int c ; c = 3 ; ; { ; } ; }", tok(code));
|
2009-05-25 08:31:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-02-17 20:18:26 +01:00
|
|
|
std::string elseif(const char code[])
|
|
|
|
{
|
|
|
|
std::istringstream istr(code);
|
|
|
|
|
|
|
|
OpenTokenizer tokenizer(code);
|
|
|
|
tokenizer.elseif_();
|
|
|
|
return tokenizer.tokens()->stringifyList(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
void elseif1()
|
|
|
|
{
|
|
|
|
const char code[] = "else if(ab) { cd } else { ef }gh";
|
2009-03-03 21:17:23 +01:00
|
|
|
ASSERT_EQUALS("\n\n##file 0\n1: else { if ( ab ) { cd } else { ef } } gh\n", elseif(code));
|
2009-02-17 20:18:26 +01:00
|
|
|
}
|
2009-02-28 10:09:55 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Simplify 'sizeof'..
|
|
|
|
std::string sizeof_(const char code[])
|
|
|
|
{
|
|
|
|
// tokenize..
|
|
|
|
Tokenizer tokenizer;
|
|
|
|
std::istringstream istr(code);
|
|
|
|
tokenizer.tokenize(istr, "test.cpp");
|
|
|
|
|
|
|
|
tokenizer.setVarId();
|
|
|
|
tokenizer.simplifyTokenList();
|
|
|
|
|
|
|
|
std::ostringstream ostr;
|
|
|
|
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
|
|
|
|
ostr << " " << tok->str();
|
|
|
|
|
|
|
|
return ostr.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sizeof1()
|
|
|
|
{
|
|
|
|
const char code1[] = " struct ABC *abc = malloc(sizeof(*abc)); ";
|
|
|
|
const char code2[] = " struct ABC *abc = malloc(100); ";
|
|
|
|
const char code3[] = " struct ABC *abc = malloc(sizeof *abc ); ";
|
|
|
|
ASSERT_EQUALS(tok(code1), tok(code2));
|
|
|
|
ASSERT_EQUALS(tok(code2), tok(code3));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sizeof2()
|
|
|
|
{
|
|
|
|
const char code[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
" int i[4];\n"
|
|
|
|
" sizeof(i);\n"
|
|
|
|
" sizeof(*i);\n"
|
|
|
|
"}\n";
|
2009-05-31 21:48:55 +02:00
|
|
|
ASSERT_EQUALS(" void foo ( ) { int i [ 4 ] ; 16 ; 4 ; }", sizeof_(code));
|
2009-02-28 10:09:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void sizeof3()
|
|
|
|
{
|
|
|
|
const char code[] = "static int i[4];\n"
|
|
|
|
"void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" int i[10];\n"
|
|
|
|
" sizeof(i);\n"
|
|
|
|
"}\n";
|
2009-05-31 21:48:55 +02:00
|
|
|
ASSERT_EQUALS(" static int i [ 4 ] ; void f ( ) { int i [ 10 ] ; 40 ; }", sizeof_(code));
|
2009-02-28 10:09:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void sizeof4()
|
|
|
|
{
|
|
|
|
const char code[] = "int i[10];\n"
|
|
|
|
"sizeof(i[0]);\n";
|
2009-05-31 21:48:55 +02:00
|
|
|
ASSERT_EQUALS(" int i [ 10 ] ; 4 ;", sizeof_(code));
|
2009-02-28 10:09:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void sizeof5()
|
|
|
|
{
|
|
|
|
const char code[] =
|
|
|
|
"for (int i = 0; i < sizeof(g_ReservedNames[0]); i++)"
|
|
|
|
"{}";
|
2009-05-31 21:48:55 +02:00
|
|
|
ASSERT_EQUALS(" for ( int i = 0 ; i < 100 ; i ++ ) { }", sizeof_(code));
|
2009-02-28 10:09:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void sizeof6()
|
|
|
|
{
|
|
|
|
const char code[] = ";int i;\n"
|
|
|
|
"sizeof(i);\n";
|
|
|
|
|
|
|
|
std::ostringstream expected;
|
|
|
|
expected << " ; int i ; " << sizeof(int) << " ;";
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected.str(), sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-03-29 16:36:34 +02:00
|
|
|
void sizeof7()
|
|
|
|
{
|
|
|
|
const char code[] = ";INT32 i[10];\n"
|
|
|
|
"sizeof(i[0]);\n";
|
|
|
|
ASSERT_EQUALS(" ; INT32 i [ 10 ] ; sizeof ( i [ 0 ] ) ;", sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-05-31 21:33:44 +02:00
|
|
|
void sizeof8()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" char* ptrs[2];\n"
|
|
|
|
" int a = sizeof( ptrs );\n"
|
|
|
|
"}\n";
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << (sizeof(void *) * 2);
|
|
|
|
ASSERT_EQUALS(" void f ( ) { char * ptrs [ 2 ] ; int a ; a = " + oss.str() + " ; }", sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" char* ptrs[55];\n"
|
|
|
|
" int a = sizeof( ptrs );\n"
|
|
|
|
"}\n";
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << (sizeof(void *) * 55);
|
|
|
|
ASSERT_EQUALS(" void f ( ) { char * ptrs [ 55 ] ; int a ; a = " + oss.str() + " ; }", sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" char* ptrs;\n"
|
|
|
|
" int a = sizeof( ptrs );\n"
|
|
|
|
"}\n";
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << sizeof(void *);
|
2009-06-01 12:01:45 +02:00
|
|
|
ASSERT_EQUALS(" void f ( ) { char * ptrs ; int a ; a = " + oss.str() + " ; }", sizeof_(code));
|
2009-05-31 21:33:44 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-05 20:32:02 +01:00
|
|
|
void casting()
|
|
|
|
{
|
2009-06-19 19:25:56 +02:00
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
"for (int i = 0; i < static_cast<int>(3); ++i) {}\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
const std::string expected(" void f ( ) { for ( int i = 0 ; i < 3 ; ++ i ) { } }");
|
2009-03-05 20:32:02 +01:00
|
|
|
|
2009-06-19 19:25:56 +02:00
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" p = const_cast<char *> qtu ();\n"
|
|
|
|
"}\n";
|
2009-03-05 20:32:02 +01:00
|
|
|
|
2009-06-19 19:25:56 +02:00
|
|
|
const std::string expected(" void f ( ) { p = const_cast < char * > qtu ( ) ; }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
2009-03-11 18:50:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void template1()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T> void f(T val) { T a; }\n"
|
|
|
|
"f<int>(10);";
|
|
|
|
|
|
|
|
const std::string expected(" "
|
|
|
|
"template < classname T > void f ( T val ) { T a ; } "
|
|
|
|
"f<int> ( 10 ) ; "
|
|
|
|
"void f<int> ( int val ) { int a ; }");
|
2009-03-11 19:14:45 +01:00
|
|
|
|
2009-03-11 18:50:24 +01:00
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
2009-03-05 20:32:02 +01:00
|
|
|
}
|
2009-03-12 22:17:42 +01:00
|
|
|
|
|
|
|
void template2()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T> class Fred { T a; };\n"
|
|
|
|
"Fred<int> fred;";
|
|
|
|
|
|
|
|
const std::string expected(" "
|
|
|
|
"template < classname T > class Fred { T a ; } ; "
|
|
|
|
"Fred<int> fred ; "
|
|
|
|
"class Fred<int> { int a ; }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
2009-03-13 00:07:05 +01:00
|
|
|
|
2009-03-14 21:26:32 +01:00
|
|
|
void template3()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T, int sz> class Fred { T data[sz]; };\n"
|
|
|
|
"Fred<float,4> fred;";
|
|
|
|
|
|
|
|
const std::string expected(" "
|
|
|
|
"template < classname T , int sz > class Fred { T data [ sz ] ; } ; "
|
|
|
|
"Fred<float,4> fred ; "
|
|
|
|
"class Fred<float,4> { float data [ 4 ] ; }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-03-15 17:07:05 +01:00
|
|
|
void template4()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T> class Fred { Fred(); };\n"
|
|
|
|
"Fred<float> fred;";
|
|
|
|
|
|
|
|
const std::string expected(" "
|
|
|
|
"template < classname T > class Fred { Fred ( ) ; } ; "
|
|
|
|
"Fred<float> fred ; "
|
|
|
|
"class Fred<float> { Fred<float> ( ) ; }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-03-15 20:03:29 +01:00
|
|
|
void template5()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T> class Fred { };\n"
|
|
|
|
"template <classname T> Fred<T>::Fred() { }\n"
|
|
|
|
"Fred<float> fred;";
|
|
|
|
|
|
|
|
const std::string expected(" "
|
|
|
|
"template < classname T > class Fred { } ; "
|
|
|
|
"template < classname T > Fred < T > :: Fred ( ) { } "
|
|
|
|
"Fred<float> fred ; "
|
|
|
|
"class Fred<float> { } "
|
|
|
|
"Fred<float> :: Fred<float> ( ) { }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-05-05 20:16:57 +02:00
|
|
|
void template6()
|
|
|
|
{
|
|
|
|
const char code[] = "template <classname T> class Fred { };\n"
|
|
|
|
"Fred<float> fred1;\n"
|
|
|
|
"Fred<float> fred2;";
|
|
|
|
|
|
|
|
const std::string expected(" template < classname T > class Fred { } ;"
|
|
|
|
" Fred<float> fred1 ;"
|
|
|
|
" Fred<float> fred2 ;"
|
|
|
|
" class Fred<float> { }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-05-05 22:09:15 +02:00
|
|
|
void template7()
|
|
|
|
{
|
2009-05-06 21:03:11 +02:00
|
|
|
// A template class that is not used => no simplification
|
2009-05-05 22:09:15 +02:00
|
|
|
{
|
|
|
|
const char code[] = "template <class T>\n"
|
|
|
|
"class ABC\n"
|
|
|
|
"{\n"
|
|
|
|
"public:\n"
|
|
|
|
" typedef ABC<T> m;\n"
|
|
|
|
"\n"
|
2009-05-06 21:03:11 +02:00
|
|
|
"};\n";
|
2009-05-05 22:09:15 +02:00
|
|
|
|
|
|
|
const std::string expected(" template < class T > "
|
|
|
|
"class ABC "
|
|
|
|
"{ "
|
|
|
|
"public: "
|
2009-05-06 21:03:11 +02:00
|
|
|
"typedef ABC < T > m ; "
|
|
|
|
"} ;");
|
2009-05-05 22:09:15 +02:00
|
|
|
|
2009-05-06 21:03:11 +02:00
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
2009-05-05 22:09:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "template <typename T> class ABC {\n"
|
|
|
|
"public:\n"
|
|
|
|
" typedef std::vector<T> type;\n"
|
|
|
|
"};\n"
|
|
|
|
"int main() {\n"
|
|
|
|
" ABC<int>::type v;\n"
|
|
|
|
" v.push_back(4);\n"
|
|
|
|
" return 0;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
const std::string expected(" template < typename T > class ABC {"
|
|
|
|
" public: "
|
|
|
|
"typedef std :: vector < T > type ; "
|
|
|
|
"} ; "
|
|
|
|
"int main ( ) { "
|
|
|
|
"std :: vector < int > v ; "
|
|
|
|
"v . push_back ( 4 ) ; "
|
|
|
|
"return 0 ; "
|
|
|
|
"}");
|
|
|
|
|
|
|
|
TODO_ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "template <typename T> class ABC {\n"
|
|
|
|
"public:\n"
|
|
|
|
" typedef std::vector<T> type;\n"
|
|
|
|
" void f()\n"
|
|
|
|
" {\n"
|
|
|
|
" ABC<int>::type v;\n"
|
|
|
|
" v.push_back(4);\n"
|
|
|
|
" }\n"
|
2009-07-08 09:38:59 +02:00
|
|
|
"};\n";
|
2009-05-05 22:09:15 +02:00
|
|
|
|
|
|
|
const std::string expected(" template < typename T > class ABC "
|
|
|
|
"{"
|
|
|
|
" public: typedef std :: vector < T > type ;"
|
|
|
|
" void f ( ) "
|
|
|
|
"{ "
|
|
|
|
"std :: vector < int > v ;"
|
|
|
|
" v . push_back ( 4 ) ;"
|
|
|
|
" } "
|
2009-07-08 09:38:59 +02:00
|
|
|
"} ;");
|
2009-05-05 22:09:15 +02:00
|
|
|
|
|
|
|
TODO_ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
}
|
2009-03-14 21:26:32 +01:00
|
|
|
|
2009-05-08 16:19:22 +02:00
|
|
|
// Template definitions but no usage => no expansion
|
|
|
|
void template8()
|
|
|
|
{
|
|
|
|
const char code[] = "template<typename T> class A;\n"
|
|
|
|
"template<typename T> class B;\n"
|
|
|
|
"\n"
|
|
|
|
"typedef A<int> x;\n"
|
|
|
|
"typedef B<int> y;\n"
|
|
|
|
"\n"
|
|
|
|
"template<typename T> class A {\n"
|
|
|
|
" void f() {\n"
|
|
|
|
" B<T> a = B<T>::g();\n"
|
|
|
|
" T b = 0;\n"
|
|
|
|
" if (b)\n"
|
|
|
|
" b = 0;\n"
|
|
|
|
" }\n"
|
|
|
|
"};\n"
|
|
|
|
"\n"
|
|
|
|
"template<typename T> inline B<T> h() { return B<T>(); }\n";
|
|
|
|
|
|
|
|
const std::string expected(" template < typename T > class A ;"
|
|
|
|
" template < typename T > class B ;"
|
|
|
|
""
|
|
|
|
" typedef A < int > x ;"
|
|
|
|
" typedef B < int > y ;"
|
|
|
|
""
|
|
|
|
" template < typename T > class A {"
|
|
|
|
" void f ( ) {"
|
|
|
|
" B < T > a = B < T > :: g ( ) ;"
|
|
|
|
" T b ; b = 0 ;"
|
|
|
|
" }"
|
|
|
|
" } ;"
|
|
|
|
""
|
|
|
|
" template < typename T > inline B < T > h ( ) { return B < T > ( ) ; }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-05-09 08:02:59 +02:00
|
|
|
void template9()
|
|
|
|
{
|
|
|
|
const char code[] = "template < typename T > class A { } ;\n"
|
|
|
|
"\n"
|
|
|
|
"void f ( ) {\n"
|
|
|
|
" A<int> a ;\n"
|
|
|
|
"}\n"
|
|
|
|
"\n"
|
|
|
|
"template < typename T >\n"
|
|
|
|
"class B {\n"
|
|
|
|
" void g ( ) {\n"
|
|
|
|
" A < T > b = A < T > :: h ( ) ;\n"
|
|
|
|
" }\n"
|
|
|
|
"} ;\n";
|
|
|
|
|
|
|
|
// The expected result..
|
|
|
|
std::string expected(std::string(" ") + code + " class A<int> { }");
|
|
|
|
std::string::size_type pos;
|
|
|
|
while ((pos = expected.find("\n")) != std::string::npos)
|
|
|
|
expected[pos] = ' ';
|
|
|
|
while ((pos = expected.find(" ")) != std::string::npos)
|
|
|
|
expected.erase(pos, 1);
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-06-14 11:28:25 +02:00
|
|
|
void template10()
|
|
|
|
{
|
|
|
|
const char code[] = "template <int ui, typename T> T * foo()\n"
|
|
|
|
"{ return new T[ui]; }\n"
|
|
|
|
"\n"
|
|
|
|
"void f ( )\n"
|
|
|
|
"{\n"
|
|
|
|
" foo<3,int>();\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
// The expected result..
|
|
|
|
const std::string expected(" template < int ui , typename T > T * foo ( )"
|
|
|
|
" { return new T [ ui ] ; }"
|
|
|
|
" void f ( )"
|
|
|
|
" {"
|
|
|
|
" foo<3,int> ( ) ;"
|
|
|
|
" }"
|
|
|
|
" int * foo<3,int> ( ) { return new int [ 3 ] ; }");
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
2009-05-08 16:19:22 +02:00
|
|
|
|
2009-06-14 14:57:47 +02:00
|
|
|
void template11()
|
|
|
|
{
|
|
|
|
const char code[] = "template <int ui, typename T> T * foo()\n"
|
|
|
|
"{ return new T[ui]; }\n"
|
|
|
|
"\n"
|
|
|
|
"void f ( )\n"
|
|
|
|
"{\n"
|
|
|
|
" char * p = foo<3,char>();\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
// The expected result..
|
|
|
|
const std::string expected(" template < int ui , typename T > T * foo ( )"
|
|
|
|
" { return new T [ ui ] ; }"
|
|
|
|
" void f ( )"
|
|
|
|
" {"
|
|
|
|
" char * p ; p = foo<3,char> ( ) ;"
|
|
|
|
" }"
|
|
|
|
" char * foo<3,char> ( ) { return new char [ 3 ] ; }");
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-07-22 13:29:42 +02:00
|
|
|
void template12()
|
|
|
|
{
|
|
|
|
const char code[] = "template <int x, int y, int z>\n"
|
|
|
|
"class A : public B<x, y, (x - y) ? ((y < z) ? 1 : -1) : 0>\n"
|
|
|
|
"{ };\n"
|
|
|
|
"\n"
|
|
|
|
"void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" A<12,12,11> a;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
// The expected result..
|
|
|
|
const std::string expected(" template < int x , int y , int z >"
|
|
|
|
" class A : public B < x , y , ( x - y ) ? ( ( y < z ) ? 1 : - 1 ) : 0 >"
|
|
|
|
" { } ;"
|
|
|
|
" void f ( )"
|
|
|
|
" {"
|
|
|
|
" A<12,12,11> a ;"
|
|
|
|
" }"
|
|
|
|
" class A<12,12,11> : public B < 12 , 12 , 0 >"
|
|
|
|
" { }");
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
2009-05-08 16:19:22 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
2009-03-13 00:07:05 +01:00
|
|
|
void namespaces()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code[] = "using namespace std; namespace a{ namespace b{ void f(){} } }";
|
|
|
|
|
|
|
|
const std::string expected(" using namespace std ; void f ( ) { }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "namespace b{ void f(){} }";
|
|
|
|
|
|
|
|
const std::string expected(" void f ( ) { }");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
2009-03-30 23:59:33 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "int a; namespace b{ }";
|
|
|
|
|
|
|
|
const std::string expected(" int a ;");
|
|
|
|
|
|
|
|
ASSERT_EQUALS(expected, sizeof_(code));
|
|
|
|
}
|
2009-03-13 00:07:05 +01:00
|
|
|
}
|
2009-03-23 18:20:56 +01:00
|
|
|
|
|
|
|
|
|
|
|
std::string simplifyIfAssign(const char code[])
|
|
|
|
{
|
|
|
|
// tokenize..
|
|
|
|
Tokenizer tokenizer;
|
|
|
|
std::istringstream istr(code);
|
|
|
|
tokenizer.tokenize(istr, "test.cpp");
|
|
|
|
|
|
|
|
tokenizer.simplifyIfAssign();
|
|
|
|
|
|
|
|
std::ostringstream ostr;
|
|
|
|
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
|
|
|
|
ostr << (tok->previous() ? " " : "") << tok->str();
|
|
|
|
|
|
|
|
return ostr.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
void ifassign1()
|
|
|
|
{
|
|
|
|
ASSERT_EQUALS("; a = b ; if ( a ) ;", simplifyIfAssign(";if(a=b);"));
|
|
|
|
ASSERT_EQUALS("; a = b ( ) ; if ( ( a ) ) ;", simplifyIfAssign(";if((a=b()));"));
|
2009-03-24 18:23:21 +01:00
|
|
|
ASSERT_EQUALS("; a = b ( ) ; if ( ! ( a ) ) ;", simplifyIfAssign(";if(!(a=b()));"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-20 13:58:30 +02:00
|
|
|
void whileAssign()
|
|
|
|
{
|
|
|
|
ASSERT_EQUALS("; a = b ; while ( a ) { b = 0 ; a = b ; }", simplifyIfAssign(";while(a=b) { b = 0; }"));
|
|
|
|
//ASSERT_EQUALS("; a = b ( ) ; if ( ( a ) ) ;", simplifyIfAssign(";if((a=b()));"));
|
|
|
|
//ASSERT_EQUALS("; a = b ( ) ; if ( ! ( a ) ) ;", simplifyIfAssign(";if(!(a=b()));"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-03-24 18:23:21 +01:00
|
|
|
std::string simplifyIfNot(const char code[])
|
|
|
|
{
|
|
|
|
// tokenize..
|
|
|
|
Tokenizer tokenizer;
|
|
|
|
std::istringstream istr(code);
|
|
|
|
tokenizer.tokenize(istr, "test.cpp");
|
|
|
|
|
|
|
|
tokenizer.simplifyIfNot();
|
|
|
|
|
|
|
|
std::ostringstream ostr;
|
|
|
|
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
|
|
|
|
ostr << (tok->previous() ? " " : "") << tok->str();
|
|
|
|
|
|
|
|
return ostr.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
void ifnot()
|
|
|
|
{
|
|
|
|
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(0==x)"));
|
2009-07-18 10:18:46 +02:00
|
|
|
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)"));
|
2009-03-24 18:23:21 +01:00
|
|
|
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if(0==(a=b))"));
|
2009-05-01 12:07:10 +02:00
|
|
|
ASSERT_EQUALS("if ( ! x )", simplifyIfNot("if(x==0)"));
|
|
|
|
ASSERT_EQUALS("if ( ! a && b ( ) )", simplifyIfNot("if( 0 == a && b() )"));
|
|
|
|
ASSERT_EQUALS("if ( b ( ) && ! a )", simplifyIfNot("if( b() && 0 == a )"));
|
|
|
|
ASSERT_EQUALS("if ( ! ( a = b ) )", simplifyIfNot("if((a=b)==0)"));
|
2009-07-18 10:18:46 +02:00
|
|
|
ASSERT_EQUALS("if ( ! x . y )", simplifyIfNot("if(x.y==0)"));
|
2009-03-23 18:20:56 +01:00
|
|
|
}
|
|
|
|
|
2009-05-31 10:42:27 +02:00
|
|
|
|
|
|
|
|
|
|
|
std::string simplifyNot(const char code[])
|
|
|
|
{
|
|
|
|
// tokenize..
|
|
|
|
Tokenizer tokenizer;
|
|
|
|
std::istringstream istr(code);
|
|
|
|
tokenizer.tokenize(istr, "test.cpp");
|
|
|
|
|
|
|
|
tokenizer.simplifyNot();
|
|
|
|
|
|
|
|
std::ostringstream ostr;
|
|
|
|
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
|
|
|
|
ostr << (tok->previous() ? " " : "") << tok->str();
|
|
|
|
|
|
|
|
return ostr.str();
|
|
|
|
}
|
|
|
|
|
|
|
|
void not1()
|
|
|
|
{
|
|
|
|
ASSERT_EQUALS("if ( ! p )", simplifyNot("if (not p)"));
|
|
|
|
ASSERT_EQUALS("if ( p && ! q )", simplifyNot("if (p && not q)"));
|
|
|
|
ASSERT_EQUALS("void foo ( not i )", simplifyNot("void foo ( not i )"));
|
|
|
|
}
|
|
|
|
|
2009-06-10 23:12:26 +02:00
|
|
|
void comma_keyword()
|
|
|
|
{
|
2009-06-18 23:00:16 +02:00
|
|
|
{
|
|
|
|
const char code[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
" char *a, *b;\n"
|
|
|
|
" delete a, delete b;\n"
|
|
|
|
"}\n";
|
|
|
|
ASSERT_EQUALS(" void foo ( ) { char * a ; char * b ; delete a ; delete b ; }", sizeof_(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void foo()\n"
|
|
|
|
"{\n"
|
|
|
|
" char *a, *b;\n"
|
|
|
|
" delete a, b;\n"
|
|
|
|
"}\n";
|
|
|
|
ASSERT_EQUALS(" void foo ( ) { char * a ; char * b ; delete a ; delete b ; }", sizeof_(code));
|
|
|
|
}
|
2009-06-10 23:12:26 +02:00
|
|
|
}
|
2009-05-31 10:42:27 +02:00
|
|
|
|
2009-07-04 17:06:25 +02:00
|
|
|
void remove_comma()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" int a,b;\n"
|
|
|
|
" if( a )\n"
|
|
|
|
" a=0,\n"
|
|
|
|
" b=0;\n"
|
|
|
|
"}\n";
|
2009-07-05 20:29:09 +02:00
|
|
|
ASSERT_EQUALS(" void f ( ) { int a ; int b ; if ( a ) { a = 0 ; b = 0 ; } }", sizeof_(code));
|
2009-07-04 17:06:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "void f()\n"
|
|
|
|
"{\n"
|
|
|
|
" A a,b;\n"
|
|
|
|
" if( a.f )\n"
|
|
|
|
" a.f=b.f,\n"
|
|
|
|
" a.g=b.g;\n"
|
|
|
|
"}\n";
|
2009-07-05 20:29:09 +02:00
|
|
|
ASSERT_EQUALS(" void f ( ) { A a ; A b ; if ( a . f ) { a . f = b . f ; a . g = b . g ; } }", sizeof_(code));
|
2009-07-04 17:06:25 +02:00
|
|
|
}
|
|
|
|
}
|
2009-07-14 12:06:38 +02:00
|
|
|
|
|
|
|
void conditionOperator()
|
|
|
|
{
|
2009-07-22 13:29:42 +02:00
|
|
|
{
|
|
|
|
const char code[] = "; x = a ? b : c;";
|
|
|
|
ASSERT_EQUALS("; if ( a ) { x = b ; } else { x = c ; }", tok(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "(0?(false?1:2):3)";
|
|
|
|
ASSERT_EQUALS("( 3 )", tok(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "(1?(false?1:2):3)";
|
2009-07-23 10:12:02 +02:00
|
|
|
ASSERT_EQUALS("( 2 )", tok(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "( true ? a ( ) : b ( ) )";
|
|
|
|
ASSERT_EQUALS(code, tok(code));
|
|
|
|
TODO_ASSERT_EQUALS("( a ( ) )", tok(code));
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
const char code[] = "( true ? abc . a : abc . b )";
|
|
|
|
ASSERT_EQUALS(code, tok(code));
|
|
|
|
TODO_ASSERT_EQUALS("( abc . a )", tok(code));
|
2009-07-22 13:29:42 +02:00
|
|
|
}
|
2009-07-14 12:06:38 +02:00
|
|
|
}
|
2008-12-18 22:28:57 +01:00
|
|
|
};
|
|
|
|
|
2009-01-05 16:49:57 +01:00
|
|
|
REGISTER_TEST(TestSimplifyTokens)
|