d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Replaced a couple of UnGetChar calls with ChPushBack calls. The

Browse source 
UnGetChar call is wrong after skipspaces().
This commit is contained in:
ceriel 1998-02-09 09:49:00 +00:00
parent d6e0e461f7
commit 91cb060d10
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/cem/cemcom.ansi/domacro.c
View file

@ -388,7 +388,7 @@ do_define()
/* read the replacement text if there is any */ /* read the replacement text if there is any */
ch = skipspaces(ch,0); /* find first character of the text */ ch = skipspaces(ch,0); /* find first character of the text */
ASSERT(ch != EOI); ASSERT(ch != EOI);
/* UngetChar() is not right when replacement starts with a '/' */ /* UnGetChar() is not right when replacement starts with a '/' */
ChPushBack(ch); ChPushBack(ch);
repl_text = get_text((nformals > 0) ? formals : 0, &length); repl_text = get_text((nformals > 0) ? formals : 0, &length);
macro_def(id, repl_text, nformals, length, NOFLAG); macro_def(id, repl_text, nformals, length, NOFLAG);

8
lang/cem/cemcom.ansi/replace.c
View file

@ -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, ' ');
} }

2
lang/cem/cpp.ansi/domacro.c
View file

@ -366,7 +366,7 @@ do_define()
/* read the replacement text if there is any */ /* read the replacement text if there is any */
ch = skipspaces(ch,0); /* find first character of the text */ ch = skipspaces(ch,0); /* find first character of the text */
assert(ch != EOI); assert(ch != EOI);
/* UngetChar() is not right when replacement starts with a '/' */ /* UnGetChar() is not right when replacement starts with a '/' */
ChPushBack(ch); ChPushBack(ch);
repl_text = get_text((nformals > 0) ? formals : 0, &length); repl_text = get_text((nformals > 0) ? formals : 0, &length);
macro_def(str2idf(str, 0), repl_text, nformals, length, NOFLAG); macro_def(str2idf(str, 0), repl_text, nformals, length, NOFLAG);

8
lang/cem/cpp.ansi/replace.c
View file

@ -140,7 +140,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);
@ -185,11 +185,11 @@ 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);
str = GetIdentifier(0); str = GetIdentifier(0);
if (str) { if (str) {
id = findidf(str); id = findidf(str);
@ -198,7 +198,7 @@ expand_defined(repl)
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, ' ');
} }