diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-26 16:34:02 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-26 16:34:02 +0000 |
| commit | ff0fcde5c61c9f9cb0315bc47ecff200b27db505 (patch) | |
| tree | dc877899b474ad3f4ddbffd50e855ff42867f1ab /pbx/ael/ael_lex.c | |
| parent | 237b86b3225b873b1fb4f3345e725cb71da5e566 (diff) | |
closes issue #11086 where a user complains that references to following contexts report a problem; The problem was REALLy that he was referring to empty contexts, which were being ignored. Reporter stated that empty contexts should be OK. I checked it out against extensions.conf, and sure enough, empty contexts ARE ok. So, I removed the restriction from AEL. This, though, highlighted a problem with multiple contexts of the same name. This should be OK, also. So, I added the extend keyword to AEL, and it can preceed the 'context' keyword (mixed with 'abstract', if nec.). This will turn off the warnings in AEL if the same context name is used 2 or more times. Also, I now call ast_context_find_or_create for contexts now, instead of just ast_context_create; I did this because pbx_config does this. The 'extend' keyword thus becomes a statement of intent. AEL can now duplicate the behavior of pbx_config,
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@87168 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/ael/ael_lex.c')
| -rw-r--r-- | pbx/ael/ael_lex.c | 693 |
1 files changed, 350 insertions, 343 deletions
diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 6adf8ba9b..9a1a7bc6c 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -345,8 +345,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 61 -#define YY_END_OF_BUFFER 62 +#define YY_NUM_RULES 62 +#define YY_END_OF_BUFFER 63 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -354,34 +354,34 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[234] = +static yyconst flex_int16_t yy_accept[239] = { 0, - 0, 0, 0, 0, 0, 0, 0, 0, 41, 41, - 62, 61, 48, 46, 47, 49, 49, 9, 3, 4, - 7, 49, 8, 5, 6, 12, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 1, 10, 2, 61, 51, 50, 61, 52, 61, - 57, 58, 59, 61, 61, 53, 54, 55, 61, 56, - 41, 42, 43, 48, 47, 49, 49, 40, 13, 11, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 20, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 0, 51, 50, 0, 52, 51, 50, 52, 0, - - 57, 58, 59, 0, 57, 58, 59, 0, 53, 54, - 55, 0, 56, 53, 54, 55, 56, 41, 42, 43, - 44, 43, 45, 49, 13, 13, 49, 49, 49, 49, - 49, 49, 49, 49, 31, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 33, 49, 49, 49, 25, 49, 49, 26, - 24, 49, 49, 49, 27, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 29, 36, 49, 49, 49, 49, - 49, 49, 49, 49, 16, 49, 49, 49, 49, 49, - 32, 49, 49, 49, 49, 49, 49, 49, 21, 49, - - 49, 49, 22, 49, 28, 19, 49, 49, 14, 49, - 34, 49, 17, 49, 49, 35, 49, 49, 49, 15, - 30, 49, 49, 39, 23, 37, 0, 38, 18, 0, - 0, 60, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, + 63, 62, 49, 47, 48, 50, 50, 9, 3, 4, + 7, 50, 8, 5, 6, 12, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 1, 10, 2, 62, 52, 51, 62, 53, 62, + 58, 59, 60, 62, 62, 54, 55, 56, 62, 57, + 42, 43, 44, 49, 48, 50, 50, 41, 13, 11, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 21, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 0, 52, 51, 0, 53, 52, 51, 53, + + 0, 58, 59, 60, 0, 58, 59, 60, 0, 54, + 55, 56, 0, 57, 54, 55, 56, 57, 42, 43, + 44, 45, 44, 46, 50, 13, 13, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 32, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 50, 50, 50, 50, 34, 50, 50, 50, 26, 50, + 50, 50, 27, 25, 50, 50, 50, 28, 50, 50, + 50, 50, 50, 50, 50, 50, 50, 30, 37, 50, + 50, 50, 50, 50, 50, 50, 50, 50, 17, 50, + 50, 50, 50, 50, 33, 50, 50, 50, 50, 50, + + 50, 16, 50, 22, 50, 50, 50, 23, 50, 29, + 20, 50, 50, 14, 50, 35, 50, 18, 50, 50, + 36, 50, 50, 50, 15, 31, 50, 50, 40, 24, + 38, 0, 39, 19, 0, 0, 61, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -425,184 +425,186 @@ static yyconst flex_int32_t yy_meta[48] = 3, 3, 3, 3, 3, 1, 3 } ; -static yyconst flex_int16_t yy_base[247] = +static yyconst flex_int16_t yy_base[252] = { 0, 0, 0, 39, 42, 81, 120, 159, 198, 47, 54, - 310, 985, 307, 985, 304, 0, 276, 985, 985, 985, - 985, 42, 985, 985, 289, 985, 281, 265, 31, 276, - 32, 265, 33, 270, 45, 258, 276, 272, 48, 251, - 263, 985, 985, 985, 73, 985, 985, 89, 985, 237, + 315, 985, 312, 985, 309, 0, 281, 985, 985, 985, + 985, 42, 985, 985, 294, 985, 286, 270, 31, 281, + 32, 270, 33, 275, 45, 263, 281, 280, 48, 259, + 271, 985, 985, 985, 73, 985, 985, 89, 985, 237, 985, 985, 985, 276, 315, 985, 985, 985, 354, 985, - 289, 985, 66, 288, 285, 0, 252, 0, 401, 985, - 247, 256, 64, 245, 252, 239, 235, 238, 239, 234, - 238, 254, 236, 246, 235, 244, 227, 231, 47, 235, - 234, 103, 985, 985, 137, 985, 142, 176, 181, 439, - - 985, 985, 985, 478, 517, 556, 595, 634, 985, 985, - 985, 673, 985, 712, 751, 790, 829, 261, 985, 103, - 985, 104, 985, 238, 0, 876, 221, 238, 233, 231, - 214, 231, 226, 220, 0, 226, 212, 207, 213, 205, - 207, 202, 200, 197, 211, 209, 193, 193, 199, 198, - 192, 197, 0, 199, 100, 185, 0, 184, 201, 0, - 0, 187, 178, 174, 0, 178, 187, 176, 168, 172, - 184, 178, 158, 176, 0, 0, 151, 158, 159, 167, - 154, 156, 151, 151, 0, 137, 140, 132, 130, 131, - 0, 134, 131, 114, 112, 112, 119, 105, 0, 106, - - 116, 103, 0, 111, 0, 110, 106, 91, 0, 95, - 0, 94, 0, 96, 68, 0, 64, 57, 76, 0, - 0, 52, 44, 0, 0, 0, 168, 0, 0, 0, - 50, 985, 985, 922, 927, 932, 937, 940, 945, 950, - 955, 960, 964, 969, 974, 979 + 297, 985, 66, 297, 291, 0, 258, 0, 401, 985, + 253, 265, 64, 254, 261, 248, 244, 242, 242, 243, + 238, 242, 258, 240, 250, 239, 248, 231, 235, 51, + 239, 238, 103, 985, 985, 137, 985, 142, 176, 181, + + 439, 985, 985, 985, 478, 517, 556, 595, 634, 985, + 985, 985, 673, 985, 712, 751, 790, 829, 265, 985, + 103, 985, 104, 985, 242, 0, 876, 225, 242, 237, + 238, 221, 238, 233, 225, 228, 0, 230, 216, 210, + 219, 212, 214, 206, 203, 200, 214, 212, 196, 196, + 202, 201, 195, 200, 0, 202, 100, 189, 0, 189, + 193, 204, 0, 0, 190, 185, 180, 0, 180, 189, + 178, 170, 174, 187, 184, 167, 182, 0, 0, 156, + 163, 161, 169, 167, 158, 161, 156, 152, 0, 138, + 141, 134, 137, 136, 0, 135, 135, 115, 113, 113, + + 123, 0, 109, 0, 107, 117, 107, 0, 112, 0, + 111, 110, 92, 0, 105, 0, 95, 0, 85, 60, + 0, 61, 48, 117, 0, 0, 45, 37, 0, 0, + 0, 168, 0, 0, 0, 50, 985, 985, 922, 927, + 932, 937, 940, 945, 950, 955, 960, 964, 969, 974, + 979 } ; -static yyconst flex_int16_t yy_def[247] = +static yyconst flex_int16_t yy_def[252] = { 0, - 233, 1, 234, 234, 235, 235, 236, 236, 237, 237, - 233, 233, 233, 233, 233, 238, 238, 233, 233, 233, - 233, 238, 233, 233, 233, 233, 238, 238, 238, 238, + 238, 1, 239, 239, 240, 240, 241, 241, 242, 242, + 238, 238, 238, 238, 238, 243, 243, 238, 238, 238, + 238, 243, 238, 238, 238, 238, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 238, 238, 238, 244, 238, 238, 244, 238, 245, + 238, 238, 238, 245, 246, 238, 238, 238, 246, 238, + 247, 238, 248, 238, 238, 243, 243, 243, 249, 238, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 244, 238, 238, 244, 238, 244, 244, 244, + + 245, 238, 238, 238, 245, 245, 245, 245, 246, 238, + 238, 238, 246, 238, 246, 246, 246, 246, 247, 238, + 248, 238, 248, 238, 243, 250, 249, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 238, 243, 243, 251, 251, 238, 0, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 233, 233, 233, 239, 233, 233, 239, 233, 240, - 233, 233, 233, 240, 241, 233, 233, 233, 241, 233, - 242, 233, 243, 233, 233, 238, 238, 238, 244, 233, + 238 + } ; + +static yyconst flex_int16_t yy_nxt[1033] = + { 0, + 12, 13, 14, 15, 16, 16, 17, 18, 19, 20, + 16, 21, 22, 23, 24, 25, 16, 26, 16, 16, + 12, 16, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 16, 16, 37, 16, 16, 38, 39, 40, + 16, 16, 41, 16, 42, 43, 44, 46, 47, 62, + 46, 47, 68, 73, 69, 237, 62, 63, 46, 48, + 49, 46, 48, 49, 63, 76, 80, 74, 122, 81, + 89, 77, 83, 84, 90, 78, 123, 234, 124, 148, + 85, 94, 95, 46, 233, 49, 46, 231, 49, 51, + 52, 149, 94, 96, 97, 53, 230, 98, 99, 229, + + 51, 54, 52, 130, 131, 122, 122, 228, 98, 96, + 100, 94, 95, 238, 123, 238, 238, 94, 232, 97, + 232, 227, 94, 96, 97, 51, 180, 52, 51, 52, + 181, 226, 225, 98, 53, 100, 224, 223, 222, 51, + 54, 52, 221, 220, 219, 98, 99, 94, 218, 97, + 94, 95, 217, 216, 215, 214, 98, 96, 100, 213, + 212, 94, 96, 97, 51, 211, 52, 56, 57, 232, + 58, 232, 210, 235, 209, 208, 207, 206, 56, 59, + 60, 98, 205, 100, 94, 95, 94, 204, 97, 94, + 95, 203, 202, 201, 200, 94, 96, 97, 199, 198, + + 94, 96, 97, 56, 197, 60, 56, 57, 196, 58, + 195, 194, 193, 192, 191, 190, 189, 56, 59, 60, + 94, 188, 97, 187, 186, 94, 185, 97, 184, 183, + 182, 179, 178, 177, 176, 175, 174, 173, 172, 171, + 170, 169, 56, 168, 60, 102, 103, 167, 166, 165, + 164, 104, 163, 162, 161, 160, 102, 105, 103, 159, + 158, 157, 156, 155, 154, 153, 152, 120, 151, 150, + 147, 146, 145, 144, 143, 142, 141, 140, 139, 138, + 137, 102, 136, 103, 106, 107, 135, 134, 133, 132, + 108, 129, 128, 125, 65, 106, 105, 107, 64, 120, + + 92, 91, 88, 87, 86, 82, 79, 75, 72, 71, + 70, 67, 65, 64, 238, 238, 238, 238, 238, 238, + 106, 238, 107, 110, 111, 238, 112, 238, 238, 238, + 238, 238, 238, 238, 110, 113, 114, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 110, + 238, 114, 115, 116, 238, 117, 238, 238, 238, 238, + 238, 238, 238, 115, 113, 118, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 239, 233, 233, 239, 233, 239, 239, 239, 240, + 238, 238, 238, 238, 238, 238, 238, 238, 115, 238, - 233, 233, 233, 240, 240, 240, 240, 241, 233, 233, - 233, 241, 233, 241, 241, 241, 241, 242, 233, 243, - 233, 243, 233, 238, 245, 244, 238, 238, 238, 238, + 118, 126, 126, 238, 126, 238, 238, 238, 126, 126, + 126, 238, 126, 238, 126, 126, 126, 238, 126, 238, + 238, 126, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 126, 102, 103, 238, + 238, 238, 238, 104, 238, 238, 238, 238, 102, 105, + 103, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 102, 238, 103, 106, 107, 238, 238, + 238, 238, 108, 238, 238, 238, 238, 106, 105, 107, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 106, 238, 107, 102, 103, 238, 238, 238, + 238, 104, 238, 238, 238, 238, 102, 105, 103, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 102, 238, 103, 102, 103, 238, 238, 238, 238, + 104, 238, 238, 238, 238, 102, 105, 103, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 102, 238, 103, 102, 103, 238, 238, 238, 238, 104, + 238, 238, 238, 238, 102, 105, 103, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 102, + 238, 103, 110, 111, 238, 112, 238, 238, 238, 238, + 238, 238, 238, 110, 113, 114, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 233, 238, 238, 246, - 246, 233, 0, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233 - } ; + 238, 238, 238, 238, 238, 238, 238, 238, 110, 238, + 114, 115, 116, 238, 117, 238, 238, 238, 238, 238, + 238, 238, 115, 113, 118, 238, 238, 238, 238, 238, -static yyconst flex_int16_t yy_nxt[1033] = - { 0, - 12, 13, 14, 15, 16, 16, 17, 18, 19, 20, - 16, 21, 22, 23, 24, 25, 16, 26, 16, 16, - 12, 16, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 16, 16, 37, 16, 16, 38, 39, 40, - 16, 16, 41, 16, 42, 43, 44, 46, 47, 62, - 46, 47, 68, 73, 69, 232, 62, 63, 46, 48, - 49, 46, 48, 49, 63, 76, 79, 74, 121, 80, - 88, 77, 82, 83, 89, 146, 122, 227, 123, 227, - 84, 93, 94, 46, 229, 49, 46, 147, 49, 51, - 52, 228, 93, 95, 96, 53, 226, 97, 98, 225, - - 51, 54, 52, 129, 130, 121, 121, 224, 97, 95, - 99, 93, 94, 233, 122, 233, 233, 93, 223, 96, - 222, 221, 93, 95, 96, 51, 177, 52, 51, 52, - 178, 220, 219, 97, 53, 99, 218, 217, 216, 51, - 54, 52, 215, 214, 213, 97, 98, 93, 212, 96, - 93, 94, 211, 210, 209, 208, 97, 95, 99, 207, - 206, 93, 95, 96, 51, 205, 52, 56, 57, 227, - 58, 227, 204, 230, 203, 202, 201, 200, 56, 59, - 60, 97, 199, 99, 93, 94, 93, 198, 96, 93, - 94, 197, 196, 195, 194, 93, 95, 96, 193, 192, - - 93, 95, 96, 56, 191, 60, 56, 57, 190, 58, - 189, 188, 187, 186, 185, 184, 183, 56, 59, 60, - 93, 182, 96, 181, 180, 93, 179, 96, 176, 175, - 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, - 164, 163, 56, 162, 60, 101, 102, 161, 160, 159, - 158, 103, 157, 156, 155, 154, 101, 104, 102, 153, - 152, 151, 150, 119, 149, 148, 145, 144, 143, 142, - 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, - 131, 101, 128, 102, 105, 106, 127, 124, 65, 64, - 107, 119, 91, 90, 87, 105, 104, 106, 86, 85, - - 81, 78, 75, 72, 71, 70, 67, 65, 64, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 105, 233, 106, 109, 110, 233, 111, 233, 233, 233, - 233, 233, 233, 233, 109, 112, 113, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 109, - 233, 113, 114, 115, 233, 116, 233, 233, 233, 233, - 233, 233, 233, 114, 112, 117, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 114, 233, - - 117, 125, 125, 233, 125, 233, 233, 233, 125, 125, - 125, 233, 125, 233, 125, 125, 125, 233, 125, 233, - 233, 125, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 125, 101, 102, 233, - 233, 233, 233, 103, 233, 233, 233, 233, 101, 104, - 102, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 101, 233, 102, 105, 106, 233, 233, - 233, 233, 107, 233, 233, 233, 233, 105, 104, 106, - - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 105, 233, 106, 101, 102, 233, 233, 233, - 233, 103, 233, 233, 233, 233, 101, 104, 102, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 101, 233, 102, 101, 102, 233, 233, 233, 233, - 103, 233, 233, 233, 233, 101, 104, 102, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - - 101, 233, 102, 101, 102, 233, 233, 233, 233, 103, - 233, 233, 233, 233, 101, 104, 102, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 101, - 233, 102, 109, 110, 233, 111, 233, 233, 233, 233, - 233, 233, 233, 109, 112, 113, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 109, 233, - 113, 114, 115, 233, 116, 233, 233, 233, 233, 233, - 233, 233, 114, 112, 117, 233, 233, 233, 233, 233, - - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 114, 233, 117, - 109, 110, 233, 111, 233, 233, 233, 233, 233, 233, - 233, 109, 112, 113, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 109, 233, 113, 109, - 110, 233, 111, 233, 233, 233, 233, 233, 233, 233, - 109, 112, 113, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 109, 233, 113, 109, 110, - - 233, 111, 233, 233, 233, 233, 233, 233, 233, 109, - 112, 113, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 109, 233, 113, 109, 110, 233, - 111, 233, 233, 233, 233, 233, 233, 233, 109, 112, - 113, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 109, 233, 113, 125, 125, 233, 125, - 233, 233, 233, 125, 125, 125, 233, 125, 233, 125, - 125, 125, 233, 125, 233, 233, 125, 233, 233, 233, - - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 125, 45, 45, 45, 45, 45, 50, 50, 50, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 115, 238, 118, + 110, 111, 238, 112, 238, 238, 238, 238, 238, 238, + 238, 110, 113, 114, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 110, 238, 114, 110, + 111, 238, 112, 238, 238, 238, 238, 238, 238, 238, + 110, 113, 114, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 110, 238, 114, 110, 111, + + 238, 112, 238, 238, 238, 238, 238, 238, 238, 110, + 113, 114, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 110, 238, 114, 110, 111, 238, + 112, 238, 238, 238, 238, 238, 238, 238, 110, 113, + 114, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 110, 238, 114, 126, 126, 238, 126, + 238, 238, 238, 126, 126, 126, 238, 126, 238, 126, + 126, 126, 238, 126, 238, 238, 126, 238, 238, 238, + + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 126, 45, 45, 45, 45, 45, 50, 50, 50, 50, 50, 55, 55, 55, 55, 55, 61, 61, 61, - 61, 61, 66, 66, 66, 92, 92, 92, 92, 92, - 100, 100, 100, 100, 100, 108, 108, 108, 108, 108, - 118, 118, 118, 118, 120, 120, 120, 120, 120, 126, - 233, 126, 126, 126, 125, 233, 125, 125, 125, 231, - 231, 231, 233, 231, 11, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233 + 61, 61, 66, 66, 66, 93, 93, 93, 93, 93, + 101, 101, 101, 101, 101, 109, 109, 109, 109, 109, + 119, 119, 119, 119, 121, 121, 121, 121, 121, 127, + 238, 127, 127, 127, 126, 238, 126, 126, 126, 236, + 236, 236, 238, 236, 11, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238 } ; static yyconst flex_int16_t yy_chk[1033] = @@ -612,36 +614,36 @@ static yyconst flex_int16_t yy_chk[1033] = 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, 1, 1, 3, 3, 9, - 4, 4, 22, 29, 22, 231, 10, 9, 3, 3, + 4, 4, 22, 29, 22, 236, 10, 9, 3, 3, 3, 4, 4, 4, 10, 31, 33, 29, 63, 33, - 39, 31, 35, 35, 39, 89, 63, 219, 63, 219, - 35, 45, 45, 3, 223, 3, 4, 89, 4, 5, - 5, 222, 45, 45, 45, 5, 218, 48, 48, 217, - - 5, 5, 5, 73, 73, 120, 122, 215, 48, 48, - 48, 92, 92, 120, 122, 120, 122, 45, 214, 45, - 212, 210, 92, 92, 92, 5, 155, 5, 6, 6, - 155, 208, 207, 48, 6, 48, 206, 204, 202, 6, - 6, 6, 201, 200, 198, 95, 95, 92, 197, 92, - 97, 97, 196, 195, 194, 193, 95, 95, 95, 192, - 190, 97, 97, 97, 6, 189, 6, 7, 7, 227, - 7, 227, 188, 227, 187, 186, 184, 183, 7, 7, - 7, 95, 182, 95, 98, 98, 97, 181, 97, 99, - 99, 180, 179, 178, 177, 98, 98, 98, 174, 173, - - 99, 99, 99, 7, 172, 7, 8, 8, 171, 8, - 170, 169, 168, 167, 166, 164, 163, 8, 8, 8, - 98, 162, 98, 159, 158, 99, 156, 99, 154, 152, - 151, 150, 149, 148, 147, 146, 145, 144, 143, 142, - 141, 140, 8, 139, 8, 50, 50, 138, 137, 136, - 134, 50, 133, 132, 131, 130, 50, 50, 50, 129, - 128, 127, 124, 118, 91, 90, 88, 87, 86, 85, - 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, - 74, 50, 72, 50, 54, 54, 71, 67, 65, 64, - 54, 61, 41, 40, 38, 54, 54, 54, 37, 36, - - 34, 32, 30, 28, 27, 25, 17, 15, 13, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 39, 31, 35, 35, 39, 31, 63, 228, 63, 90, + 35, 45, 45, 3, 227, 3, 4, 223, 4, 5, + 5, 90, 45, 45, 45, 5, 222, 48, 48, 220, + + 5, 5, 5, 73, 73, 121, 123, 219, 48, 48, + 48, 93, 93, 121, 123, 121, 123, 45, 224, 45, + 224, 217, 93, 93, 93, 5, 157, 5, 6, 6, + 157, 215, 213, 48, 6, 48, 212, 211, 209, 6, + 6, 6, 207, 206, 205, 96, 96, 93, 203, 93, + 98, 98, 201, 200, 199, 198, 96, 96, 96, 197, + 196, 98, 98, 98, 6, 194, 6, 7, 7, 232, + 7, 232, 193, 232, 192, 191, 190, 188, 7, 7, + 7, 96, 187, 96, 99, 99, 98, 186, 98, 100, + 100, 185, 184, 183, 182, 99, 99, 99, 181, 180, + + 100, 100, 100, 7, 177, 7, 8, 8, 176, 8, + 175, 174, 173, 172, 171, 170, 169, 8, 8, 8, + 99, 167, 99, 166, 165, 100, 162, 100, 161, 160, + 158, 156, 154, 153, 152, 151, 150, 149, 148, 147, + 146, 145, 8, 144, 8, 50, 50, 143, 142, 141, + 140, 50, 139, 138, 136, 135, 50, 50, 50, 134, + 133, 132, 131, 130, 129, 128, 125, 119, 92, 91, + 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, + 79, 50, 78, 50, 54, 54, 77, 76, 75, 74, + 54, 72, 71, 67, 65, 54, 54, 54, 64, 61, + + 41, 40, 38, 37, 36, 34, 32, 30, 28, 27, + 25, 17, 15, 13, 11, 0, 0, 0, 0, 0, 54, 0, 54, 55, 55, 0, 55, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -655,72 +657,72 @@ static yyconst flex_int16_t yy_chk[1033] = 69, 0, 69, 0, 69, 69, 69, 0, 69, 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 69, 100, 100, 0, - 0, 0, 0, 100, 0, 0, 0, 0, 100, 100, - 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 69, 101, 101, 0, + 0, 0, 0, 101, 0, 0, 0, 0, 101, 101, + 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 100, 0, 100, 104, 104, 0, 0, - 0, 0, 104, 0, 0, 0, 0, 104, 104, 104, + 0, 0, 0, 101, 0, 101, 105, 105, 0, 0, + 0, 0, 105, 0, 0, 0, 0, 105, 105, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 104, 0, 104, 105, 105, 0, 0, 0, - 0, 105, 0, 0, 0, 0, 105, 105, 105, 0, + 0, 0, 105, 0, 105, 106, 106, 0, 0, 0, + 0, 106, 0, 0, 0, 0, 106, 106, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 105, 0, 105, 106, 106, 0, 0, 0, 0, - 106, 0, 0, 0, 0, 106, 106, 106, 0, 0, + 0, 106, 0, 106, 107, 107, 0, 0, 0, 0, + 107, 0, 0, 0, 0, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 106, 0, 106, 107, 107, 0, 0, 0, 0, 107, - 0, 0, 0, 0, 107, 107, 107, 0, 0, 0, + 107, 0, 107, 108, 108, 0, 0, 0, 0, 108, + 0, 0, 0, 0, 108, 108, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, - 0, 107, 108, 108, 0, 108, 0, 0, 0, 0, - 0, 0, 0, 108, 108, 108, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, + 0, 108, 109, 109, 0, 109, 0, 0, 0, 0, + 0, 0, 0, 109, 109, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 108, 0, - 108, 112, 112, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 112, 112, 112, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 109, 0, + 109, 113, 113, 0, 113, 0, 0, 0, 0, 0, + 0, 0, 113, 113, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 112, 0, 112, - 114, 114, 0, 114, 0, 0, 0, 0, 0, 0, - 0, 114, 114, 114, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 113, 0, 113, + 115, 115, 0, 115, 0, 0, 0, 0, 0, 0, + 0, 115, 115, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 114, 0, 114, 115, - 115, 0, 115, 0, 0, 0, 0, 0, 0, 0, - 115, 115, 115, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 115, 0, 115, 116, + 116, 0, 116, 0, 0, 0, 0, 0, 0, 0, + 116, 116, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 115, 0, 115, 116, 116, + 0, 0, 0, 0, 0, 116, 0, 116, 117, 117, - 0, 116, 0, 0, 0, 0, 0, 0, 0, 116, - 116, 116, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 117, 0, 0, 0, 0, 0, 0, 0, 117, + 117, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 116, 0, 116, 117, 117, 0, - 117, 0, 0, 0, 0, 0, 0, 0, 117, 117, - 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 117, 0, 117, 118, 118, 0, + 118, 0, 0, 0, 0, 0, 0, 0, 118, 118, + 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 117, 0, 117, 126, 126, 0, 126, - 0, 0, 0, 126, 126, 126, 0, 126, 0, 126, - 126, 126, 0, 126, 0, 0, 126, 0, 0, 0, + 0, 0, 0, 118, 0, 118, 127, 127, 0, 127, + 0, 0, 0, 127, 127, 127, 0, 127, 0, 127, + 127, 127, 0, 127, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 126, 234, 234, 234, 234, 234, 235, 235, 235, - 235, 235, 236, 236, 236, 236, 236, 237, 237, 237, - 237, 237, 238, 238, 238, 239, 239, 239, 239, 239, - 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, - 242, 242, 242, 242, 243, 243, 243, 243, 243, 244, - 0, 244, 244, 244, 245, 0, 245, 245, 245, 246, - 246, 246, 0, 246, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233 + 0, 127, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 241, 241, 241, 241, 241, 242, 242, 242, + 242, 242, 243, 243, 243, 244, 244, 244, 244, 244, + 245, 245, 245, 245, 245, 246, 246, 246, 246, 246, + 247, 247, 247, 247, 248, 248, 248, 248, 248, 249, + 0, 249, 249, 249, 250, 0, 250, 250, 250, 251, + 251, 251, 0, 251, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238 } ; /* The intent behind this definition is that it'll catch @@ -889,7 +891,7 @@ static void pbcwhere(const char *text, int *line, int *col ) #define STORE_POS #define STORE_LOC #endif -#line 892 "ael_lex.c" +#line 894 "ael_lex.c" #define INITIAL 0 #define paren 1 @@ -1133,7 +1135,7 @@ YY_DECL #line 181 "ael.flex" -#line 1136 "ael_lex.c" +#line 1138 "ael_lex.c" yylval = yylval_param; @@ -1196,13 +1198,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 >= 234 ) + if ( yy_current_state >= 239 ) 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 != 233 ); + while ( yy_current_state != 238 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -1300,174 +1302,179 @@ YY_RULE_SETUP case 16: YY_RULE_SETUP #line 198 "ael.flex" -{ STORE_POS; return KW_MACRO;}; +{ STORE_POS; return KW_EXTEND;} YY_BREAK case 17: YY_RULE_SETUP #line 199 "ael.flex" -{ STORE_POS; return KW_GLOBALS;} +{ STORE_POS; return KW_MACRO;}; YY_BREAK case 18: YY_RULE_SETUP #line 200 "ael.flex" -{ STORE_POS; return KW_IGNOREPAT;} +{ STORE_POS; return KW_GLOBALS;} YY_BREAK case 19: YY_RULE_SETUP #line 201 "ael.flex" -{ STORE_POS; return KW_SWITCH;} +{ STORE_POS; return KW_IGNOREPAT;} YY_BREAK case 20: YY_RULE_SETUP #line 202 "ael.flex" -{ STORE_POS; return KW_IF;} +{ STORE_POS; return KW_SWITCH;} YY_BREAK case 21: YY_RULE_SETUP #line 203 "ael.flex" -{ STORE_POS; return KW_IFTIME;} +{ STORE_POS; return KW_IF;} YY_BREAK case 22: YY_RULE_SETUP #line 204 "ael.flex" -{ STORE_POS; return KW_RANDOM;} +{ STORE_POS; return KW_IFTIME;} YY_BREAK case 23: YY_RULE_SETUP #line 205 "ael.flex" -{ STORE_POS; return KW_REGEXTEN;} +{ STORE_POS; return KW_RANDOM;} YY_BREAK case 24: YY_RULE_SETUP #line 206 "ael.flex" -{ STORE_POS; return KW_HINT;} +{ STORE_POS; return KW_REGEXTEN;} YY_BREAK case 25: YY_RULE_SETUP #line 207 "ael.flex" -{ STORE_POS; return KW_ELSE;} +{ STORE_POS; return KW_HINT;} YY_BREAK case 26: YY_RULE_SETUP #line 208 "ael.flex" -{ STORE_POS; return KW_GOTO;} +{ STORE_POS; return KW_ELSE;} YY_BREAK case 27: YY_RULE_SETUP #line 209 "ael.flex" -{ STORE_POS; return KW_JUMP;} +{ STORE_POS; return KW_GOTO;} YY_BREAK case 28: YY_RULE_SETUP #line 210 "ael.flex" -{ STORE_POS; return KW_RETURN;} +{ STORE_POS; return KW_JUMP;} YY_BREAK case 29: YY_RULE_SETUP #line 211 "ael.flex" -{ STORE_POS; return KW_BREAK;} +{ STORE_POS; return KW_RETURN;} YY_BREAK case 30: YY_RULE_SETUP #line 212 "ael.flex" -{ STORE_POS; return KW_CONTINUE;} +{ STORE_POS; return KW_BREAK;} YY_BREAK case 31: YY_RULE_SETUP #line 213 "ael.flex" -{ STORE_POS; return KW_FOR;} +{ STORE_POS; return KW_CONTINUE;} YY_BREAK case 32: YY_RULE_SETUP #line 214 "ael.flex" -{ STORE_POS; return KW_WHILE;} +{ STORE_POS; return KW_FOR;} YY_BREAK case 33: YY_RULE_SETUP #line 215 "ael.flex" -{ STORE_POS; return KW_CASE;} +{ STORE_POS; return KW_WHILE;} YY_BREAK case 34: YY_RULE_SETUP #line 216 "ael.flex" -{ STORE_POS; return KW_DEFAULT;} +{ STORE_POS; return KW_CASE;} YY_BREAK case 35: YY_RULE_SETUP #line 217 "ael.flex" -{ STORE_POS; return KW_PATTERN;} +{ STORE_POS; return KW_DEFAULT;} YY_BREAK case 36: YY_RULE_SETUP #line 218 "ael.flex" -{ STORE_POS; return KW_CATCH;} +{ STORE_POS; return KW_PATTERN;} YY_BREAK case 37: YY_RULE_SETUP #line 219 "ael.flex" -{ STORE_POS; return KW_SWITCHES;} +{ STORE_POS; return KW_CATCH;} YY_BREAK case 38: YY_RULE_SETUP #line 220 "ael.flex" -{ STORE_POS; return KW_ESWITCHES;} +{ STORE_POS; return KW_SWITCHES;} YY_BREAK case 39: YY_RULE_SETUP #line 221 "ael.flex" -{ STORE_POS; return KW_INCLUDES;} +{ STORE_POS; return KW_ESWITCHES;} YY_BREAK case 40: YY_RULE_SETUP #line 222 "ael.flex" -{ BEGIN(comment); my_col += 2; } +{ STORE_POS; return KW_INCLUDES;} YY_BREAK case 41: YY_RULE_SETUP -#line 224 "ael.flex" -{ my_col += yyleng; } +#line 223 "ael.flex" +{ BEGIN(comment); my_col += 2; } YY_BREAK case 42: -/* rule 42 can match eol */ YY_RULE_SETUP #line 225 "ael.flex" -{ ++my_lineno; my_col=1;} +{ my_col += yyleng; } YY_BREAK case 43: +/* rule 43 can match eol */ YY_RULE_SETUP #line 226 "ael.flex" -{ my_col += yyleng; } +{ ++my_lineno; my_col=1;} YY_BREAK case 44: -/* rule 44 can match eol */ YY_RULE_SETUP #line 227 "ael.flex" -{ ++my_lineno; my_col=1;} +{ my_col += yyleng; } YY_BREAK case 45: +/* rule 45 can match eol */ YY_RULE_SETUP #line 228 "ael.flex" -{ my_col += 2; BEGIN(INITIAL); } +{ ++my_lineno; my_col=1;} YY_BREAK case 46: -/* rule 46 can match eol */ YY_RULE_SETUP -#line 230 "ael.flex" -{ my_lineno++; my_col = 1; } +#line 229 "ael.flex" +{ my_col += 2; BEGIN(INITIAL); } YY_BREAK case 47: +/* rule 47 can match eol */ YY_RULE_SETUP #line 231 "ael.flex" -{ my_col += yyleng; } +{ my_lineno++; my_col = 1; } YY_BREAK case 48: YY_RULE_SETUP #line 232 "ael.flex" -{ my_col += (yyleng*8)-(my_col%8); } +{ my_col += yyleng; } YY_BREAK case 49: YY_RULE_SETUP -#line 234 "ael.flex" +#line 233 "ael.flex" +{ my_col += (yyleng*8)-(my_col%8); } + YY_BREAK +case 50: +YY_RULE_SETUP +#line 235 "ael.flex" { STORE_POS; yylval->str = strdup(yytext); @@ -1482,10 +1489,10 @@ YY_RULE_SETUP * A comma at the top level is valid here, unlike in argg where it * is an argument separator so it must be returned as a token. */ -case 50: -/* rule 50 can match eol */ +case 51: +/* rule 51 can match eol */ YY_RULE_SETUP -#line 250 "ael.flex" +#line 251 "ael.flex" { if ( pbcpop(')') ) { /* error */ STORE_LOC; @@ -1508,10 +1515,10 @@ YY_RULE_SETUP } } YY_BREAK -case 51: -/* rule 51 can match eol */ +case 52: +/* rule 52 can match eol */ YY_RULE_SETUP -#line 272 "ael.flex" +#line 273 "ael.flex" { char c = yytext[yyleng-1]; if (c == '(') @@ -1520,10 +1527,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 52: -/* rule 52 can match eol */ +case 53: +/* rule 53 can match eol */ YY_RULE_SETUP -#line 280 "ael.flex" +#line 281 "ael.flex" { char c = yytext[yyleng-1]; if ( pbcpop(c)) { /* error */ @@ -1545,10 +1552,10 @@ YY_RULE_SETUP * of the (external) call, which happens when parencount == 0 * before the decrement. */ -case 53: -/* rule 53 can match eol */ +case 54: +/* rule 54 can match eol */ YY_RULE_SETUP -#line 302 "ael.flex" +#line 303 "ael.flex" { char c = yytext[yyleng-1]; if (c == '(') @@ -1557,10 +1564,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 54: -/* rule 54 can match eol */ +case 55: +/* rule 55 can match eol */ YY_RULE_SETUP -#line 310 "ael.flex" +#line 311 "ael.flex" { if ( pbcpop(')') ) { /* error */ STORE_LOC; @@ -1585,10 +1592,10 @@ YY_RULE_SETUP } } YY_BREAK -case 55: -/* rule 55 can match eol */ +case 56: +/* rule 56 can match eol */ YY_RULE_SETUP -#line 334 "ael.flex" +#line 335 "ael.flex" { if( parencount != 0) { /* printf("Folding in a comma!\n"); */ yymore(); @@ -1603,10 +1610,10 @@ YY_RULE_SETUP } } YY_BREAK -case 56: -/* rule 56 can match eol */ +case 57: +/* rule 57 can match eol */ YY_RULE_SETUP -#line 348 "ael.flex" +#line 349 "ael.flex" { char c = yytext[yyleng-1]; if ( pbcpop(c) ) { /* error */ @@ -1624,20 +1631,20 @@ YY_RULE_SETUP * or in the first and second operand of a 'for'. As above, match * commas and use ';' as a separator (hence return it as a separate token). */ -case 57: -/* rule 57 can match eol */ +case 58: +/* rule 58 can match eol */ YY_RULE_SETUP -#line 365 "ael.flex" +#line 366 "ael.flex" { char c = yytext[yyleng-1]; yymore(); pbcpush(c); } YY_BREAK -case 58: -/* rule 58 can match eol */ +case 59: +/* rule 59 can match eol */ YY_RULE_SETUP -#line 371 "ael.flex" +#line 372 "ael.flex" { char c = yytext[yyleng-1]; if ( pbcpop(c) ) { /* error */ @@ -1650,10 +1657,10 @@ YY_RULE_SETUP yymore(); } YY_BREAK -case 59: -/* rule 59 can match eol */ +case 60: +/* rule 60 can match eol */ YY_RULE_SETUP -#line 383 "ael.flex" +#line 384 "ael.flex" { STORE_LOC; yylval->str = strdup(yytext); @@ -1663,10 +1670,10 @@ YY_RULE_SETUP return word; } YY_BREAK -case 60: -/* rule 60 can match eol */ +case 61: +/* rule 61 can match eol */ YY_RULE_SETUP -#line 392 "ael.flex" +#line 393 "ael.flex" { char fnamebuf[1024],*p1,*p2; int glob_ret; @@ -1712,7 +1719,7 @@ case YY_STATE_EOF(paren): case YY_STATE_EOF(semic): case YY_STATE_EOF(argg): case YY_STATE_EOF(comment): -#line 433 "ael.flex" +#line 434 "ael.flex" { char fnamebuf[2048]; if (include_stack_index > 0 && include_stack[include_stack_index-1].globbuf_pos < include_stack[include_stack_index-1].globbuf.gl_pathc-1) { @@ -1747,12 +1754,12 @@ case YY_STATE_EOF(comment): } } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 467 "ael.flex" +#line 468 "ael.flex" ECHO; YY_BREAK -#line 1755 "ael_lex.c" +#line 1762 "ael_lex.c" case YY_END_OF_BUFFER: { @@ -2037,7 +2044,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 >= 234 ) + if ( yy_current_state >= 239 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2066,11 +2073,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 >= 234 ) + if ( yy_current_state >= 239 ) 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 == 233); + yy_is_jam = (yy_current_state == 238); return yy_is_jam ? 0 : yy_current_state; } @@ -2888,7 +2895,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner) #undef YY_DECL_IS_OURS #undef YY_DECL #endif -#line 467 "ael.flex" +#line 468 "ael.flex" |