[asterisk-commits] branch oej/test-this-branch r24253 - in
/team/oej/test-this-branch: ./ channe...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue May 2 11:25:25 MST 2006
Author: oej
Date: Tue May 2 13:25:24 2006
New Revision: 24253
URL: http://svn.digium.com/view/asterisk?rev=24253&view=rev
Log:
Reset
Modified:
team/oej/test-this-branch/ (props changed)
team/oej/test-this-branch/Makefile
team/oej/test-this-branch/channels/chan_misdn.c
team/oej/test-this-branch/pbx/ael/ael.tab.c
team/oej/test-this-branch/pbx/ael/ael.y
team/oej/test-this-branch/utils/Makefile
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 2 13:25:24 2006
@@ -1,1 +1,1 @@
-/trunk:1-24166
+/trunk:1-24250
Modified: team/oej/test-this-branch/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/Makefile?rev=24253&r1=24252&r2=24253&view=diff
==============================================================================
--- team/oej/test-this-branch/Makefile (original)
+++ team/oej/test-this-branch/Makefile Tue May 2 13:25:24 2006
@@ -895,7 +895,7 @@
$(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
fi
-dont-optimize: install
+dont-optimize: _all
valgrind: dont-optimize
Modified: team/oej/test-this-branch/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_misdn.c?rev=24253&r1=24252&r2=24253&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_misdn.c (original)
+++ team/oej/test-this-branch/channels/chan_misdn.c Tue May 2 13:25:24 2006
@@ -1508,9 +1508,7 @@
ast_copy_string(ast->exten, bc->dad, sizeof(ast->exten));
}
- if ( !ast->cid.cid_num) {
- ast_set_callerid(ast, bc->oad, NULL, bc->oad);
- }
+ ast_set_callerid(ast, bc->oad, NULL, bc->oad);
if ( !ast_strlen_zero(bc->rad) ) {
if (ast->cid.cid_rdnis)
@@ -2074,8 +2072,16 @@
tmp->zero_read_cnt=0;
}
- tmp->frame.frametype = AST_FRAME_NULL;
- tmp->frame.subclass = 0;
+
+ /*faking Voice Frame*/
+ tmp->frame.frametype = AST_FRAME_VOICE;
+ tmp->frame.subclass = AST_FORMAT_ALAW;
+ memset(tmp->ast_rd_buf,0,128);
+ tmp->frame.data = tmp->ast_rd_buf ;
+ tmp->frame.mallocd =0 ;
+ tmp->frame.datalen = 128;
+ tmp->frame.samples = 128;
+
frame=ast_frisolate(&tmp->frame);
return frame;
}
Modified: team/oej/test-this-branch/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/pbx/ael/ael.tab.c?rev=24253&r1=24252&r2=24253&view=diff
==============================================================================
--- team/oej/test-this-branch/pbx/ael/ael.tab.c (original)
+++ team/oej/test-this-branch/pbx/ael/ael.tab.c Tue May 2 13:25:24 2006
@@ -420,16 +420,16 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 14
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 505
+#define YYLAST 510
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 42
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 58
+#define YYNNTS 55
/* YYNRULES -- Number of rules. */
-#define YYNRULES 150
+#define YYNRULES 146
/* YYNRULES -- Number of states. */
-#define YYNSTATES 340
+#define YYNSTATES 332
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -487,13 +487,12 @@
221, 223, 226, 230, 232, 235, 239, 240, 247, 251,
252, 258, 262, 266, 269, 270, 271, 272, 285, 286,
293, 296, 300, 304, 307, 310, 311, 317, 320, 323,
- 326, 330, 334, 338, 340, 343, 344, 346, 350, 354,
- 360, 366, 372, 378, 380, 384, 390, 394, 400, 404,
- 405, 411, 415, 416, 420, 424, 427, 429, 430, 432,
- 433, 437, 439, 442, 447, 451, 456, 460, 463, 467,
- 469, 472, 474, 480, 483, 486, 490, 493, 496, 500,
- 503, 506, 521, 532, 536, 552, 564, 567, 569, 571,
- 576
+ 326, 330, 332, 335, 336, 338, 342, 346, 352, 358,
+ 364, 370, 372, 376, 382, 386, 392, 396, 397, 403,
+ 407, 408, 412, 416, 419, 421, 422, 424, 425, 429,
+ 431, 434, 439, 443, 448, 452, 455, 459, 461, 464,
+ 466, 472, 475, 478, 482, 485, 488, 492, 495, 498,
+ 513, 524, 528, 544, 556, 559, 564
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -502,82 +501,80 @@
43, 0, -1, 44, -1, 45, -1, 44, 45, -1,
44, 1, -1, 47, -1, 49, -1, 50, -1, 8,
-1, 41, -1, 36, -1, 48, 3, 46, 55, -1,
- 23, -1, -1, 15, 41, 6, 54, 7, 4, 91,
+ 23, -1, -1, 15, 41, 6, 54, 7, 4, 89,
5, -1, 15, 41, 6, 54, 7, 4, 5, -1,
- 15, 41, 6, 7, 4, 91, 5, -1, 15, 41,
+ 15, 41, 6, 7, 4, 89, 5, -1, 15, 41,
6, 7, 4, 5, -1, 16, 4, 51, 5, -1,
16, 4, 5, -1, 52, -1, 51, 52, -1, 51,
1, -1, -1, 41, 9, 53, 41, 8, -1, 41,
-1, 54, 10, 41, -1, 54, 1, -1, 4, 5,
-1, 4, 56, 5, -1, 57, -1, 1, -1, 56,
- 57, -1, 56, 1, -1, 60, -1, 99, -1, 93,
- -1, 94, -1, 59, -1, -1, 41, 9, 58, 41,
+ 57, -1, 56, 1, -1, 60, -1, 96, -1, 91,
+ -1, 92, -1, 59, -1, -1, 41, 9, 58, 41,
8, -1, 41, 1, -1, 8, -1, 17, 24, 41,
- 8, -1, 41, 24, 72, -1, 30, 41, 24, 72,
- -1, 31, 6, 68, 7, 41, 24, 72, -1, 30,
- 31, 6, 68, 7, 41, 24, 72, -1, 72, -1,
- 61, 72, -1, 61, 1, -1, -1, 19, 6, 63,
- 67, 7, -1, -1, 22, 6, 65, 67, 7, -1,
- 20, 6, 68, 11, 68, 11, 68, 13, 68, 13,
- 68, 13, 68, 7, -1, 20, 6, 41, 13, 68,
- 13, 68, 13, 68, 7, -1, 41, -1, 41, 41,
+ 8, -1, 41, 24, 70, -1, 30, 41, 24, 70,
+ -1, 31, 6, 66, 7, 41, 24, 70, -1, 30,
+ 31, 6, 66, 7, 41, 24, 70, -1, 70, -1,
+ 61, 70, -1, 61, 1, -1, -1, 19, 6, 63,
+ 65, 7, -1, -1, 22, 6, 64, 65, 7, -1,
+ 20, 6, 66, 11, 66, 11, 66, 13, 66, 13,
+ 66, 13, 66, 7, -1, 20, 6, 41, 13, 66,
+ 13, 66, 13, 66, 7, -1, 41, -1, 41, 41,
-1, 41, -1, 41, 41, -1, 41, 41, 41, -1,
41, -1, 41, 41, -1, 41, 11, 41, -1, -1,
- 18, 6, 71, 41, 7, 4, -1, 4, 61, 5,
- -1, -1, 41, 9, 73, 41, 8, -1, 25, 80,
- 8, -1, 26, 81, 8, -1, 41, 11, -1, -1,
- -1, -1, 32, 6, 74, 41, 8, 75, 41, 8,
- 76, 41, 7, 72, -1, -1, 33, 6, 77, 41,
- 7, 72, -1, 70, 5, -1, 70, 89, 5, -1,
- 12, 82, 8, -1, 86, 8, -1, 41, 8, -1,
- -1, 86, 9, 78, 41, 8, -1, 28, 8, -1,
- 27, 8, -1, 29, 8, -1, 64, 72, 79, -1,
- 62, 72, 79, -1, 66, 72, 79, -1, 8, -1,
- 21, 72, -1, -1, 69, -1, 69, 13, 69, -1,
- 69, 10, 69, -1, 69, 13, 69, 13, 69, -1,
- 69, 10, 69, 10, 69, -1, 36, 13, 69, 13,
- 69, -1, 36, 10, 69, 10, 69, -1, 69, -1,
- 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, 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,
- -1, 35, 41, 11, 61, -1, 34, 41, 11, -1,
- 36, 11, -1, 35, 41, 11, -1, 92, -1, 91,
- 92, -1, 72, -1, 37, 41, 4, 61, 5, -1,
- 38, 95, -1, 39, 95, -1, 4, 96, 5, -1,
- 4, 5, -1, 41, 8, -1, 96, 41, 8, -1,
- 96, 1, -1, 98, 8, -1, 98, 13, 68, 11,
- 68, 11, 68, 13, 68, 13, 68, 13, 68, 8,
- -1, 98, 13, 41, 13, 68, 13, 68, 13, 68,
- 8, -1, 97, 98, 8, -1, 97, 98, 13, 68,
- 11, 68, 11, 68, 13, 68, 13, 68, 13, 68,
- 8, -1, 97, 98, 13, 41, 13, 68, 13, 68,
- 13, 68, 8, -1, 97, 1, -1, 41, -1, 36,
- -1, 40, 4, 97, 5, -1, 40, 4, 5, -1
+ 18, 6, 69, 41, 7, 4, -1, 4, 61, 5,
+ -1, -1, 41, 9, 71, 41, 8, -1, 25, 78,
+ 8, -1, 26, 79, 8, -1, 41, 11, -1, -1,
+ -1, -1, 32, 6, 72, 41, 8, 73, 41, 8,
+ 74, 41, 7, 70, -1, -1, 33, 6, 75, 41,
+ 7, 70, -1, 68, 5, -1, 68, 87, 5, -1,
+ 12, 80, 8, -1, 84, 8, -1, 41, 8, -1,
+ -1, 84, 9, 76, 41, 8, -1, 28, 8, -1,
+ 27, 8, -1, 29, 8, -1, 62, 70, 77, -1,
+ 8, -1, 21, 70, -1, -1, 67, -1, 67, 13,
+ 67, -1, 67, 10, 67, -1, 67, 13, 67, 13,
+ 67, -1, 67, 10, 67, 10, 67, -1, 36, 13,
+ 67, 13, 67, -1, 36, 10, 67, 10, 67, -1,
+ 67, -1, 67, 10, 67, -1, 67, 10, 41, 14,
+ 41, -1, 67, 14, 67, -1, 67, 10, 41, 14,
+ 36, -1, 67, 14, 36, -1, -1, 41, 6, 81,
+ 86, 7, -1, 41, 6, 7, -1, -1, 41, 6,
+ 83, -1, 82, 86, 7, -1, 82, 7, -1, 41,
+ -1, -1, 65, -1, -1, 86, 10, 85, -1, 88,
+ -1, 87, 88, -1, 34, 41, 11, 61, -1, 36,
+ 11, 61, -1, 35, 41, 11, 61, -1, 34, 41,
+ 11, -1, 36, 11, -1, 35, 41, 11, -1, 90,
+ -1, 89, 90, -1, 70, -1, 37, 41, 4, 61,
+ 5, -1, 38, 93, -1, 39, 93, -1, 4, 94,
+ 5, -1, 4, 5, -1, 41, 8, -1, 94, 41,
+ 8, -1, 94, 1, -1, 46, 8, -1, 46, 13,
+ 66, 11, 66, 11, 66, 13, 66, 13, 66, 13,
+ 66, 8, -1, 46, 13, 41, 13, 66, 13, 66,
+ 13, 66, 8, -1, 95, 46, 8, -1, 95, 46,
+ 13, 66, 11, 66, 11, 66, 13, 66, 13, 66,
+ 13, 66, 8, -1, 95, 46, 13, 41, 13, 66,
+ 13, 66, 13, 66, 8, -1, 95, 1, -1, 40,
+ 4, 95, 5, -1, 40, 4, 5, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 176, 176, 179, 180, 191, 194, 195, 196, 197,
- 200, 201, 204, 212, 213, 216, 219, 222, 226, 231,
- 234, 238, 239, 240, 243, 243, 249, 250, 254, 257,
- 258, 261, 262, 263, 266, 269, 270, 271, 272, 273,
- 274, 274, 278, 279, 282, 287, 291, 296, 301, 310,
- 311, 314, 317, 317, 322, 322, 327, 340, 356, 357,
- 364, 365, 370, 378, 379, 383, 389, 389, 397, 400,
- 400, 404, 407, 410, 413, 414, 415, 413, 421, 421,
- 425, 427, 430, 432, 434, 437, 437, 470, 471, 472,
- 473, 477, 481, 485, 488, 489, 494, 495, 498, 501,
- 505, 509, 513, 520, 523, 526, 533, 540, 547, 556,
- 556, 561, 569, 569, 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
+ 0, 173, 173, 176, 177, 178, 181, 182, 183, 184,
+ 187, 188, 191, 199, 200, 203, 206, 209, 213, 218,
+ 221, 225, 226, 227, 230, 230, 236, 237, 238, 241,
+ 242, 245, 246, 247, 248, 251, 252, 253, 254, 255,
+ 256, 256, 260, 261, 264, 269, 273, 278, 283, 292,
+ 293, 294, 298, 298, 301, 301, 304, 317, 333, 334,
+ 341, 342, 347, 355, 356, 360, 366, 366, 374, 377,
+ 377, 381, 384, 387, 390, 391, 392, 390, 398, 398,
+ 402, 404, 407, 409, 411, 414, 414, 447, 448, 449,
+ 450, 454, 457, 458, 463, 464, 467, 470, 474, 478,
+ 482, 489, 492, 495, 499, 503, 507, 513, 513, 518,
+ 526, 526, 537, 544, 547, 548, 551, 552, 555, 558,
+ 559, 562, 566, 570, 574, 577, 580, 585, 586, 589,
+ 590, 596, 601, 606, 607, 610, 611, 612, 615, 616,
+ 629, 637, 638, 652, 663, 666, 669
};
#endif
@@ -596,14 +593,13 @@
"objects", "object", "word_or_default", "context", "opt_abstract",
"macro", "globals", "global_statements", "global_statement", "@1",
"arglist", "elements_block", "elements", "element", "@2", "ignorepat",
- "extension", "statements", "if_head", "@3", "random_head", "@4",
- "iftime_head", "word_list", "word3_list", "goto_word", "switch_head",
- "@5", "statement", "@6", "@7", "@8", "@9", "@10", "@11", "opt_else",
- "target", "jumptarget", "macro_call", "@12", "application_call_head",
- "@13", "application_call", "opt_word", "eval_arglist", "case_statements",
- "case_statement", "macro_statements", "macro_statement", "switches",
- "eswitches", "switchlist_block", "switchlist", "includeslist",
- "includedname", "includes", 0
+ "extension", "statements", "if_like_head", "@3", "@4", "word_list",
+ "word3_list", "goto_word", "switch_head", "@5", "statement", "@6", "@7",
+ "@8", "@9", "@10", "@11", "opt_else", "target", "jumptarget",
+ "macro_call", "@12", "application_call_head", "@13", "application_call",
+ "opt_word", "eval_arglist", "case_statements", "case_statement",
+ "macro_statements", "macro_statement", "switches", "eswitches",
+ "switchlist_block", "switchlist", "includeslist", "includes", 0
};
#endif
@@ -628,17 +624,16 @@
50, 51, 51, 51, 53, 52, 54, 54, 54, 55,
55, 56, 56, 56, 56, 57, 57, 57, 57, 57,
58, 57, 57, 57, 59, 60, 60, 60, 60, 61,
- 61, 61, 63, 62, 65, 64, 66, 66, 67, 67,
- 68, 68, 68, 69, 69, 69, 71, 70, 72, 73,
- 72, 72, 72, 72, 74, 75, 76, 72, 77, 72,
- 72, 72, 72, 72, 72, 78, 72, 72, 72, 72,
- 72, 72, 72, 72, 79, 79, 80, 80, 80, 80,
- 80, 80, 80, 81, 81, 81, 81, 81, 81, 83,
- 82, 82, 85, 84, 86, 86, 87, 87, 88, 88,
- 88, 89, 89, 90, 90, 90, 90, 90, 90, 91,
- 91, 92, 92, 93, 94, 95, 95, 96, 96, 96,
- 97, 97, 97, 97, 97, 97, 97, 98, 98, 99,
- 99
+ 61, 61, 63, 62, 64, 62, 62, 62, 65, 65,
+ 66, 66, 66, 67, 67, 67, 69, 68, 70, 71,
+ 70, 70, 70, 70, 72, 73, 74, 70, 75, 70,
+ 70, 70, 70, 70, 70, 76, 70, 70, 70, 70,
+ 70, 70, 77, 77, 78, 78, 78, 78, 78, 78,
+ 78, 79, 79, 79, 79, 79, 79, 81, 80, 80,
+ 83, 82, 84, 84, 85, 85, 86, 86, 86, 87,
+ 87, 88, 88, 88, 88, 88, 88, 89, 89, 90,
+ 90, 91, 92, 93, 93, 94, 94, 94, 95, 95,
+ 95, 95, 95, 95, 95, 96, 96
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -653,13 +648,12 @@
1, 2, 3, 1, 2, 3, 0, 6, 3, 0,
5, 3, 3, 2, 0, 0, 0, 12, 0, 6,
2, 3, 3, 2, 2, 0, 5, 2, 2, 2,
- 3, 3, 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, 3, 2, 3, 1,
- 2, 1, 5, 2, 2, 3, 2, 2, 3, 2,
- 2, 14, 10, 3, 15, 11, 2, 1, 1, 4,
- 3
+ 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, 3, 2, 3, 1, 2, 1,
+ 5, 2, 2, 3, 2, 2, 3, 2, 2, 14,
+ 10, 3, 15, 11, 2, 4, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -672,213 +666,215 @@
0, 0, 21, 11, 10, 0, 0, 26, 0, 24,
23, 19, 22, 0, 12, 0, 28, 0, 0, 0,
32, 29, 43, 0, 0, 0, 0, 0, 0, 0,
- 0, 31, 39, 35, 37, 38, 36, 0, 18, 93,
+ 0, 31, 39, 35, 37, 38, 36, 0, 18, 91,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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,
- 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, 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,
- 0, 0, 65, 98, 97, 63, 104, 108, 106, 0,
- 0, 0, 0, 94, 126, 128, 0, 116, 120, 0,
- 0, 62, 0, 138, 143, 0, 60, 0, 41, 0,
- 0, 53, 0, 0, 55, 0, 0, 0, 0, 0,
- 75, 0, 132, 70, 0, 0, 86, 0, 0, 60,
- 0, 0, 0, 110, 67, 0, 0, 102, 101, 100,
- 99, 107, 105, 0, 79, 0, 47, 0, 0, 0,
- 0, 0, 0, 0, 48, 0, 0, 0, 0, 0,
- 0, 76, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 57, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 142, 0, 0, 77, 145, 0,
- 0, 0, 0, 0, 56, 0, 0, 0, 141, 144
+ 0, 0, 0, 0, 0, 0, 129, 117, 0, 0,
+ 127, 0, 27, 0, 0, 0, 0, 0, 0, 131,
+ 132, 0, 42, 40, 0, 34, 30, 33, 0, 49,
+ 0, 0, 66, 52, 0, 54, 0, 63, 94, 0,
+ 101, 0, 88, 87, 89, 74, 78, 0, 110, 84,
+ 69, 73, 93, 80, 0, 0, 0, 0, 119, 113,
+ 58, 116, 0, 83, 85, 17, 128, 16, 0, 25,
+ 0, 0, 0, 60, 0, 134, 0, 0, 146, 0,
+ 0, 0, 45, 51, 68, 50, 107, 82, 0, 0,
+ 60, 0, 0, 0, 0, 0, 64, 0, 0, 71,
+ 0, 0, 72, 0, 0, 0, 111, 0, 0, 90,
+ 0, 0, 125, 81, 120, 59, 112, 115, 0, 15,
+ 44, 0, 46, 61, 0, 135, 137, 133, 0, 138,
+ 0, 144, 145, 0, 0, 109, 117, 0, 0, 0,
+ 0, 0, 0, 0, 65, 96, 95, 63, 102, 106,
+ 104, 0, 0, 0, 0, 92, 124, 126, 0, 114,
+ 118, 0, 0, 62, 0, 136, 60, 0, 141, 0,
+ 41, 0, 0, 53, 0, 0, 55, 0, 0, 0,
+ 0, 0, 75, 0, 130, 70, 0, 0, 86, 0,
+ 0, 0, 0, 60, 0, 108, 67, 0, 0, 100,
+ 99, 98, 97, 105, 103, 0, 79, 0, 47, 0,
+ 0, 0, 0, 0, 0, 0, 48, 0, 0, 0,
+ 0, 0, 0, 76, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 57, 0, 0, 0, 0,
+ 0, 0, 0, 0, 140, 0, 0, 0, 0, 77,
+ 0, 143, 0, 0, 0, 0, 56, 0, 0, 139,
+ 0, 142
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short int yydefgoto[] =
{
-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, 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
+ 22, 39, 28, 34, 50, 51, 151, 52, 53, 98,
+ 74, 159, 162, 131, 144, 108, 75, 158, 99, 177,
+ 173, 275, 300, 174, 188, 179, 109, 111, 101, 206,
+ 77, 176, 78, 230, 132, 127, 128, 79, 80, 54,
+ 55, 89, 147, 150, 56
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -180
+#define YYPACT_NINF -173
static const short int yypact[] =
{
- 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,
- 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, 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, 173,
- 338, -180, 330, 334, -180, 145, 145, 145, 145, 135,
- -180, 464, -180, -180, 134, 239, -180, 322, 464, 62,
- 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
+ 117, -173, -23, 2, -173, 27, 164, -173, -173, 55,
+ -173, -173, 72, 10, -173, -173, -173, 70, 7, -173,
+ 76, 33, -173, -173, -173, 87, 104, -173, 146, -173,
+ -173, -173, -173, 322, -173, 365, -173, 112, 79, 81,
+ -173, -173, -173, 100, 41, 124, 135, 135, 145, 19,
+ 327, -173, -173, -173, -173, -173, -173, 469, -173, -173,
+ 119, 160, 169, 201, 202, 116, 157, 143, 204, 205,
+ 203, 208, 176, 175, 469, 65, -173, 34, 195, 391,
+ -173, 417, -173, 215, 187, 210, 206, 188, 12, -173,
+ -173, -1, -173, -173, 469, -173, -173, -173, 4, -173,
+ 220, 224, -173, -173, 193, -173, 54, 8, 113, 227,
+ 11, 228, -173, -173, -173, -173, -173, 239, -173, -173,
+ -173, -173, 223, -173, 209, 212, 234, 110, -173, -173,
+ 213, -173, 185, -173, -173, -173, -173, -173, 443, -173,
+ 238, 188, 469, 216, 240, -173, 241, 51, -173, 155,
+ 6, 217, -173, -173, -173, -173, 249, -173, 219, 221,
+ 63, 250, 221, 157, 157, 222, -173, 157, 157, -173,
+ 229, 133, -173, 230, 236, 469, -173, 243, 469, -173,
+ 253, 257, 469, -173, -173, -173, -173, 244, 246, -173,
+ -173, 284, -173, 251, 254, -173, -173, -173, 286, -173,
+ 255, -173, -173, 165, 290, -173, 221, 292, 293, 188,
+ 188, 294, 296, 289, -173, 298, 302, 57, -173, -173,
+ -173, 301, 309, 109, 314, -173, 469, 469, 61, -173,
+ -173, 316, 288, -173, 307, -173, 64, 323, -173, 295,
+ -173, 192, 321, -173, 320, 326, -173, 157, 157, 157,
+ 157, 153, -173, 469, -173, -173, 247, 285, -173, 317,
+ 469, 188, 188, 71, 329, -173, -173, 188, 188, -173,
+ -173, -173, -173, -173, -173, 297, -173, 469, -173, 330,
+ 331, 188, 188, 332, 333, 339, -173, 188, 188, 335,
+ 338, 188, 188, -173, 337, 341, 188, 188, 344, 342,
+ 315, 188, 188, 346, 351, -173, 188, 364, 366, 359,
+ 188, 188, 362, 469, -173, 188, 368, 367, 188, -173,
+ 369, -173, 188, 371, 188, 373, -173, 380, 188, -173,
+ 381, -173
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -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, -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
+ -173, -173, -173, 375, -90, -173, -173, -173, -173, -173,
+ 358, -173, -173, -173, -173, 350, -173, -173, -173, -172,
+ -173, -173, -173, 23, -91, -9, -173, -173, -35, -173,
+ -173, -173, -173, -173, -173, -173, -173, -173, -173, -173,
+ -173, -173, -173, -173, 198, -173, 274, 324, -77, -173,
+ -173, 360, -173, -173, -173
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -126
+#define YYTABLE_NINF -124
static const short int yytable[] =
{
- 78, 140, 231, 207, 30, 204, 152, 208, 31, 205,
- 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, 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, 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,
- 268, 269, 65, 66, 67, 68, 69, 97, 272, 70,
- 71, 98, 274, 275, 42, 276, 285, 32, 73, 293,
- 288, 298, 301, 43, 297, 299, 300, 303, 302, 313,
- 311, 312, 314, 316, 57, 58, 44, 45, 59, 315,
- 317, 321, 60, 324, 46, 47, 48, 49, 61, 62,
- 63, 325, 64, 326, 328, 65, 66, 67, 68, 69,
- 57, 139, 70, 71, 59, 329, 333, 72, 60, 334,
- 335, 73, 338, 339, 61, 62, 63, 16, 64, 99,
- 249, 65, 66, 67, 68, 69, 57, 141, 70, 71,
- 59, 92, 192, 72, 60, 209, 0, 73, 0, 0,
- 61, 62, 63, 0, 64, 0, 142, 65, 66, 67,
- 68, 69, 57, 197, 70, 71, 59, 0, 0, 72,
- 60, 0, 0, 73, 0, 0, 61, 62, 63, 0,
- 64, 0, 0, 65, 66, 67, 68, 69, 57, 0,
- 70, 71, 59, 0, 0, 72, 60, 0, 0, 73,
- 0, 0, 61, 62, 63, 0, 64, 0, 0, 65,
- 66, 67, 68, 69, 0, 0, 70, 71, 0, 0,
- 0, 0, 0, 0, 0, 73
+ 76, 149, 136, 223, 148, 153, 13, 201, 57, 154,
+ 228, 202, 59, 161, 26, 19, 60, 145, 12, 165,
+ 92, 170, 61, 62, 63, 171, 64, 14, 93, 65,
+ 66, 67, 68, 69, 30, 23, 70, 71, 31, 122,
+ 24, 129, 23, 94, 76, 73, 76, 24, 27, 166,
+ 191, 20, 196, 146, 256, 257, 197, 110, 17, 152,
+ 203, 136, 153, 155, 163, 57, -122, 164, 165, 59,
+ 123, 251, 85, 60, 20, 130, 209, 261, 18, 61,
+ 62, 63, 86, 64, 281, 29, 65, 66, 67, 68,
+ 69, 33, 198, 70, 71, -122, -122, -122, 166, 124,
+ 125, 126, 73, 76, 193, 193, 23, 192, 35, 237,
+ 153, 24, 193, 57, 254, 183, 81, 59, 244, 245,
+ 82, 60, 83, 167, 84, 1, 168, 61, 62, 63,
+ 87, 64, 2, 3, 65, 66, 67, 68, 69, 88,
+ 4, 70, 71, 225, 124, 125, 126, 36, 264, 91,
+ 73, 112, 106, 37, 212, 213, 38, 107, 215, 216,
+ 100, 218, 220, 199, -2, 15, 102, -14, 200, 219,
+ 279, 280, 1, 238, 107, 103, 283, 284, 239, 2,
+ 3, 118, 208, 119, 120, 211, 121, 4, 155, 273,
+ 289, 290, 186, 155, 274, 187, 294, 295, 107, 265,
+ 298, 299, 187, 133, 134, 303, 304, 104, 105, 115,
+ 308, 309, 113, 114, 116, 312, 141, 117, 276, 316,
+ 317, 155, 155, 139, 320, 278, 156, 323, 140, 143,
+ 142, 325, 157, 327, 160, 169, 172, 330, 269, 270,
+ 271, 272, 286, 175, 178, 182, 190, 194, 153, 195,
+ 180, 57, -121, 181, 185, 59, 205, 193, 204, 60,
+ 207, 210, 130, 214, 226, 61, 62, 63, 227, 64,
+ 217, 221, 65, 66, 67, 68, 69, 222, 319, 70,
+ 71, -121, -121, -121, 224, 229, 153, 231, 73, 57,
+ -123, 232, 233, 59, 235, 234, 236, 60, 240, 242,
+ 243, 246, 248, 61, 62, 63, 247, 64, 249, 252,
+ 65, 66, 67, 68, 69, 250, 253, 70, 71, -123,
+ -123, -123, 255, 40, 258, 266, 73, 41, 95, 259,
+ 42, 260, 96, 267, 262, 42, 263, 268, 285, 43,
+ 282, 277, 288, 287, 43, 291, 292, 293, 296, 297,
+ 301, 305, 44, 45, 302, 306, 307, 44, 45, 310,
+ 46, 47, 48, 49, 311, 46, 47, 48, 49, 57,
+ 58, 313, 315, 59, 314, 318, 321, 60, 326, 32,
+ 322, 16, 324, 61, 62, 63, 328, 64, 329, 331,
+ 65, 66, 67, 68, 69, 57, 135, 70, 71, 59,
+ 97, 184, 72, 60, 241, 138, 73, 90, 0, 61,
+ 62, 63, 0, 64, 0, 0, 65, 66, 67, 68,
+ 69, 57, 137, 70, 71, 59, 0, 0, 72, 60,
+ 0, 0, 73, 0, 0, 61, 62, 63, 0, 64,
+ 0, 0, 65, 66, 67, 68, 69, 57, 189, 70,
+ 71, 59, 0, 0, 72, 60, 0, 0, 73, 0,
+ 0, 61, 62, 63, 0, 64, 0, 0, 65, 66,
+ 67, 68, 69, 57, 0, 70, 71, 59, 0, 0,
+ 72, 60, 0, 0, 73, 0, 0, 61, 62, 63,
+ 0, 64, 0, 0, 65, 66, 67, 68, 69, 0,
+ 0, 70, 71, 0, 0, 0, 0, 0, 0, 0,
+ 73
};
static const short int yycheck[] =
{
- 35, 81, 181, 1, 1, 1, 5, 5, 5, 5,
- 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, 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, 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, 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,
[... 2373 lines stripped ...]
More information about the asterisk-commits
mailing list