whitespace-only change:

fix formatting and indentation of the flex file,
and regenerate the ael_lex.c



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

pbx/ael/ael.flex

@@ -52,8 +52,7 @@ static int pbcpop(char x);
 static void pbcwhere(char *text, int *line, int *col );
 static int c_prevword(void);
 
-struct stackelement
-{
+struct stackelement {
 	char *fname;
 	int lineno;
 	int colno;
@@ -120,15 +119,19 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 [	]+	{/* nothing */ int wid = 8-(my_col%8); my_col+=wid;}
 
 [-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]][-a-zA-Z0-9'"_/.!\*\+\<\>\{\}$#\[\]]*	{
-                                               yylloc->first_line = yylloc->last_line = my_lineno;yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col; /* set up the ptr */
+		yylloc->first_line = yylloc->last_line = my_lineno;
+		yylloc->last_column=my_col+yyleng-1;
+		yylloc->first_column=my_col; /* set up the ptr */
+		my_col+=yyleng;
 		yylval->str = strdup(yytext);
 		/* printf("\nGot WORD %s[%d][%d:%d]\n", yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
-                                               my_col+=yyleng; 
 		prev_word = yylval->str;
 		return word;
 	}
 
-<paren>[^()\[\]\{\}]*\)	{yylloc->first_line = my_lineno; yylloc->first_column=my_col; 
+<paren>[^()\[\]\{\}]*\)	{
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
 		if ( pbcpop(')') ) {
 			/* error */
 			int l4,c4;
@@ -162,12 +165,17 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		}
 	}
 
-<paren>[^()\[\]\{\}]*\(	{yylloc->first_line = my_lineno; yylloc->first_column=my_col; 
-                  parencount++; pbcpush('(');
+<paren>[^()\[\]\{\}]*\(	{
+		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>[^()\[\]\{\}]*\]	{yylloc->first_line = my_lineno;yylloc->first_column=my_col; 
+
+<paren>[^()\[\]\{\}]*\]	{
+		yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(']') ) {
 			/* error */
 			int l4,c4;
@@ -183,8 +191,11 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		}
 		yymore();
 	}
+
 <paren>[^()\[\]\{\}]*\{	{yylloc->first_line = my_lineno;yylloc->first_column=my_col;  yymore(); pbcpush('{'); }
-<paren>[^()\[\]\{\}]*\}	{yylloc->first_line = my_lineno;
+
+<paren>[^()\[\]\{\}]*\}	{
+		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
 		if ( pbcpop('}') ) {
 			/* error */
@@ -202,8 +213,8 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		yymore();
 	}
 
-
-<argg>[^(),\{\}\[\]]*\)	{/* printf("ARGG:%s\n",yytext); */
+<argg>[^(),\{\}\[\]]*\)	{
+		/* printf("ARGG:%s\n",yytext); */
 		int linecount = 0;
 		int colcount = my_col;
 		char *pt = yytext;
@@ -257,7 +268,9 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 			}
 		}
 	}
