Filter: refactoring of instruction constructors

2 files changed, 5 insertions, 1 deletions

diff --git a/conf/conf.h b/conf/conf.h
index 427569fd..6138ccec 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -107,7 +107,7 @@ struct symbol {
   struct sym_scope *scope;
   int class;
   int aux;
-  void *aux2;
+  uint aux2;
   void *def;
   char name[1];
 };
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 492ecd08..13f6aade 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -49,6 +49,10 @@ CF_DECLS
   struct rtable_config *r;
   struct channel_config *cc;
   struct f_inst *x;
+  struct f_inst *xp[2];
+  struct { struct f_inst *inst; uint count; } xc;
+  enum filter_return fret;
+  enum ec_subtype ecs;
   struct f_dynamic_attr fda;
   struct f_static_attr fsa;
   struct filter *f;