projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix macro expansion
[m6w6/ext-psi]
/
src
/
cpp.c
diff --git
a/src/cpp.c
b/src/cpp.c
index 4b11c25fc4e49ef1d441537612e5ce6d13bdc4b2..034f8a230d0f99e2adabc1d1b73075349b200bf8 100644
(file)
--- a/
src/cpp.c
+++ b/
src/cpp.c
@@
-317,12
+317,7
@@
static bool psi_cpp_stage2(struct psi_cpp *cpp)
}
if (do_expansion && psi_cpp_defined(cpp, current)) {
}
if (do_expansion && psi_cpp_defined(cpp, current)) {
- bool expanded = false;
-
if (psi_cpp_tokiter_expand(cpp)) {
if (psi_cpp_tokiter_expand(cpp)) {
- expanded = true;
- }
- if (expanded) {
continue;
}
}
continue;
}
}
@@
-334,13
+329,7
@@
static bool psi_cpp_stage2(struct psi_cpp *cpp)
bool parsed;
cpp->do_cpp = false;
bool parsed;
cpp->do_cpp = false;
-
parsed = psi_parser_process(cpp->parser, cpp->tokens.exec, &processed);
parsed = psi_parser_process(cpp->parser, cpp->tokens.exec, &processed);
-
- /* leave EOLs in the input stream, else we might end up
- * with a hash not preceded with a new line after include */
- psi_cpp_tokiter_add(cpp, current);
- psi_plist_pop(cpp->tokens.exec, NULL);
psi_plist_clean(cpp->tokens.exec);
if (!parsed) {
psi_plist_clean(cpp->tokens.exec);
if (!parsed) {