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

Fix small bug: space following a replacement list was included in the list

Browse source
This commit is contained in:
ceriel 1993-01-26 11:58:00 +00:00
parent cf7095f8cc
commit ebf5153f35
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -645,7 +645,7 @@ get_text(formals, length)
*repl->r_ptr = '\0'; *repl->r_ptr = '\0';
while ((c != EOI) && (class(c) != STNL)) { while ((c != EOI) && (class(c) != STNL)) {
if (BLANK(c)) { if (BLANK(c)) {
if (!blank++) add2repl(repl, ' '); blank++;
c = GetChar(); c = GetChar();
continue; continue;
} }
@ -653,6 +653,10 @@ get_text(formals, length)
if (c == '\'' || c == '"') { if (c == '\'' || c == '"') {
register int delim = c; register int delim = c;
if (blank) {
blank = 0;
add2repl(repl, ' ');
}
do { do {
add2repl(repl, c); add2repl(repl, c);
if (c == '\\') add2repl(repl, GetChar()); if (c == '\\') add2repl(repl, GetChar());
@ -668,10 +672,15 @@ get_text(formals, length)
c = GetChar(); c = GetChar();
if (c == '*') { if (c == '*') {
skipcomment(); skipcomment();
if (!blank++) add2repl(repl, ' '); blank++;
c = GetChar(); c = GetChar();
continue; continue;
} else add2repl(repl, '/'); }
if (blank) {
blank = 0;
add2repl(repl, ' ');
}
add2repl(repl, '/');
} else if (formals } else if (formals
&& (class(c) == STIDF || class(c) == STELL)) { && (class(c) == STIDF || class(c) == STELL)) {
char id_buf[IDFSIZE + 1]; char id_buf[IDFSIZE + 1];
@ -686,6 +695,11 @@ get_text(formals, length)
*idp++ = c; *idp++ = c;
} while (in_idf(c)); } while (in_idf(c));
*--idp = '\0'; *--idp = '\0';
if (blank) {
blank = 0;
add2repl(repl, ' ');
}
/* construct the formal parameter mark or identifier */ /* construct the formal parameter mark or identifier */
if (n = find_name(id_buf, formals)) if (n = find_name(id_buf, formals))
add2repl(repl, FORMALP | (char) n); add2repl(repl, FORMALP | (char) n);
@ -694,11 +708,15 @@ get_text(formals, length)
while (*idp) add2repl(repl, *idp++); while (*idp) add2repl(repl, *idp++);
} }
} else if (class(c) == STNUM) { } else if (class(c) == STNUM) {
if (blank) {
blank = 0;
add2repl(repl, ' ');
}
add2repl(repl, c); add2repl(repl, c);
if (c == '.') { if (c == '.') {
c = GetChar(); c = GetChar();
if (class(c) != STNUM) { if (class(c) != STNUM) {
blank = 0; continue; continue;
} }
add2repl(repl, c); add2repl(repl, c);
} }
@ -715,10 +733,13 @@ get_text(formals, length)
} }
} }
} else { } else {
if (blank) {
blank = 0;
add2repl(repl, ' ');
}
add2repl(repl, c); add2repl(repl, c);
c = GetChar(); c = GetChar();
} }
blank = 0;
} }
*length = repl->r_ptr - repl->r_text; *length = repl->r_ptr - repl->r_text;
return Realloc(repl->r_text, (unsigned)(repl->r_ptr - repl->r_text +1)); return Realloc(repl->r_text, (unsigned)(repl->r_ptr - repl->r_text +1));