diff options
| author | Pavel Machek <pavel@ucw.cz> | 1999-04-12 19:58:18 +0000 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 1999-04-12 19:58:18 +0000 |
| commit | 38506f71b0bea5580987e999a7b1a69f58aec7ec (patch) | |
| tree | f9779191375233fb91582d32eed2489c0e2032ce /conf | |
| parent | 01bd7759b260b379089acf28cc47bd49572ebd22 (diff) | |
Sets of integers now actually work. Sets of IP will work as soon as
compare function is ready.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 4 | ||||
| -rw-r--r-- | conf/confbase.Y | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index a9e7b542..ca7bfae1 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 <errno.h> #include <stdlib.h> #include <string.h> @@ -103,7 +105,7 @@ WHITE [ \t] return SYM; } -[={}:;,()+*/%-<>~] { +[={}:;,()+*/%-<>~\[\]] { return yytext[0]; } diff --git a/conf/confbase.Y b/conf/confbase.Y index 0598d560..f65a9f6b 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 <i> expr bool pxlen -%nonassoc '=' '<' '>' +%nonassoc '=' '<' '>' '~' ELSE IF %left '+' '-' %left '*' '/' '%' %left '!' |