scanner: at: Move to own scope

Modification of raw TCP option rule is a bit more complicated to avoid
pushing tcp_hdr_option_type into the introduced scope by accident.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/parser.h b/include/parser.h
index 0ff0ecfbad9acf6a02b2f3ffdef42bcb42132fee..0dcc30be64780ef44a4373e65c14d7f706292a85 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -31,6 +31,7 @@ struct parser_state {
 enum startcond_type {
        PARSER_SC_BEGIN,
        PARSER_SC_ARP,
+       PARSER_SC_AT,
        PARSER_SC_CT,
        PARSER_SC_COUNTER,
        PARSER_SC_ETH,

diff --git a/src/parser_bison.y b/src/parser_bison.y
index d8e9937bfff6b674de66114a6700d3646403304d..794a273f5844e8452131eef76dcc575200dd65bb 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -931,6 +931,7 @@ opt_newline         :       NEWLINE
 
 close_scope_ah         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_AH); };
 close_scope_arp                : { scanner_pop_start_cond(nft->scanner, PARSER_SC_ARP); };
+close_scope_at         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_AT); };
 close_scope_comp       : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_COMP); };
 close_scope_ct         : { scanner_pop_start_cond(nft->scanner, PARSER_SC_CT); };
 close_scope_counter    : { scanner_pop_start_cond(nft->scanner, PARSER_SC_COUNTER); };
@@ -4045,7 +4046,7 @@ set_ref_expr              :       set_ref_symbol_expr
                        |       variable_expr
                        ;
 
-set_ref_symbol_expr    :       AT      identifier
+set_ref_symbol_expr    :       AT      identifier      close_scope_at
                        {
                                $$ = symbol_expr_alloc(&@$, SYMBOL_SET,
                                                       current_scope(state),
@@ -5018,11 +5019,11 @@ meta_stmt               :       META    meta_key        SET     stmt_expr
                        {
                                $$ = notrack_stmt_alloc(&@$);
                        }
-                       |       FLOW    OFFLOAD AT string
+                       |       FLOW    OFFLOAD AT string       close_scope_at
                        {
                                $$ = flow_offload_stmt_alloc(&@$, $4);
                        }
-                       |       FLOW    ADD     AT string
+                       |       FLOW    ADD     AT string       close_scope_at
                        {
                                $$ = flow_offload_stmt_alloc(&@$, $4);
                        }
@@ -5295,7 +5296,7 @@ payload_expr              :       payload_raw_expr
                        |       th_hdr_expr
                        ;
 
-payload_raw_expr       :       AT      payload_base_spec       COMMA   NUM     COMMA   NUM
+payload_raw_expr       :       AT      payload_base_spec       COMMA   NUM     COMMA   NUM     close_scope_at
                        {
                                $$ = payload_expr_alloc(&@$, NULL, 0);
                                payload_init_raw($$, $2, $4, $6);
@@ -5537,10 +5538,10 @@ tcp_hdr_expr            :       TCP     tcp_hdr_field
                        {
                                $$ = tcpopt_expr_alloc(&@$, $3.kind, $3.field);
                        }
-                       |       TCP     OPTION  AT tcp_hdr_option_type  COMMA   NUM     COMMA   NUM
+                       |       TCP     OPTION  AT      close_scope_at  tcp_hdr_option_type     COMMA   NUM     COMMA   NUM
                        {
-                               $$ = tcpopt_expr_alloc(&@$, $4, 0);
-                               tcpopt_init_raw($$, $4, $6, $8, 0);
+                               $$ = tcpopt_expr_alloc(&@$, $5, 0);
+                               tcpopt_init_raw($$, $5, $7, $9, 0);
                        }
                        ;
 

diff --git a/src/scanner.l b/src/scanner.l
index 078bcc7084eba9bfaa721f7b26dc73a6b7f3a3f6..8d4907dc1fdfe4ed3eda1c98dce42672cf43eeea 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -197,6 +197,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 %option warn
 %option stack
 %s SCANSTATE_ARP
+%s SCANSTATE_AT
 %s SCANSTATE_CT
 %s SCANSTATE_COUNTER
 %s SCANSTATE_ETH
@@ -283,7 +284,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 "/"                    { return SLASH; }
 "-"                    { return DASH; }
 "*"                    { return ASTERISK; }
-"@"                    { return AT; }
+"@"                    { scanner_push_start_cond(yyscanner, SCANSTATE_AT); return AT; }
 "$"                    { return '$'; }
 "="                    { return '='; }
 "vmap"                 { return VMAP; }
@@ -456,8 +457,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr})
        "port"                  { return PORT; }
 }
 
-"ll"                   { return LL_HDR; }
-"nh"                   { return NETWORK_HDR; }
+<SCANSTATE_AT>{
+       "ll"                    { return LL_HDR; }
+       "nh"                    { return NETWORK_HDR; }
+}
 "th"                   { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_TH); return TRANSPORT_HDR; }
 
 "bridge"               { return BRIDGE; }