summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-14 12:38:12 +0000
committerPatrick McHardy <kaber@trash.net>2014-01-14 12:38:12 +0000
commit4aa022a097e06edb677d37aca8633df55016f8f5 (patch)
tree882a0d47ddbcb78ce65101bb9b6196eb052e3221 /src
parent7d98127b61f5e530388ff2344ace69a292a9829d (diff)
parent7c358b1705ea1b7d2101c39a9c3b9e5773437096 (diff)
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'src')
-rw-r--r--src/parser.y3
-rw-r--r--src/scanner.l1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/parser.y b/src/parser.y
index e5610e5a..7c18875d 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"
@@ -1272,7 +1273,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 5a5ec723..0b8abacb 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; }