parser: replace "vmap" keyword by "map"

Consistently use "map" to express mappings.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/src/parser.y b/src/parser.y
index 26e71e37669b6885c5e1ae8d61f6476ff617c261..faa9a33fd63a1acc4f80eaf3a3400df74efa49ad 100644 (file)
--- a/src/parser.y
+++ b/src/parser.y
@@ -150,7 +150,6 @@ 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"
@@ -1207,7 +1206,7 @@ map_expr          :       concat_expr     MAP     expr
                        }
                        ;
 
-verdict_map_expr       :       concat_expr     VMAP    expr
+verdict_map_expr       :       concat_expr     MAP     expr
                        {
                                $$ = map_expr_alloc(&@$, $1, $3);
                        }

diff --git a/src/scanner.l b/src/scanner.l
index cee6aa6ee7553cc7840d81c968cab65b55492b8c..13b0ce8c411c22d830f0f7c8214a3c91b03d6bb2 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -210,7 +210,6 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 "$"                    { return '$'; }
 "="                    { return '='; }
 "=>"                   { return ARROW; }
-"vmap"                 { return VMAP; }
 
 "include"              { return INCLUDE; }
 "define"               { return DEFINE; }