define some flex constants for character sets.

partly fix indentation and normalize code layout.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22725 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 62e5d97..29ce30f 100644 (file)
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -74,7 +74,14 @@ static int include_stack_index = 0;
 /* %option yylineno I've tried hard, but haven't been able to use this */
 %option noyywrap
 
+NOPARENS       [^()\[\]\{\}]*
+
+NOARGG         [^(),\{\}\[\]]*
+
+NOSEMIC                [^;()\{\}\[\]]*
+
 %%
+
 \{             { STORE_POS; return LC;}
 \}             { STORE_POS; return RC;}
 \(             { STORE_POS; return LP;}
@@ -122,12 +129,13 @@ includes  { STORE_POS; return KW_INCLUDES;}
 [-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]][-a-zA-Z0-9'"_/.!\*\+\<\>\{\}$#\[\]]*  {
                STORE_POS;
                yylval->str = strdup(yytext);
-               /* printf("\nGot WORD %s[%d][%d:%d]\n", yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
+               /* printf("\nGot WORD %s[%d][%d:%d]\n",
+                       yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
                prev_word = yylval->str;
                return word;
        }
 
-<paren>[^()\[\]\{\}]*\)        {
+<paren>{NOPARENS}\)    {
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
                if ( pbcpop(')') ) {
@@ -163,22 +171,30 @@ includes  { STORE_POS; return KW_INCLUDES;}
                }
        }
 
-<paren>[^()\[\]\{\}]*\(        {
-               yylloc->first_line = my_lineno; yylloc->first_column=my_col;
+<paren>{NOPARENS}\(    {
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                parencount++;
                pbcpush('(');
                yymore();
        }
 
-<paren>[^()\[\]\{\}]*\[        {yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+<paren>{NOPARENS}\[    {
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('[');
+               yymore();
+       }
 
-<paren>[^()\[\]\{\}]*\]        {
-               yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+<paren>{NOPARENS}\]    {
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* 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!\n",
+                               my_file, my_lineno+l4, c4);
                        BEGIN(0);
                        yylloc->last_line = my_lineno+l4;
                        yylloc->last_column=c4;
@@ -190,16 +206,22 @@ includes  { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<paren>[^()\[\]\{\}]*\{        {yylloc->first_line = my_lineno;yylloc->first_column=my_col;  yymore(); pbcpush('{'); }
+<paren>{NOPARENS}\{    {
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('{');
+               yymore();
+       }
 
-<paren>[^()\[\]\{\}]*\}        {
+<paren>{NOPARENS}\}    {
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
                if ( pbcpop('}') ) {
                        /* 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!\n",
+                               my_file, my_lineno+l4, c4);
                        BEGIN(0);
                        yylloc->last_line = my_lineno+l4;
                        yylloc->last_column=c4;
@@ -211,7 +233,7 @@ includes    { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<argg>[^(),\{\}\[\]]*\)        {
+<argg>{NOARGG}\)       {
                /* printf("ARGG:%s\n",yytext); */
                int linecount = 0;
                int colcount = my_col;
@@ -267,7 +289,7 @@ includes    { STORE_POS; return KW_INCLUDES;}
                }
        }
 
