more duplicate removal

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

1 files changed, 8 insertions, 37 deletions

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 7e8110156..51c994dfe 100644
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -194,29 +194,15 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 		yymore();
 	}
 
-<argg>{NOARGG}\(	  {
+<argg>{NOARGG}[\(\[\{]	  {
+		char c = yytext[yyleng-1];
 		/* 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('{');
+		if (c == '(')
+			parencount++;
+		pbcpush(c);
 		yymore();
 	}
 
@@ -326,30 +312,15 @@ includes	{ STORE_POS; return KW_INCLUDES;}
 
 
 
-<semic>{NOSEMIC}\[	{
+<semic>{NOSEMIC}[\(\[\{]	{
+		char c = yytext[yyleng-1];
 		/*printf("SEMIC:%s\n",yytext);*/
 		yylloc->first_line = my_lineno;
 		yylloc->first_column=my_col;
 		yymore();
-		pbcpush('[');
+		pbcpush(c);
 		}
 
-<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;