Skip to content

Commit cd93389

Browse files
firewavefirewave
committed
TestTokenize: removed need for tokenizeAndStringifyWindows() 
1 parent 33d856a commit cd93389

1 file changed

Lines changed: 25 additions & 37 deletions

File tree

‎test/testtokenize.cpp‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ class TestTokenizer : public TestFixture {
5656
const Settings settings2_unix64 = settingsBuilder(settings2).platform(Platform::Type::Unix64).build();
5757
const Settings settings3 = settingsBuilder(settings0).c(Standards::C89).cpp(Standards::CPP03).build();
5858
const Settings settings_windows = settingsBuilder().library("windows.cfg").debugwarnings().cpp(Standards::CPP11).build();
59+
const Settings settings_win32a = settingsBuilder(settings_windows).platform(Platform::Type::Win32A).build();
60+
const Settings settings_win32w = settingsBuilder(settings_windows).platform(Platform::Type::Win32W).build();
5961

6062
void run() override {
6163
mNewTemplate = true;
@@ -575,20 +577,6 @@ class TestTokenizer : public TestFixture {
575577
return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
576578
}
577579

578-
#define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
579-
template<size_t size>
580-
std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char (&code)[size], Platform::Type platform = Platform::Type::Native) {
581-
const Settings settings = settingsBuilder(settings_windows).platform(platform).build();
582-
583-
// tokenize..
584-
SimpleTokenizer tokenizer(settings, *this);
585-
ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
586-
587-
if (tokenizer.tokens())
588-
return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
589-
return "";
590-
}
591-
592580
#define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
593581
template<size_t size>
594582
std::string tokenizeDebugListing_(const char* file, int line, const char (&code)[size], bool cpp = true) {
@@ -4821,16 +4809,16 @@ class TestTokenizer : public TestFixture {
48214809
ASSERT_EQUALS("struct A { long x ; } ;", tokenizeAndStringify(code5));
48224810

48234811
const char code6[] = "struct A { __int8 x : 3; };";
4824-
ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringifyWindows(code6, Platform::Type::Win32A));
4812+
ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringify(code6, settings_win32a));
48254813

48264814
const char code7[] = "struct A { __int16 x : 3; };";
4827-
ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringifyWindows(code7, Platform::Type::Win32A));
4815+
ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringify(code7,settings_win32a));
48284816

48294817
const char code8[] = "struct A { __int32 x : 3; };";
4830-
ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringifyWindows(code8, Platform::Type::Win32A));
4818+
ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringify(code8, settings_win32a));
48314819

48324820
const char code9[] = "struct A { __int64 x : 3; };";
4833-
ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringifyWindows(code9, Platform::Type::Win32A));
4821+
ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringify(code9, settings_win32a));
48344822

48354823
const char code10[] = "struct A { unsigned char x : 3; };";
48364824
ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code10));
@@ -4845,16 +4833,16 @@ class TestTokenizer : public TestFixture {
48454833
ASSERT_EQUALS("struct A { unsigned long x ; } ;", tokenizeAndStringify(code13));
48464834

48474835
const char code14[] = "struct A { unsigned __int8 x : 3; };";
4848-
ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringifyWindows(code14, Platform::Type::Win32A));
4836+
ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code14, settings_win32a));
48494837

48504838
const char code15[] = "struct A { unsigned __int16 x : 3; };";
4851-
ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringifyWindows(code15, Platform::Type::Win32A));
4839+
ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringify(code15, settings_win32a));
48524840

48534841
const char code16[] = "struct A { unsigned __int32 x : 3; };";
4854-
ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringifyWindows(code16, Platform::Type::Win32A));
4842+
ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringify(code16, settings_win32a));
48554843

48564844
const char code17[] = "struct A { unsigned __int64 x : 3; };";
4857-
ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringifyWindows(code17, Platform::Type::Win32A));
4845+
ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringify(code17, settings_win32a));
48584846

48594847
const char code18[] = "struct A { signed char x : 3; };";
48604848
ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code18));
@@ -4866,19 +4854,19 @@ class TestTokenizer : public TestFixture {
48664854
ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code20));
48674855

