Browse Source

- bsd fixes (ADD already defined)

Andrei Pelinescu-Onciul 20 years ago
parent
commit
8126b42565
2 changed files with 5 additions and 5 deletions
  1. 2 2
      cfg.lex
  2. 3 3
      cfg.y

+ 2 - 2
cfg.lex

@@ -171,7 +171,7 @@ GTE	>=
 LTE	<=
 LTE	<=
 DIFF	!=
 DIFF	!=
 MATCH	=~
 MATCH	=~
-ADD     "+="
+ADDEQ     "+="
 NOT		!|"not"
 NOT		!|"not"
 LOG_AND		"and"|"&&"
 LOG_AND		"and"|"&&"
 BIN_AND         "&"
 BIN_AND         "&"
@@ -462,7 +462,7 @@ EAT_ABLE	[\ \t\b\r]
 <INITIAL>{MODPARAM}     { count(); yylval.strval=yytext; return MODPARAM; }
 <INITIAL>{MODPARAM}     { count(); yylval.strval=yytext; return MODPARAM; }
 
 
 <INITIAL>{EQUAL}	{ count(); return EQUAL; }
 <INITIAL>{EQUAL}	{ count(); return EQUAL; }
-<INITIAL>{ADD}          { count(); return ADD; }
+<INITIAL>{ADDEQ}          { count(); return ADDEQ; }
 <INITIAL>{EQUAL_T}	{ count(); return EQUAL_T; }
 <INITIAL>{EQUAL_T}	{ count(); return EQUAL_T; }
 <INITIAL>{GT}	{ count(); return GT; }
 <INITIAL>{GT}	{ count(); return GT; }
 <INITIAL>{LT}	{ count(); return LT; }
 <INITIAL>{LT}	{ count(); return LT; }

+ 3 - 3
cfg.y

@@ -269,7 +269,7 @@ static struct socket_id* mk_listen_id(char*, int, int);
 %token ATTR_USER
 %token ATTR_USER
 %token ATTR_DOMAIN
 %token ATTR_DOMAIN
 %token ATTR_GLOBAL
 %token ATTR_GLOBAL
-%token ADD
+%token ADDEQ
 
 
 /* operators */
 /* operators */
 %nonassoc EQUAL
 %nonassoc EQUAL
@@ -1125,7 +1125,7 @@ actions:	actions action	{$$=append_action($1, $2); }
 
 
 action:		cmd SEMICOLON {$$=$1;}
 action:		cmd SEMICOLON {$$=$1;}
 		| if_cmd {$$=$1;}
 		| if_cmd {$$=$1;}
-                | assign_action SEMICOLON {$$=$1}
+		| assign_action SEMICOLON {$$=$1;}
 		| SEMICOLON /* null action */ {$$=0;}
 		| SEMICOLON /* null action */ {$$=0;}
 		| cmd error { $$=0; yyerror("bad command: missing ';'?"); }
 		| cmd error { $$=0; yyerror("bad command: missing ';'?"); }
 	;
 	;
@@ -1192,7 +1192,7 @@ attr_id : ATTR_MARK ID { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp
                                             }
                                             }
 ;
 ;
 
 
-assign_op : ADD { $$ = ADD_T; }
+assign_op : ADDEQ { $$ = ADD_T; }
           | EQUAL { $$ = ASSIGN_T; }
           | EQUAL { $$ = ASSIGN_T; }
 ;
 ;