[svn-commits] trunk r23783 - in /trunk/pbx/ael: ael.tab.c ael.y
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sun Apr 30 16:53:23 MST 2006
Author: rizzo
Date: Sun Apr 30 18:53:22 2006
New Revision: 23783
URL: http://svn.digium.com/view/asterisk?rev=23783&view=rev
Log:
switch a couple of operands.
This gives slightly different results from the previous code
on syntax errors, but it actually makes fewer mistakes so
i think it is an improvement. Additionally, it makes the
code more uniform (the other call of reset_argcount
occurs after LP and not before).
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=23783&r1=23782&r2=23783&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Sun Apr 30 18:53:22 2006
@@ -541,7 +541,7 @@
69, 10, 69, -1, 69, 10, 41, 14, 41, -1,
69, 14, 69, -1, 69, 10, 41, 14, 36, -1,
69, 14, 36, -1, -1, 41, 6, 83, 88, 7,
- -1, 41, 6, 7, -1, -1, 41, 85, 6, -1,
+ -1, 41, 6, 7, -1, -1, 41, 6, 85, -1,
84, 88, 7, -1, 84, 7, -1, 41, -1, -1,
67, -1, -1, 88, 10, 87, -1, 90, -1, 89,
90, -1, 34, 41, 11, 61, -1, 36, 11, 61,
@@ -574,11 +574,11 @@
426, 428, 431, 433, 435, 438, 438, 471, 472, 473,
474, 478, 482, 486, 489, 490, 495, 496, 499, 502,
506, 510, 514, 521, 524, 527, 534, 541, 548, 557,
- 557, 562, 567, 567, 577, 584, 587, 588, 591, 592,
- 595, 601, 602, 607, 611, 615, 619, 622, 625, 630,
- 631, 636, 637, 643, 648, 653, 654, 657, 660, 665,
- 668, 671, 685, 694, 699, 714, 726, 729, 730, 733,
- 736
+ 557, 562, 570, 570, 580, 587, 590, 591, 594, 595,
+ 598, 604, 605, 610, 614, 618, 622, 625, 628, 633,
+ 634, 639, 640, 646, 651, 656, 657, 660, 663, 668,
+ 671, 674, 688, 697, 702, 717, 729, 732, 733, 736,
+ 739
};
#endif
@@ -675,18 +675,18 @@
32, 29, 43, 0, 0, 0, 0, 0, 0, 0,
0, 31, 39, 35, 37, 38, 36, 0, 18, 93,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 112, 0, 0, 0, 0, 131, 119,
+ 0, 0, 0, 0, 0, 0, 0, 0, 131, 119,
0, 0, 129, 0, 27, 0, 0, 0, 0, 0,
0, 133, 134, 0, 42, 40, 0, 34, 30, 33,
0, 49, 0, 0, 66, 52, 0, 54, 0, 63,
96, 0, 103, 0, 88, 87, 89, 74, 78, 0,
- 84, 69, 73, 0, 95, 95, 95, 80, 0, 0,
+ 112, 84, 69, 73, 95, 95, 95, 80, 0, 0,
0, 0, 121, 115, 58, 118, 0, 83, 85, 17,
130, 16, 0, 25, 0, 0, 0, 60, 0, 136,
0, 0, 150, 148, 147, 0, 0, 0, 45, 51,
68, 50, 109, 82, 0, 0, 60, 0, 0, 0,
0, 0, 64, 0, 0, 71, 0, 0, 72, 0,
- 0, 0, 0, 113, 0, 91, 90, 92, 0, 0,
+ 0, 0, 113, 0, 0, 91, 90, 92, 0, 0,
127, 81, 122, 59, 114, 117, 0, 15, 44, 0,
46, 61, 0, 137, 139, 135, 0, 146, 149, 0,
140, 0, 0, 111, 119, 0, 0, 0, 0, 0,
@@ -710,8 +710,8 @@
-1, 5, 6, 7, 25, 8, 9, 10, 11, 21,
22, 39, 28, 34, 50, 51, 157, 52, 53, 100,
74, 165, 75, 168, 76, 135, 148, 110, 77, 164,
- 101, 182, 179, 283, 308, 180, 196, 185, 111, 113,
- 103, 214, 79, 123, 80, 238, 136, 131, 132, 81,
+ 101, 183, 179, 283, 308, 180, 196, 185, 111, 113,
+ 103, 214, 79, 182, 80, 238, 136, 131, 132, 81,
82, 54, 55, 91, 151, 155, 156, 56
};
@@ -720,40 +720,40 @@
#define YYPACT_NINF -180
static const short int yypact[] =
{
- 132, -180, -31, 19, -180, 16, 105, -180, -180, 30,
- -180, -180, 29, 8, -180, -180, -180, -10, 11, -180,
- 67, 3, -180, -180, -180, 66, 68, -180, 20, -180,
- -180, -180, -180, 283, -180, 360, -180, 78, 71, 75,
- -180, -180, -180, 94, -16, 131, 141, 141, 146, 95,
+ 132, -180, -31, 19, -180, 76, 105, -180, -180, 77,
+ -180, -180, 10, 8, -180, -180, -180, 73, 11, -180,
+ 103, 3, -180, -180, -180, 112, 133, -180, 20, -180,
+ -180, -180, -180, 283, -180, 360, -180, 139, 116, 117,
+ -180, -180, -180, 94, -16, 138, 160, 160, 161, 95,
336, -180, -180, -180, -180, -180, -180, 464, -180, -180,
- 116, 152, 158, 159, 173, -7, 143, 177, 178, 179,
- 182, 183, 149, 163, 464, 464, 464, 23, -180, 12,
- 81, 386, -180, 412, -180, 184, 150, 189, 174, 156,
+ 131, 167, 168, 178, 179, 74, 145, 171, 180, 181,
+ 184, 185, 146, 25, 464, 464, 464, 23, -180, 12,
+ 81, 386, -180, 412, -180, 187, 151, 191, 174, 158,
9, -180, -180, 1, -180, -180, 464, -180, -180, -180,
- 277, -180, 193, 192, -180, -180, 161, -180, 56, 13,
- 70, 199, 22, 202, -180, -180, -180, -180, -180, 211,
- -180, -180, -180, 210, 198, 198, 198, -180, 180, 186,
- 213, 63, -180, -180, 187, -180, 124, -180, -180, -180,
- -180, -180, 438, -180, 217, 156, 464, 195, 227, -180,
- 229, 4, -180, -180, -180, 2, 101, 197, -180, -180,
- -180, -180, 235, -180, 204, 205, 60, 237, 205, 143,
- 143, 208, -180, 143, 143, -180, 212, 74, -180, 214,
- 215, 464, 219, -180, 464, -180, -180, -180, 241, 243,
- 464, -180, -180, -180, -180, 221, 222, -180, -180, 262,
- -180, 236, 238, -180, -180, -180, 268, -180, -180, 114,
- -180, 242, 279, -180, 205, 263, 285, 156, 156, 286,
- 280, 281, -180, 288, 294, 6, -180, -180, -180, 293,
+ 277, -180, 194, 199, -180, -180, 169, -180, 16, 13,
+ 22, 207, 56, 208, -180, -180, -180, -180, -180, 198,
+ -180, -180, -180, -180, 200, 200, 200, -180, 183, 186,
+ 214, 63, -180, -180, 193, -180, 124, -180, -180, -180,
+ -180, -180, 438, -180, 211, 158, 464, 195, 221, -180,
+ 229, 4, -180, -180, -180, 2, 114, 197, -180, -180,
+ -180, -180, 235, -180, 204, 205, 60, 237, 205, 145,
+ 145, 212, -180, 145, 145, -180, 213, 100, -180, 215,
+ 219, 464, -180, 222, 464, -180, -180, -180, 238, 241,
+ 464, -180, -180, -180, -180, 228, 236, -180, -180, 248,
+ -180, 242, 246, -180, -180, -180, 254, -180, -180, 137,
+ -180, 249, 262, -180, 205, 269, 272, 158, 158, 285,
+ 284, 280, -180, 288, 294, 6, -180, -180, -180, 293,
309, 307, 312, -180, 464, 464, 59, -180, -180, 320,
- 276, -180, 306, -180, -180, 290, 61, 327, -180, 166,
- 338, -180, 330, 334, -180, 143, 143, 143, 143, 100,
+ 276, -180, 306, -180, -180, 290, 61, 327, -180, 173,
+ 338, -180, 330, 334, -180, 145, 145, 145, 145, 135,
-180, 464, -180, -180, 134, 239, -180, 322, 464, 62,
- 339, 156, 156, -180, -180, 156, 156, -180, -180, -180,
- -180, -180, -180, 308, -180, 464, -180, 156, 156, 341,
- 340, 342, 343, 344, -180, 345, 346, 156, 156, 156,
- 156, -180, 156, 156, 347, 348, 352, 349, 328, 350,
- 357, 156, 156, -180, 156, 364, 156, 156, 365, 368,
- 370, 464, 376, 382, -180, 156, 156, -180, -180, 156,
- 383, 392, 387, 156, -180, 156, 394, 395, -180, -180
+ 339, 158, 158, -180, -180, 158, 158, -180, -180, -180,
+ -180, -180, -180, 308, -180, 464, -180, 158, 158, 341,
+ 340, 342, 343, 344, -180, 345, 346, 158, 158, 158,
+ 158, -180, 158, 158, 347, 348, 352, 349, 328, 350,
+ 357, 158, 158, -180, 158, 364, 158, 158, 365, 368,
+ 370, 464, 376, 382, -180, 158, 158, -180, -180, 158,
+ 383, 392, 387, 158, -180, 158, 394, 395, -180, -180
};
/* YYPGOTO[NTERM-NUM]. */
@@ -761,8 +761,8 @@
{
-180, -180, -180, 401, -180, -180, -180, -180, -180, -180,
326, -180, -180, -180, -180, 359, -180, -180, -180, -179,
- -180, -180, -180, -180, -180, 15, -94, -44, -180, -180,
- -35, -180, -180, -180, -180, -180, -180, 18, -180, -180,
+ -180, -180, -180, -180, -180, -96, -94, -44, -180, -180,
+ -35, -180, -180, -180, -180, -180, -180, -43, -180, -180,
-180, -180, -180, -180, -180, -180, 196, -180, 291, 353,
-80, -180, -180, 374, -180, -180, 270, -180
};
@@ -775,35 +775,35 @@
static const short int yytable[] =
{
78, 140, 231, 207, 30, 204, 152, 208, 31, 205,
- 12, 236, 167, 19, 149, 87, 14, 171, 26, 133,
- 259, 36, 112, 13, 171, 88, 23, 37, 127, 108,
- 38, 24, 176, 17, 109, 18, 177, 153, 153, 124,
+ 12, 236, 167, 19, 149, 87, 18, 171, 26, 133,
+ 259, 36, 112, 13, 171, 88, 169, 37, 127, 170,
+ 38, 120, 173, 121, 122, 174, 123, 153, 153, 124,
125, 126, 154, 154, 20, 206, 78, 172, 78, 20,
150, 199, 27, 134, 172, 264, 265, 128, 129, 130,
- 159, 158, 140, 57, -124, 161, 169, 59, 191, 170,
- 33, 60, 35, 217, 271, 287, 29, 61, 62, 63,
- 173, 64, 83, 174, 65, 66, 67, 68, 69, 137,
+ 159, 158, 140, 57, -124, 161, 176, 59, 191, 216,
+ 177, 60, 219, 217, 271, 287, 14, 61, 62, 63,
+ 17, 64, 186, 187, 65, 66, 67, 68, 69, 137,
138, 70, 71, -124, -124, -124, 94, 128, 129, 130,
- 73, 201, 201, 201, 95, -2, 15, 78, -14, 210,
- 227, 200, 84, 1, 211, 109, 85, 247, 86, 96,
- 2, 3, 244, 252, 253, 220, 221, 245, 4, 223,
- 224, 194, 226, 228, 195, 159, 281, 89, 57, -123,
- 1, 282, 59, 186, 187, 90, 60, 2, 3, 233,
- 93, 270, 61, 62, 63, 4, 64, 102, 104, 65,
- 66, 67, 68, 69, 105, 106, 70, 71, -123, -123,
- -123, 120, 121, 273, 122, 73, 195, 289, 290, 107,
- 216, 291, 292, 219, 109, 114, 115, 116, 117, 118,
- 119, 144, 143, 295, 296, 145, 161, 147, 146, 162,
- 163, 161, 166, 304, 305, 306, 307, 175, 309, 310,
- 178, 277, 278, 279, 280, 181, 183, 318, 319, 184,
- 320, 188, 322, 323, 190, 198, 284, 189, 193, 161,
- 161, 330, 331, 286, 202, 332, 201, 203, 212, 336,
- 159, 337, 213, 57, -125, 215, 134, 59, 218, 222,
- 294, 60, 234, 225, 235, 229, 230, 61, 62, 63,
- 232, 64, 237, 239, 65, 66, 67, 68, 69, 240,
- 250, 70, 71, -125, -125, -125, 243, 241, 159, 242,
- 73, 57, 160, 246, 40, 59, 327, 248, 41, 60,
- 255, 42, 251, 254, 256, 61, 62, 63, 257, 64,
+ 73, 201, 201, 201, 95, -2, 15, 78, -14, 23,
+ 108, 200, 29, 1, 24, 109, 33, 247, 86, 96,
+ 2, 3, 210, 252, 253, 220, 221, 211, 4, 223,
+ 224, 194, 226, 228, 195, 159, 227, 35, 57, -123,
+ 1, 109, 59, 83, 89, 244, 60, 2, 3, 233,
+ 245, 270, 61, 62, 63, 4, 64, 84, 85, 65,
+ 66, 67, 68, 69, 90, 93, 70, 71, -123, -123,
+ -123, 281, 102, 104, 105, 73, 282, 289, 290, 114,
+ 273, 291, 292, 195, 106, 107, 109, 119, 115, 116,
+ 117, 118, 144, 295, 296, 143, 161, 145, 146, 147,
+ 162, 161, 181, 304, 305, 306, 307, 163, 309, 310,
+ 166, 277, 278, 279, 280, 175, 178, 318, 319, 198,
+ 320, 184, 322, 323, 188, 190, 284, 189, 202, 161,
+ 161, 330, 331, 286, 193, 332, 201, 203, 212, 336,
+ 159, 337, 213, 57, -125, 215, 134, 59, 218, 234,
+ 294, 60, 235, 222, 225, 240, 229, 61, 62, 63,
+ 230, 64, 243, 232, 65, 66, 67, 68, 69, 237,
+ 248, 70, 71, -125, -125, -125, 250, 239, 159, 251,
+ 73, 57, 160, 241, 40, 59, 327, 242, 41, 60,
+ 246, 42, 254, 256, 255, 61, 62, 63, 257, 64,
43, 260, 65, 66, 67, 68, 69, 258, 159, 70,
71, 57, 262, 44, 45, 59, 261, 267, 73, 60,
263, 46, 47, 48, 49, 61, 62, 63, 266, 64,
@@ -830,35 +830,35 @@
static const short int yycheck[] =
{
35, 81, 181, 1, 1, 1, 5, 5, 5, 5,
- 41, 190, 106, 5, 5, 31, 0, 11, 7, 7,
- 14, 1, 66, 4, 11, 41, 36, 7, 5, 36,
- 10, 41, 10, 3, 41, 6, 14, 36, 36, 74,
+ 41, 190, 106, 5, 5, 31, 6, 11, 7, 7,
+ 14, 1, 66, 4, 11, 41, 10, 7, 5, 13,
+ 10, 6, 10, 8, 9, 13, 11, 36, 36, 74,
75, 76, 41, 41, 41, 41, 81, 41, 83, 41,
41, 145, 41, 41, 41, 234, 235, 34, 35, 36,
- 1, 96, 142, 4, 5, 100, 10, 8, 5, 13,
- 4, 12, 4, 13, 13, 13, 9, 18, 19, 20,
- 10, 22, 4, 13, 25, 26, 27, 28, 29, 8,
+ 1, 96, 142, 4, 5, 100, 10, 8, 5, 165,
+ 14, 12, 168, 13, 13, 13, 0, 18, 19, 20,
+ 3, 22, 125, 126, 25, 26, 27, 28, 29, 8,
9, 32, 33, 34, 35, 36, 1, 34, 35, 36,
- 41, 41, 41, 41, 9, 0, 1, 142, 3, 8,
- 36, 146, 41, 8, 13, 41, 41, 211, 24, 24,
+ 41, 41, 41, 41, 9, 0, 1, 142, 3, 36,
+ 36, 146, 9, 8, 41, 41, 4, 211, 24, 24,
15, 16, 8, 217, 218, 169, 170, 13, 23, 173,
- 174, 7, 176, 177, 10, 1, 36, 6, 4, 5,
- 8, 41, 8, 125, 126, 4, 12, 15, 16, 184,
- 4, 245, 18, 19, 20, 23, 22, 41, 6, 25,
- 26, 27, 28, 29, 6, 6, 32, 33, 34, 35,
- 36, 8, 9, 7, 11, 41, 10, 271, 272, 6,
- 165, 275, 276, 168, 41, 8, 8, 8, 6, 6,
- 41, 41, 8, 287, 288, 6, 231, 41, 24, 6,
- 8, 236, 41, 297, 298, 299, 300, 8, 302, 303,
- 8, 255, 256, 257, 258, 4, 6, 311, 312, 21,
- 314, 41, 316, 317, 11, 8, 261, 41, 41, 264,
- 265, 325, 326, 268, 7, 329, 41, 8, 41, 333,
- 1, 335, 7, 4, 5, 41, 41, 8, 11, 41,
- 285, 12, 11, 41, 11, 41, 41, 18, 19, 20,
- 41, 22, 41, 41, 25, 26, 27, 28, 29, 7,
- 7, 32, 33, 34, 35, 36, 8, 41, 1, 41,
- 41, 4, 5, 41, 1, 8, 321, 8, 5, 12,
- 10, 8, 7, 7, 13, 18, 19, 20, 10, 22,
+ 174, 7, 176, 177, 10, 1, 36, 4, 4, 5,
+ 8, 41, 8, 4, 6, 8, 12, 15, 16, 184,
+ 13, 245, 18, 19, 20, 23, 22, 41, 41, 25,
+ 26, 27, 28, 29, 4, 4, 32, 33, 34, 35,
+ 36, 36, 41, 6, 6, 41, 41, 271, 272, 8,
+ 7, 275, 276, 10, 6, 6, 41, 41, 8, 8,
+ 6, 6, 41, 287, 288, 8, 231, 6, 24, 41,
+ 6, 236, 4, 297, 298, 299, 300, 8, 302, 303,
+ 41, 255, 256, 257, 258, 8, 8, 311, 312, 8,
+ 314, 21, 316, 317, 41, 11, 261, 41, 7, 264,
+ 265, 325, 326, 268, 41, 329, 41, 8, 41, 333,
+ 1, 335, 7, 4, 5, 41, 41, 8, 11, 11,
+ 285, 12, 11, 41, 41, 7, 41, 18, 19, 20,
+ 41, 22, 8, 41, 25, 26, 27, 28, 29, 41,
+ 8, 32, 33, 34, 35, 36, 7, 41, 1, 7,
+ 41, 4, 5, 41, 1, 8, 321, 41, 5, 12,
+ 41, 8, 7, 13, 10, 18, 19, 20, 10, 22,
17, 8, 25, 26, 27, 28, 29, 13, 1, 32,
33, 4, 5, 30, 31, 8, 7, 41, 41, 12,
8, 38, 39, 40, 41, 18, 19, 20, 8, 22,
@@ -898,13 +898,13 @@
4, 95, 95, 4, 1, 9, 24, 1, 5, 57,
61, 72, 41, 82, 6, 6, 6, 6, 36, 41,
69, 80, 69, 81, 8, 8, 8, 6, 6, 41,
- 8, 9, 11, 85, 72, 72, 72, 5, 34, 35,
+ 6, 8, 9, 11, 72, 72, 72, 5, 34, 35,
36, 89, 90, 7, 41, 67, 88, 8, 9, 5,
92, 5, 91, 8, 41, 6, 24, 41, 68, 5,
41, 96, 5, 36, 41, 97, 98, 58, 72, 1,
5, 72, 6, 8, 71, 63, 41, 68, 65, 10,
13, 11, 41, 10, 13, 8, 10, 14, 8, 74,
- 77, 4, 73, 6, 21, 79, 79, 79, 41, 41,
+ 77, 4, 85, 73, 21, 79, 79, 79, 41, 41,
11, 5, 90, 41, 7, 10, 78, 5, 8, 68,
72, 41, 7, 8, 1, 5, 41, 1, 5, 98,
8, 13, 41, 7, 83, 41, 67, 13, 11, 67,
@@ -2698,12 +2698,12 @@
break;
case 112:
-#line 567 "ael.y"
+#line 570 "ael.y"
{reset_argcount(parseio->scanner);;}
break;
case 113:
-#line 567 "ael.y"
+#line 570 "ael.y"
{
if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
(yyval.pval)= npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
@@ -2715,7 +2715,7 @@
break;
case 114:
-#line 577 "ael.y"
+#line 580 "ael.y"
{
(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
if( (yyval.pval)->type == PV_GOTO )
@@ -2726,34 +2726,34 @@
break;
case 115:
-#line 584 "ael.y"
+#line 587 "ael.y"
{ (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
break;
case 116:
-#line 587 "ael.y"
+#line 590 "ael.y"
{ (yyval.str) = (yyvsp[0].str) ;}
break;
case 117:
-#line 588 "ael.y"
+#line 591 "ael.y"
{ (yyval.str) = strdup(""); ;}
break;
case 118:
-#line 591 "ael.y"
+#line 594 "ael.y"
{ (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
break;
case 119:
-#line 592 "ael.y"
+#line 595 "ael.y"
{
(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
(yyval.pval)->u1.str = strdup(""); ;}
break;
case 120:
-#line 595 "ael.y"
+#line 598 "ael.y"
{
pval *z = nword((yyvsp[0].str), &(yylsp[0]));
(yyval.pval) = (yyvsp[-2].pval);
@@ -2761,19 +2761,19 @@
break;
case 121:
-#line 601 "ael.y"
+#line 604 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 122:
-#line 602 "ael.y"
+#line 605 "ael.y"
{ if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));}
else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);}
else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;}
break;
case 123:
-#line 607 "ael.y"
+#line 610 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-3]), &(yylsp[-1])); /* XXX 3 or 4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2781,7 +2781,7 @@
break;
case 124:
-#line 611 "ael.y"
+#line 614 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;
@@ -2789,7 +2789,7 @@
break;
case 125:
-#line 615 "ael.y"
+#line 618 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-3]), &(yylsp[0])); /* XXX at 3 or @4 ? */
(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2797,45 +2797,45 @@
break;
case 126:
-#line 619 "ael.y"
+#line 622 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 127:
-#line 622 "ael.y"
+#line 625 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = NULL;;}
break;
case 128:
-#line 625 "ael.y"
+#line 628 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 129:
-#line 630 "ael.y"
+#line 633 "ael.y"
{(yyval.pval) = (yyvsp[0].pval);;}
break;
case 130:
-#line 631 "ael.y"
+#line 634 "ael.y"
{ if ( (yyvsp[-1].pval) && (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[-1].pval); linku1((yyval.pval),(yyvsp[0].pval));}
else if ( (yyvsp[-1].pval) ) {(yyval.pval)=(yyvsp[-1].pval);}
else if ( (yyvsp[0].pval) ) {(yyval.pval)=(yyvsp[0].pval);} ;}
break;
case 131:
-#line 636 "ael.y"
+#line 639 "ael.y"
{(yyval.pval)=(yyvsp[0].pval);;}
break;
case 132:
-#line 637 "ael.y"
+#line 640 "ael.y"
{
(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-3].str);
@@ -2843,38 +2843,38 @@
break;
case 133:
-#line 643 "ael.y"
+#line 646 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
case 134:
-#line 648 "ael.y"
+#line 651 "ael.y"
{
(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
break;
case 135:
-#line 653 "ael.y"
+#line 656 "ael.y"
{ (yyval.pval) = (yyvsp[-1].pval); ;}
break;
case 136:
-#line 654 "ael.y"
+#line 657 "ael.y"
{ (yyval.pval) = NULL; ;}
break;
case 137:
-#line 657 "ael.y"
+#line 660 "ael.y"
{
(yyval.pval) = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 138:
-#line 660 "ael.y"
+#line 663 "ael.y"
{
pval *z = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0]));
z->u1.str = (yyvsp[-1].str);
@@ -2883,19 +2883,19 @@
break;
case 139:
-#line 665 "ael.y"
+#line 668 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 140:
-#line 668 "ael.y"
+#line 671 "ael.y"
{
(yyval.pval) = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0]));
(yyval.pval)->u1.str = (yyvsp[-1].str);;}
break;
case 141:
-#line 672 "ael.y"
+#line 675 "ael.y"
{
(yyval.pval) = npval2(PV_WORD, &(yylsp[-13]), &(yylsp[-12]));
(yyval.pval)->u1.str = (yyvsp[-13].str);
@@ -2912,7 +2912,7 @@
break;
case 142:
-#line 685 "ael.y"
+#line 688 "ael.y"
{
(yyval.pval) = npval2(PV_WORD, &(yylsp[-9]), &(yylsp[-8]));
(yyval.pval)->u1.str = (yyvsp[-9].str);
@@ -2925,7 +2925,7 @@
break;
case 143:
-#line 694 "ael.y"
+#line 697 "ael.y"
{
pval *z = npval2(PV_WORD, &(yylsp[-1]), &(yylsp[0])); /* XXX don't we need @1- at 3 ?*/
(yyval.pval)=(yyvsp[-2].pval);
@@ -2934,7 +2934,7 @@
break;
case 144:
-#line 700 "ael.y"
+#line 703 "ael.y"
{
pval *z = npval2(PV_WORD, &(yylsp[-13]), &(yylsp[-12]));
(yyval.pval)=(yyvsp[-14].pval); z->u1.str = (yyvsp[-13].str);
@@ -2952,7 +2952,7 @@
break;
case 145:
-#line 714 "ael.y"
+#line 717 "ael.y"
{
pval *z = npval2(PV_WORD, &(yylsp[-9]), &(yylsp[-8]));
(yyval.pval)=(yyvsp[-10].pval);
@@ -2968,29 +2968,29 @@
break;
case 146:
-#line 726 "ael.y"
+#line 729 "ael.y"
{(yyval.pval)=(yyvsp[-1].pval);;}
break;
case 147:
-#line 729 "ael.y"
+#line 732 "ael.y"
{ (yyval.str) = (yyvsp[0].str);;}
break;
case 148:
-#line 730 "ael.y"
+#line 733 "ael.y"
{(yyval.str)=strdup("default");;}
break;
case 149:
-#line 733 "ael.y"
+#line 736 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
break;
case 150:
-#line 736 "ael.y"
+#line 739 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
break;
@@ -3275,7 +3275,7 @@
}
-#line 741 "ael.y"
+#line 744 "ael.y"
static char *token_equivs1[] =
Modified: trunk/pbx/ael/ael.y
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.y?rev=23783&r1=23782&r2=23783&view=diff
==============================================================================
--- trunk/pbx/ael/ael.y (original)
+++ trunk/pbx/ael/ael.y Sun Apr 30 18:53:22 2006
@@ -564,7 +564,10 @@
$$->u1.str = $1; }
;
-application_call_head: word {reset_argcount(parseio->scanner);} LP {
+/* XXX application_call_head must be revised. Having 'word LP { ...'
+ * just as above should work fine, however it gives a different result.
+ */
+application_call_head: word LP {reset_argcount(parseio->scanner);} {
if (strcasecmp($1,"goto") == 0) {
$$= npval2(PV_GOTO, &@1, &@3);
free($1); /* won't be using this */
More information about the svn-commits
mailing list