From 543bf3c2bb5e67b024231f01c9d88fb29298c72b Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 27 Jul 2021 16:35:14 +0200 Subject: scanner: import, export: Move to own scopes In theory, one could use a common scope for both import and export commands, their parameters are identical. Signed-off-by: Phil Sutter --- src/scanner.l | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/scanner.l') diff --git a/src/scanner.l b/src/scanner.l index 8725295a..97545b70 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -211,6 +211,8 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %s SCANSTATE_TCP %s SCANSTATE_TYPE %s SCANSTATE_VLAN +%s SCANSTATE_CMD_EXPORT +%s SCANSTATE_CMD_IMPORT %s SCANSTATE_CMD_LIST %s SCANSTATE_CMD_MONITOR %s SCANSTATE_CMD_RESET @@ -344,8 +346,8 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "reset" { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_RESET); return RESET; } "flush" { return FLUSH; } "rename" { return RENAME; } -"import" { return IMPORT; } -"export" { return EXPORT; } +"import" { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_IMPORT); return IMPORT; } +"export" { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_EXPORT); return EXPORT; } "monitor" { scanner_push_start_cond(yyscanner, SCANSTATE_CMD_MONITOR); return MONITOR; } "position" { return POSITION; } @@ -759,9 +761,11 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "all" { return ALL; } -"xml" { return XML; } -"json" { return JSON; } -"vm" { return VM; } +{ + "xml" { return XML; } + "json" { return JSON; } + "vm" { return VM; } +} "exists" { return EXISTS; } "missing" { return MISSING; } -- cgit v1.2.3