[asterisk-commits] branch murf/AEL2 r9031 - in /team/murf/AEL2/pbx: ael.flex ael_lex.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Jan 31 22:11:13 MST 2006


Author: murf
Date: Tue Jan 31 23:11:10 2006
New Revision: 9031

URL: http://svn.digium.com/view/asterisk?rev=9031&view=rev
Log:
I forgot to reset the stack index for the #include code. This is fixed.
The problem happened in ael2 reloads; the stack index starting at a bad value
would cause the parse to terminate before the files were read in. Ugh.


Modified:
    team/murf/AEL2/pbx/ael.flex
    team/murf/AEL2/pbx/ael_lex.c

Modified: team/murf/AEL2/pbx/ael.flex
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/ael.flex?rev=9031&r1=9030&r2=9031&view=diff
==============================================================================
--- team/murf/AEL2/pbx/ael.flex (original)
+++ team/murf/AEL2/pbx/ael.flex Tue Jan 31 23:11:10 2006
@@ -598,14 +598,16 @@
 	struct stat stats;
 	FILE *fin;
 	extern int ael_errcnt;
+	/* extern int ael_yydebug; */
 
 	io = calloc(sizeof(struct parse_io),1);
 	/* reset the global counters */
 	prev_word = 0;
 	my_lineno = 1;
+	include_stack_index=0;
 	my_col = 0;
 	ael_errcnt = 0;
-
+	/* ael_yydebug = 1; */
 	ael_yylex_init(&io->scanner);
 	fin = fopen(filename,"r");
 	if ( !fin ) {

Modified: team/murf/AEL2/pbx/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/ael_lex.c?rev=9031&r1=9030&r2=9031&view=diff
==============================================================================
--- team/murf/AEL2/pbx/ael_lex.c (original)
+++ team/murf/AEL2/pbx/ael_lex.c Tue Jan 31 23:11:10 2006
@@ -2948,14 +2948,16 @@
 	struct stat stats;
 	FILE *fin;
 	extern int ael_errcnt;
+	/* extern int ael_yydebug; */
 
 	io = calloc(sizeof(struct parse_io),1);
 	/* reset the global counters */
 	prev_word = 0;
 	my_lineno = 1;
+	include_stack_index=0;
 	my_col = 0;
 	ael_errcnt = 0;
-
+	/* ael_yydebug = 1; */
 	ael_yylex_init(&io->scanner);
 	fin = fopen(filename,"r");
 	if ( !fin ) {



More information about the asterisk-commits mailing list