diff options
| -rw-r--r-- | src/parser_bison.y | 15 | ||||
| -rw-r--r-- | src/scanner.l | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 6c46d098..fd2407c8 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -211,8 +211,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token <val> NUM "number" %token <string> STRING "string" %token <string> QUOTED_STRING -%token <string> ERROR "error" -%destructor { xfree($$); } STRING QUOTED_STRING ERROR +%destructor { xfree($$); } STRING QUOTED_STRING %token LL_HDR "ll" %token NETWORK_HDR "nh" @@ -471,8 +470,6 @@ static void location_update(struct location *loc, struct location *rhs, int n) %destructor { expr_free($$); } list_expr %type <expr> concat_expr map_lhs_expr %destructor { expr_free($$); } concat_expr map_lhs_expr -%type <expr> error_expr -%destructor { expr_free($$); } error_expr %type <expr> map_expr %destructor { expr_free($$); } map_expr @@ -1690,16 +1687,6 @@ expr : concat_expr | set_expr | map_expr | multiton_expr - | error_expr - ; - -error_expr : ERROR - { - $$ = NULL; - erec_queue(error(&@1, "bad value '%s'", $1), - state->msgs); - YYERROR; - } ; set_expr : '{' set_list_expr '}' diff --git a/src/scanner.l b/src/scanner.l index 52b00783..73c4f8b1 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -462,7 +462,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) yylval->val = strtoull(yytext, NULL, 0); if (errno != 0) { yylval->string = xstrdup(yytext); - return ERROR; + return STRING; } return NUM; } @@ -472,7 +472,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) yylval->val = strtoull(yytext, NULL, 0); if (errno != 0) { yylval->string = xstrdup(yytext); - return ERROR; + return STRING; } return NUM; } |