summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-14 12:37:36 +0000
committerPatrick McHardy <kaber@trash.net>2014-01-14 12:37:36 +0000
commit7c358b1705ea1b7d2101c39a9c3b9e5773437096 (patch)
treeb687c0ba88f17466dd9bce59fcc6155f60ade5a7 /src/scanner.l
parent5e8f8a1807917f92e568437598670b0026462c1c (diff)
Revert "parser: replace "vmap" keyword by "map""
This reverts commit 5e8f8a1807917f92e568437598670b0026462c1c. I missed that this introduces shift-reduce conflicts. Revert for now.
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 13b0ce8c..cee6aa6e 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; }