|
@@ -150,7 +150,7 @@ expand_macro(repl, idf)
|
|
ch = GetChar();
|
|
ch = GetChar();
|
|
ch = skipspaces(ch,1);
|
|
ch = skipspaces(ch,1);
|
|
if (ch != '(') { /* no replacement if no () */
|
|
if (ch != '(') { /* no replacement if no () */
|
|
- UnGetChar();
|
|
|
|
|
|
+ ChPushBack(ch);
|
|
return 0;
|
|
return 0;
|
|
} else
|
|
} else
|
|
getactuals(repl, idf);
|
|
getactuals(repl, idf);
|
|
@@ -194,17 +194,17 @@ expand_defined(repl)
|
|
if ((class(ch) != STIDF) && (class(ch) != STELL)) {
|
|
if ((class(ch) != STIDF) && (class(ch) != STELL)) {
|
|
error("identifier missing");
|
|
error("identifier missing");
|
|
if (parens && ch != ')') error(") missing");
|
|
if (parens && ch != ')') error(") missing");
|
|
- if (!parens || ch != ')') UnGetChar();
|
|
|
|
|
|
+ if (!parens || ch != ')') ChPushBack(ch);
|
|
add2repl(repl, '0');
|
|
add2repl(repl, '0');
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- UnGetChar();
|
|
|
|
|
|
+ ChPushBack(ch);
|
|
id = GetIdentifier(0);
|
|
id = GetIdentifier(0);
|
|
ASSERT(id || class(ch) == STELL);
|
|
ASSERT(id || class(ch) == STELL);
|
|
ch = GetChar();
|
|
ch = GetChar();
|
|
ch = skipspaces(ch, 0);
|
|
ch = skipspaces(ch, 0);
|
|
if (parens && ch != ')') error(") missing");
|
|
if (parens && ch != ')') error(") missing");
|
|
- if (!parens || ch != ')') UnGetChar();
|
|
|
|
|
|
+ if (!parens || ch != ')') ChPushBack(ch);
|
|
add2repl(repl, (id && id->id_macro) ? '1' : '0');
|
|
add2repl(repl, (id && id->id_macro) ? '1' : '0');
|
|
add2repl(repl, ' ');
|
|
add2repl(repl, ' ');
|
|
}
|
|
}
|