diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:37:36 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:37:36 +0000 |
| commit | 7c358b1705ea1b7d2101c39a9c3b9e5773437096 (patch) | |
| tree | b687c0ba88f17466dd9bce59fcc6155f60ade5a7 /src | |
| parent | 5e8f8a1807917f92e568437598670b0026462c1c (diff) | |
Revert "parser: replace "vmap" keyword by "map""
This reverts commit 5e8f8a1807917f92e568437598670b0026462c1c.
I missed that this introduces shift-reduce conflicts. Revert for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/parser.y | 3 | ||||
| -rw-r--r-- | src/scanner.l | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/parser.y b/src/parser.y index faa9a33f..26e71e37 100644 --- a/src/parser.y +++ b/src/parser.y @@ -150,6 +150,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token DASH "-" %token AT "@" %token ARROW "=>" +%token VMAP "vmap" %token INCLUDE "include" %token DEFINE "define" @@ -1206,7 +1207,7 @@ map_expr : concat_expr MAP expr } ; -verdict_map_expr : concat_expr MAP expr +verdict_map_expr : concat_expr VMAP expr { $$ = map_expr_alloc(&@$, $1, $3); } diff --git a/src/scanner.l b/src/scanner.l index 13b0ce8c..cee6aa6e 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -210,6 +210,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "$" { return '$'; } "=" { return '='; } "=>" { return ARROW; } +"vmap" { return VMAP; } "include" { return INCLUDE; } "define" { return DEFINE; } |