diff options
| -rw-r--r-- | conf/confbase.Y | 3 | ||||
| -rw-r--r-- | filter/config.Y | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index ba60fb27..33fb3f74 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -41,6 +41,7 @@ CF_DECLS } %token END CLI_MARKER INVALID_TOKEN +%token GEQ LEQ NEQ %token <i> NUM ENUM %token <i32> RTRID %token <a> IPA @@ -50,7 +51,7 @@ CF_DECLS %type <i> expr bool pxlen %type <time> datetime -%nonassoc '=' '<' '>' '~' '.' +%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ %left '+' '-' %left '*' '/' '%' %left '!' diff --git a/filter/config.Y b/filter/config.Y index dc7cc5a0..e99d5b71 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -39,8 +39,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, CONST, UNSET, RETURN, %nonassoc THEN %nonassoc ELSE -%token GEQ LEQ NEQ - %type <x> term block cmds cmd function_body constant print_one print_list var_list var_listn dynamic_attr function_call %type <f> filter filter_body where_filter %type <i> type break_command pair @@ -298,8 +296,6 @@ function_call: } ; -/* NEQ, LEQ and GEQ are responsible for 42 shift/reduce conflicts */ - term: '(' term ')' { $$ = $2; } | term '+' term { $$ = f_new_inst(); $$->code = '+'; $$->a1.p = $1; $$->a2.p = $3; } |