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

[asterisk-commits at lists.digium.com]

Author: murf
Date: Sat Jan 28 22:32:09 2006
New Revision: 8849

URL: http://svn.digium.com/view/asterisk?rev=8849&view=rev
Log:
Fixed an error in the prevword routine, that generated to false syntax errors later in the parse.


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=8849&r1=8848&r2=8849&view=diff
==============================================================================
--- team/murf/AEL2/pbx/ael.flex (original)
+++ team/murf/AEL2/pbx/ael.flex Sat Jan 28 22:32:09 2006
@@ -133,7 +133,7 @@
                              /* error */
                              int l4,c4;
                              pbcwhere(yytext, &l4, &c4);
-                             ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression!\n", my_file, my_lineno+l4, c4);
+                             ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression: %s !\n", my_file, my_lineno+l4, c4, yytext);
                              BEGIN(0);
                              yylloc->last_line = my_lineno+l4;
                              yylloc->last_column=c4; 
@@ -524,9 +524,9 @@
             case '{': pbcpush('{');break;
             case '}': ret = pbcpop('}');break;
             case '[':pbcpush('[');break;
-            case ']':ret = pbcpop('}');break;
+            case ']':ret = pbcpop(']');break;
             case '(':pbcpush('(');break;
-            case ')':ret = pbcpop('}'); break;
+            case ')':ret = pbcpop(')'); break;
         }
         if( ret )
             return 1;

Modified: team/murf/AEL2/pbx/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/ael_lex.c?rev=8849&r1=8848&r2=8849&view=diff
==============================================================================
--- team/murf/AEL2/pbx/ael_lex.c (original)
+++ team/murf/AEL2/pbx/ael_lex.c Sat Jan 28 22:32:09 2006
@@ -1244,7 +1244,7 @@
                              /* error */
                              int l4,c4;
                              pbcwhere(yytext, &l4, &c4);
-                             ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression!\n", my_file, my_lineno+l4, c4);
+                             ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression: %s !\n", my_file, my_lineno+l4, c4, yytext);
                              BEGIN(0);
                              yylloc->last_line = my_lineno+l4;
                              yylloc->last_column=c4; 
@@ -2874,9 +2874,9 @@
             case '{': pbcpush('{');break;
             case '}': ret = pbcpop('}');break;
             case '[':pbcpush('[');break;
-            case ']':ret = pbcpop('}');break;
+            case ']':ret = pbcpop(']');break;
             case '(':pbcpush('(');break;
-            case ')':ret = pbcpop('}'); break;
+            case ')':ret = pbcpop(')'); break;
         }
         if( ret )
             return 1;