TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

cppparser: don't expand function-style macro if not followed by (

Browse Source
This commit is contained in:
rdb 2019-10-07 18:38:21 +02:00
parent 5b938278c2
commit 657af0edb5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1942,7 +1942,22 @@ get_identifier(int c) {
// Is it a manifest? // Is it a manifest?
Manifests::const_iterator mi = _manifests.find(name); Manifests::const_iterator mi = _manifests.find(name);
if (mi != _manifests.end() && !should_ignore_manifest((*mi).second)) { if (mi != _manifests.end() && !should_ignore_manifest((*mi).second)) {
return expand_manifest((*mi).second); // If the manifest is expecting arguments, we don't expand it unless the
// the next token is an open-parenthesis.
CPPManifest *manifest = (*mi).second;
if (manifest->_has_parameters) {
while (c != EOF && isspace(c)) {
get();
c = peek();
}
if (c == '(') {
// It is followed by a parenthesis, so we can expand this.
return expand_manifest(manifest);
}
} else {
// Non-function-like macros are always expanded.
return expand_manifest(manifest);
}
} }
if (name == "__FILE__") { if (name == "__FILE__") {
return get_literal(SIMPLE_STRING, loc, loc.file._filename_as_referenced); return get_literal(SIMPLE_STRING, loc, loc.file._filename_as_referenced);