move similar blocks close to each other to make similarities

more evident



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

1 files changed, 51 insertions, 42 deletions

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 35219521f..b6af3a236 100644
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -135,6 +135,9 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		return word;
 	}
 
+
+
+
 <paren>{NOPARENS}\)	{
 		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
@@ -218,6 +221,35 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
+
+
+
+<argg>{NOARGG}\(	  {
+		/* printf("ARGG:%s\n",yytext); */
+		/* printf("GOT AN LP!!!\n"); */
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		parencount++;
+		pbcpush('(');
+		yymore();
+	}
+
+<argg>{NOARGG}\[	{
+		/*printf("ARGG:%s\n",yytext);*/
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		pbcpush('[');
+		yymore();
+	}
+
+<argg>{NOARGG}\{	{
+		/*printf("ARGG:%s\n",yytext);*/
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		pbcpush('{');
+		yymore();
+	}
+
 <argg>{NOARGG}\)	{
 		/* printf("ARGG:%s\n",yytext); */
 		yylloc->first_line = my_lineno;
@@ -256,16 +288,6 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		}
 	}
 
-<argg>{NOARGG}\(	  {
-		/* printf("ARGG:%s\n",yytext); */
-		/* printf("GOT AN LP!!!\n"); */
-		yylloc->first_line = my_lineno;
-		yylloc->first_column=my_col;
-		parencount++;
-		pbcpush('(');
-		yymore();
-	}
-
 <argg>{NOARGG}\,	{
 		/* printf("ARGG:%s\n",yytext); */
 		if( parencount != 0) {
@@ -299,14 +321,6 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		}
 	}
 
-<argg>{NOARGG}\{	{
-		/*printf("ARGG:%s\n",yytext);*/
-		yylloc->first_line = my_lineno;
-		yylloc->first_column=my_col;
-		pbcpush('{');
-		yymore();
-	}
-
 <argg>{NOARGG}\}	{
 		/*printf("ARGG:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
@@ -323,14 +337,6 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
-<argg>{NOARGG}\[	{
-		/*printf("ARGG:%s\n",yytext);*/
-		yylloc->first_line = my_lineno;
-		yylloc->first_column=my_col;
-		pbcpush('[');
-		yymore();
-	}
-
 <argg>{NOARGG}\]	{
 		/*printf("ARGG:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
@@ -347,6 +353,9 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
+
+
+
 <semic>{NOSEMIC}\[	{
 		/*printf("SEMIC:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
@@ -355,6 +364,22 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		pbcpush('[');
 		}
 
+<semic>{NOSEMIC}\{	{
+		/*printf("SEMIC:%s\n",yytext);*/
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		pbcpush('{');
+		yymore();
+	}
+
+<semic>{NOSEMIC}\(	{
+		/*printf("SEMIC:%s\n",yytext);*/
+		yylloc->first_line = my_lineno;
+		yylloc->first_column=my_col;
+		pbcpush('(');
+		yymore();
+	}
+
 <semic>{NOSEMIC}\]	{
 		/*printf("SEMIC:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
@@ -371,14 +396,6 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
-<semic>{NOSEMIC}\{	{
-		/*printf("SEMIC:%s\n",yytext);*/
-		yylloc->first_line = my_lineno;
-		yylloc->first_column=my_col;
-		pbcpush('{');
-		yymore();
-	}
-
 <semic>{NOSEMIC}\}	{
 		/*printf("SEMIC:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
@@ -395,14 +412,6 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
-<semic>{NOSEMIC}\(	{
-		/*printf("SEMIC:%s\n",yytext);*/
-		yylloc->first_line = my_lineno;
-		yylloc->first_column=my_col;
-		pbcpush('(');
-		yymore();
-	}
-
 <semic>{NOSEMIC}\)	{
 		/*printf("SEMIC:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;