Browse Source

- reverted previous accidental commit

Jan Janak 20 years ago
parent
commit
a7391012c9
2 changed files with 1 additions and 9 deletions
  1. 1 4
      cfg.lex
  2. 0 5
      cfg.y

+ 1 - 4
cfg.lex

@@ -181,8 +181,7 @@ PLUS	"+"
 MINUS	"-"
 
 /* Attribute specification */
-ATTR_MARK   "$"|"%"
-FUNC_MARK   "@"
+ATTR_MARK   "$"|"%"|"@"
 ATTR_FROM   "from"|"f"
 ATTR_TO     "to"|"t"
 ATTR_USER   "user"|"u"
@@ -495,7 +494,6 @@ EAT_ABLE	[\ \t\b\r]
                            BEGIN(INITIAL);
 			   return ID; 
                         }
-<INITIAL>{FUNC_MARK}    { count(); return FUNC_MARK; }
 
 <INITIAL>{IPV6ADDR}		{ count(); yylval.strval=yytext; return IPV6ADDR; }
 <INITIAL>{DECNUMBER}		{ count(); yylval.intval=atoi(yytext);return NUMBER; }
@@ -677,4 +675,3 @@ static void count()
 	}
 }
 
-

+ 0 - 5
cfg.y

@@ -67,7 +67,6 @@
  *
  */
 
-
 %{
 
 #include <stdlib.h>
@@ -264,7 +263,6 @@ static struct socket_id* mk_listen_id(char*, int, int);
 %token TOS
 
 %token ATTR_MARK
-%token FUNC_MARK
 %token ATTR_FROM
 %token ATTR_TO
 %token ATTR_USER
@@ -1193,9 +1191,6 @@ attr_id : ATTR_MARK ID { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp
                                             }
 ;
 
-func_id : FUNC_MARK ID
-       
-
 assign_op : ADDEQ { $$ = ADD_T; }
           | EQUAL { $$ = ASSIGN_T; }
 ;