From: Martin Mares <mj@ucw.cz>
Date: Mon, 15 May 2000 12:15:18 +0000 (+0000)
Subject: Changed syntax of expressions. Each `expr' can be now either a numeric literal
X-Git-Tag: v1.2.0~903
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc590a11a7a285463dff89d0bd677d0762dd8e45;p=thirdparty%2Fbird.git

Changed syntax of expressions. Each `expr' can be now either a numeric literal
or a symbol or parenthesised filter expression.
---

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 588f5826f..31b361730 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -82,12 +82,7 @@ CF_ADDTO(conf, ';')
 
 expr:
    NUM
- | expr '+' expr { $$ = $1 + $3; }
- | expr '-' expr { $$ = $1 - $3; }
- | expr '*' expr { $$ = $1 * $3; }
- | expr '/' expr { if ($3) $$ = $1 / $3; else cf_error("Division by zero"); }
- | expr '%' expr { if ($3) $$ = $1 % $3; else cf_error("Division by zero"); }
- | '(' expr ')' { $$ = $2; }
+ | '(' term ')' { $$ = f_eval_int($2); }
  | SYM { if ($1->class != SYM_NUMBER) cf_error("Number expected"); else $$ = $1->aux; }
  ;