diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-06-26 18:17:09 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-06-26 18:17:09 +0000 |
| commit | 988f24328666a8847e261f8a48f1643bbf8564b5 (patch) | |
| tree | 84ce853d113268723fc90adbae94cdb1d7b387a1 /src | |
| parent | db142b6e234702a39c49b978d2040a780e873091 (diff) | |
| download | tinyproxy-988f24328666a8847e261f8a48f1643bbf8564b5.tar.gz tinyproxy-988f24328666a8847e261f8a48f1643bbf8564b5.zip | |
# Removed the STRING_ADDRESS token since it was conflicting with the
IDENTIFIER directive and also the keyword directives.
Diffstat (limited to 'src')
| -rw-r--r-- | src/grammar.y | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/grammar.y b/src/grammar.y index 6d39a53..00596dd 100644 --- a/src/grammar.y +++ b/src/grammar.y @@ -1,4 +1,4 @@ -/* $Id: grammar.y,v 1.22 2003-06-20 17:02:13 rjkaes Exp $ +/* $Id: grammar.y,v 1.23 2003-06-26 18:17:09 rjkaes Exp $ * * This is the grammar for tinyproxy's configuration file. It needs to be * in sync with scanner.l. If you know more about yacc and lex than I do @@ -37,7 +37,6 @@ int yylex(void); %union { unsigned int num; char *cptr; - void *ptr; } /* statements */ @@ -69,7 +68,6 @@ int yylex(void); %token <num> NUMBER %token <cptr> STRING %token <cptr> NUMERIC_ADDRESS -%token <cptr> STRING_ADDRESS %token <cptr> NETMASK_ADDRESS %type <num> yesno @@ -238,7 +236,7 @@ network_address ; unique_address - : STRING_ADDRESS + : IDENTIFIER | NUMERIC_ADDRESS ; @@ -255,7 +253,7 @@ string %% -extern unsigned int scanner_lineno; +extern int yylineno; void yyerror(char *s) @@ -267,6 +265,6 @@ yyerror(char *s) headerdisplayed = 1; } - fprintf(stderr, "\t%s:%d: %s\n", config.config_file, scanner_lineno, s); + fprintf(stderr, "\t%s:%d: %s\n", config.config_file, yylineno, s); exit(EXIT_FAILURE); } |