[svn-commits] trunk r24341 - in /trunk/pbx/ael: ael.tab.c ael.y
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue May 2 13:18:03 MST 2006
Author: rizzo
Date: Tue May 2 15:18:02 2006
New Revision: 24341
URL: http://svn.digium.com/view/asterisk?rev=24341&view=rev
Log:
simplify case statements
Modified:
trunk/pbx/ael/ael.tab.c
trunk/pbx/ael/ael.y
Modified: trunk/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.tab.c?rev=24341&r1=24340&r2=24341&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Tue May 2 15:18:02 2006
@@ -420,7 +420,7 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 14
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 383
+#define YYLAST 382
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 42
@@ -429,7 +429,7 @@
/* YYNRULES -- Number of rules. */
#define YYNRULES 141
/* YYNRULES -- Number of states. */
-#define YYNSTATES 268
+#define YYNSTATES 267
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -485,14 +485,14 @@
108, 110, 115, 119, 124, 132, 141, 143, 146, 149,
155, 157, 165, 166, 171, 174, 177, 182, 184, 187,
189, 192, 196, 198, 201, 205, 209, 213, 215, 219,
- 223, 226, 227, 228, 229, 242, 246, 249, 253, 257,
- 260, 263, 264, 270, 273, 276, 279, 283, 285, 288,
- 289, 291, 295, 299, 305, 311, 317, 323, 325, 329,
- 335, 339, 345, 349, 350, 356, 360, 361, 365, 369,
- 372, 374, 375, 377, 378, 382, 384, 387, 392, 396,
- 401, 405, 408, 412, 413, 415, 418, 420, 426, 429,
- 432, 436, 439, 442, 446, 449, 452, 457, 459, 462,
- 465, 470
+ 223, 226, 227, 228, 229, 242, 246, 250, 254, 257,
+ 260, 261, 267, 270, 273, 276, 280, 282, 285, 286,
+ 288, 292, 296, 302, 308, 314, 320, 322, 326, 332,
+ 336, 342, 346, 347, 353, 357, 358, 362, 366, 369,
+ 371, 372, 374, 375, 379, 380, 382, 385, 390, 394,
+ 399, 403, 406, 410, 411, 413, 416, 418, 424, 427,
+ 430, 434, 437, 440, 444, 447, 450, 455, 457, 460,
+ 463, 468
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -522,30 +522,30 @@
60, 5, -1, 52, -1, 25, 76, 8, -1, 26,
77, 8, -1, 41, 11, -1, -1, -1, -1, 32,
6, 71, 41, 8, 72, 41, 8, 73, 41, 7,
- 70, -1, 33, 63, 70, -1, 69, 5, -1, 69,
- 85, 5, -1, 12, 78, 8, -1, 82, 8, -1,
- 41, 8, -1, -1, 82, 9, 74, 41, 8, -1,
- 28, 8, -1, 27, 8, -1, 29, 8, -1, 65,
- 70, 75, -1, 8, -1, 21, 70, -1, -1, 68,
- -1, 68, 13, 68, -1, 68, 10, 68, -1, 68,
- 13, 68, 13, 68, -1, 68, 10, 68, 10, 68,
- -1, 36, 13, 68, 13, 68, -1, 36, 10, 68,
- 10, 68, -1, 68, -1, 68, 10, 68, -1, 68,
- 10, 41, 14, 41, -1, 68, 14, 68, -1, 68,
- 10, 41, 14, 36, -1, 68, 14, 36, -1, -1,
- 41, 6, 79, 84, 7, -1, 41, 6, 7, -1,
- -1, 41, 6, 81, -1, 80, 84, 7, -1, 80,
- 7, -1, 41, -1, -1, 66, -1, -1, 84, 10,
- 83, -1, 86, -1, 85, 86, -1, 34, 41, 11,
- 60, -1, 36, 11, 60, -1, 35, 41, 11, 60,
- -1, 34, 41, 11, -1, 36, 11, -1, 35, 41,
- 11, -1, -1, 88, -1, 87, 88, -1, 70, -1,
- 37, 41, 4, 60, 5, -1, 38, 91, -1, 39,
- 91, -1, 4, 92, 5, -1, 4, 5, -1, 41,
- 8, -1, 92, 41, 8, -1, 92, 1, -1, 46,
- 8, -1, 46, 13, 62, 8, -1, 93, -1, 94,
- 93, -1, 94, 1, -1, 40, 4, 94, 5, -1,
- 40, 4, 5, -1
+ 70, -1, 33, 63, 70, -1, 69, 85, 5, -1,
+ 12, 78, 8, -1, 82, 8, -1, 41, 8, -1,
+ -1, 82, 9, 74, 41, 8, -1, 28, 8, -1,
+ 27, 8, -1, 29, 8, -1, 65, 70, 75, -1,
+ 8, -1, 21, 70, -1, -1, 68, -1, 68, 13,
+ 68, -1, 68, 10, 68, -1, 68, 13, 68, 13,
+ 68, -1, 68, 10, 68, 10, 68, -1, 36, 13,
+ 68, 13, 68, -1, 36, 10, 68, 10, 68, -1,
+ 68, -1, 68, 10, 68, -1, 68, 10, 41, 14,
+ 41, -1, 68, 14, 68, -1, 68, 10, 41, 14,
+ 36, -1, 68, 14, 36, -1, -1, 41, 6, 79,
+ 84, 7, -1, 41, 6, 7, -1, -1, 41, 6,
+ 81, -1, 80, 84, 7, -1, 80, 7, -1, 41,
+ -1, -1, 66, -1, -1, 84, 10, 83, -1, -1,
+ 86, -1, 85, 86, -1, 34, 41, 11, 60, -1,
+ 36, 11, 60, -1, 35, 41, 11, 60, -1, 34,
+ 41, 11, -1, 36, 11, -1, 35, 41, 11, -1,
+ -1, 88, -1, 87, 88, -1, 70, -1, 37, 41,
+ 4, 60, 5, -1, 38, 91, -1, 39, 91, -1,
+ 4, 92, 5, -1, 4, 5, -1, 41, 8, -1,
+ 92, 41, 8, -1, 92, 1, -1, 46, 8, -1,
+ 46, 13, 62, 8, -1, 93, -1, 94, 93, -1,
+ 94, 1, -1, 40, 4, 94, 5, -1, 40, 4,
+ 5, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -558,14 +558,14 @@
256, 259, 264, 268, 273, 278, 287, 288, 289, 295,
300, 304, 312, 312, 317, 320, 323, 334, 335, 342,
343, 348, 356, 357, 361, 367, 375, 378, 379, 382,
- 385, 388, 389, 390, 388, 396, 400, 402, 405, 407,
- 409, 412, 412, 445, 446, 447, 448, 452, 455, 456,
- 461, 462, 465, 468, 472, 476, 480, 487, 490, 493,
- 497, 501, 505, 511, 511, 516, 524, 524, 535, 542,
- 545, 546, 549, 550, 553, 556, 557, 560, 564, 568,
- 572, 575, 578, 583, 584, 585, 588, 589, 595, 600,
- 605, 606, 609, 610, 611, 614, 615, 622, 623, 624,
- 627, 630
+ 385, 388, 389, 390, 388, 396, 400, 403, 405, 407,
+ 410, 410, 443, 444, 445, 446, 450, 453, 454, 459,
+ 460, 463, 466, 470, 474, 478, 485, 488, 491, 495,
+ 499, 503, 509, 509, 514, 522, 522, 533, 540, 543,
+ 544, 547, 548, 551, 554, 555, 556, 559, 563, 567,
+ 571, 574, 577, 582, 583, 584, 587, 588, 594, 599,
+ 604, 605, 608, 609, 610, 613, 614, 621, 622, 623,
+ 626, 629
};
#endif
@@ -618,10 +618,10 @@
61, 62, 64, 63, 65, 65, 65, 66, 66, 67,
67, 67, 68, 68, 68, 69, 70, 70, 70, 70,
70, 71, 72, 73, 70, 70, 70, 70, 70, 70,
- 70, 74, 70, 70, 70, 70, 70, 70, 75, 75,
- 76, 76, 76, 76, 76, 76, 76, 77, 77, 77,
- 77, 77, 77, 79, 78, 78, 81, 80, 82, 82,
- 83, 83, 84, 84, 84, 85, 85, 86, 86, 86,
+ 74, 70, 70, 70, 70, 70, 70, 75, 75, 76,
+ 76, 76, 76, 76, 76, 76, 77, 77, 77, 77,
+ 77, 77, 79, 78, 78, 81, 80, 82, 82, 83,
+ 83, 84, 84, 84, 85, 85, 85, 86, 86, 86,
86, 86, 86, 87, 87, 87, 88, 88, 89, 90,
91, 91, 92, 92, 92, 93, 93, 94, 94, 94,
95, 95
@@ -637,11 +637,11 @@
1, 4, 3, 4, 7, 8, 1, 2, 2, 5,
1, 7, 0, 4, 2, 2, 4, 1, 2, 1,
2, 3, 1, 2, 3, 3, 3, 1, 3, 3,
- 2, 0, 0, 0, 12, 3, 2, 3, 3, 2,
- 2, 0, 5, 2, 2, 2, 3, 1, 2, 0,
- 1, 3, 3, 5, 5, 5, 5, 1, 3, 5,
- 3, 5, 3, 0, 5, 3, 0, 3, 3, 2,
- 1, 0, 1, 0, 3, 1, 2, 4, 3, 4,
+ 2, 0, 0, 0, 12, 3, 3, 3, 2, 2,
+ 0, 5, 2, 2, 2, 3, 1, 2, 0, 1,
+ 3, 3, 5, 5, 5, 5, 1, 3, 5, 3,
+ 5, 3, 0, 5, 3, 0, 3, 3, 2, 1,
+ 0, 1, 0, 3, 0, 1, 2, 4, 3, 4,
3, 2, 3, 0, 1, 2, 1, 5, 2, 2,
3, 2, 2, 3, 2, 2, 4, 1, 2, 2,
4, 3
@@ -659,82 +659,82 @@
40, 0, 0, 0, 0, 0, 0, 0, 38, 0,
29, 37, 33, 35, 36, 34, 123, 25, 0, 0,
0, 0, 0, 0, 128, 129, 0, 39, 0, 32,
- 28, 31, 0, 87, 0, 0, 0, 0, 0, 0,
+ 28, 31, 0, 86, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 67, 0,
- 0, 126, 113, 0, 0, 124, 22, 0, 0, 0,
+ 114, 126, 112, 0, 0, 124, 22, 0, 0, 0,
59, 0, 131, 0, 0, 141, 0, 137, 0, 42,
0, 46, 0, 0, 52, 0, 54, 0, 55, 0,
- 62, 90, 0, 97, 0, 84, 83, 85, 71, 0,
- 0, 106, 80, 70, 89, 76, 0, 0, 0, 0,
- 115, 109, 57, 112, 0, 79, 81, 15, 125, 41,
- 0, 43, 60, 0, 132, 134, 130, 0, 135, 0,
- 139, 140, 138, 48, 66, 47, 103, 78, 0, 65,
- 50, 0, 0, 0, 0, 0, 0, 63, 0, 0,
- 68, 0, 0, 69, 0, 75, 0, 107, 0, 86,
- 0, 0, 121, 77, 116, 58, 108, 111, 0, 0,
- 61, 0, 133, 0, 105, 113, 0, 0, 56, 0,
- 0, 0, 64, 92, 91, 62, 98, 102, 100, 0,
- 0, 88, 120, 122, 0, 110, 114, 0, 0, 0,
- 136, 0, 53, 0, 0, 0, 0, 0, 0, 0,
- 72, 127, 0, 0, 82, 0, 44, 104, 0, 0,
- 96, 95, 94, 93, 101, 99, 0, 45, 0, 49,
- 0, 0, 73, 51, 0, 0, 0, 74
+ 62, 89, 0, 96, 0, 83, 82, 84, 71, 0,
+ 0, 105, 79, 70, 88, 0, 0, 0, 0, 115,
+ 108, 57, 111, 0, 78, 80, 15, 125, 41, 0,
+ 43, 60, 0, 132, 134, 130, 0, 135, 0, 139,
+ 140, 138, 48, 66, 47, 102, 77, 0, 65, 50,
+ 0, 0, 0, 0, 0, 0, 63, 0, 0, 68,
+ 0, 0, 69, 0, 75, 0, 106, 0, 85, 0,
+ 0, 121, 76, 116, 58, 107, 110, 0, 0, 61,
+ 0, 133, 0, 104, 112, 0, 0, 56, 0, 0,
+ 0, 64, 91, 90, 62, 97, 101, 99, 0, 0,
+ 87, 120, 122, 0, 109, 113, 0, 0, 0, 136,
+ 0, 53, 0, 0, 0, 0, 0, 0, 0, 72,
+ 127, 0, 0, 81, 0, 44, 103, 0, 0, 95,
+ 94, 93, 92, 100, 98, 0, 45, 0, 49, 0,
+ 0, 73, 51, 0, 0, 0, 74
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short int yydefgoto[] =
{
-1, 5, 6, 7, 106, 8, 9, 10, 11, 21,
- 88, 37, 27, 33, 49, 50, 51, 52, 110, 171,
- 172, 115, 168, 89, 143, 173, 121, 90, 111, 184,
- 256, 264, 198, 189, 122, 124, 113, 205, 92, 187,
- 93, 226, 144, 139, 140, 94, 95, 53, 54, 64,
+ 88, 37, 27, 33, 49, 50, 51, 52, 110, 170,
+ 171, 115, 167, 89, 142, 172, 121, 90, 111, 183,
+ 255, 263, 197, 188, 122, 124, 113, 204, 92, 186,
+ 93, 225, 143, 138, 139, 94, 95, 53, 54, 64,
104, 107, 108, 55
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -141
+#define YYPACT_NINF -140
static const short int yypact[] =
{
- 127, -141, -31, 17, -141, 34, 360, -141, -141, 71,
- -141, -141, 95, 23, -141, -141, -141, -22, 66, -141,
- 108, 4, -141, -141, -141, 121, -141, 123, -141, -141,
- -141, -141, 19, -141, -141, 125, 93, 107, -141, -141,
- -141, 112, -16, 149, 174, 174, 189, 7, -141, 136,
- -141, -141, -141, -141, -141, -141, 300, -141, 186, 155,
- 191, 171, 160, 25, -141, -141, 87, -141, 326, -141,
- -141, -141, 326, -141, 163, 205, 205, 211, 205, -18,
- 177, 212, 216, 217, 221, 205, 187, 154, -141, 326,
- 104, -141, 0, 162, 274, -141, -141, 223, 160, 326,
- 188, 225, -141, 226, 12, -141, 73, -141, 1, -141,
- 218, -141, 227, 231, -141, 237, -141, 194, -141, 22,
- 56, 159, 234, 75, 240, -141, -141, -141, -141, 326,
- 250, -141, -141, -141, 236, -141, 214, 220, 247, 111,
- -141, -141, 222, -141, 172, -141, -141, -141, -141, -141,
- 255, -141, 224, 228, -141, -141, -141, 256, -141, 194,
- -141, -141, -141, -141, -141, -141, 264, -141, 242, -141,
- 69, 259, 277, 276, 177, 177, 244, -141, 177, 177,
- -141, 249, 52, -141, 254, -141, 326, -141, 326, -141,
- 280, 286, 326, -141, -141, -141, -141, 257, 268, 269,
- -141, 281, -141, 305, -141, 242, 307, 160, -141, 160,
- 278, 303, -141, 311, 304, 15, -141, -141, -141, 315,
- 248, -141, 326, 326, 43, -141, -141, 316, 312, 326,
- -141, 173, -141, 318, 324, 177, 177, 177, 177, 90,
- -141, -141, 86, 180, -141, 326, -141, -141, 160, 160,
- -141, -141, -141, -141, -141, -141, 298, -141, 327, -141,
- 334, 160, -141, -141, 302, 340, 326, -141
+ 119, -140, -31, 14, -140, 67, 359, -140, -140, 71,
+ -140, -140, 75, 23, -140, -140, -140, -22, 39, -140,
+ 113, 4, -140, -140, -140, 145, -140, 22, -140, -140,
+ -140, -140, 19, -140, -140, 149, 128, 129, -140, -140,
+ -140, 136, -16, 175, 178, 178, 188, 7, -140, 135,
+ -140, -140, -140, -140, -140, -140, 299, -140, 185, 154,
+ 190, 170, 159, 25, -140, -140, 51, -140, 325, -140,
+ -140, -140, 325, -140, 162, 204, 204, 210, 204, -15,
+ 176, 211, 215, 216, 220, 204, 186, 153, -140, 325,
+ 143, -140, 0, 26, 273, -140, -140, 222, 159, 325,
+ 187, 224, -140, 225, 12, -140, 83, -140, 1, -140,
+ 217, -140, 226, 230, -140, 236, -140, 193, -140, 96,
+ 89, 134, 233, 131, 239, -140, -140, -140, -140, 325,
+ 249, -140, -140, -140, 235, 213, 219, 246, 103, -140,
+ -140, 221, -140, 144, -140, -140, -140, -140, -140, 254,
+ -140, 223, 227, -140, -140, -140, 255, -140, 193, -140,
+ -140, -140, -140, -140, -140, 263, -140, 241, -140, 105,
+ 258, 276, 275, 176, 176, 243, -140, 176, 176, -140,
+ 248, 88, -140, 253, -140, 325, -140, 325, -140, 279,
+ 285, 325, -140, -140, -140, -140, 256, 267, 268, -140,
+ 280, -140, 304, -140, 241, 306, 159, -140, 159, 277,
+ 302, -140, 310, 303, 74, -140, -140, -140, 314, 247,
+ -140, 325, 325, 43, -140, -140, 315, 311, 325, -140,
+ 161, -140, 317, 323, 176, 176, 176, 176, 92, -140,
+ -140, 85, 179, -140, 325, -140, -140, 159, 159, -140,
+ -140, -140, -140, -140, -140, 297, -140, 326, -140, 333,
+ 159, -140, -140, 301, 339, 325, -140
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -141, -141, -141, 343, 333, -141, -141, -141, -141, -141,
- -10, -141, -141, -141, -141, 308, -141, -141, -140, -141,
- 197, 76, -141, -141, 196, -58, -79, -141, -56, -141,
- -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
- -141, -141, 157, -141, 230, -141, 271, -141, -141, 321,
- -141, 262, -141, -141
+ -140, -140, -140, 342, 332, -140, -140, -140, -140, -140,
+ -10, -140, -140, -140, -140, 307, -140, -140, -139, -140,
+ 197, 47, -140, -140, 194, -58, -79, -140, -56, -140,
+ -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
+ -140, -140, 160, -140, 231, -140, 269, -140, -140, 320,
+ -140, 260, -140, -140
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -744,88 +744,88 @@
#define YYTABLE_NINF -120
static const short int yytable[] =
{
- 91, 123, 160, 22, 101, 29, 161, 141, 67, 30,
- 12, 31, 109, 155, 23, 60, 28, 156, 119, 24,
- 38, 13, 48, 120, 39, 61, 176, 40, 19, 239,
- 102, 68, 174, 134, 14, 175, 41, 23, 91, 48,
- 150, 142, 24, 151, 163, 20, 220, 72, -118, 42,
- 43, 73, 224, 157, 165, 74, 177, 44, 45, 46,
- 47, 75, 76, 77, 20, 78, 103, 176, 79, 80,
- 81, 82, 83, 185, 17, 84, 85, -118, -118, -118,
- -59, 158, 242, 243, 87, 181, 159, 163, 217, 182,
- 72, -117, 105, 120, 73, 210, 211, 177, 74, 213,
- 214, 18, 216, 218, 75, 76, 77, 26, 78, 135,
- 152, 79, 80, 81, 82, 83, 193, 28, 84, 85,
- -117, -117, -117, 23, 34, 32, 254, 87, 24, 56,
- 35, 255, 221, 36, 57, 1, 59, 69, 136, 137,
- 138, 70, 2, 3, 40, 136, 137, 138, 58, 233,
- 4, 234, 116, 41, 118, 62, 250, 251, 252, 253,
- 131, 129, 132, 28, 165, 133, 42, 43, 165, 178,
- 145, 146, 179, 246, 44, 45, 46, 47, 63, 196,
- 247, 163, 197, 197, 72, -119, 165, 165, 73, 257,
- 258, 259, 74, 66, 96, 99, 97, 98, 75, 76,
- 77, 100, 78, 263, 112, 79, 80, 81, 82, 83,
- 267, 114, 84, 85, -119, -119, -119, 117, 120, 163,
- 125, 87, 72, 164, 126, 127, 73, 128, 130, 152,
- 74, 149, 153, 166, 154, 170, 75, 76, 77, 167,
- 78, 169, 180, 79, 80, 81, 82, 83, 183, 163,
- 84, 85, 72, 241, 186, 190, 73, 188, 192, 87,
- 74, 191, 199, 195, 202, 200, 75, 76, 77, 201,
- 78, 204, 207, 79, 80, 81, 82, 83, 72, 147,
- 84, 85, 73, 142, 208, 212, 74, 209, 235, 87,
- 215, 222, 75, 76, 77, 219, 78, 223, 225, 79,
- 80, 81, 82, 83, 72, 229, 84, 85, 73, 227,
- 228, 86, 74, 230, 232, 87, 236, 238, 75, 76,
- 77, 237, 78, 240, 244, 79, 80, 81, 82, 83,
- 72, 248, 84, 85, 73, 249, 245, 86, 74, 260,
- 261, 87, 262, 265, 75, 76, 77, 266, 78, 16,
- 25, 79, 80, 81, 82, 83, 203, 71, 84, 85,
- -2, 15, 231, -14, 206, 148, 65, 87, 1, 194,
- 162, 0, 0, 0, 0, 2, 3, 0, 0, 0,
- 0, 0, 0, 4
+ 91, 123, 159, 22, 101, 29, 160, 140, 67, 30,
+ 12, 31, 109, 154, 23, 60, 28, 155, 13, 24,
+ 38, 119, 48, 34, 39, 61, 120, 40, 19, 35,
+ 102, 68, 36, 134, 144, 145, 41, 23, 91, 48,
+ 149, 141, 24, 150, 162, 20, 219, 72, -118, 42,
+ 43, 73, 223, 156, 164, 74, 105, 44, 45, 46,
+ 47, 75, 76, 77, 20, 78, 103, 14, 79, 80,
+ 81, 82, 83, 184, 17, 84, 85, -118, -118, -118,
+ 26, 18, 241, 242, 87, 175, 162, 23, 238, 72,
+ -117, 157, 24, 73, 209, 210, 158, 74, 212, 213,
+ 175, 215, 217, 75, 76, 77, 173, 78, 192, 174,
+ 79, 80, 81, 82, 83, 176, -59, 84, 85, -117,
+ -117, -117, 28, 116, 216, 118, 87, 1, 253, 120,
+ 176, 220, 129, 254, 2, 3, 69, 135, 136, 137,
+ 70, 180, 4, 40, 177, 181, 151, 178, 232, 32,
+ 233, 195, 41, 56, 196, 249, 250, 251, 252, 131,
+ 59, 132, 28, 164, 133, 42, 43, 164, 246, 57,
+ 58, 196, 245, 44, 45, 46, 47, 135, 136, 137,
+ 162, 62, 63, 72, -119, 164, 164, 73, 256, 257,
+ 258, 74, 66, 96, 99, 97, 98, 75, 76, 77,
+ 100, 78, 262, 112, 79, 80, 81, 82, 83, 266,
+ 114, 84, 85, -119, -119, -119, 117, 120, 162, 125,
+ 87, 72, 163, 126, 127, 73, 128, 130, 151, 74,
+ 148, 152, 165, 153, 169, 75, 76, 77, 166, 78,
+ 168, 179, 79, 80, 81, 82, 83, 182, 162, 84,
+ 85, 72, 240, 185, 189, 73, 187, 191, 87, 74,
+ 190, 198, 194, 201, 199, 75, 76, 77, 200, 78,
+ 203, 206, 79, 80, 81, 82, 83, 72, 146, 84,
+ 85, 73, 141, 207, 211, 74, 208, 234, 87, 214,
+ 221, 75, 76, 77, 218, 78, 222, 224, 79, 80,
+ 81, 82, 83, 72, 228, 84, 85, 73, 226, 227,
+ 86, 74, 229, 231, 87, 235, 237, 75, 76, 77,
+ 236, 78, 239, 243, 79, 80, 81, 82, 83, 72,
+ 247, 84, 85, 73, 248, 244, 86, 74, 259, 260,
+ 87, 261, 264, 75, 76, 77, 265, 78, 16, 25,
+ 79, 80, 81, 82, 83, 202, 71, 84, 85, -2,
+ 15, 205, -14, 147, 230, 65, 87, 1, 161, 193,
+ 0, 0, 0, 0, 2, 3, 0, 0, 0, 0,
+ 0, 0, 4
};
static const short int yycheck[] =
{
56, 80, 1, 13, 62, 1, 5, 7, 1, 5,
- 41, 21, 68, 1, 36, 31, 9, 5, 36, 41,
- 1, 4, 32, 41, 5, 41, 11, 8, 5, 14,
- 5, 24, 10, 89, 0, 13, 17, 36, 94, 49,
- 98, 41, 41, 99, 1, 41, 186, 4, 5, 30,
- 31, 8, 192, 41, 110, 12, 41, 38, 39, 40,
- 41, 18, 19, 20, 41, 22, 41, 11, 25, 26,
+ 41, 21, 68, 1, 36, 31, 9, 5, 4, 41,
+ 1, 36, 32, 1, 5, 41, 41, 8, 5, 7,
+ 5, 24, 10, 89, 8, 9, 17, 36, 94, 49,
+ 98, 41, 41, 99, 1, 41, 185, 4, 5, 30,
+ 31, 8, 191, 41, 110, 12, 5, 38, 39, 40,
+ 41, 18, 19, 20, 41, 22, 41, 0, 25, 26,
27, 28, 29, 129, 3, 32, 33, 34, 35, 36,
- 11, 8, 222, 223, 41, 10, 13, 1, 36, 14,
- 4, 5, 5, 41, 8, 174, 175, 41, 12, 178,
- 179, 6, 181, 182, 18, 19, 20, 41, 22, 5,
- 41, 25, 26, 27, 28, 29, 5, 9, 32, 33,
- 34, 35, 36, 36, 1, 4, 36, 41, 41, 4,
- 7, 41, 188, 10, 41, 8, 24, 1, 34, 35,
- 36, 5, 15, 16, 8, 34, 35, 36, 41, 207,
- 23, 209, 76, 17, 78, 6, 235, 236, 237, 238,
- 6, 85, 8, 9, 220, 11, 30, 31, 224, 10,
- 8, 9, 13, 229, 38, 39, 40, 41, 4, 7,
- 7, 1, 10, 10, 4, 5, 242, 243, 8, 245,
- 248, 249, 12, 4, 8, 24, 41, 6, 18, 19,
- 20, 41, 22, 261, 41, 25, 26, 27, 28, 29,
- 266, 6, 32, 33, 34, 35, 36, 6, 41, 1,
- 8, 41, 4, 5, 8, 8, 8, 6, 41, 41,
- 12, 8, 7, 6, 8, 41, 18, 19, 20, 8,
- 22, 4, 8, 25, 26, 27, 28, 29, 8, 1,
- 32, 33, 4, 5, 4, 41, 8, 21, 11, 41,
- 12, 41, 7, 41, 8, 41, 18, 19, 20, 41,
- 22, 7, 13, 25, 26, 27, 28, 29, 4, 5,
- 32, 33, 8, 41, 7, 41, 12, 11, 10, 41,
- 41, 11, 18, 19, 20, 41, 22, 11, 41, 25,
- 26, 27, 28, 29, 4, 24, 32, 33, 8, 41,
- 41, 37, 12, 8, 7, 41, 13, 13, 18, 19,
- 20, 10, 22, 8, 8, 25, 26, 27, 28, 29,
- 4, 13, 32, 33, 8, 11, 24, 37, 12, 41,
- 13, 41, 8, 41, 18, 19, 20, 7, 22, 6,
- 17, 25, 26, 27, 28, 29, 159, 49, 32, 33,
- 0, 1, 205, 3, 168, 94, 45, 41, 8, 139,
- 108, -1, -1, -1, -1, 15, 16, -1, -1, -1,
- -1, -1, -1, 23
+ 41, 6, 221, 222, 41, 11, 1, 36, 14, 4,
+ 5, 8, 41, 8, 173, 174, 13, 12, 177, 178,
+ 11, 180, 181, 18, 19, 20, 10, 22, 5, 13,
+ 25, 26, 27, 28, 29, 41, 11, 32, 33, 34,
+ 35, 36, 9, 76, 36, 78, 41, 8, 36, 41,
+ 41, 187, 85, 41, 15, 16, 1, 34, 35, 36,
+ 5, 10, 23, 8, 10, 14, 41, 13, 206, 4,
+ 208, 7, 17, 4, 10, 234, 235, 236, 237, 6,
+ 24, 8, 9, 219, 11, 30, 31, 223, 7, 41,
+ 41, 10, 228, 38, 39, 40, 41, 34, 35, 36,
+ 1, 6, 4, 4, 5, 241, 242, 8, 244, 247,
+ 248, 12, 4, 8, 24, 41, 6, 18, 19, 20,
+ 41, 22, 260, 41, 25, 26, 27, 28, 29, 265,
+ 6, 32, 33, 34, 35, 36, 6, 41, 1, 8,
+ 41, 4, 5, 8, 8, 8, 6, 41, 41, 12,
+ 8, 7, 6, 8, 41, 18, 19, 20, 8, 22,
+ 4, 8, 25, 26, 27, 28, 29, 8, 1, 32,
+ 33, 4, 5, 4, 41, 8, 21, 11, 41, 12,
+ 41, 7, 41, 8, 41, 18, 19, 20, 41, 22,
+ 7, 13, 25, 26, 27, 28, 29, 4, 5, 32,
+ 33, 8, 41, 7, 41, 12, 11, 10, 41, 41,
+ 11, 18, 19, 20, 41, 22, 11, 41, 25, 26,
+ 27, 28, 29, 4, 24, 32, 33, 8, 41, 41,
+ 37, 12, 8, 7, 41, 13, 13, 18, 19, 20,
+ 10, 22, 8, 8, 25, 26, 27, 28, 29, 4,
+ 13, 32, 33, 8, 11, 24, 37, 12, 41, 13,
+ 41, 8, 41, 18, 19, 20, 7, 22, 6, 17,
+ 25, 26, 27, 28, 29, 158, 49, 32, 33, 0,
+ 1, 167, 3, 94, 204, 45, 41, 8, 108, 138,
+ -1, -1, -1, -1, 15, 16, -1, -1, -1, -1,
+ -1, -1, 23
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -845,20 +845,20 @@
41, 67, 5, 41, 92, 5, 46, 93, 94, 70,
60, 70, 41, 78, 6, 63, 63, 6, 63, 36,
41, 68, 76, 68, 77, 8, 8, 8, 6, 63,
- 41, 6, 8, 11, 70, 5, 34, 35, 36, 85,
- 86, 7, 41, 66, 84, 8, 9, 5, 88, 8,
- 67, 70, 41, 7, 8, 1, 5, 41, 8, 13,
- 1, 5, 93, 1, 5, 70, 6, 8, 64, 4,
- 41, 61, 62, 67, 10, 13, 11, 41, 10, 13,
- 8, 10, 14, 8, 71, 70, 4, 81, 21, 75,
- 41, 41, 11, 5, 86, 41, 7, 10, 74, 7,
- 41, 41, 8, 62, 7, 79, 66, 13, 7, 11,
- 68, 68, 41, 68, 68, 41, 68, 36, 68, 41,
- 60, 70, 11, 11, 60, 41, 83, 41, 41, 24,
- 8, 84, 7, 67, 67, 10, 13, 10, 13, 14,
- 8, 5, 60, 60, 8, 24, 70, 7, 13, 11,
- 68, 68, 68, 68, 36, 41, 72, 70, 67, 67,
- 41, 13, 8, 67, 73, 41, 7, 70
+ 41, 6, 8, 11, 70, 34, 35, 36, 85, 86,
+ 7, 41, 66, 84, 8, 9, 5, 88, 8, 67,
+ 70, 41, 7, 8, 1, 5, 41, 8, 13, 1,
+ 5, 93, 1, 5, 70, 6, 8, 64, 4, 41,
+ 61, 62, 67, 10, 13, 11, 41, 10, 13, 8,
+ 10, 14, 8, 71, 70, 4, 81, 21, 75, 41,
+ 41, 11, 5, 86, 41, 7, 10, 74, 7, 41,
+ 41, 8, 62, 7, 79, 66, 13, 7, 11, 68,
+ 68, 41, 68, 68, 41, 68, 36, 68, 41, 60,
+ 70, 11, 11, 60, 41, 83, 41, 41, 24, 8,
+ 84, 7, 67, 67, 10, 13, 10, 13, 14, 8,
+ 5, 60, 60, 8, 24, 70, 7, 13, 11, 68,
+ 68, 68, 68, 36, 41, 72, 70, 67, 67, 41,
+ 13, 8, 67, 73, 41, 7, 70
};
#define yyerrok (yyerrstatus = 0)
@@ -2331,42 +2331,36 @@
case 76:
#line 400 "ael.y"
{
- (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
- break;
-
- case 77:
-#line 402 "ael.y"
- {
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
break;
+ case 77:
+#line 403 "ael.y"
+ {
+ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
+ break;
+
case 78:
#line 405 "ael.y"
{
- (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
+ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
case 79:
#line 407 "ael.y"
{
- (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
- break;
-
- case 80:
-#line 409 "ael.y"
- {
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
+ case 80:
+#line 410 "ael.y"
+ {reset_semicount(parseio->scanner);;}
+ break;
+
case 81:
-#line 412 "ael.y"
- {reset_semicount(parseio->scanner);;}
- break;
-
- case 82:
-#line 412 "ael.y"
+#line 410 "ael.y"
{
char *bufx;
int tot=0;
@@ -2402,148 +2396,148 @@
;}
break;
+ case 82:
+#line 443 "ael.y"
+ { (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
+ break;
+
case 83:
+#line 444 "ael.y"
+ { (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
+ break;
+
+ case 84:
#line 445 "ael.y"
- { (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
- break;
-
- case 84:
+ { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
+ break;
+
+ case 85:
#line 446 "ael.y"
- { (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
- break;
-
- case 85:
-#line 447 "ael.y"
- { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
- break;
-
- case 86:
-#line 448 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1]));
(yyval.pval)->u2.statements = (yyvsp[-1].pval);
(yyval.pval)->u3.else_statements = (yyvsp[0].pval);;}
break;
+ case 86:
+#line 450 "ael.y"
+ { (yyval.pval)=0; ;}
+ break;
+
case 87:
-#line 452 "ael.y"
- { (yyval.pval)=0; ;}
+#line 453 "ael.y"
+ { (yyval.pval) = (yyvsp[0].pval); ;}
break;
case 88:
-#line 455 "ael.y"
- { (yyval.pval) = (yyvsp[0].pval); ;}
+#line 454 "ael.y"
+ { (yyval.pval) = NULL ; ;}
break;
case 89:
-#line 456 "ael.y"
- { (yyval.pval) = NULL ; ;}
+#line 459 "ael.y"
+ { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 90:
-#line 461 "ael.y"
- { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
- break;
-
- case 91:
-#line 462 "ael.y"
+#line 460 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 92:
-#line 465 "ael.y"
+ case 91:
+#line 463 "ael.y"
{
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 93:
-#line 468 "ael.y"
+ case 92:
+#line 466 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 94:
-#line 472 "ael.y"
+ case 93:
+#line 470 "ael.y"
{
(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 95:
-#line 476 "ael.y"
+ case 94:
+#line 474 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 96:
-#line 480 "ael.y"
+ case 95:
+#line 478 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 97:
-#line 487 "ael.y"
+ case 96:
+#line 485 "ael.y"
{ /* ext, 1 */
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
- case 98:
-#line 490 "ael.y"
+ case 97:
+#line 488 "ael.y"
{ /* ext, pri */
(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
- case 99:
-#line 493 "ael.y"
+ case 98:
+#line 491 "ael.y"
{ /* context, ext, pri */
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
break;
- case 100:
-#line 497 "ael.y"
+ case 99:
+#line 495 "ael.y"
{ /* context, ext, 1 */
(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
(yyval.pval)->next->next = nword(strdup("1"), &(yylsp[0])); ;}
break;
- case 101:
-#line 501 "ael.y"
+ case 100:
+#line 499 "ael.y"
{ /* default, ext, pri */
(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
break;
- case 102:
-#line 505 "ael.y"
+ case 101:
+#line 503 "ael.y"
{ /* default, ext, 1 */
(yyval.pval) = nword(strdup("default"), &(yylsp[-2]));
(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[0]));
(yyval.pval)->next->next = nword( strdup("1"), &(yylsp[0])); ;}
break;
+ case 102:
+#line 509 "ael.y"
+ {reset_argcount(parseio->scanner);;}
+ break;
+
case 103:
-#line 511 "ael.y"
- {reset_argcount(parseio->scanner);;}
- break;
-
- case 104:
-#line 511 "ael.y"
+#line 509 "ael.y"
{
/* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2551,20 +2545,20 @@
(yyval.pval)->u2.arglist = (yyvsp[-1].pval);;}
break;
- case 105:
-#line 516 "ael.y"
+ case 104:
+#line 514 "ael.y"
{
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
break;
+ case 105:
+#line 522 "ael.y"
+ {reset_argcount(parseio->scanner);;}
+ break;
+
case 106:
-#line 524 "ael.y"
- {reset_argcount(parseio->scanner);;}
- break;
-
- case 107:
-#line 524 "ael.y"
+#line 522 "ael.y"
{
if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2576,8 +2570,8 @@
} ;}
break;
- case 108:
-#line 535 "ael.y"
+ case 107:
+#line 533 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
if( (yyval.pval)->type == PV_GOTO )
@@ -2587,50 +2581,55 @@
;}
break;
+ case 108:
+#line 540 "ael.y"
+ { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
+ break;
+
case 109:
-#line 542 "ael.y"
- { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
+#line 543 "ael.y"
+ { (yyval.str) = (yyvsp[0].str) ;}
break;
case 110:
-#line 545 "ael.y"
- { (yyval.str) = (yyvsp[0].str) ;}
+#line 544 "ael.y"
+ { (yyval.str) = strdup(""); ;}
break;
case 111:
-#line 546 "ael.y"
- { (yyval.str) = strdup(""); ;}
+#line 547 "ael.y"
+ { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 112:
-#line 549 "ael.y"
- { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
- break;
-
- case 113:
-#line 550 "ael.y"
[... 283 lines stripped ...]
More information about the svn-commits
mailing list