Changeset 169:f8507f57a3c0 in freeDiameter for extensions/rt_default

Timestamp:

Feb 2, 2010, 10:24:32 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Allow '+' and '-' operators in conf file

Location:

extensions/rt_default

Files:

• rtd_conf.l (modified) (1 diff)
• rtd_conf.y (modified) (3 diffs)

extensions/rt_default/rtd_conf.l

@@ -136 +136 @@
                         
         /* Valid single characters for yyparse */
-[*:=+;]                 { return yytext[0]; }
+[*:=+-;]                { return yytext[0]; }
 
         /* Unrecognized sequence, if it did not match any previous pattern */

extensions/rt_default/rtd_conf.y

@@ -143 +143 @@
 %type <criteria> CRITERIA
 %type <target>   TARGET
+%type <integer>  EXPR_INT
 
 /* Tokens */
@@ -165 +166 @@
                         
         /* a RULE entry */
-rule:                   CRITERIA ':' TARGET '+' '=' INTEGER ';'
+rule:                   CRITERIA ':' TARGET '+' '=' EXPR_INT ';'
                         {
                                 int flag = 0;
@@ -256 +257 @@
                         }
                         ;
+        
+        /* An expression that has an integer value; we allow + and - operators cause it is convenient */
+EXPR_INT:               INTEGER
+                        {
+                                $$ = $1;
+                        }
+                        | EXPR_INT '+' INTEGER
+                        {
+                                $$ = $1 + $3;
+                        }
+                        | EXPR_INT '-' INTEGER
+                        {
+                                $$ = $1 - $3;
+                        }
+                        ;