瀏覽代碼

core: include replaced with include_file

- due to opinions expressed on mailing list suggesting it reflects
  better the meaning
Daniel-Constantin Mierla 16 年之前
父節點
當前提交
1c9c433f7b
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      cfg.lex

+ 5 - 5
cfg.lex

@@ -156,7 +156,7 @@
 
 
 /* start conditions */
 /* start conditions */
 %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P 
 %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P 
-%x PVARID INCL
+%x PVARID INCLF
 
 
 /* config script types : #!SER  or #!KAMAILIO or #!MAX_COMPAT */
 /* config script types : #!SER  or #!KAMAILIO or #!MAX_COMPAT */
 SER_CFG			SER
 SER_CFG			SER
@@ -220,7 +220,7 @@ CASE			"case"
 DEFAULT			"default"
 DEFAULT			"default"
 WHILE			"while"
 WHILE			"while"
 
 
-INCLUDE         "include"
+INCLUDEFILE     "include_file"
 
 
 /*ACTION LVALUES*/
 /*ACTION LVALUES*/
 URIHOST			"uri:host"
 URIHOST			"uri:host"
@@ -577,7 +577,7 @@ EAT_ABLE	[\ \t\b\r]
 <INITIAL>{DEFAULT}	{ count(); yylval.strval=yytext; return DEFAULT; }
 <INITIAL>{DEFAULT}	{ count(); yylval.strval=yytext; return DEFAULT; }
 <INITIAL>{WHILE}	{ count(); yylval.strval=yytext; return WHILE; }
 <INITIAL>{WHILE}	{ count(); yylval.strval=yytext; return WHILE; }
 
 
-<INITIAL>{INCLUDE}  { count(); BEGIN(INCL); }
+<INITIAL>{INCLUDEFILE}  { count(); BEGIN(INCLF); }
 
 
 <INITIAL>{URIHOST}	{ count(); yylval.strval=yytext; return URIHOST; }
 <INITIAL>{URIHOST}	{ count(); yylval.strval=yytext; return URIHOST; }
 <INITIAL>{URIPORT}	{ count(); yylval.strval=yytext; return URIPORT; }
 <INITIAL>{URIPORT}	{ count(); yylval.strval=yytext; return URIPORT; }
@@ -1120,8 +1120,8 @@ EAT_ABLE	[\ \t\b\r]
 
 
 <SELECT>.               { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */
 <SELECT>.               { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */
 
 
-<INCL>[ \t]*      /* eat the whitespace */
-<INCL>[^ \t\n]+   { /* get the include file name */
+<INCLF>[ \t]*      /* eat the whitespace */
+<INCLF>[^ \t\n]+   { /* get the include file name */
 				if(sr_push_yy_state(yytext)<0)
 				if(sr_push_yy_state(yytext)<0)
 					exit(-1);
 					exit(-1);
 				BEGIN(INITIAL);
 				BEGIN(INITIAL);