diff options
Diffstat (limited to 'awkgram.y')
| -rw-r--r-- | awkgram.y | 32 |
1 files changed, 27 insertions, 5 deletions
@@ -89,7 +89,11 @@ static void check_comment(void); static bool at_seen = false; static bool want_source = false; static bool want_regexp = false; /* lexical scanning kludge */ -static bool want_param_names = false; /* ditto */ +static enum { + FUNC_HEADER, + FUNC_BODY, + DONT_CHECK +} want_param_names = DONT_CHECK; /* ditto */ static char *in_function; /* parsing kludge */ static int rule = 0; @@ -247,7 +251,7 @@ rule { in_function = NULL; (void) mk_function($1, $2); - want_param_names = false; + want_param_names = DONT_CHECK; yyerrok; } | '@' LEX_INCLUDE source statement_term @@ -426,7 +430,7 @@ lex_builtin ; function_prologue - : LEX_FUNCTION func_name '(' { want_param_names = true; } opt_param_list r_paren opt_nls + : LEX_FUNCTION func_name '(' { want_param_names = FUNC_HEADER; } opt_param_list r_paren opt_nls { /* * treat any comments between BOF and the first function @@ -452,6 +456,7 @@ function_prologue bcfree($2); /* $5 already free'd in install_function */ $$ = $1; + want_param_names = FUNC_BODY; } ; @@ -3893,8 +3898,25 @@ retry: goto out; /* allow parameter names to shadow the names of gawk extension built-ins */ - if (want_param_names && (tokentab[mid].flags & GAWKX) != 0) - goto out; + if ((tokentab[mid].flags & GAWKX) != 0) { + switch (want_param_names) { + case FUNC_HEADER: + /* in header, defining parameter names */ + goto out; + case FUNC_BODY: + /* in body, name must be in symbol table for it to be a parameter */ + if (lookup(tokstart) != NULL) + goto out; + /* else + fall through */ + case DONT_CHECK: + /* regular code */ + break; + default: + cant_happen(); + break; + } + } if (do_lint) { if ((tokentab[mid].flags & GAWKX) != 0 && (warntab[mid] & GAWKX) == 0) { |