Module Name: src
Committed By: riastradh
Date: Sat Mar 15 15:22:37 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_parse.y
Log Message:
Convert right-recursive rules to left-recursive ones.
This should obviate the need for the workaround of a large stack in
order to handle many rules.
No change in the resulting plists.
ok rmind
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/npf/npfctl/npf_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_parse.y
diff -u src/usr.sbin/npf/npfctl/npf_parse.y:1.34 src/usr.sbin/npf/npfctl/npf_parse.y:1.35
--- src/usr.sbin/npf/npfctl/npf_parse.y:1.34 Fri Mar 14 11:29:45 2014
+++ src/usr.sbin/npf/npfctl/npf_parse.y Sat Mar 15 15:22:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_parse.y,v 1.34 2014/03/14 11:29:45 rmind Exp $ */
+/* $NetBSD: npf_parse.y,v 1.35 2014/03/15 15:22:37 riastradh Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@ input
;
lines
- : line SEPLINE lines
+ : lines SEPLINE line
| line
;
@@ -235,7 +235,7 @@ list
;
list_elems
- : element COMMA list_elems
+ : list_elems COMMA element
{
npfvar_add_elements($1, $3);
}
@@ -346,7 +346,7 @@ rproc
;
procs
- : proc_call SEPLINE procs
+ : procs SEPLINE proc_call
{
$$ = npfvar_add_elements($1, $3);
}
@@ -367,7 +367,7 @@ proc_call
;
proc_param_list
- : proc_param COMMA proc_param_list
+ : proc_param_list COMMA proc_param
{
$$ = npfvar_add_elements($1, $3);
}
@@ -447,7 +447,7 @@ ruleset_block
;
ruleset_def
- : rule_group SEPLINE ruleset_def
+ : ruleset_def SEPLINE rule_group
| rule_group
;
