github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-01-25 19:56:30 +00:00
Code Issues Projects Releases Wiki Activity

Make .narg work

Browse Source 
it should count only non-keyword (actual) arguments.
This commit is contained in:
Olaf Seibert
2015-05-14 14:33:54 +02:00
parent 833d9186cc
commit 4fabe28497
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
macros.c
View File

@@ -47,7 +47,7 @@ STREAM *new_macro_stream(
STREAM *refstr,
BUFFER *buf,
MACRO *mac,
ARG *args)
int nargs)
{
MACRO_STREAM *mstr = memcheck(malloc(sizeof(MACRO_STREAM))); {
char *name = memcheck(malloc(strlen(refstr->name) + 32));
@@ -58,8 +58,7 @@ STREAM *new_macro_stream(
}
mstr->bstr.stream.vtbl = &macro_stream_vtbl;
/* Count the args and save their number */
for (mstr->nargs = 0; args; args = args->next, mstr->nargs++) ;
mstr->nargs = nargs; /* for .NARG directive: nonkeyword arguments in call*/
mstr->cond = last_cond;
return &mstr->bstr.stream;
}
@@ -414,9 +413,11 @@ STREAM *expandmacro(
char *label;
STREAM *str;
BUFFER *buf;
int nargs;
args = NULL;
arg = NULL;
nargs = 0; /* for the .NARG directive */
/* Parse the arguments */
@@ -455,6 +456,7 @@ STREAM *expandmacro(
arg = new_arg();
arg->label = memcheck(strdup(macarg->label)); /* Copy the name */
arg->value = getstring(cp, &nextcp);
nargs++; /* Count nonkeyword arguments only. */
}
arg->next = args;
@@ -500,7 +502,7 @@ STREAM *expandmacro(
buf = subst_args(mac->text, args);
str = new_macro_stream(refstr, buf, mac, args);
str = new_macro_stream(refstr, buf, mac, nargs);
free_args(args);
buffer_free(buf);