-<argg>[^(),\{\}\[\]]*\(	  { /* printf("ARGG:%s\n",yytext); */
+
+<argg>[^(),\{\}\[\]]*\(	  {
+		/* printf("ARGG:%s\n",yytext); */
 		/* printf("GOT AN LP!!!\n"); */
 		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
@@ -266,7 +279,8 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		yymore();
 	}
 
-<argg>[^(),\{\}\[\]]*\,	{  /* printf("ARGG:%s\n",yytext); */
+<argg>[^(),\{\}\[\]]*\,	{
+		/* printf("ARGG:%s\n",yytext); */
 		if( parencount != 0) {
 			/* printf("Folding in a comma!\n"); */
 			yymore();
@@ -290,8 +304,11 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 			yylloc->last_column=colcount;
 			yylloc->first_column=my_col;
 			if( !commaout ) {
-						if( !strcmp(yytext,"," ) ) 
-							{commaout = 0; my_col+=1; return COMMA;} 
+				if( !strcmp(yytext,"," ) ) {
+					commaout = 0;
+					my_col+=1;
+					return COMMA;
+				}
 				yylval->str = strdup(yytext); /* printf("Got argg2 word %s\n", yylval->str); */
 				unput(',');
 				commaout = 1;
@@ -308,8 +325,15 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		}
 	}
 
-<argg>[^(),\{\}\[\]]*\{	{/*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>[^(),\{\}\[\]]*\{	{
+		/*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;
 		if ( pbcpop('}') ) {
 			/* error */
 			int l4,c4;
@@ -325,7 +349,9 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		}
 		yymore();
 	}
+
 <argg>[^(),\{\}\[\]]*\[	{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
+
 <argg>[^(),\{\}\[\]]*\]	{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(']') ) {
 			/* error */
@@ -343,8 +369,8 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		yymore();
 	}
 
-
 <semic>[^;()\{\}\[\]]*\[	{/*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;
 		if ( pbcpop(']') ) {
 			/* error */
@@ -359,8 +385,11 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
+
 <semic>[^;()\{\}\[\]]*\{	{/*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;
 		if ( pbcpop('}') ) {
 			/* error */
@@ -375,8 +404,11 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
+
 <semic>[^;()\{\}\[\]]*\(	{/*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;
 		if ( pbcpop(')') ) {
 			/* error */
@@ -391,7 +423,9 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
+
 <semic>[^;()\{\}\[\]]*;	{
 		int linecount = 0;
 		int colcount = my_col;
@@ -442,17 +476,14 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 						break;
 					}
 				}
-								if( !found )
-								{
+				if ( !found ) {
 					*p2 = 0;
 					/* relative vs. absolute */
-                                    if ( *(p1+1) != '/' )
-                                    {
+					if ( *(p1+1) != '/' ) {
 						strcpy(fnamebuf,ast_config_AST_CONFIG_DIR);
 						strcat(fnamebuf,"/");
 						strcat(fnamebuf,p1+1);
-                                    }
-                                    else
+					} else
 						strcpy(fnamebuf,p1+1);
 					in1 = fopen( fnamebuf, "r" );
 					if ( ! in1 ) {
@@ -497,7 +528,6 @@ includes	{yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_colum
 		}
 	}
 
-
 %%
 
 static void pbcpush(char x)
@@ -513,7 +543,6 @@ static int pbcpop(char x)
 		pbcpos--;
 		return 0;
 	}
-	else
 	return 1; /* error */
 }
 

pbx/ael/ael_lex.c

@@ -687,8 +687,7 @@ static int pbcpop(char x);
 static void pbcwhere(char *text, int *line, int *col );
 static int c_prevword(void);
 
-struct stackelement
-{
+struct stackelement {
 	char *fname;
 	int lineno;
 	int colno;
@@ -699,7 +698,7 @@ int include_stack_index = 0;
 
 
 /* %option yylineno I've tried hard, but haven't been able to use this */
-#line 703 "ael_lex.c"
+#line 702 "ael_lex.c"
 
 #define INITIAL 0
 #define paren 1
@@ -939,9 +938,9 @@ YY_DECL
 	register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 77 "ael.flex"
+#line 76 "ael.flex"
 
-#line 945 "ael_lex.c"
+#line 944 "ael_lex.c"
 
     yylval = yylval_param;
 
@@ -1032,223 +1031,225 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 78 "ael.flex"
+#line 77 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return LC;}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 79 "ael.flex"
+#line 78 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return RC;}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 80 "ael.flex"
+#line 79 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return LP;}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 81 "ael.flex"
+#line 80 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return RP;}
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 82 "ael.flex"
+#line 81 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return SEMI;}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 83 "ael.flex"
+#line 82 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return EQ;}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 84 "ael.flex"
+#line 83 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return COMMA;}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 85 "ael.flex"
+#line 84 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return COLON;}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 86 "ael.flex"
+#line 85 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return AMPER;}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 87 "ael.flex"
+#line 86 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return BAR;}
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 88 "ael.flex"
+#line 87 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return EXTENMARK;}
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 89 "ael.flex"
+#line 88 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return AT;}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 90 "ael.flex"
+#line 89 "ael.flex"
 {/*comment*/}
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 91 "ael.flex"
+#line 90 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_CONTEXT;}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 92 "ael.flex"
+#line 91 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_ABSTRACT;}
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 93 "ael.flex"
+#line 92 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_MACRO;};
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 94 "ael.flex"
+#line 93 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_GLOBALS;}
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 95 "ael.flex"
+#line 94 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_IGNOREPAT;}
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 96 "ael.flex"
+#line 95 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_SWITCH;}
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 97 "ael.flex"
+#line 96 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_IF;}
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 98 "ael.flex"
+#line 97 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_IFTIME;}
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 99 "ael.flex"
+#line 98 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_RANDOM;}
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 100 "ael.flex"
+#line 99 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_REGEXTEN;}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 101 "ael.flex"
+#line 100 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_HINT;}
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 102 "ael.flex"
+#line 101 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_ELSE;}
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 103 "ael.flex"
+#line 102 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_GOTO;}
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 104 "ael.flex"
+#line 103 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_JUMP;}
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 105 "ael.flex"
+#line 104 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_RETURN;}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 106 "ael.flex"
+#line 105 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_BREAK;}
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 107 "ael.flex"
+#line 106 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_CONTINUE;}
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 108 "ael.flex"
+#line 107 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_FOR;}
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 109 "ael.flex"
+#line 108 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_WHILE;}
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 110 "ael.flex"
+#line 109 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_CASE;}
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 111 "ael.flex"
+#line 110 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_DEFAULT;}
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 112 "ael.flex"
+#line 111 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_PATTERN;}
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 113 "ael.flex"
+#line 112 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_CATCH;}
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 114 "ael.flex"
+#line 113 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_SWITCHES;}
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 115 "ael.flex"
+#line 114 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_ESWITCHES;}
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 116 "ael.flex"
+#line 115 "ael.flex"
 {yylloc->first_line = yylloc->last_line = my_lineno; yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col;my_col+=yyleng;return KW_INCLUDES;}
 	YY_BREAK
 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP
-#line 118 "ael.flex"
+#line 117 "ael.flex"
 {my_lineno++;my_col=0;}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 119 "ael.flex"
+#line 118 "ael.flex"
 {/* nothing */ my_col+=yyleng;}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 120 "ael.flex"
+#line 119 "ael.flex"
 {/* nothing */ int wid = 8-(my_col%8); my_col+=wid;}
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 122 "ael.flex"
+#line 121 "ael.flex"
 {
-                                               yylloc->first_line = yylloc->last_line = my_lineno;yylloc->last_column=my_col+yyleng-1; yylloc->first_column=my_col; /* set up the ptr */
+		yylloc->first_line = yylloc->last_line = my_lineno;
+		yylloc->last_column=my_col+yyleng-1;
+		yylloc->first_column=my_col; /* set up the ptr */
+		my_col+=yyleng;
 		yylval->str = strdup(yytext);
 		/* printf("\nGot WORD %s[%d][%d:%d]\n", yylval->str, my_lineno ,yylloc->first_column,yylloc->last_column );  */
-                                               my_col+=yyleng; 
 		prev_word = yylval->str;
 		return word;
 	}
@@ -1256,8 +1257,10 @@ YY_RULE_SETUP
 case 44:
 /* rule 44 can match eol */
 YY_RULE_SETUP
-#line 131 "ael.flex"
-{yylloc->first_line = my_lineno; yylloc->first_column=my_col; 
+#line 132 "ael.flex"
+{
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
 		if ( pbcpop(')') ) {
 			/* error */
 			int l4,c4;
@@ -1294,23 +1297,26 @@ YY_RULE_SETUP
 case 45:
 /* rule 45 can match eol */
 YY_RULE_SETUP
-#line 165 "ael.flex"
-{yylloc->first_line = my_lineno; yylloc->first_column=my_col; 
-                  parencount++; pbcpush('(');
+#line 168 "ael.flex"
+{
+		yylloc->first_line = my_lineno; yylloc->first_column=my_col;
+		parencount++;
+		pbcpush('(');
 		yymore();
 	}
 	YY_BREAK
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 169 "ael.flex"
+#line 175 "ael.flex"
 {yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
 	YY_BREAK
 case 47:
 /* rule 47 can match eol */
 YY_RULE_SETUP
-#line 170 "ael.flex"
-{yylloc->first_line = my_lineno;yylloc->first_column=my_col; 
+#line 177 "ael.flex"
+{
+		yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(']') ) {
 			/* error */
 			int l4,c4;
@@ -1330,14 +1336,15 @@ YY_RULE_SETUP
 case 48:
 /* rule 48 can match eol */
 YY_RULE_SETUP
-#line 186 "ael.flex"
+#line 195 "ael.flex"
 {yylloc->first_line = my_lineno;yylloc->first_column=my_col;  yymore(); pbcpush('{'); }
 	YY_BREAK
 case 49:
 /* rule 49 can match eol */
 YY_RULE_SETUP
-#line 187 "ael.flex"
-{yylloc->first_line = my_lineno;
+#line 197 "ael.flex"
+{
+		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
 		if ( pbcpop('}') ) {
 			/* error */
@@ -1358,8 +1365,9 @@ YY_RULE_SETUP
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
-#line 206 "ael.flex"
-{/* printf("ARGG:%s\n",yytext); */
+#line 216 "ael.flex"
+{
+		/* printf("ARGG:%s\n",yytext); */
 		int linecount = 0;
 		int colcount = my_col;
 		char *pt = yytext;
@@ -1417,8 +1425,9 @@ YY_RULE_SETUP
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-#line 260 "ael.flex"
-{ /* printf("ARGG:%s\n",yytext); */
+#line 272 "ael.flex"
+{
+		/* printf("ARGG:%s\n",yytext); */
 		/* printf("GOT AN LP!!!\n"); */
 		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
@@ -1430,8 +1439,9 @@ YY_RULE_SETUP
 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP
-#line 269 "ael.flex"
-{  /* printf("ARGG:%s\n",yytext); */
+#line 282 "ael.flex"
+{
+		/* printf("ARGG:%s\n",yytext); */
 		if( parencount != 0) {
 			/* printf("Folding in a comma!\n"); */
 			yymore();
@@ -1455,8 +1465,11 @@ YY_RULE_SETUP
 			yylloc->last_column=colcount;
 			yylloc->first_column=my_col;
 			if( !commaout ) {
-						if( !strcmp(yytext,"," ) ) 
-							{commaout = 0; my_col+=1; return COMMA;} 
+				if( !strcmp(yytext,"," ) ) {
+					commaout = 0;
+					my_col+=1;
+					return COMMA;
+				}
 				yylval->str = strdup(yytext); /* printf("Got argg2 word %s\n", yylval->str); */
 				unput(',');
 				commaout = 1;
@@ -1476,14 +1489,20 @@ YY_RULE_SETUP
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-#line 311 "ael.flex"
-{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; pbcpush('{'); yymore();  }
+#line 328 "ael.flex"
+{
+		/*printf("ARGG:%s\n",yytext);*/
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		pbcpush('{'); yymore();
+	}
 	YY_BREAK
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
-#line 312 "ael.flex"
-{/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; 
+#line 335 "ael.flex"
+{
+		/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop('}') ) {
 			/* error */
 			int l4,c4;
@@ -1503,13 +1522,13 @@ YY_RULE_SETUP
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-#line 328 "ael.flex"
+#line 353 "ael.flex"
 {/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('['); }
 	YY_BREAK
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
-#line 329 "ael.flex"
+#line 355 "ael.flex"
 {/*printf("ARGG:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(']') ) {
 			/* error */
@@ -1530,13 +1549,13 @@ YY_RULE_SETUP
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
-#line 347 "ael.flex"
+#line 372 "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 348 "ael.flex"
+#line 374 "ael.flex"
 {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(']') ) {
 			/* error */
@@ -1551,18 +1570,19 @@ YY_RULE_SETUP
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
 	YY_BREAK
 case 59:
 /* rule 59 can match eol */
 YY_RULE_SETUP
-#line 363 "ael.flex"
+#line 391 "ael.flex"
 {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('{');}
 	YY_BREAK
 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP
-#line 364 "ael.flex"
+#line 393 "ael.flex"
 {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop('}') ) {
 			/* error */
@@ -1577,18 +1597,19 @@ YY_RULE_SETUP
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
 	YY_BREAK
 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP
-#line 379 "ael.flex"
+#line 410 "ael.flex"
 {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col; yymore(); pbcpush('(');}
 	YY_BREAK
 case 62:
 /* rule 62 can match eol */
 YY_RULE_SETUP
-#line 380 "ael.flex"
+#line 412 "ael.flex"
 {/*printf("SEMIC:%s\n",yytext);*/yylloc->first_line = my_lineno;yylloc->first_column=my_col;
 		if ( pbcpop(')') ) {
 			/* error */
@@ -1603,12 +1624,13 @@ YY_RULE_SETUP
 			yylval->str = strdup(yytext);
 			return word;
 		}
-                         yymore();}
+		yymore();
+	}
 	YY_BREAK
 case 63:
 /* rule 63 can match eol */
 YY_RULE_SETUP
-#line 395 "ael.flex"
+#line 429 "ael.flex"
 {
 		int linecount = 0;
 		int colcount = my_col;
@@ -1639,7 +1661,7 @@ YY_RULE_SETUP
 case 64:
 /* rule 64 can match eol */
 YY_RULE_SETUP
-#line 422 "ael.flex"
+#line 456 "ael.flex"
 {
 		FILE *in1;
 		char fnamebuf[1024],*p1,*p2;
@@ -1663,17 +1685,14 @@ YY_RULE_SETUP
 						break;
 					}
 				}
-								if( !found )
-								{
+				if ( !found ) {
 					*p2 = 0;
 					/* relative vs. absolute */
-                                    if ( *(p1+1) != '/' )
-                                    {
+					if ( *(p1+1) != '/' ) {
 						strcpy(fnamebuf,ast_config_AST_CONFIG_DIR);
 						strcat(fnamebuf,"/");
 						strcat(fnamebuf,p1+1);
-                                    }
-                                    else
+					} else
 						strcpy(fnamebuf,p1+1);
 					in1 = fopen( fnamebuf, "r" );
 					if ( ! in1 ) {
@@ -1709,7 +1728,7 @@ case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(paren):
 case YY_STATE_EOF(semic):
 case YY_STATE_EOF(argg):
-#line 487 "ael.flex"
+#line 518 "ael.flex"
 {
 		if ( --include_stack_index < 0 ) {
 			yyterminate();
@@ -1725,10 +1744,10 @@ case YY_STATE_EOF(argg):
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 501 "ael.flex"
+#line 531 "ael.flex"
 ECHO;
 	YY_BREAK
-#line 1732 "ael_lex.c"
+#line 1751 "ael_lex.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2858,7 +2877,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 501 "ael.flex"
+#line 531 "ael.flex"
 
 
 
@@ -2875,7 +2894,6 @@ static int pbcpop(char x)
 		pbcpos--;
 		return 0;
 	}
-	else
 	return 1; /* error */
 }