From 5e8f8a1807917f92e568437598670b0026462c1c Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 14 Jan 2014 12:30:48 +0000 Subject: parser: replace "vmap" keyword by "map" Consistently use "map" to express mappings. Signed-off-by: Patrick McHardy --- src/parser.y | 3 +-- src/scanner.l | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/parser.y b/src/parser.y index 26e71e37..faa9a33f 100644 --- 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 cee6aa6e..13b0ce8c 100644 --- 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; } -- cgit v1.2.3