From 98d769c7c07d25dd229623f8eb3b4443c9015487 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Thu, 27 Apr 2006 11:34:44 +0000 Subject: more duplicate removal git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22843 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/ael/ael.flex | 45 +----- pbx/ael/ael_lex.c | 473 ++++++++++++++++++++++++------------------------------ 2 files changed, 222 insertions(+), 296 deletions(-) (limited to 'pbx/ael') 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(); } -{NOARGG}\( { +{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(); - } - -{NOARGG}\[ { - /*printf("ARGG:%s\n",yytext);*/ - yylloc->first_line = my_lineno; - yylloc->first_column=my_col; - pbcpush('['); - yymore(); - } - -{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;} -{NOSEMIC}\[ { +{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); } -{NOSEMIC}\{ { - /*printf("SEMIC:%s\n",yytext);*/ - yylloc->first_line = my_lineno; - yylloc->first_column=my_col; - pbcpush('{'); - yymore(); - } - -{NOSEMIC}\( { - /*printf("SEMIC:%s\n",yytext);*/ - yylloc->first_line = my_lineno; - yylloc->first_column=my_col; - pbcpush('('); - yymore(); - } - {NOSEMIC}\] { /*printf("SEMIC:%s\n",yytext);*/ yylloc->first_line = my_lineno; diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 8be184f61..83bd7e862 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -356,8 +356,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 62 -#define YY_END_OF_BUFFER 63 +#define YY_NUM_RULES 58 +#define YY_END_OF_BUFFER 59 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -365,32 +365,32 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[220] = +static yyconst flex_int16_t yy_accept[212] = { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 63, 62, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 58, 42, 40, 41, 43, 43, 9, 3, 4, 7, 43, 8, 5, 6, 12, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 1, - 10, 2, 62, 45, 44, 46, 62, 56, 59, 60, - 54, 57, 55, 58, 62, 47, 50, 51, 48, 53, - 49, 52, 42, 41, 43, 43, 13, 11, 43, 43, - 43, 43, 43, 43, 43, 43, 43, 43, 43, 20, - 43, 43, 43, 43, 43, 43, 43, 43, 43, 0, - 45, 44, 46, 0, 56, 59, 60, 54, 57, 55, - - 58, 0, 47, 50, 51, 48, 53, 49, 52, 43, - 13, 13, 43, 43, 43, 43, 43, 43, 43, 43, - 31, 43, 43, 43, 43, 43, 43, 43, 43, 43, - 43, 43, 43, 43, 43, 43, 43, 43, 33, 43, - 43, 43, 25, 43, 43, 26, 24, 43, 43, 43, - 27, 43, 43, 43, 43, 43, 43, 43, 43, 43, - 29, 36, 43, 43, 43, 43, 43, 43, 43, 43, - 16, 43, 43, 43, 43, 43, 32, 43, 43, 43, - 43, 43, 43, 43, 21, 43, 43, 43, 22, 43, - 28, 19, 43, 43, 14, 43, 34, 43, 17, 43, - - 43, 35, 43, 43, 43, 15, 30, 43, 43, 39, - 23, 37, 0, 38, 18, 0, 0, 61, 0 + 10, 2, 58, 45, 44, 46, 58, 52, 55, 56, + 53, 54, 58, 47, 48, 49, 51, 50, 42, 41, + 43, 43, 13, 11, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 20, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 0, 45, 44, 46, 0, + 52, 55, 56, 53, 54, 0, 47, 48, 49, 51, + + 50, 43, 13, 13, 43, 43, 43, 43, 43, 43, + 43, 43, 31, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 33, 43, 43, 43, 25, 43, 43, 26, 24, 43, + 43, 43, 27, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 29, 36, 43, 43, 43, 43, 43, 43, + 43, 43, 16, 43, 43, 43, 43, 43, 32, 43, + 43, 43, 43, 43, 43, 43, 21, 43, 43, 43, + 22, 43, 28, 19, 43, 43, 14, 43, 34, 43, + 17, 43, 43, 35, 43, 43, 43, 15, 30, 43, + + 43, 39, 23, 37, 0, 38, 18, 0, 0, 57, + 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -434,62 +434,62 @@ static yyconst flex_int32_t yy_meta[46] = 3, 3, 3, 1, 3 } ; -static yyconst flex_int16_t yy_base[230] = +static yyconst flex_int16_t yy_base[222] = { 0, 0, 0, 37, 40, 77, 114, 151, 188, 237, 507, 234, 507, 228, 0, 201, 507, 507, 507, 507, 217, 507, 507, 212, 507, 205, 189, 27, 200, 20, 189, 19, 194, 37, 182, 200, 199, 40, 178, 190, 507, 507, 507, 57, 507, 507, 507, 225, 507, 507, 507, - 507, 507, 507, 507, 262, 507, 507, 507, 507, 507, - 507, 507, 215, 212, 0, 181, 307, 507, 176, 188, - 30, 178, 185, 172, 168, 169, 170, 165, 169, 184, - 167, 177, 162, 170, 153, 157, 45, 161, 160, 69, - 507, 507, 507, 343, 507, 507, 507, 507, 507, 507, - - 507, 380, 507, 507, 507, 507, 507, 507, 507, 165, - 0, 425, 148, 165, 160, 161, 144, 161, 156, 151, - 0, 157, 143, 138, 147, 140, 142, 137, 135, 130, - 144, 142, 126, 126, 132, 131, 121, 125, 0, 127, - 45, 114, 0, 114, 131, 0, 0, 118, 113, 109, - 0, 113, 122, 111, 103, 107, 120, 117, 101, 119, - 0, 0, 97, 104, 105, 113, 103, 107, 106, 106, - 0, 92, 94, 87, 91, 93, 0, 95, 95, 78, - 76, 76, 85, 73, 0, 74, 84, 74, 0, 82, - 0, 81, 80, 65, 0, 78, 0, 76, 0, 78, - - 60, 0, 61, 55, 51, 0, 0, 43, 36, 0, - 0, 0, 88, 0, 0, 0, 67, 507, 507, 469, - 473, 477, 479, 483, 487, 491, 495, 499, 503 + 507, 507, 262, 507, 507, 507, 507, 507, 215, 212, + 0, 181, 307, 507, 176, 188, 30, 178, 185, 172, + 168, 169, 170, 165, 169, 184, 167, 177, 162, 170, + 153, 157, 45, 161, 160, 69, 507, 507, 507, 343, + 507, 507, 507, 507, 507, 380, 507, 507, 507, 507, + + 507, 165, 0, 425, 148, 165, 160, 161, 144, 161, + 156, 151, 0, 157, 143, 138, 147, 140, 142, 137, + 135, 130, 144, 142, 126, 126, 132, 131, 121, 125, + 0, 127, 45, 114, 0, 114, 131, 0, 0, 118, + 113, 109, 0, 113, 122, 111, 103, 107, 120, 117, + 101, 119, 0, 0, 97, 104, 105, 113, 103, 107, + 106, 106, 0, 92, 94, 87, 91, 93, 0, 95, + 95, 78, 76, 76, 85, 73, 0, 74, 84, 74, + 0, 82, 0, 81, 80, 65, 0, 78, 0, 76, + 0, 78, 60, 0, 61, 55, 51, 0, 0, 43, + + 36, 0, 0, 0, 88, 0, 0, 0, 67, 507, + 507, 469, 473, 477, 479, 483, 487, 491, 495, 499, + 503 } ; -static yyconst flex_int16_t yy_def[230] = +static yyconst flex_int16_t yy_def[222] = { 0, - 219, 1, 220, 220, 221, 221, 222, 222, 219, 219, - 219, 219, 219, 223, 223, 219, 219, 219, 219, 223, - 219, 219, 219, 219, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 219, - 219, 219, 224, 219, 219, 219, 225, 219, 219, 219, - 219, 219, 219, 219, 226, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 223, 223, 227, 219, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 224, - 219, 219, 219, 225, 219, 219, 219, 219, 219, 219, - - 219, 226, 219, 219, 219, 219, 219, 219, 219, 223, - 228, 227, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 219, 223, 223, 229, 229, 219, 0, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219 + 211, 1, 212, 212, 213, 213, 214, 214, 211, 211, + 211, 211, 211, 215, 215, 211, 211, 211, 211, 215, + 211, 211, 211, 211, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 211, + 211, 211, 216, 211, 211, 211, 217, 211, 211, 211, + 211, 211, 218, 211, 211, 211, 211, 211, 211, 211, + 215, 215, 219, 211, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 216, 211, 211, 211, 217, + 211, 211, 211, 211, 211, 218, 211, 211, 211, 211, + + 211, 215, 220, 219, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + + 215, 215, 215, 215, 211, 215, 215, 221, 221, 211, + 0, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211 } ; static yyconst flex_int16_t yy_nxt[553] = @@ -498,63 +498,63 @@ static yyconst flex_int16_t yy_nxt[553] = 19, 20, 21, 22, 23, 14, 24, 14, 14, 14, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 14, 14, 35, 14, 14, 36, 37, 38, 14, 14, - 39, 14, 40, 41, 42, 44, 45, 71, 44, 45, - 77, 74, 213, 78, 213, 44, 46, 75, 44, 46, - 86, 72, 80, 81, 87, 91, 92, 115, 116, 163, - 82, 132, 218, 164, 215, 91, 93, 91, 92, 44, - 214, 46, 44, 133, 46, 48, 49, 91, 93, 213, - 50, 213, 212, 216, 211, 51, 52, 210, 209, 91, - - 208, 93, 207, 206, 205, 204, 203, 202, 201, 200, - 199, 91, 198, 93, 197, 196, 195, 194, 193, 53, - 192, 54, 48, 49, 191, 190, 189, 50, 188, 187, - 186, 185, 51, 52, 184, 183, 182, 181, 180, 179, - 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, - 168, 167, 166, 165, 162, 161, 53, 160, 54, 56, - 57, 58, 159, 158, 157, 156, 155, 154, 153, 59, - 60, 152, 151, 150, 149, 148, 147, 146, 145, 144, - 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, - 131, 130, 129, 61, 128, 62, 56, 57, 58, 127, - - 126, 125, 124, 123, 122, 121, 59, 60, 120, 119, - 118, 117, 114, 113, 110, 64, 63, 89, 88, 85, - 84, 83, 79, 76, 73, 70, 69, 68, 67, 66, - 61, 64, 62, 95, 96, 63, 219, 219, 97, 219, - 219, 219, 219, 98, 99, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 100, 219, 101, - 103, 104, 105, 219, 219, 219, 219, 219, 219, 219, - 106, 107, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - - 219, 219, 219, 219, 108, 219, 109, 111, 111, 219, - 111, 219, 219, 219, 111, 111, 111, 111, 219, 111, - 111, 111, 219, 111, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 111, 95, 96, 219, 219, 219, 97, 219, 219, 219, - 219, 98, 99, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 100, 219, 101, 103, 104, - 105, 219, 219, 219, 219, 219, 219, 219, 106, 107, - - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 108, 219, 109, 111, 111, 219, 111, 219, - 219, 219, 111, 111, 111, 111, 219, 111, 111, 111, - 219, 111, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 111, 43, - 43, 43, 43, 47, 47, 47, 47, 55, 55, 55, - 55, 65, 65, 90, 90, 90, 90, 94, 94, 94, - 94, 102, 102, 102, 102, 112, 219, 112, 112, 111, - - 219, 111, 111, 217, 217, 217, 9, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219 + 39, 14, 40, 41, 42, 44, 45, 67, 44, 45, + 73, 70, 205, 74, 205, 44, 46, 71, 44, 46, + 82, 68, 76, 77, 83, 87, 88, 107, 108, 155, + 78, 124, 210, 156, 207, 87, 89, 87, 88, 44, + 206, 46, 44, 125, 46, 48, 49, 87, 89, 205, + 50, 205, 204, 208, 203, 48, 51, 202, 201, 87, + + 200, 89, 199, 198, 197, 196, 195, 194, 193, 192, + 191, 87, 190, 89, 189, 188, 187, 186, 185, 48, + 184, 52, 48, 49, 183, 182, 181, 50, 180, 179, + 178, 177, 48, 51, 176, 175, 174, 173, 172, 171, + 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, + 160, 159, 158, 157, 154, 153, 48, 152, 52, 54, + 55, 56, 151, 150, 149, 148, 147, 146, 145, 54, + 57, 144, 143, 142, 141, 140, 139, 138, 137, 136, + 135, 134, 133, 132, 131, 130, 129, 128, 127, 126, + 123, 122, 121, 54, 120, 58, 54, 55, 56, 119, + + 118, 117, 116, 115, 114, 113, 54, 57, 112, 111, + 110, 109, 106, 105, 102, 60, 59, 85, 84, 81, + 80, 79, 75, 72, 69, 66, 65, 64, 63, 62, + 54, 60, 58, 91, 92, 59, 211, 211, 93, 211, + 211, 211, 211, 91, 94, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 91, 211, 95, + 97, 98, 99, 211, 211, 211, 211, 211, 211, 211, + 97, 100, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + + 211, 211, 211, 211, 97, 211, 101, 103, 103, 211, + 103, 211, 211, 211, 103, 103, 103, 103, 211, 103, + 103, 103, 211, 103, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 103, 91, 92, 211, 211, 211, 93, 211, 211, 211, + 211, 91, 94, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 91, 211, 95, 97, 98, + 99, 211, 211, 211, 211, 211, 211, 211, 97, 100, + + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 97, 211, 101, 103, 103, 211, 103, 211, + 211, 211, 103, 103, 103, 103, 211, 103, 103, 103, + 211, 103, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 103, 43, + 43, 43, 43, 47, 47, 47, 47, 53, 53, 53, + 53, 61, 61, 86, 86, 86, 86, 90, 90, 90, + 90, 96, 96, 96, 96, 104, 211, 104, 104, 103, + + 211, 103, 103, 209, 209, 209, 9, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211 } ; static yyconst flex_int16_t yy_chk[553] = @@ -564,62 +564,62 @@ static yyconst flex_int16_t yy_chk[553] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 27, 4, 4, - 31, 29, 205, 31, 205, 3, 3, 29, 4, 4, - 37, 27, 33, 33, 37, 43, 43, 71, 71, 141, - 33, 87, 217, 141, 209, 43, 43, 90, 90, 3, - 208, 3, 4, 87, 4, 5, 5, 90, 90, 213, - 5, 213, 204, 213, 203, 5, 5, 201, 200, 43, - - 198, 43, 196, 194, 193, 192, 190, 188, 187, 186, - 184, 90, 183, 90, 182, 181, 180, 179, 178, 5, - 176, 5, 6, 6, 175, 174, 173, 6, 172, 170, - 169, 168, 6, 6, 167, 166, 165, 164, 163, 160, - 159, 158, 157, 156, 155, 154, 153, 152, 150, 149, - 148, 145, 144, 142, 140, 138, 6, 137, 6, 7, - 7, 7, 136, 135, 134, 133, 132, 131, 130, 7, - 7, 129, 128, 127, 126, 125, 124, 123, 122, 120, - 119, 118, 117, 116, 115, 114, 113, 110, 89, 88, - 86, 85, 84, 7, 83, 7, 8, 8, 8, 82, - - 81, 80, 79, 78, 77, 76, 8, 8, 75, 74, - 73, 72, 70, 69, 66, 64, 63, 39, 38, 36, + 31, 29, 197, 31, 197, 3, 3, 29, 4, 4, + 37, 27, 33, 33, 37, 43, 43, 67, 67, 133, + 33, 83, 209, 133, 201, 43, 43, 86, 86, 3, + 200, 3, 4, 83, 4, 5, 5, 86, 86, 205, + 5, 205, 196, 205, 195, 5, 5, 193, 192, 43, + + 190, 43, 188, 186, 185, 184, 182, 180, 179, 178, + 176, 86, 175, 86, 174, 173, 172, 171, 170, 5, + 168, 5, 6, 6, 167, 166, 165, 6, 164, 162, + 161, 160, 6, 6, 159, 158, 157, 156, 155, 152, + 151, 150, 149, 148, 147, 146, 145, 144, 142, 141, + 140, 137, 136, 134, 132, 130, 6, 129, 6, 7, + 7, 7, 128, 127, 126, 125, 124, 123, 122, 7, + 7, 121, 120, 119, 118, 117, 116, 115, 114, 112, + 111, 110, 109, 108, 107, 106, 105, 102, 85, 84, + 82, 81, 80, 7, 79, 7, 8, 8, 8, 78, + + 77, 76, 75, 74, 73, 72, 8, 8, 71, 70, + 69, 68, 66, 65, 62, 60, 59, 39, 38, 36, 35, 34, 32, 30, 28, 26, 25, 23, 20, 15, 8, 13, 8, 47, 47, 11, 9, 0, 47, 0, 0, 0, 0, 47, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 0, 47, - 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, - 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, + 53, 53, 53, 0, 0, 0, 0, 0, 0, 0, + 53, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 55, 0, 55, 67, 67, 0, - 67, 0, 0, 0, 67, 67, 67, 67, 0, 67, - 67, 67, 0, 67, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 53, 0, 53, 63, 63, 0, + 63, 0, 0, 0, 63, 63, 63, 63, 0, 63, + 63, 63, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 67, 94, 94, 0, 0, 0, 94, 0, 0, 0, - 0, 94, 94, 0, 0, 0, 0, 0, 0, 0, + 63, 90, 90, 0, 0, 0, 90, 0, 0, 0, + 0, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 94, 0, 94, 102, 102, - 102, 0, 0, 0, 0, 0, 0, 0, 102, 102, + 0, 0, 0, 0, 0, 90, 0, 90, 96, 96, + 96, 0, 0, 0, 0, 0, 0, 0, 96, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 102, 0, 102, 112, 112, 0, 112, 0, - 0, 0, 112, 112, 112, 112, 0, 112, 112, 112, - 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 96, 0, 96, 104, 104, 0, 104, 0, + 0, 0, 104, 104, 104, 104, 0, 104, 104, 104, + 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 112, 220, - 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, - 222, 223, 223, 224, 224, 224, 224, 225, 225, 225, - 225, 226, 226, 226, 226, 227, 0, 227, 227, 228, - - 0, 228, 228, 229, 229, 229, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 219 + 0, 0, 0, 0, 0, 0, 0, 0, 104, 212, + 212, 212, 212, 213, 213, 213, 213, 214, 214, 214, + 214, 215, 215, 216, 216, 216, 216, 217, 217, 217, + 217, 218, 218, 218, 218, 219, 0, 219, 219, 220, + + 0, 220, 220, 221, 221, 221, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211 } ; /* The intent behind this definition is that it'll catch @@ -1002,13 +1002,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 220 ) + if ( yy_current_state >= 212 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 219 ); + while ( yy_current_state != 211 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -1324,43 +1324,21 @@ case 47: YY_RULE_SETUP #line 197 "ael.flex" { + 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('('); + if (c == '(') + parencount++; + pbcpush(c); yymore(); } YY_BREAK case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 207 "ael.flex" -{ - /*printf("ARGG:%s\n",yytext);*/ - 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 215 "ael.flex" -{ - /*printf("ARGG:%s\n",yytext);*/ - yylloc->first_line = my_lineno; - yylloc->first_column=my_col; - pbcpush('{'); - yymore(); - } - YY_BREAK -case 50: -/* rule 50 can match eol */ -YY_RULE_SETUP -#line 223 "ael.flex" +#line 209 "ael.flex" { /* printf("ARGG:%s\n",yytext); */ yylloc->first_line = my_lineno; @@ -1399,10 +1377,10 @@ YY_RULE_SETUP } } YY_BREAK -case 51: -/* rule 51 can match eol */ +case 49: +/* rule 49 can match eol */ YY_RULE_SETUP -#line 261 "ael.flex" +#line 247 "ael.flex" { /* printf("ARGG:%s\n",yytext); */ if( parencount != 0) { @@ -1436,10 +1414,10 @@ YY_RULE_SETUP } } YY_BREAK -case 52: -/* rule 52 can match eol */ +case 50: +/* rule 50 can match eol */ YY_RULE_SETUP -#line 294 "ael.flex" +#line 280 "ael.flex" { /*printf("ARGG:%s\n",yytext);*/ yylloc->first_line = my_lineno; @@ -1456,10 +1434,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 53: -/* rule 53 can match eol */ +case 51: +/* rule 51 can match eol */ YY_RULE_SETUP -#line 310 "ael.flex" +#line 296 "ael.flex" { /*printf("ARGG:%s\n",yytext);*/ yylloc->first_line = my_lineno; @@ -1476,46 +1454,23 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 54: -/* rule 54 can match eol */ +case 52: +/* rule 52 can match eol */ YY_RULE_SETUP -#line 329 "ael.flex" +#line 315 "ael.flex" { + char c = yytext[yyleng-1]; /*printf("SEMIC:%s\n",yytext);*/ yylloc->first_line = my_lineno; yylloc->first_column=my_col; yymore(); - pbcpush('['); + pbcpush(c); } YY_BREAK -case 55: -/* rule 55 can match eol */ -YY_RULE_SETUP -#line 337 "ael.flex" -{ - /*printf("SEMIC:%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 345 "ael.flex" -{ - /*printf("SEMIC:%s\n",yytext);*/ - yylloc->first_line = my_lineno; - yylloc->first_column=my_col; - pbcpush('('); - yymore(); - } - YY_BREAK -case 57: -/* rule 57 can match eol */ +case 53: +/* rule 53 can match eol */ YY_RULE_SETUP -#line 353 "ael.flex" +#line 324 "ael.flex" { /*printf("SEMIC:%s\n",yytext);*/ yylloc->first_line = my_lineno; @@ -1532,10 +1487,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 58: -/* rule 58 can match eol */ +case 54: +/* rule 54 can match eol */ YY_RULE_SETUP -#line 369 "ael.flex" +#line 340 "ael.flex" { /*printf("SEMIC:%s\n",yytext);*/ yylloc->first_line = my_lineno; @@ -1552,10 +1507,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 59: -/* rule 59 can match eol */ +case 55: +/* rule 55 can match eol */ YY_RULE_SETUP -#line 385 "ael.flex" +#line 356 "ael.flex" { /*printf("SEMIC:%s\n",yytext);*/ yylloc->first_line = my_lineno; @@ -1572,10 +1527,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 60: -/* rule 60 can match eol */ +case 56: +/* rule 56 can match eol */ YY_RULE_SETUP -#line 401 "ael.flex" +#line 372 "ael.flex" { yylloc->first_line = my_lineno; yylloc->first_column=my_col; @@ -1591,10 +1546,10 @@ YY_RULE_SETUP return word; } YY_BREAK -case 61: -/* rule 61 can match eol */ +case 57: +/* rule 57 can match eol */ YY_RULE_SETUP -#line 416 "ael.flex" +#line 387 "ael.flex" { FILE *in1; char fnamebuf[1024],*p1,*p2; @@ -1661,7 +1616,7 @@ case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(paren): case YY_STATE_EOF(semic): case YY_STATE_EOF(argg): -#line 478 "ael.flex" +#line 449 "ael.flex" { if ( --include_stack_index < 0 ) { yyterminate(); @@ -1675,12 +1630,12 @@ case YY_STATE_EOF(argg): } } YY_BREAK -case 62: +case 58: YY_RULE_SETUP -#line 491 "ael.flex" +#line 462 "ael.flex" ECHO; YY_BREAK -#line 1684 "ael_lex.c" +#line 1639 "ael_lex.c" case YY_END_OF_BUFFER: { @@ -1965,7 +1920,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 220 ) + if ( yy_current_state >= 212 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1994,11 +1949,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 220 ) + if ( yy_current_state >= 212 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 219); + yy_is_jam = (yy_current_state == 211); return yy_is_jam ? 0 : yy_current_state; } @@ -2810,7 +2765,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 491 "ael.flex" +#line 462 "ael.flex" -- cgit v1.2.3