diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-09-10 13:57:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-25 00:08:16 +0200 |
| commit | 99194d1db61b6ad3f5aff3bec1f46a3bcf3f242e (patch) | |
| tree | 24855b28a021eb912598b7eb35696a7e3ec90577 /src/tools | |
| parent | 38f1b4eeaeb013983126c155a9b25e08074c41f7 (diff) | |
Moc: Make # and ## valid tokens in cpp parsing mode
This is required so preprocessing macros with arguments
can work correctly.
Change-Id: Ia30ede6a3579be13800bf1255d313748e2d696f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/keywords.cpp | 9 | ||||
| -rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp index 1cc608c3d5..603b531b03 100644 --- a/src/tools/moc/keywords.cpp +++ b/src/tools/moc/keywords.cpp @@ -48,7 +48,7 @@ static const short keyword_trans[][128] = { 546,252,544,547,0,38,239,545,25,26,236,234,30,235,27,237, 22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43, 0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, - 8,21,8,8,8,8,8,8,8,8,8,31,548,32,238,8, + 8,21,8,8,8,8,8,8,8,8,8,31,549,32,238,8, 0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13, 14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -190,7 +190,7 @@ static const short keyword_trans[][128] = { {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0, - 551,551,551,551,551,551,551,551,551,551,0,0,0,0,0,0, + 552,552,552,552,552,552,552,552,552,552,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -349,7 +349,7 @@ static const short keyword_trans[][128] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,549, + 0,0,0,0,0,0,0,0,0,0,551,0,0,0,0,550, 0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1000,7 +1000,8 @@ static const struct {QUOTE, 0, 0, 0, NOTOKEN}, {SINGLEQUOTE, 0, 0, 0, NOTOKEN}, {WHITESPACE, 0, 0, 0, NOTOKEN}, - {HASH, 0, 0, 0, HASH}, + {HASH, 0, 35, 548, HASH}, + {PP_HASHHASH, 0, 0, 0, NOTOKEN}, {BACKSLASH, 0, 0, 0, NOTOKEN}, {CPP_COMMENT, 0, 0, 0, NOTOKEN}, {C_COMMENT, 0, 0, 0, NOTOKEN}, diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index ab981c1d5c..d04e53653c 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -256,6 +256,7 @@ static const Keyword keywords[] = { { " ", "WHITESPACE" }, { "\t", "WHITESPACE" }, { "#", "HASH" }, + { "##", "PP_HASHHASH" }, { "\\", "BACKSLASH" }, { "//", "CPP_COMMENT" }, { "/*", "C_COMMENT" }, |