diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:31:38 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-14 12:31:38 +0000 |
| commit | 7d98127b61f5e530388ff2344ace69a292a9829d (patch) | |
| tree | 86292dd6142764e406821465db1950def498fd30 /src/parser.y | |
| parent | 3f8820318302da097795ba7d8b2ae3f6dff6cf2e (diff) | |
| parent | 5e8f8a1807917f92e568437598670b0026462c1c (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'src/parser.y')
| -rw-r--r-- | src/parser.y | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/parser.y b/src/parser.y index 7c18875d..e5610e5a 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" @@ -1273,7 +1272,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); } |