[svn-commits] murf: trunk r41527 - in /trunk/pbx/ael: ./ ael-test/
ael-test/ael-test15/ ael...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Aug 30 19:53:16 MST 2006
Author: murf
Date: Wed Aug 30 21:53:15 2006
New Revision: 41527
URL: http://svn.digium.com/view/asterisk?rev=41527&view=rev
Log:
This commit is a basic AEL enhancement: c-style comments
Added:
trunk/pbx/ael/ael-test/ael-test15/
- copied from r41526, team/murf/AEL-blockcomments/pbx/ael/ael-test/ael-test15/
trunk/pbx/ael/ael-test/ael-test15/extensions.ael
- copied unchanged from r41526, team/murf/AEL-blockcomments/pbx/ael/ael-test/ael-test15/extensions.ael
trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
- copied unchanged from r41526, team/murf/AEL-blockcomments/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
trunk/pbx/ael/ael-test/ref.ael-test15
- copied unchanged from r41526, team/murf/AEL-blockcomments/pbx/ael/ael-test/ref.ael-test15
Modified:
trunk/pbx/ael/ael-test/ael-test3/extensions.ael
trunk/pbx/ael/ael-test/ref.ael-test3
trunk/pbx/ael/ael.flex
trunk/pbx/ael/ael_lex.c
Modified: trunk/pbx/ael/ael-test/ael-test3/extensions.ael
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ael-test3/extensions.ael?rev=41527&r1=41526&r2=41527&view=diff
==============================================================================
--- trunk/pbx/ael/ael-test/ael-test3/extensions.ael (original)
+++ trunk/pbx/ael/ael-test/ael-test3/extensions.ael Wed Aug 30 21:53:15 2006
@@ -3178,6 +3178,6 @@
// now include the telemarketer torture scripts!
-#include "/etc/asterisk/telemarket_torture.ael2"
-
-
+#include "telemarket_torture.ael2"
+
+
Modified: trunk/pbx/ael/ael-test/ref.ael-test3
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test3?rev=41527&r1=41526&r2=41527&view=diff
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test3 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-test3 Wed Aug 30 21:53:15 2006
@@ -2,17 +2,17 @@
(If you find progress and other non-error messages irritating, you can use -q to suppress them)
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:../pbx/pbx_ael.c line:3747 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3754 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file /etc/asterisk/telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:../pbx/pbx_ael.c line:3757 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3760 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3762 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3765 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3768 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:458 func: main 172 contexts, 858 extensions, 2326 priorities
+LOG: lev:2 file:../pbx/pbx_ael.c line:3797 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3804 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:../pbx/pbx_ael.c line:3807 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3810 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3812 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3815 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3818 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse line:479 func: main 172 contexts, 858 extensions, 2326 priorities
Modified: trunk/pbx/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.flex?rev=41527&r1=41526&r2=41527&view=diff
==============================================================================
--- trunk/pbx/ael/ael.flex (original)
+++ trunk/pbx/ael/ael.flex Wed Aug 30 21:53:15 2006
@@ -26,7 +26,7 @@
*
* %x describes the contexts we have: paren, semic and argg, plus INITIAL
*/
-%x paren semic argg
+%x paren semic argg comment
/* prefix used for various globally-visible functions and variables.
* This renames also yywrap, but since we do not use it, we just
@@ -211,6 +211,13 @@
switches { STORE_POS; return KW_SWITCHES;}
eswitches { STORE_POS; return KW_ESWITCHES;}
includes { STORE_POS; return KW_INCLUDES;}
+"/*" { BEGIN(comment); my_col += 2; }
+
+<comment>[^*\n]* { my_col += yyleng; }
+<comment>[^*\n]*\n { ++my_lineno; my_col=1;}
+<comment>"*"+[^*/\n]* { my_col += yyleng; }
+<comment>"*"+[^*/\n]*\n { ++my_lineno; my_col=1;}
+<comment>"*/" { my_col += 2; BEGIN(INITIAL); }
\n { my_lineno++; my_col = 1; }
[ ]+ { my_col += yyleng; }
Modified: trunk/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael_lex.c?rev=41527&r1=41526&r2=41527&view=diff
==============================================================================
--- trunk/pbx/ael/ael_lex.c (original)
+++ trunk/pbx/ael/ael_lex.c Wed Aug 30 21:53:15 2006
@@ -345,8 +345,8 @@
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 55
-#define YY_END_OF_BUFFER 56
+#define YY_NUM_RULES 61
+#define YY_END_OF_BUFFER 62
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -354,33 +354,34 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[222] =
+static yyconst flex_int16_t yy_accept[234] =
{ 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 56, 55,
- 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, 55, 45, 44, 55, 46, 55, 51, 52,
- 53, 55, 55, 47, 48, 49, 55, 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, 0, 46,
- 45, 44, 46, 0, 51, 52, 53, 0, 51, 52,
-
- 53, 0, 47, 48, 49, 0, 50, 47, 48, 49,
- 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, 54,
- 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
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -389,16 +390,16 @@
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 5, 6, 7, 5, 1, 8, 5, 9,
- 10, 5, 5, 11, 5, 5, 12, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 13, 14, 5,
- 15, 16, 1, 17, 5, 5, 5, 5, 5, 5,
+ 10, 11, 5, 12, 5, 5, 13, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 14, 15, 5,
+ 16, 17, 1, 18, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 18, 5, 5, 5, 5, 5, 5,
- 19, 20, 21, 1, 5, 1, 22, 23, 24, 25,
-
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 5, 38, 39, 40, 41, 5, 42, 43,
- 5, 5, 44, 45, 46, 1, 1, 1, 1, 1,
+ 5, 5, 5, 19, 5, 5, 5, 5, 5, 5,
+ 20, 21, 22, 1, 5, 1, 23, 24, 25, 26,
+
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 5, 39, 40, 41, 42, 5, 43, 44,
+ 5, 5, 45, 46, 47, 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, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -415,363 +416,311 @@
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[47] =
+static yyconst flex_int32_t yy_meta[48] =
{ 0,
1, 1, 2, 1, 3, 4, 3, 1, 1, 1,
- 1, 3, 1, 1, 1, 3, 1, 3, 3, 1,
+ 5, 1, 3, 1, 1, 1, 3, 1, 3, 3,
+ 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 1, 3
+ 3, 3, 3, 3, 3, 1, 3
} ;
-static yyconst flex_int16_t yy_base[232] =
+static yyconst flex_int16_t yy_base[247] =
{ 0,
- 0, 0, 38, 76, 114, 152, 190, 228, 220, 1238,
- 217, 1238, 214, 0, 187, 1238, 1238, 1238, 1238, 204,
- 1238, 1238, 199, 1238, 191, 175, 27, 186, 17, 172,
- 18, 177, 25, 165, 183, 182, 39, 161, 173, 1238,
- 1238, 1238, 266, 1238, 1238, 304, 1238, 342, 1238, 1238,
- 1238, 380, 418, 1238, 1238, 1238, 456, 1238, 195, 191,
- 0, 159, 502, 1238, 154, 166, 27, 156, 163, 150,
- 146, 149, 150, 145, 149, 165, 147, 157, 146, 155,
- 138, 142, 34, 146, 145, 539, 1238, 1238, 577, 1238,
- 615, 653, 691, 729, 1238, 1238, 1238, 767, 805, 843,
-
- 881, 919, 1238, 1238, 1238, 957, 1238, 995, 1033, 1071,
- 1109, 150, 0, 1155, 130, 147, 142, 143, 125, 142,
- 137, 129, 0, 134, 120, 115, 124, 117, 119, 114,
- 112, 109, 123, 121, 105, 105, 111, 110, 104, 109,
- 0, 111, 38, 98, 0, 98, 115, 0, 0, 102,
- 94, 90, 0, 94, 103, 91, 83, 87, 97, 93,
- 77, 95, 0, 0, 73, 80, 81, 89, 79, 85,
- 84, 84, 0, 70, 73, 66, 70, 75, 0, 78,
- 78, 61, 59, 59, 69, 55, 0, 56, 66, 56,
- 0, 64, 0, 63, 62, 47, 0, 57, 0, 55,
-
- 0, 58, 40, 0, 43, 37, 67, 0, 0, 33,
- 30, 0, 0, 0, 71, 0, 0, 0, 49, 1238,
- 1238, 1200, 1204, 1208, 1210, 1214, 1218, 1222, 1226, 1230,
- 1234
+ 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,
+ 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
} ;
-static yyconst flex_int16_t yy_def[232] =
+static yyconst flex_int16_t yy_def[247] =
{ 0,
- 221, 1, 222, 222, 223, 223, 224, 224, 221, 221,
- 221, 221, 221, 225, 225, 221, 221, 221, 221, 225,
- 221, 221, 221, 221, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 221,
- 221, 221, 226, 221, 221, 226, 221, 227, 221, 221,
- 221, 227, 228, 221, 221, 221, 228, 221, 221, 221,
- 225, 225, 229, 221, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 226, 221, 221, 226, 221,
- 226, 226, 226, 227, 221, 221, 221, 227, 227, 227,
-
- 227, 228, 221, 221, 221, 228, 221, 228, 228, 228,
- 228, 225, 230, 229, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
-
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 221, 225, 225, 231, 231, 221,
- 0, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221
+ 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, 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, 238, 238, 238, 238, 238, 238, 238, 238, 238,
+ 238, 238, 238, 238, 238, 238, 238, 238, 238, 238,
+ 238, 239, 233, 233, 239, 233, 239, 239, 239, 240,
+
+ 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,
+ 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, 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, 233, 238, 238, 246,
+ 246, 233, 0, 233, 233, 233, 233, 233, 233, 233,
+ 233, 233, 233, 233, 233, 233
} ;
-static yyconst flex_int16_t yy_nxt[1285] =
+static yyconst flex_int16_t yy_nxt[1033] =
{ 0,
- 10, 11, 12, 13, 14, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 14, 24, 14, 14, 10,
- 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, 67, 70,
- 73, 76, 77, 74, 220, 71, 44, 46, 47, 78,
- 82, 134, 68, 165, 83, 117, 118, 166, 215, 217,
- 215, 216, 215, 135, 215, 214, 218, 213, 212, 211,
- 210, 44, 209, 47, 44, 45, 208, 207, 206, 205,
- 204, 203, 202, 201, 44, 46, 47, 200, 199, 198,
-
- 197, 196, 195, 194, 193, 192, 191, 190, 189, 188,
- 187, 186, 185, 184, 183, 182, 181, 180, 179, 44,
- 178, 47, 49, 50, 177, 176, 175, 51, 174, 173,
- 172, 171, 49, 52, 50, 170, 169, 168, 167, 164,
- 163, 162, 161, 160, 159, 158, 157, 156, 155, 154,
- 153, 152, 151, 150, 149, 148, 147, 49, 146, 50,
- 49, 50, 145, 144, 143, 51, 142, 141, 140, 139,
- 49, 52, 50, 138, 137, 136, 133, 132, 131, 130,
- 129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
- 119, 116, 115, 112, 60, 49, 59, 50, 54, 55,
-
- 56, 85, 84, 81, 80, 79, 75, 72, 54, 57,
- 58, 69, 66, 65, 64, 63, 62, 60, 59, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 54, 221, 58, 54, 55, 56, 221,
- 221, 221, 221, 221, 221, 221, 54, 57, 58, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 54, 221, 58, 87, 88, 221, 221, 221, 221,
- 221, 221, 221, 221, 87, 89, 90, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
-
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 87,
- 221, 90, 91, 92, 221, 221, 221, 221, 221, 221,
- 221, 221, 91, 89, 93, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 91, 221, 93,
- 95, 96, 221, 221, 221, 97, 221, 221, 221, 221,
- 95, 98, 96, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 95, 221, 96, 99, 100,
- 221, 221, 221, 101, 221, 221, 221, 221, 99, 98,
-
- 100, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 99, 221, 100, 103, 104, 105, 221,
- 221, 221, 221, 221, 221, 221, 103, 106, 107, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 103, 221, 107, 108, 109, 110, 221, 221, 221,
- 221, 221, 221, 221, 108, 106, 111, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 108,
-
- 221, 111, 113, 113, 221, 113, 221, 221, 221, 113,
- 113, 113, 113, 221, 113, 113, 113, 221, 113, 221,
- 221, 113, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 113, 87, 88, 221,
- 221, 221, 221, 221, 221, 221, 221, 87, 89, 90,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 87, 221, 90, 91, 92, 221, 221, 221,
- 221, 221, 221, 221, 221, 91, 89, 93, 221, 221,
-
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 91, 221, 93, 87, 88, 221, 221, 221, 221, 221,
- 221, 221, 221, 87, 89, 90, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 87, 221,
- 90, 87, 88, 221, 221, 221, 221, 221, 221, 221,
- 221, 87, 89, 90, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 87, 221, 90, 87,
-
- 88, 221, 221, 221, 221, 221, 221, 221, 221, 87,
- 89, 90, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 87, 221, 90, 95, 96, 221,
- 221, 221, 97, 221, 221, 221, 221, 95, 98, 96,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 95, 221, 96, 99, 100, 221, 221, 221,
- 101, 221, 221, 221, 221, 99, 98, 100, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
-
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 99, 221, 100, 95, 96, 221, 221, 221, 97, 221,
- 221, 221, 221, 95, 98, 96, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 95, 221,
- 96, 95, 96, 221, 221, 221, 97, 221, 221, 221,
- 221, 95, 98, 96, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 95, 221, 96, 95,
- 96, 221, 221, 221, 97, 221, 221, 221, 221, 95,
-
- 98, 96, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 95, 221, 96, 103, 104, 105,
- 221, 221, 221, 221, 221, 221, 221, 103, 106, 107,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 103, 221, 107, 108, 109, 110, 221, 221,
- 221, 221, 221, 221, 221, 108, 106, 111, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
-
- 108, 221, 111, 103, 104, 105, 221, 221, 221, 221,
- 221, 221, 221, 103, 106, 107, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 103, 221,
- 107, 103, 104, 105, 221, 221, 221, 221, 221, 221,
- 221, 103, 106, 107, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 103, 221, 107, 103,
- 104, 105, 221, 221, 221, 221, 221, 221, 221, 103,
- 106, 107, 221, 221, 221, 221, 221, 221, 221, 221,
-
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 103, 221, 107, 103, 104, 105,
- 221, 221, 221, 221, 221, 221, 221, 103, 106, 107,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 103, 221, 107, 113, 113, 221, 113, 221,
- 221, 221, 113, 113, 113, 113, 221, 113, 113, 113,
- 221, 113, 221, 221, 113, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 113,
-
- 43, 43, 43, 43, 48, 48, 48, 48, 53, 53,
- 53, 53, 61, 61, 86, 86, 86, 86, 94, 94,
- 94, 94, 102, 102, 102, 102, 114, 221, 114, 114,
- 113, 221, 113, 113, 219, 219, 219, 9, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
- 221, 221, 221, 221
+ 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,
+ 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
} ;
-static yyconst flex_int16_t yy_chk[1285] =
+static yyconst flex_int16_t yy_chk[1033] =
{ 0,
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, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 3, 27, 29,
- 31, 33, 33, 31, 219, 29, 3, 3, 3, 33,
- 37, 83, 27, 143, 37, 67, 67, 143, 207, 211,
- 207, 210, 215, 83, 215, 206, 215, 205, 203, 202,
- 200, 3, 198, 3, 4, 4, 196, 195, 194, 192,
- 190, 189, 188, 186, 4, 4, 4, 185, 184, 183,
-
- 182, 181, 180, 178, 177, 176, 175, 174, 172, 171,
- 170, 169, 168, 167, 166, 165, 162, 161, 160, 4,
- 159, 4, 5, 5, 158, 157, 156, 5, 155, 154,
- 152, 151, 5, 5, 5, 150, 147, 146, 144, 142,
- 140, 139, 138, 137, 136, 135, 134, 133, 132, 131,
- 130, 129, 128, 127, 126, 125, 124, 5, 122, 5,
- 6, 6, 121, 120, 119, 6, 118, 117, 116, 115,
- 6, 6, 6, 112, 85, 84, 82, 81, 80, 79,
- 78, 77, 76, 75, 74, 73, 72, 71, 70, 69,
- 68, 66, 65, 62, 60, 6, 59, 6, 7, 7,
-
- 7, 39, 38, 36, 35, 34, 32, 30, 7, 7,
- 7, 28, 26, 25, 23, 20, 15, 13, 11, 9,
+ 1, 1, 1, 1, 1, 1, 1, 3, 3, 9,
+ 4, 4, 22, 29, 22, 231, 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,
- 0, 0, 0, 7, 0, 7, 8, 8, 8, 0,
- 0, 0, 0, 0, 0, 0, 8, 8, 8, 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 55,
+ 0, 55, 59, 59, 0, 59, 0, 0, 0, 0,
+ 0, 0, 0, 59, 59, 59, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 59, 0,
+
+ 59, 69, 69, 0, 69, 0, 0, 0, 69, 69,
+ 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, 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, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 8, 0, 8, 43, 43, 0, 0, 0, 0,
- 0, 0, 0, 0, 43, 43, 43, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 43,
- 0, 43, 46, 46, 0, 0, 0, 0, 0, 0,
- 0, 0, 46, 46, 46, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 46, 0, 46,
- 48, 48, 0, 0, 0, 48, 0, 0, 0, 0,
[... 533 lines stripped ...]
More information about the svn-commits
mailing list