Browse code

- bsd fixes (ADD already defined)

Andrei Pelinescu-Onciul authored on 06/12/2005 13:15:11
Showing 2 changed files
... ...
@@ -171,7 +171,7 @@ GTE	>=
171 171
 LTE	<=
172 172
 DIFF	!=
173 173
 MATCH	=~
174
-ADD     "+="
174
+ADDEQ     "+="
175 175
 NOT		!|"not"
176 176
 LOG_AND		"and"|"&&"
177 177
 BIN_AND         "&"
... ...
@@ -462,7 +462,7 @@ EAT_ABLE	[\ \t\b\r]
462 462
 <INITIAL>{MODPARAM}     { count(); yylval.strval=yytext; return MODPARAM; }
463 463
 
464 464
 <INITIAL>{EQUAL}	{ count(); return EQUAL; }
465
-<INITIAL>{ADD}          { count(); return ADD; }
465
+<INITIAL>{ADDEQ}          { count(); return ADDEQ; }
466 466
 <INITIAL>{EQUAL_T}	{ count(); return EQUAL_T; }
467 467
 <INITIAL>{GT}	{ count(); return GT; }
468 468
 <INITIAL>{LT}	{ count(); return LT; }
... ...
@@ -269,7 +269,7 @@ static struct socket_id* mk_listen_id(char*, int, int);
269 269
 %token ATTR_USER
270 270
 %token ATTR_DOMAIN
271 271
 %token ATTR_GLOBAL
272
-%token ADD
272
+%token ADDEQ
273 273
 
274 274
 /* operators */
275 275
 %nonassoc EQUAL
... ...
@@ -1125,7 +1125,7 @@ actions:	actions action	{$$=append_action($1, $2); }
1125 1125
 
1126 1126
 action:		cmd SEMICOLON {$$=$1;}
1127 1127
 		| if_cmd {$$=$1;}
1128
-                | assign_action SEMICOLON {$$=$1}
1128
+		| assign_action SEMICOLON {$$=$1;}
1129 1129
 		| SEMICOLON /* null action */ {$$=0;}
1130 1130
 		| cmd error { $$=0; yyerror("bad command: missing ';'?"); }
1131 1131
 	;
... ...
@@ -1192,7 +1192,7 @@ attr_id : ATTR_MARK ID { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp
1192 1192
                                             }
1193 1193
 ;
1194 1194
 
1195
-assign_op : ADD { $$ = ADD_T; }
1195
+assign_op : ADDEQ { $$ = ADD_T; }
1196 1196
           | EQUAL { $$ = ASSIGN_T; }
1197 1197
 ;
1198 1198