These patches move more keywords away from the initial flex scope. Just like the preceding patches they follow the same pattern: 1. New scope is entered from flex when encountering a start token, e.g. "ip". 2. Scope is left from bison once a complete expression has been parsed. Unlike the initial patches which only did this for a few expressions this series also covers tokens that can appear in object context. Florian Westphal (12): scanner: ct: move to own scope scanner: ip: move to own scope scanner: ip6: move to own scope scanner: add fib scope scanner: add ether scope scanner: arp: move to own scope scanner: remove saddr/daddr from initial state scanner: vlan: move to own scope scanner: limit: move to own scope scanner: quota: move to own scope scanner: move until,over,used keywords away from init state scanner: secmark: move to own scope include/parser.h | 10 +++ src/parser_bison.y | 176 ++++++++++++++++++++++++--------------------- src/scanner.l | 122 ++++++++++++++++++------------- 3 files changed, 177 insertions(+), 131 deletions(-) -- 2.26.2