Merge pull request #141 from bazsi/cfg-grammar-fix-to-set-context-in-log-forks

alltilla · web-flow · commit 142d92980050 · 2024-06-03T15:03:17.000+02:00
cfg-grammar: fix context for looking up blocks
diff --git a/lib/cfg-grammar.y b/lib/cfg-grammar.y
@@ -799,23 +799,23 @@ log_forks
         ;
 
 log_fork
-        : KW_LOG optional_string '{' log_content '}'
+        : KW_LOG optional_string '{' _log_context_push log_content _log_context_pop '}'
           {
             if ($2)
               {
-                log_expr_node_set_name($4, $2);
+                log_expr_node_set_name($5, $2);
                 free($2);
               }
-            $$ = $4;
+            $$ = $5;
           }
-        | KW_CHANNEL optional_string '{' log_content '}'
+        | KW_CHANNEL optional_string '{' _log_context_push log_content _log_context_pop '}'
           {
             if ($2)
               {
-                log_expr_node_set_name($4, $2);
+                log_expr_node_set_name($5, $2);
                 free($2);
               }
-            $$ = $4;
+            $$ = $5;
           }
         ;
 

Original file line number	Diff line number	Diff line change
`@@ -799,23 +799,23 @@ log_forks`
`799`	`799`	`;`
`800`	`800`
`801`	`801`	`log_fork`
`802`		`- : KW_LOG optional_string '{' log_content '}'`
	`802`	`+ : KW_LOG optional_string '{' _log_context_push log_content _log_context_pop '}'`
`803`	`803`	`{`
`804`	`804`	`if ($2)`
`805`	`805`	`{`
`806`		`- log_expr_node_set_name($4, $2);`
	`806`	`+ log_expr_node_set_name($5, $2);`
`807`	`807`	`free($2);`
`808`	`808`	`}`
`809`		`- $$ = $4;`
	`809`	`+ $$ = $5;`
`810`	`810`	`}`
`811`		`- \| KW_CHANNEL optional_string '{' log_content '}'`
	`811`	`+ \| KW_CHANNEL optional_string '{' _log_context_push log_content _log_context_pop '}'`
`812`	`812`	`{`
`813`	`813`	`if ($2)`
`814`	`814`	`{`
`815`		`- log_expr_node_set_name($4, $2);`
	`815`	`+ log_expr_node_set_name($5, $2);`
`816`	`816`	`free($2);`
`817`	`817`	`}`
`818`		`- $$ = $4;`
	`818`	`+ $$ = $5;`
`819`	`819`	`}`
`820`	`820`	`;`
`821`	`821`