-<argg>[^(),\{\}\[\]]*\(          {
+<argg>{NOARGG}\(         {
                /* printf("ARGG:%s\n",yytext); */
                /* printf("GOT AN LP!!!\n"); */
                yylloc->first_line = my_lineno;
@@ -277,7 +299,7 @@ includes    { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<argg>[^(),\{\}\[\]]*\,        {
+<argg>{NOARGG}\,       {
                /* printf("ARGG:%s\n",yytext); */
                if( parencount != 0) {
                        /* printf("Folding in a comma!\n"); */
@@ -323,14 +345,15 @@ includes  { STORE_POS; return KW_INCLUDES;}
                }
        }
 
-<argg>[^(),\{\}\[\]]*\{        {
+<argg>{NOARGG}\{       {
                /*printf("ARGG:%s\n",yytext);*/
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
-               pbcpush('{'); yymore();
+               pbcpush('{');
+               yymore();
        }
 
-<argg>[^(),\{\}\[\]]*\}        {
+<argg>{NOARGG}\}       {
                /*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
                if ( pbcpop('}') ) {
                        /* error */
@@ -348,9 +371,18 @@ includes   { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<argg>[^(),\{\}\[\]]*\[        {/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+<argg>{NOARGG}\[       {
+               /*printf("ARGG:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('[');
+               yymore();
+       }
 
-<argg>[^(),\{\}\[\]]*\]        {/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+<argg>{NOARGG}\]       {
+               /*printf("ARGG:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* error */
                        int l4,c4;
@@ -367,9 +399,18 @@ includes   { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<semic>[^;()\{\}\[\]]*\[       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+<semic>{NOSEMIC}\[     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               yymore();
+               pbcpush('[');
+               }
 
-<semic>[^;()\{\}\[\]]*\]       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+<semic>{NOSEMIC}\]     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* error */
                        int l4,c4;
@@ -386,9 +427,18 @@ includes   { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<semic>[^;()\{\}\[\]]*\{       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('{');}
+<semic>{NOSEMIC}\{     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('{');
+               yymore();
+       }
 
-<semic>[^;()\{\}\[\]]*\}       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+<semic>{NOSEMIC}\}     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop('}') ) {
                        /* error */
                        int l4,c4;
@@ -405,9 +455,18 @@ includes   { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<semic>[^;()\{\}\[\]]*\(       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('(');}
+<semic>{NOSEMIC}\(     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('(');
+               yymore();
+       }
 
-<semic>[^;()\{\}\[\]]*\)       {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+<semic>{NOSEMIC}\)     {
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(')') ) {
                        /* error */
                        int l4,c4;
@@ -424,7 +483,7 @@ includes    { STORE_POS; return KW_INCLUDES;}
                yymore();
        }
 
-<semic>[^;()\{\}\[\]]*;        {
+<semic>{NOSEMIC};      {
                int linecount = 0;
                int colcount = my_col;
                char *pt = yytext;

diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c
index 005d2eb..4425c29 100644 (file)
--- a/pbx/ael/ael_lex.c
+++ b/pbx/ael/ael_lex.c
@@ -939,9 +939,10 @@ YY_DECL
        register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 77 "ael.flex"
+#line 83 "ael.flex"
+
 
-#line 945 "ael_lex.c"
+#line 946 "ael_lex.c"
 
     yylval = yylval_param;
 
@@ -1032,222 +1033,223 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 78 "ael.flex"
+#line 85 "ael.flex"
 { STORE_POS; return LC;}
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 79 "ael.flex"
+#line 86 "ael.flex"
 { STORE_POS; return RC;}
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 80 "ael.flex"
+#line 87 "ael.flex"
 { STORE_POS; return LP;}
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 81 "ael.flex"
+#line 88 "ael.flex"
 { STORE_POS; return RP;}
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 82 "ael.flex"
+#line 89 "ael.flex"
 { STORE_POS; return SEMI;}
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 83 "ael.flex"
+#line 90 "ael.flex"
 { STORE_POS; return EQ;}
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 84 "ael.flex"
+#line 91 "ael.flex"
 { STORE_POS; return COMMA;}
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 85 "ael.flex"
+#line 92 "ael.flex"
 { STORE_POS; return COLON;}
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 86 "ael.flex"
+#line 93 "ael.flex"
 { STORE_POS; return AMPER;}
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 87 "ael.flex"
+#line 94 "ael.flex"
 { STORE_POS; return BAR;}
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 88 "ael.flex"
+#line 95 "ael.flex"
 { STORE_POS; return EXTENMARK;}
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 89 "ael.flex"
+#line 96 "ael.flex"
 { STORE_POS; return AT;}
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 90 "ael.flex"
+#line 97 "ael.flex"
 {/*comment*/}
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 91 "ael.flex"
+#line 98 "ael.flex"
 { STORE_POS; return KW_CONTEXT;}
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 92 "ael.flex"
+#line 99 "ael.flex"
 { STORE_POS; return KW_ABSTRACT;}
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 93 "ael.flex"
+#line 100 "ael.flex"
 { STORE_POS; return KW_MACRO;};
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 94 "ael.flex"
+#line 101 "ael.flex"
 { STORE_POS; return KW_GLOBALS;}
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 95 "ael.flex"
+#line 102 "ael.flex"
 { STORE_POS; return KW_IGNOREPAT;}
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 96 "ael.flex"
+#line 103 "ael.flex"
 { STORE_POS; return KW_SWITCH;}
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 97 "ael.flex"
+#line 104 "ael.flex"
 { STORE_POS; return KW_IF;}
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 98 "ael.flex"
+#line 105 "ael.flex"
 { STORE_POS; return KW_IFTIME;}
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 99 "ael.flex"
+#line 106 "ael.flex"
 { STORE_POS; return KW_RANDOM;}
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 100 "ael.flex"
+#line 107 "ael.flex"
 { STORE_POS; return KW_REGEXTEN;}
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 101 "ael.flex"
+#line 108 "ael.flex"
 { STORE_POS; return KW_HINT;}
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 102 "ael.flex"
+#line 109 "ael.flex"
 { STORE_POS; return KW_ELSE;}
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 103 "ael.flex"
+#line 110 "ael.flex"
 { STORE_POS; return KW_GOTO;}
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 104 "ael.flex"
+#line 111 "ael.flex"
 { STORE_POS; return KW_JUMP;}
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 105 "ael.flex"
+#line 112 "ael.flex"
 { STORE_POS; return KW_RETURN;}
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 106 "ael.flex"
+#line 113 "ael.flex"
 { STORE_POS; return KW_BREAK;}
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 107 "ael.flex"
+#line 114 "ael.flex"
 { STORE_POS; return KW_CONTINUE;}
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 108 "ael.flex"
+#line 115 "ael.flex"
 { STORE_POS; return KW_FOR;}
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 109 "ael.flex"
+#line 116 "ael.flex"
 { STORE_POS; return KW_WHILE;}
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 110 "ael.flex"
+#line 117 "ael.flex"
 { STORE_POS; return KW_CASE;}
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 111 "ael.flex"
+#line 118 "ael.flex"
 { STORE_POS; return KW_DEFAULT;}
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 112 "ael.flex"
+#line 119 "ael.flex"
 { STORE_POS; return KW_PATTERN;}
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 113 "ael.flex"
+#line 120 "ael.flex"
 { STORE_POS; return KW_CATCH;}
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 114 "ael.flex"
+#line 121 "ael.flex"
 { STORE_POS; return KW_SWITCHES;}
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 115 "ael.flex"
+#line 122 "ael.flex"
 { STORE_POS; return KW_ESWITCHES;}
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 116 "ael.flex"
+#line 123 "ael.flex"
 { STORE_POS; return KW_INCLUDES;}
        YY_BREAK
 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP
-#line 118 "ael.flex"
+#line 125 "ael.flex"
 { my_lineno++; my_col = 0; }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 119 "ael.flex"
+#line 126 "ael.flex"
 { my_col += yyleng; }
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 120 "ael.flex"
+#line 127 "ael.flex"
 { my_col += 8-(my_col%8); }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 122 "ael.flex"
+#line 129 "ael.flex"
 {
                STORE_POS;
                yylval->str = strdup(yytext);
-               /* printf("\nGot WORD %s[%d][%d:%d]\n", yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
+               /* printf("\nGot WORD %s[%d][%d:%d]\n",
+                       yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
                prev_word = yylval->str;
                return word;
        }
@@ -1255,7 +1257,7 @@ YY_RULE_SETUP
 case 44:
 /* rule 44 can match eol */
 YY_RULE_SETUP
-#line 130 "ael.flex"
+#line 138 "ael.flex"
 {
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
@@ -1295,9 +1297,10 @@ YY_RULE_SETUP
 case 45:
 /* rule 45 can match eol */
 YY_RULE_SETUP
-#line 166 "ael.flex"
+#line 174 "ael.flex"
 {
-               yylloc->first_line = my_lineno; yylloc->first_column=my_col;
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                parencount++;
                pbcpush('(');
                yymore();
@@ -1306,20 +1309,27 @@ YY_RULE_SETUP
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 173 "ael.flex"
-{yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+#line 182 "ael.flex"
+{
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('[');
+               yymore();
+       }
        YY_BREAK
 case 47:
 /* rule 47 can match eol */
 YY_RULE_SETUP
-#line 175 "ael.flex"
+#line 189 "ael.flex"
 {
-               yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* 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!\n",
+                               my_file, my_lineno+l4, c4);
                        BEGIN(0);
                        yylloc->last_line = my_lineno+l4;
                        yylloc->last_column=c4;
@@ -1334,13 +1344,18 @@ YY_RULE_SETUP
 case 48:
 /* rule 48 can match eol */
 YY_RULE_SETUP
-#line 193 "ael.flex"
-{yylloc->first_line = my_lineno;yylloc->first_column=my_col;  yymore(); pbcpush('{'); }
+#line 209 "ael.flex"
+{
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('{');
+               yymore();
+       }
        YY_BREAK
 case 49:
 /* rule 49 can match eol */
 YY_RULE_SETUP
-#line 195 "ael.flex"
+#line 216 "ael.flex"
 {
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
@@ -1348,7 +1363,8 @@ YY_RULE_SETUP
                        /* 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!\n",
+                               my_file, my_lineno+l4, c4);
                        BEGIN(0);
                        yylloc->last_line = my_lineno+l4;
                        yylloc->last_column=c4;
@@ -1363,7 +1379,7 @@ YY_RULE_SETUP
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
-#line 214 "ael.flex"
+#line 236 "ael.flex"
 {
                /* printf("ARGG:%s\n",yytext); */
                int linecount = 0;
@@ -1423,7 +1439,7 @@ YY_RULE_SETUP
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-#line 270 "ael.flex"
+#line 292 "ael.flex"
 {
                /* printf("ARGG:%s\n",yytext); */
                /* printf("GOT AN LP!!!\n"); */
@@ -1437,7 +1453,7 @@ YY_RULE_SETUP
 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP
-#line 280 "ael.flex"
+#line 302 "ael.flex"
 {
                /* printf("ARGG:%s\n",yytext); */
                if( parencount != 0) {
@@ -1487,18 +1503,19 @@ YY_RULE_SETUP
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-#line 326 "ael.flex"
+#line 348 "ael.flex"
 {
                /*printf("ARGG:%s\n",yytext);*/
                yylloc->first_line = my_lineno;
                yylloc->first_column=my_col;
-               pbcpush('{'); yymore();
+               pbcpush('{');
+               yymore();
        }
        YY_BREAK
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
-#line 333 "ael.flex"
+#line 356 "ael.flex"
 {
                /*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
                if ( pbcpop('}') ) {
@@ -1520,14 +1537,23 @@ YY_RULE_SETUP
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-#line 351 "ael.flex"
-{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+#line 374 "ael.flex"
+{
+               /*printf("ARGG:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('[');
+               yymore();
+       }
        YY_BREAK
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
-#line 353 "ael.flex"
-{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+#line 382 "ael.flex"
+{
+               /*printf("ARGG:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* error */
                        int l4,c4;
@@ -1547,14 +1573,23 @@ YY_RULE_SETUP
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
-#line 370 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+#line 402 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               yymore();
+               pbcpush('[');
+               }
        YY_BREAK
 case 58:
 /* rule 58 can match eol */
 YY_RULE_SETUP
-#line 372 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+#line 410 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(']') ) {
                        /* error */
                        int l4,c4;
@@ -1574,14 +1609,23 @@ YY_RULE_SETUP
 case 59:
 /* rule 59 can match eol */
 YY_RULE_SETUP
-#line 389 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('{');}
+#line 430 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('{');
+               yymore();
+       }
        YY_BREAK
 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP
-#line 391 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+#line 438 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop('}') ) {
                        /* error */
                        int l4,c4;
@@ -1601,14 +1645,23 @@ YY_RULE_SETUP
 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP
-#line 408 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('(');}
+#line 458 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
+               pbcpush('(');
+               yymore();
+       }
        YY_BREAK
 case 62:
 /* rule 62 can match eol */
 YY_RULE_SETUP
-#line 410 "ael.flex"
-{/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
+#line 466 "ael.flex"
+{
+               /*printf("SEMIC:%s\n",yytext);*/
+               yylloc->first_line = my_lineno;
+               yylloc->first_column=my_col;
                if ( pbcpop(')') ) {
                        /* error */
                        int l4,c4;
@@ -1628,7 +1681,7 @@ YY_RULE_SETUP
 case 63:
 /* rule 63 can match eol */
 YY_RULE_SETUP
-#line 427 "ael.flex"
+#line 486 "ael.flex"
 {
                int linecount = 0;
                int colcount = my_col;
@@ -1659,7 +1712,7 @@ YY_RULE_SETUP
 case 64:
 /* rule 64 can match eol */
 YY_RULE_SETUP
-#line 454 "ael.flex"
+#line 513 "ael.flex"
 {
                FILE *in1;
                char fnamebuf[1024],*p1,*p2;
@@ -1726,7 +1779,7 @@ case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(paren):
 case YY_STATE_EOF(semic):
 case YY_STATE_EOF(argg):
-#line 516 "ael.flex"
+#line 575 "ael.flex"
 {
                if ( --include_stack_index < 0 ) {
                        yyterminate();
@@ -1742,10 +1795,10 @@ case YY_STATE_EOF(argg):
        YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 529 "ael.flex"
+#line 588 "ael.flex"
 ECHO;
        YY_BREAK
-#line 1749 "ael_lex.c"
+#line 1802 "ael_lex.c"
 
        case YY_END_OF_BUFFER:
                {
@@ -2875,7 +2928,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 529 "ael.flex"
+#line 588 "ael.flex"