48684856
const char code21[] = "struct A { signed long x : 3; };";
4869-
ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringifyWindows(code21));
4857+
ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringify(code21, settings_windows));
48704858

48714859
const char code22[] = "struct A { signed __int8 x : 3; };";
4872-
ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringifyWindows(code22, Platform::Type::Win32A));
4860+
ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code22, settings_win32a));
48734861

48744862
const char code23[] = "struct A { signed __int16 x : 3; };";
4875-
ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringifyWindows(code23, Platform::Type::Win32A));
4863+
ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringify(code23, settings_win32a));
48764864

48774865
const char code24[] = "struct A { signed __int32 x : 3; };";
4878-
ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringifyWindows(code24, Platform::Type::Win32A));
4866+
ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringify(code24, settings_win32a));
48794867

48804868
const char code25[] = "struct A { signed __int64 x : 3; };";
4881-
ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringifyWindows(code25, Platform::Type::Win32A));
4869+
ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringify(code25, settings_win32a));
48824870
}
48834871

48844872
void bitfields2() {
@@ -6150,10 +6138,10 @@ class TestTokenizer : public TestFixture {
61506138
"float * ptrToFloat ;";
61516139

61526140
// These types should be defined the same on all Windows platforms
6153-
const std::string win32A = tokenizeAndStringifyWindows(code, Platform::Type::Win32A);
6141+
const std::string win32A = tokenizeAndStringify(code, settings_win32a);
61546142
ASSERT_EQUALS(expected, win32A);
6155-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
6156-
ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win64));
6143+
ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32w));
6144+
ASSERT_EQUALS(win32A, tokenizeAndStringify(code, settings_win32a));
61576145
}
61586146

61596147
void platformWin32A() {
@@ -6199,13 +6187,13 @@ class TestTokenizer : public TestFixture {
61996187
"sscanf ( dst , \"%s\" , dst ) ; "
62006188
"} "
62016189
"unsigned char tbyte ;";
6202-
ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
6190+
ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
62036191

62046192
const char code2[] = "LPCTSTR f(void* p) { return LPCTSTR(p); }\n" // #11430
62056193
"LPCTSTR g() { return LPCTSTR{}; }";
62066194
const char expected2[] = "const char * f ( void * p ) { return ( const char * ) ( p ) ; }\n"
62076195
"const char * g ( ) { return ( const char * ) ( 0 ) ; }";
6208-
ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, Platform::Type::Win32A));
6196+
ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32a));
62096197
}
62106198

62116199
void platformWin32W() {
@@ -6251,29 +6239,29 @@ class TestTokenizer : public TestFixture {
62516239
"wscanf ( L\"%s\" , dst ) ; "
62526240
"swscanf ( dst , L\"%s\" , dst ) ; "
62536241
"}";
6254-
ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
6242+
ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
62556243
}
62566244

62576245
void platformWin32AStringCat() { //#5150
62586246
const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
62596247
const char expected[] = "char text [ 10 ] = \"123456789\" ;";
6260-
ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
6248+
ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32a));
62616249
}
62626250

62636251
void platformWin32WStringCat() { //#5150
62646252
const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
62656253
const char expected[] = "wchar_t text [ 10 ] = L\"123456789\" ;";
6266-
ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
6254+
ASSERT_EQUALS(expected, tokenizeAndStringify(code, settings_win32w));
62676255
}
62686256

62696257
void platformWinWithNamespace() {
62706258
const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;";
62716259
const char expected1[] = "unsigned int a ; unsigned int b ; foo :: UINT32 c ;";
6272-
ASSERT_EQUALS(expected1, tokenizeAndStringifyWindows(code1, Platform::Type::Win32A));
6260+
ASSERT_EQUALS(expected1, tokenizeAndStringify(code1, settings_win32a));
62736261

62746262
const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;";
62756263
const char expected2[] = "const void * a ; const void * b ; foo :: LPCVOID c ;";
6276-
ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, Platform::Type::Win32A));
6264+
ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, settings_win32w));
62776265
}
62786266

62796267
void isOneNumber() const {

0 commit comments

Comments
 (0)