oops, previous fix was wrong for ## operator
This commit is contained in:
parent
1011f9679e
commit
7b00154c54
1 changed files with 3 additions and 3 deletions
|
@ -512,8 +512,8 @@ macro2buffer(repl, idf, args)
|
||||||
result onto the replacement buffer. It deals with the #
|
result onto the replacement buffer. It deals with the #
|
||||||
and ## operators, and inserts the actual parameters.
|
and ## operators, and inserts the actual parameters.
|
||||||
The argument buffer contains the raw argument (needed
|
The argument buffer contains the raw argument (needed
|
||||||
for the ## operator), and the expanded argument (for
|
for the # and ## operators), and the expanded argument
|
||||||
all other parameter substitutions).
|
(for all other parameter substitutions).
|
||||||
|
|
||||||
The grammar of the replacement list is:
|
The grammar of the replacement list is:
|
||||||
|
|
||||||
|
@ -555,7 +555,7 @@ macro2buffer(repl, idf, args)
|
||||||
ptr++;
|
ptr++;
|
||||||
} while (*ptr != delim || *ptr == '\0');
|
} while (*ptr != delim || *ptr == '\0');
|
||||||
add2repl(repl, *ptr++);
|
add2repl(repl, *ptr++);
|
||||||
} else if (func && *ptr == '#') {
|
} else if (*ptr == '#' && (func || *(ptr+1) == '#')) {
|
||||||
if (*++ptr == '#') {
|
if (*++ptr == '#') {
|
||||||
register int tmpindex;
|
register int tmpindex;
|
||||||
/* ## - paste operator */
|
/* ## - paste operator */
|
||||||
|
|
Loading…
Reference in a new issue