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

cppparser: Perform macro expansion on macro arguments

Browse Source 
Fixes #1638
This commit is contained in:
rdb 2024-03-27 02:26:14 +01:00
parent 674c037c50
commit c923cf6ee5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2180,8 +2180,12 @@ expand_manifest(const CPPManifest *manifest, const YYLTYPE &loc) {
manifest->_variadic_param, args); manifest->_variadic_param, args);
} }
string expanded = " " + manifest->expand(args) + " "; // Perform expansion on the macro arguments.
push_string(expanded, true); for (string &arg : args) {
std::set<const CPPManifest *> expanded;
expanded.insert(manifest);
r_expand_manifests(arg, false, loc, expanded);
}
string expanded = " " + manifest->expand(args) + " "; string expanded = " " + manifest->expand(args) + " ";
push_expansion(expanded, manifest, loc); push_expansion(expanded, manifest, loc);
@ -2228,6 +2232,13 @@ r_expand_manifests(string &expr, bool expand_undefined,
manifest->_variadic_param, args, expr, p); manifest->_variadic_param, args, expr, p);
} }
// Perform expansion on the macro arguments.
for (string &arg : args) {
std::set<const CPPManifest *> ignore = expanded;
ignore.insert(manifest);
r_expand_manifests(arg, expand_undefined, loc, ignore);
}
string result = manifest->expand(args); string result = manifest->expand(args);
// Recurse, but adding the manifest we just expanded to the list // Recurse, but adding the manifest we just expanded to the list