[sr-dev] git:master: core: include replaced with include_file

Daniel-Constantin Mierla miconda at gmail.com
Thu Sep 3 12:21:34 CEST 2009


Module: sip-router
Branch: master
Commit: 1c9c433f7be395652bb28c5af61d2f64f33da926
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c9c433f7be395652bb28c5af61d2f64f33da926

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Thu Sep  3 13:18:31 2009 +0300

core: include replaced with include_file

- due to opinions expressed on mailing list suggesting it reflects
  better the meaning

---

 cfg.lex |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cfg.lex b/cfg.lex
index a5941e4..9723877 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -156,7 +156,7 @@
 
 /* start conditions */
 %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 */
 SER_CFG			SER
@@ -220,7 +220,7 @@ CASE			"case"
 DEFAULT			"default"
 WHILE			"while"
 
-INCLUDE         "include"
+INCLUDEFILE     "include_file"
 
 /*ACTION LVALUES*/
 URIHOST			"uri:host"
@@ -577,7 +577,7 @@ EAT_ABLE	[\ \t\b\r]
 <INITIAL>{DEFAULT}	{ count(); yylval.strval=yytext; return DEFAULT; }
 <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>{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 */
 
-<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)
 					exit(-1);
 				BEGIN(INITIAL);




More information about the sr-dev mailing list