From 38506f71b0bea5580987e999a7b1a69f58aec7ec Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Mon, 12 Apr 1999 19:58:18 +0000 Subject: Sets of integers now actually work. Sets of IP will work as soon as compare function is ready. --- conf/cf-lex.l | 4 +++- conf/confbase.Y | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/cf-lex.l b/conf/cf-lex.l index a9e7b54..ca7bfae 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -9,6 +9,8 @@ %{ #undef REJECT /* Avoid name clashes */ +#include "filter/filter.h" + #include #include #include @@ -103,7 +105,7 @@ WHITE [ \t] return SYM; } -[={}:;,()+*/%-<>~] { +[={}:;,()+*/%-<>~\[\]] { return yytext[0]; } diff --git a/conf/confbase.Y b/conf/confbase.Y index 0598d56..f65a9f6 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -27,6 +27,8 @@ CF_DECLS char *t; struct f_inst *x; struct filter *f; + struct f_tree *e; + struct f_val v; } %token END @@ -37,7 +39,7 @@ CF_DECLS %type expr bool pxlen -%nonassoc '=' '<' '>' +%nonassoc '=' '<' '>' '~' ELSE IF %left '+' '-' %left '*' '/' '%' %left '!' -- cgit v1.2.3