[sr-dev] git:3.3: core: end simple pv name (e.g., $xy) at end of line

Daniel-Constantin Mierla miconda at gmail.com
Mon Feb 25 14:05:58 CET 2013


Module: sip-router
Branch: 3.3
Commit: 8d93eea7c92b797caae8ce9817e90ecb7d9e3d31
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d93eea7c92b797caae8ce9817e90ecb7d9e3d31

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Jan 25 11:38:38 2013 +0100

core: end simple pv name (e.g., $xy) at end of line

- cfg parser was throwing error if last token in a line was $xy as pv
  with \n was not found
(cherry picked from commit d2d6b4b932c7df6e6620a256692be5ef049356a3)

---

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

diff --git a/cfg.lex b/cfg.lex
index b074058..1de6e36 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -1101,7 +1101,7 @@ IMPORTFILE      "import_file"
 <PVARID>{ID}|'\.'			{yymore(); }
 <PVARID>{LPAREN}			{	state = PVAR_P_S; BEGIN(PVAR_P);
 								p_nest=1; yymore(); }
-<PVARID>.					{	yyless(yyleng-1);
+<PVARID>{CR}|{EAT_ABLE}|.	{	yyless(yyleng-1);
 								count();
 								addstr(&s_buf, yytext, yyleng);
 								yylval.strval=s_buf.s;




More information about the sr-dev mailing list