Revert "parser: replace "vmap" keyword by "map""

This reverts commit 5e8f8a1807917f92e568437598670b0026462c1c.

I missed that this introduces shift-reduce conflicts. Revert for now.

diff --git a/src/parser.y b/src/parser.y
index faa9a33fd63a1acc4f80eaf3a3400df74efa49ad..26e71e37669b6885c5e1ae8d61f6476ff617c261 100644 (file)
--- 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 13b0ce8c411c22d830f0f7c8214a3c91b03d6bb2..cee6aa6ee7553cc7840d81c968cab65b55492b8c 100644 (file)
--- 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; }