TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

simple fix to token-pasting problem

Browse Source
This commit is contained in:
David Rose 2008-05-09 18:48:20 +00:00
parent 2629762c2b
commit 07e5322800
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dtool/src/cppparser/cppPreprocessor.cxx
View File

@ -320,7 +320,10 @@ get_next_token0() {
if (token._token == '#') { if (token._token == '#') {
// Stringify. // Stringify.
token = internal_get_next_token(); token = internal_get_next_token();
if (token._token == SIMPLE_IDENTIFIER || token._token == STRING) { if (token._token == SIMPLE_IDENTIFIER ||
token._token == INTEGER ||
token._token == REAL ||
token._token == STRING) {
token._token = STRING; token._token = STRING;
} else { } else {
// Stringify nothing. // Stringify nothing.
@ -370,7 +373,9 @@ get_next_token0() {
// The token-pasting operator creates one continuous // The token-pasting operator creates one continuous
// identifier across whitespace. // identifier across whitespace.
token = internal_get_next_token(); token = internal_get_next_token();
if (token._token == SIMPLE_IDENTIFIER) { if (token._token == SIMPLE_IDENTIFIER ||
token._token == INTEGER ||
token._token == REAL) {
name += token._lval.str; name += token._lval.str;
ident->_names.back().append_name(token._lval.str); ident->_names.back().append_name(token._lval.str);