From: Pavel Machek <pavel@ucw.cz>
Date: Wed, 12 Apr 2000 14:05:37 +0000 (+0000)
Subject: One less shift/reduce conflict.
X-Git-Tag: v1.2.0~1183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2d157463accf02e2db9fd3dd174b7e46dae8938;p=thirdparty%2Fbird.git

One less shift/reduce conflict.
---

diff --git a/filter/config.Y b/filter/config.Y
index 04c0af553..ebb2e4b11 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -412,12 +412,13 @@ term:
  | rtadot dynamic_attr '.' ADD '(' term ')' { }
  | rtadot dynamic_attr '.' DELETE '(' term ')' { }
  | rtadot dynamic_attr '.' CONTAINS '(' term ')' { }
- | rtadot dynamic_attr '.' RESET { }
+ | rtadot dynamic_attr '.' RESET{ }
 */
 
 /* Paths */
- | rtadot dynamic_attr '.' APPEND '(' term ')' { }
- | rtadot dynamic_attr '.' LEN { $$->code = P('P','l'); }
+ | term '.' APPEND '(' term ')' { }
+ | term '.' RESET { }
+/* | term '.' LEN { $$->code = P('P','l'); } */
 
 /* function_call is inlined here */
  | SYM '(' var_list ')' {
diff --git a/filter/filter.h b/filter/filter.h
index cac124a40..d634c8675 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -64,7 +64,7 @@ struct filter {
 
 void filters_postconfig(void);
 struct f_inst *f_new_inst(void);
-struct f_inst *f_new_dynamic_attr(int type, int f_type, int code);	/* Type as core knows it, type as filters know it, and code */
+struct f_inst *f_new_dynamic_attr(int type, int f_type, int code);	/* Type as core knows it, type as filters know it, and code of dynamic attribute */
 struct f_tree *f_new_tree(void);
 
 struct f_tree *build_tree(struct f_tree *);