From: Harlan Stenn Date: Mon, 1 Sep 2008 00:42:07 +0000 (-0400) Subject: regenerate ntp_parser.c X-Git-Tag: NTP_4_2_5P127~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a833f3ddfacc7a9a091ac98cd98b59185de1e30;p=thirdparty%2Fntp.git regenerate ntp_parser.c bk: 48bb3a5fx7RRotuXJDSwY7iLY5AkCg --- diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index 4b0e3b95a..c882dab9e 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -679,18 +679,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 164 +#define YYFINAL 159 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 546 +#define YYLAST 584 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 160 +#define YYNTOKENS 158 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 64 +#define YYNNTS 62 /* YYNRULES -- Number of rules. */ -#define YYNRULES 230 +#define YYNRULES 223 /* YYNRULES -- Number of states. */ -#define YYNSTATES 361 +#define YYNSTATES 354 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -706,7 +706,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 156, 2, 157, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 155, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -714,7 +714,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 158, 2, 159, 2, 2, 2, 2, + 2, 2, 2, 156, 2, 157, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -752,124 +752,121 @@ static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 9, 12, 15, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 42, - 45, 47, 49, 51, 53, 55, 57, 59, 62, 64, - 66, 69, 71, 73, 76, 78, 80, 83, 86, 89, - 91, 93, 95, 97, 99, 102, 105, 108, 110, 113, - 116, 119, 122, 125, 128, 131, 134, 137, 140, 142, - 143, 146, 148, 151, 154, 157, 160, 163, 166, 169, - 172, 174, 177, 180, 183, 186, 189, 192, 195, 198, - 201, 204, 207, 210, 213, 217, 220, 222, 224, 226, - 228, 230, 232, 234, 236, 239, 241, 244, 247, 249, - 251, 253, 255, 257, 259, 261, 263, 265, 267, 269, - 272, 276, 280, 286, 287, 290, 292, 294, 296, 298, - 300, 302, 304, 306, 308, 310, 312, 314, 316, 319, - 321, 324, 327, 330, 334, 337, 339, 342, 345, 348, - 351, 354, 357, 360, 363, 366, 369, 372, 374, 376, - 378, 380, 382, 384, 386, 388, 391, 394, 396, 399, - 402, 405, 408, 411, 414, 417, 421, 423, 426, 429, - 432, 435, 438, 441, 444, 447, 450, 453, 456, 460, - 463, 466, 468, 471, 472, 477, 481, 484, 486, 489, - 492, 495, 497, 500, 502, 504, 506, 508, 511, 513, - 516, 518, 521, 523, 525, 527, 529, 531, 533, 539, - 541, 545, 548, 552, 556, 559, 561, 567, 572, 576, - 578, 580, 583, 585, 592, 596, 599, 603, 607, 611, - 615 + 45, 47, 49, 51, 53, 55, 57, 60, 63, 65, + 68, 70, 72, 75, 77, 79, 82, 85, 88, 90, + 92, 94, 96, 98, 101, 104, 107, 109, 112, 115, + 118, 121, 124, 127, 130, 133, 136, 139, 141, 142, + 145, 147, 150, 153, 156, 159, 162, 165, 168, 171, + 173, 176, 179, 182, 185, 188, 191, 194, 197, 200, + 203, 206, 209, 212, 216, 219, 221, 223, 225, 227, + 229, 231, 233, 235, 238, 240, 243, 246, 248, 250, + 252, 254, 256, 258, 260, 262, 264, 266, 268, 271, + 275, 279, 285, 286, 289, 291, 293, 295, 297, 299, + 301, 303, 305, 307, 309, 311, 313, 315, 318, 320, + 323, 326, 329, 333, 336, 338, 341, 344, 347, 350, + 353, 356, 359, 362, 365, 368, 371, 373, 375, 377, + 379, 381, 383, 385, 387, 390, 393, 395, 398, 401, + 404, 407, 410, 413, 416, 420, 422, 425, 428, 431, + 434, 437, 440, 443, 446, 449, 452, 455, 459, 462, + 465, 467, 470, 471, 476, 480, 483, 485, 488, 491, + 494, 496, 498, 501, 503, 506, 508, 511, 513, 515, + 517, 519, 521, 523, 529, 531, 535, 538, 542, 546, + 549, 551, 557, 562, 566, 569, 571, 578, 582, 585, + 589, 593, 597, 601 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 161, 0, -1, 162, -1, 162, 163, 144, -1, 163, - 144, -1, 1, 144, -1, -1, 164, -1, 170, -1, - 171, -1, 178, -1, 184, -1, 175, -1, 189, -1, - 192, -1, 195, -1, 198, -1, 211, -1, 165, 166, - 168, -1, 165, 166, -1, 117, -1, 103, -1, 98, - -1, 12, -1, 68, -1, 167, -1, 126, -1, 53, - 126, -1, 47, -1, 48, -1, 168, 169, -1, 169, - -1, 6, -1, 11, 210, -1, 15, -1, 49, -1, - 56, 53, -1, 78, 53, -1, 74, 53, -1, 89, - -1, 106, -1, 107, -1, 134, -1, 140, -1, 136, - 53, -1, 80, 53, -1, 138, 53, -1, 13, -1, - 13, 93, -1, 69, 208, -1, 83, 208, -1, 6, - 53, -1, 21, 53, -1, 22, 172, -1, 57, 126, - -1, 58, 126, -1, 114, 53, -1, 135, 206, -1, - 173, -1, -1, 173, 174, -1, 174, -1, 45, 126, - -1, 50, 126, -1, 109, 126, -1, 111, 126, -1, - 116, 53, -1, 119, 126, -1, 132, 176, -1, 176, - 177, -1, 177, -1, 18, 53, -1, 42, 53, -1, - 20, 209, -1, 96, 53, -1, 76, 210, -1, 72, - 210, -1, 75, 210, -1, 71, 210, -1, 79, 53, - -1, 10, 53, -1, 73, 53, -1, 120, 179, -1, - 122, 126, -1, 36, 180, 181, -1, 179, 180, -1, - 180, -1, 19, -1, 23, -1, 66, -1, 99, -1, - 112, -1, 127, -1, 108, -1, 181, 182, -1, 182, - -1, 35, 126, -1, 137, 183, -1, 63, -1, 84, - -1, 32, -1, 26, -1, 86, -1, 101, -1, 24, - -1, 139, -1, 82, -1, 141, -1, 3, -1, 27, - 187, -1, 115, 166, 185, -1, 115, 25, 185, -1, - 115, 167, 70, 167, 185, -1, -1, 185, 186, -1, - 41, -1, 51, -1, 59, -1, 62, -1, 67, -1, - 85, -1, 87, -1, 88, -1, 90, -1, 91, -1, - 92, -1, 95, -1, 138, -1, 187, 188, -1, 188, - -1, 8, 53, -1, 77, 53, -1, 81, 53, -1, - 44, 166, 190, -1, 190, 191, -1, 191, -1, 129, - 210, -1, 130, 210, -1, 125, 53, -1, 113, 126, - -1, 37, 209, -1, 38, 209, -1, 39, 209, -1, - 40, 209, -1, 32, 193, -1, 26, 193, -1, 193, - 194, -1, 194, -1, 5, -1, 9, -1, 16, -1, - 55, -1, 81, -1, 94, -1, 121, -1, 131, 196, - -1, 196, 197, -1, 197, -1, 4, 210, -1, 28, - 210, -1, 43, 210, -1, 46, 210, -1, 97, 210, - -1, 123, 210, -1, 124, 210, -1, 52, 126, 163, - -1, 33, -1, 14, 210, -1, 17, 53, -1, 128, - 210, -1, 30, 199, -1, 61, 126, -1, 102, 126, - -1, 65, 126, -1, 7, 53, -1, 64, 203, -1, - 100, 207, -1, 118, 200, -1, 133, 167, 201, -1, - 136, 206, -1, 110, 126, -1, 126, -1, 126, 29, - -1, -1, 126, 155, 126, 25, -1, 126, 155, 126, - -1, 201, 202, -1, 202, -1, 104, 53, -1, 54, - 167, -1, 203, 204, -1, 204, -1, 205, 126, -1, - 126, -1, 156, -1, 157, -1, 155, -1, 206, 53, - -1, 53, -1, 207, 126, -1, 126, -1, 208, 166, - -1, 166, -1, 53, -1, 134, -1, 34, -1, 53, - -1, 29, -1, 212, 158, 213, 215, 159, -1, 145, - -1, 213, 214, 144, -1, 214, 144, -1, 146, 155, - 210, -1, 147, 155, 210, -1, 215, 216, -1, 216, - -1, 218, 158, 217, 220, 159, -1, 148, 155, 210, - 144, -1, 117, 155, 219, -1, 167, -1, 126, -1, - 220, 221, -1, 221, -1, 149, 155, 210, 158, 222, - 159, -1, 222, 223, 144, -1, 223, 144, -1, 150, - 155, 210, -1, 151, 155, 210, -1, 152, 155, 210, - -1, 153, 155, 210, -1, 154, 155, 210, -1 + 159, 0, -1, 160, -1, 160, 161, 144, -1, 161, + 144, -1, 1, 144, -1, -1, 162, -1, 168, -1, + 169, -1, 176, -1, 182, -1, 173, -1, 187, -1, + 190, -1, 193, -1, 196, -1, 208, -1, 163, 164, + 166, -1, 163, 164, -1, 117, -1, 103, -1, 98, + -1, 12, -1, 68, -1, 165, -1, 47, 126, -1, + 48, 126, -1, 126, -1, 166, 167, -1, 167, -1, + 6, -1, 11, 207, -1, 15, -1, 49, -1, 56, + 53, -1, 78, 53, -1, 74, 53, -1, 89, -1, + 106, -1, 107, -1, 134, -1, 140, -1, 136, 53, + -1, 80, 53, -1, 138, 53, -1, 13, -1, 13, + 93, -1, 69, 205, -1, 83, 205, -1, 6, 53, + -1, 21, 53, -1, 22, 170, -1, 57, 126, -1, + 58, 126, -1, 114, 53, -1, 135, 203, -1, 171, + -1, -1, 171, 172, -1, 172, -1, 45, 126, -1, + 50, 126, -1, 109, 126, -1, 111, 126, -1, 116, + 53, -1, 119, 126, -1, 132, 174, -1, 174, 175, + -1, 175, -1, 18, 53, -1, 42, 53, -1, 20, + 206, -1, 96, 53, -1, 76, 207, -1, 72, 207, + -1, 75, 207, -1, 71, 207, -1, 79, 53, -1, + 10, 53, -1, 73, 53, -1, 120, 177, -1, 122, + 126, -1, 36, 178, 179, -1, 177, 178, -1, 178, + -1, 19, -1, 23, -1, 66, -1, 99, -1, 112, + -1, 127, -1, 108, -1, 179, 180, -1, 180, -1, + 35, 126, -1, 137, 181, -1, 63, -1, 84, -1, + 32, -1, 26, -1, 86, -1, 101, -1, 24, -1, + 139, -1, 82, -1, 141, -1, 3, -1, 27, 185, + -1, 115, 164, 183, -1, 115, 25, 183, -1, 115, + 165, 70, 165, 183, -1, -1, 183, 184, -1, 41, + -1, 51, -1, 59, -1, 62, -1, 67, -1, 85, + -1, 87, -1, 88, -1, 90, -1, 91, -1, 92, + -1, 95, -1, 138, -1, 185, 186, -1, 186, -1, + 8, 53, -1, 77, 53, -1, 81, 53, -1, 44, + 164, 188, -1, 188, 189, -1, 189, -1, 129, 207, + -1, 130, 207, -1, 125, 53, -1, 113, 126, -1, + 37, 206, -1, 38, 206, -1, 39, 206, -1, 40, + 206, -1, 32, 191, -1, 26, 191, -1, 191, 192, + -1, 192, -1, 5, -1, 9, -1, 16, -1, 55, + -1, 81, -1, 94, -1, 121, -1, 131, 194, -1, + 194, 195, -1, 195, -1, 4, 207, -1, 28, 207, + -1, 43, 207, -1, 46, 207, -1, 97, 207, -1, + 123, 207, -1, 124, 207, -1, 52, 126, 161, -1, + 33, -1, 14, 207, -1, 17, 53, -1, 128, 207, + -1, 30, 197, -1, 61, 126, -1, 102, 126, -1, + 65, 126, -1, 7, 53, -1, 64, 201, -1, 100, + 204, -1, 118, 198, -1, 133, 165, 199, -1, 136, + 203, -1, 110, 126, -1, 126, -1, 126, 29, -1, + -1, 126, 155, 126, 25, -1, 126, 155, 126, -1, + 199, 200, -1, 200, -1, 104, 53, -1, 54, 165, + -1, 201, 202, -1, 202, -1, 126, -1, 203, 53, + -1, 53, -1, 204, 126, -1, 126, -1, 205, 164, + -1, 164, -1, 53, -1, 134, -1, 34, -1, 53, + -1, 29, -1, 209, 156, 210, 212, 157, -1, 145, + -1, 210, 211, 144, -1, 211, 144, -1, 146, 155, + 207, -1, 147, 155, 207, -1, 212, 213, -1, 213, + -1, 215, 156, 214, 216, 157, -1, 148, 155, 207, + 144, -1, 117, 155, 164, -1, 216, 217, -1, 217, + -1, 149, 155, 207, 156, 218, 157, -1, 218, 219, + 144, -1, 219, 144, -1, 150, 155, 207, -1, 151, + 155, 207, -1, 152, 155, 207, -1, 153, 155, 207, + -1, 154, 155, 207, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 283, 283, 287, 288, 293, 304, 305, 306, 307, - 308, 309, 310, 311, 312, 313, 314, 315, 323, 329, - 338, 339, 340, 341, 342, 346, 347, 348, 364, 365, - 369, 370, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 399, 401, 403, - 405, 416, 418, 420, 427, 429, 431, 433, 438, 440, - 444, 445, 449, 451, 453, 455, 457, 459, 469, 474, - 475, 479, 481, 483, 485, 487, 489, 491, 493, 495, - 497, 499, 509, 511, 513, 521, 522, 526, 528, 530, - 532, 534, 536, 538, 543, 544, 548, 549, 550, 551, - 552, 553, 557, 558, 559, 560, 561, 562, 563, 572, - 574, 579, 584, 592, 593, 597, 598, 599, 600, 601, - 602, 603, 604, 605, 606, 607, 608, 609, 613, 614, - 618, 619, 620, 628, 633, 634, 638, 640, 642, 644, - 646, 648, 650, 652, 661, 663, 668, 669, 673, 674, - 675, 676, 677, 678, 680, 688, 692, 693, 697, 698, - 699, 700, 701, 702, 703, 711, 727, 733, 735, 737, - 739, 741, 744, 746, 748, 751, 753, 755, 757, 759, - 761, 765, 767, 770, 775, 777, 783, 784, 788, 789, - 794, 795, 799, 800, 817, 818, 819, 828, 829, 833, - 834, 838, 839, 843, 852, 853, 857, 858, 866, 881, - 885, 886, 890, 891, 895, 896, 900, 905, 909, 913, - 914, 918, 919, 923, 928, 929, 933, 935, 937, 939, - 941 + 0, 280, 280, 284, 285, 290, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 320, 326, + 335, 336, 337, 338, 339, 343, 344, 345, 349, 353, + 354, 359, 360, 361, 362, 363, 364, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 383, 385, 387, 389, + 400, 402, 404, 411, 413, 415, 417, 422, 424, 428, + 429, 433, 435, 437, 439, 441, 443, 453, 458, 459, + 463, 465, 467, 469, 471, 473, 475, 477, 479, 481, + 483, 493, 495, 497, 505, 506, 510, 512, 514, 516, + 518, 520, 522, 527, 528, 532, 533, 534, 535, 536, + 537, 541, 542, 543, 544, 545, 546, 547, 556, 558, + 563, 568, 576, 577, 581, 582, 583, 584, 585, 586, + 587, 588, 589, 590, 591, 592, 593, 597, 598, 602, + 603, 604, 612, 617, 618, 622, 624, 626, 628, 630, + 632, 634, 636, 645, 647, 652, 653, 657, 658, 659, + 660, 661, 662, 664, 672, 676, 677, 681, 682, 683, + 684, 685, 686, 687, 695, 711, 717, 719, 721, 723, + 725, 728, 730, 732, 735, 737, 739, 741, 743, 745, + 749, 751, 754, 759, 761, 767, 768, 772, 773, 778, + 779, 783, 800, 801, 805, 806, 810, 811, 815, 824, + 825, 829, 830, 838, 853, 857, 858, 862, 863, 867, + 868, 872, 877, 881, 885, 886, 890, 895, 896, 900, + 902, 904, 906, 908 }; #endif @@ -907,24 +904,23 @@ static const char *const yytname[] = "T_Week", "T_Xleave", "T_Year", "T_Flag", "T_Void", "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", "T_Jitter", "T_Prop_Delay", - "T_Proc_Delay", "'='", "'+'", "'-'", "'{'", "'}'", "$accept", - "configuration", "command_list", "command", "server_command", - "client_type", "address", "ip_address", "option_list", "option", - "other_mode_command", "authentication_command", "crypto_command_line", - "crypto_command_list", "crypto_command", "orphan_mode_command", - "tos_option_list", "tos_option", "monitoring_command", "stats_list", - "stat", "filegen_option_list", "filegen_option", "filegen_type", - "access_control_command", "ac_flag_list", "access_control_flag", - "discard_option_list", "discard_option", "fudge_command", - "fudge_factor_list", "fudge_factor", "system_option_command", - "system_option_list", "system_option", "tinker_command", - "tinker_option_list", "tinker_option", "miscellaneous_command", - "drift_parm", "variable_assign", "trap_option_list", "trap_option", - "log_config_list", "log_config_command", "log_config_prefix", - "integer_list", "string_list", "address_list", "boolean", "number", - "simulate_command", "sim_conf_start", "sim_init_statement_list", - "sim_init_statement", "sim_server_list", "sim_server", - "sim_server_offset", "sim_server_name", "sim_address", "sim_act_list", + "T_Proc_Delay", "'='", "'{'", "'}'", "$accept", "configuration", + "command_list", "command", "server_command", "client_type", "address", + "ip_address", "option_list", "option", "other_mode_command", + "authentication_command", "crypto_command_line", "crypto_command_list", + "crypto_command", "orphan_mode_command", "tos_option_list", "tos_option", + "monitoring_command", "stats_list", "stat", "filegen_option_list", + "filegen_option", "filegen_type", "access_control_command", + "ac_flag_list", "access_control_flag", "discard_option_list", + "discard_option", "fudge_command", "fudge_factor_list", "fudge_factor", + "system_option_command", "system_option_list", "system_option", + "tinker_command", "tinker_option_list", "tinker_option", + "miscellaneous_command", "drift_parm", "variable_assign", + "trap_option_list", "trap_option", "log_config_list", + "log_config_command", "integer_list", "string_list", "address_list", + "boolean", "number", "simulate_command", "sim_conf_start", + "sim_init_statement_list", "sim_init_statement", "sim_server_list", + "sim_server", "sim_server_offset", "sim_server_name", "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", 0 }; #endif @@ -949,37 +945,36 @@ static const yytype_uint16 yytoknum[] = 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 408, 409, 61, 43, 45, 123, 125 + 405, 406, 407, 408, 409, 61, 123, 125 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 160, 161, 162, 162, 162, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, - 165, 165, 165, 165, 165, 166, 166, 166, 167, 167, - 168, 168, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, - 170, 171, 171, 171, 171, 171, 171, 171, 172, 172, - 173, 173, 174, 174, 174, 174, 174, 174, 175, 176, - 176, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 178, 178, 178, 179, 179, 180, 180, 180, - 180, 180, 180, 180, 181, 181, 182, 182, 182, 182, - 182, 182, 183, 183, 183, 183, 183, 183, 183, 184, - 184, 184, 184, 185, 185, 186, 186, 186, 186, 186, - 186, 186, 186, 186, 186, 186, 186, 186, 187, 187, - 188, 188, 188, 189, 190, 190, 191, 191, 191, 191, - 191, 191, 191, 191, 192, 192, 193, 193, 194, 194, - 194, 194, 194, 194, 194, 195, 196, 196, 197, 197, - 197, 197, 197, 197, 197, 198, 198, 198, 198, 198, - 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, - 198, 199, 199, 199, 200, 200, 201, 201, 202, 202, - 203, 203, 204, 204, 205, 205, 205, 206, 206, 207, - 207, 208, 208, 209, 209, 209, 210, 210, 211, 212, - 213, 213, 214, 214, 215, 215, 216, 217, 218, 219, - 219, 220, 220, 221, 222, 222, 223, 223, 223, 223, - 223 + 0, 158, 159, 160, 160, 160, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 162, 162, + 163, 163, 163, 163, 163, 164, 164, 164, 165, 166, + 166, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 168, 168, 168, 168, + 169, 169, 169, 169, 169, 169, 169, 170, 170, 171, + 171, 172, 172, 172, 172, 172, 172, 173, 174, 174, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 176, 176, 176, 177, 177, 178, 178, 178, 178, + 178, 178, 178, 179, 179, 180, 180, 180, 180, 180, + 180, 181, 181, 181, 181, 181, 181, 181, 182, 182, + 182, 182, 183, 183, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 185, 185, 186, + 186, 186, 187, 188, 188, 189, 189, 189, 189, 189, + 189, 189, 189, 190, 190, 191, 191, 192, 192, 192, + 192, 192, 192, 192, 193, 194, 194, 195, 195, 195, + 195, 195, 195, 195, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 197, 197, 197, 198, 198, 199, 199, 200, 200, 201, + 201, 202, 203, 203, 204, 204, 205, 205, 206, 206, + 206, 207, 207, 208, 209, 210, 210, 211, 211, 212, + 212, 213, 214, 215, 216, 216, 217, 218, 218, 219, + 219, 219, 219, 219 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -987,28 +982,27 @@ static const yytype_uint8 yyr2[] = { 0, 2, 1, 3, 2, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, - 2, 1, 1, 2, 1, 1, 2, 2, 2, 1, - 1, 1, 1, 1, 2, 2, 2, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 1, 0, - 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 3, 3, 5, 0, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 2, 2, 2, 3, 2, 1, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, - 2, 2, 2, 2, 2, 3, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, - 2, 1, 2, 0, 4, 3, 2, 1, 2, 2, - 2, 1, 2, 1, 1, 1, 1, 2, 1, 2, - 1, 2, 1, 1, 1, 1, 1, 1, 5, 1, - 3, 2, 3, 3, 2, 1, 5, 4, 3, 1, - 1, 2, 1, 6, 3, 2, 3, 3, 3, 3, - 3 + 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, + 1, 1, 2, 1, 1, 2, 2, 2, 1, 1, + 1, 1, 1, 2, 2, 2, 1, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 0, 2, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 2, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 3, 5, 0, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, + 2, 2, 3, 2, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, + 2, 2, 2, 2, 3, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, + 1, 2, 0, 4, 3, 2, 1, 2, 2, 2, + 1, 1, 2, 1, 2, 1, 2, 1, 1, 1, + 1, 1, 1, 5, 1, 3, 2, 3, 3, 2, + 1, 5, 4, 3, 2, 1, 6, 3, 2, 3, + 3, 3, 3, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1016,111 +1010,109 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 0, 23, 47, 0, 0, 0, 59, - 0, 0, 183, 0, 166, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 23, 46, 0, 0, 0, 58, + 0, 0, 182, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 22, 0, 0, 21, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 209, 0, 2, 0, 7, 0, 8, + 0, 0, 0, 204, 0, 2, 0, 7, 0, 8, 9, 12, 10, 11, 13, 14, 15, 16, 17, 0, - 5, 51, 174, 48, 207, 206, 167, 168, 52, 0, - 0, 0, 0, 0, 0, 53, 58, 61, 148, 149, - 150, 151, 152, 153, 154, 145, 147, 0, 0, 0, - 109, 129, 181, 170, 144, 87, 88, 89, 90, 93, - 91, 92, 0, 28, 29, 0, 26, 0, 25, 6, - 54, 55, 171, 193, 196, 194, 195, 175, 191, 0, - 173, 202, 49, 50, 200, 176, 172, 180, 56, 113, - 113, 25, 0, 177, 82, 86, 83, 169, 0, 0, - 0, 0, 0, 0, 0, 155, 157, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 70, - 0, 198, 57, 179, 1, 0, 4, 19, 0, 62, - 63, 64, 65, 66, 67, 60, 146, 130, 131, 132, - 128, 182, 101, 100, 0, 98, 99, 0, 84, 95, - 27, 0, 0, 0, 0, 0, 0, 0, 0, 133, - 135, 165, 190, 192, 201, 199, 111, 110, 0, 0, - 85, 158, 159, 160, 161, 162, 163, 164, 156, 80, - 71, 205, 203, 204, 73, 72, 78, 76, 81, 77, - 75, 79, 74, 69, 0, 0, 178, 187, 197, 3, - 32, 0, 34, 35, 0, 0, 0, 0, 39, 40, - 41, 42, 0, 0, 43, 18, 31, 0, 0, 0, - 0, 96, 108, 104, 106, 102, 103, 105, 107, 97, - 94, 140, 141, 142, 143, 139, 138, 136, 137, 134, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 114, 113, 185, 189, 188, 186, 33, - 36, 38, 37, 45, 44, 46, 30, 0, 0, 0, - 0, 0, 215, 0, 211, 112, 184, 212, 213, 0, - 210, 208, 214, 0, 220, 219, 218, 0, 0, 0, - 0, 0, 222, 0, 0, 216, 221, 217, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 223, 0, 225, 226, 227, 228, 229, 230, - 224 + 5, 50, 173, 47, 202, 201, 166, 167, 51, 0, + 0, 0, 0, 0, 0, 52, 57, 60, 147, 148, + 149, 150, 151, 152, 153, 144, 146, 0, 0, 0, + 108, 128, 180, 169, 143, 86, 87, 88, 89, 92, + 90, 91, 0, 0, 0, 28, 0, 25, 6, 53, + 54, 170, 191, 174, 190, 172, 197, 48, 49, 195, + 175, 171, 179, 55, 112, 112, 25, 0, 176, 81, + 85, 82, 168, 0, 0, 0, 0, 0, 0, 0, + 154, 156, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 67, 69, 0, 193, 56, 178, 1, + 0, 4, 19, 0, 61, 62, 63, 64, 65, 66, + 59, 145, 129, 130, 131, 127, 181, 100, 99, 0, + 97, 98, 0, 83, 94, 26, 27, 0, 0, 0, + 0, 0, 0, 0, 0, 132, 134, 164, 189, 196, + 194, 110, 109, 0, 0, 84, 157, 158, 159, 160, + 161, 162, 163, 155, 79, 70, 200, 198, 199, 72, + 71, 77, 75, 80, 76, 74, 78, 73, 68, 0, + 0, 177, 186, 192, 3, 31, 0, 33, 34, 0, + 0, 0, 0, 38, 39, 40, 41, 0, 0, 42, + 18, 30, 0, 0, 0, 0, 95, 107, 103, 105, + 101, 102, 104, 106, 96, 93, 139, 140, 141, 142, + 138, 137, 135, 136, 133, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 113, 112, + 184, 188, 187, 185, 32, 35, 37, 36, 44, 43, + 45, 29, 0, 0, 0, 0, 0, 210, 0, 206, + 111, 183, 207, 208, 0, 205, 203, 209, 0, 213, + 0, 0, 0, 0, 0, 215, 0, 0, 211, 214, + 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 216, 0, 218, 219, 220, + 221, 222, 223, 217 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 44, 45, 46, 47, 48, 121, 108, 255, 256, - 49, 50, 75, 76, 77, 51, 158, 159, 52, 134, - 102, 188, 189, 269, 53, 206, 293, 90, 91, 54, - 199, 200, 55, 85, 86, 56, 145, 146, 57, 93, - 133, 236, 237, 117, 118, 119, 162, 125, 122, 224, - 66, 58, 59, 259, 260, 311, 312, 328, 313, 326, - 331, 332, 345, 346 + -1, 44, 45, 46, 47, 48, 116, 107, 250, 251, + 49, 50, 75, 76, 77, 51, 153, 154, 52, 129, + 102, 183, 184, 264, 53, 201, 288, 90, 91, 54, + 195, 196, 55, 85, 86, 56, 140, 141, 57, 93, + 128, 231, 232, 113, 114, 157, 120, 117, 219, 66, + 58, 59, 254, 255, 306, 307, 321, 308, 324, 325, + 338, 339 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -129 +#define YYPACT_NINF -125 static const yytype_int16 yypact[] = { - 10, -119, -4, 2, -129, -29, -9, 16, 19, 274, - 5, 0, -46, 5, -129, -16, -35, -41, -28, -26, - -10, -122, -3, -129, -35, -35, -129, 23, 26, -129, - 27, 34, 41, -129, 30, -16, 31, -9, 185, 163, - 4, 42, 42, -129, 109, 158, -13, -129, -35, -129, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -7, - -129, -129, -129, -129, -129, -129, -129, -129, -129, 32, - 36, 37, 43, 86, 48, -129, 274, -129, -129, -129, - -129, -129, -129, -129, -129, 5, -129, 115, 123, 125, - 0, -129, 153, -129, 5, -129, -129, -129, -129, -129, - -129, -129, 13, -129, -129, 60, -129, 225, -129, 309, - -129, -129, -129, -129, -129, -129, -129, -122, -129, 61, - -129, -129, -35, -35, -129, 66, -129, -129, -129, -129, - -129, 126, 38, -129, -16, -129, -129, -129, -9, -9, - -9, -9, -9, -9, -9, 185, -129, 142, 145, -15, - 147, -9, -9, 148, -9, -9, 159, 161, 163, -129, - -39, -129, 164, 164, -129, 67, -129, 354, -25, -129, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, 92, -129, -129, 58, 13, -129, - -129, -15, -15, -15, -15, 94, 168, -9, -9, 225, - -129, -129, -129, -129, -129, -129, 408, 408, 4, 98, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, 4, 172, -39, -129, -129, -129, - -129, -9, -129, -129, 176, 177, 179, 180, -129, -129, - -129, -129, 184, 187, -129, 354, -129, 95, 96, -88, - 104, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, -129, -129, -129, -129, -129, -129, - -129, -129, -129, -129, -129, 224, -129, -129, -129, -129, - -129, -129, -129, -129, -129, -129, -129, -9, -9, 99, - 111, -89, -129, 108, -129, 408, -129, -129, -129, -42, - -129, -129, -129, 105, -129, -129, -129, 102, 118, -9, - 114, -96, -129, 130, -9, -129, -129, -129, 119, -17, - 124, 128, 129, 132, 140, 93, 137, -9, -9, -9, - -9, -9, -129, 141, -129, -129, -129, -129, -129, -129, - -129 + 117, -109, -17, -12, -125, -54, -5, -9, -8, -29, + 33, -3, -86, 33, -125, 56, -40, -76, -75, -73, + -65, -64, -61, -125, -40, -40, -125, -60, -59, -125, + -58, 23, -21, -125, -49, 56, -45, -5, 9, 298, + -42, 32, 32, -125, 91, 265, -52, -125, -40, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -41, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -32, + -19, -7, -6, 68, -1, -125, -29, -125, -125, -125, + -125, -125, -125, -125, -125, 33, -125, 73, 75, 82, + -3, -125, 66, -125, 33, -125, -125, -125, -125, -125, + -125, -125, -20, 10, 11, -125, 151, -125, 399, -125, + -125, -125, -125, -64, -125, -125, -125, -40, -40, -125, + 14, -125, -125, -125, -125, -125, 71, -10, -125, 56, + -125, -125, -125, -5, -5, -5, -5, -5, -5, -5, + 9, -125, 89, 98, -23, 99, -5, -5, 105, -5, + -5, 106, 107, 298, -125, -35, -125, 109, 109, -125, + 19, -125, 444, -118, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, 39, + -125, -125, 7, -20, -125, -125, -125, -23, -23, -23, + -23, 40, 118, -5, -5, 151, -125, -125, -125, -125, + -125, 269, 269, -42, 44, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -42, + 120, -35, -125, -125, -125, -125, -5, -125, -125, 123, + 124, 126, 127, -125, -125, -125, -125, 131, 134, -125, + 444, -125, 46, 47, -100, 53, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, + 178, -125, -125, -125, -125, -125, -125, -125, -125, -125, + -125, -125, -5, -5, 49, 61, -103, -125, 50, -125, + 269, -125, -125, -125, -40, -125, -125, -125, 59, -125, + 54, 62, -5, 55, -124, -125, 64, -5, -125, -125, + -125, 57, 42, 63, 67, 69, 70, 74, -94, 72, + -5, -5, -5, -5, -5, -125, 77, -125, -125, -125, + -125, -125, -125, -125 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -129, -129, -129, -19, -129, -129, 25, -31, -129, 44, - -129, -129, -129, -129, 220, -129, -129, 143, -129, -129, - -5, -129, 110, -129, -129, -128, -129, -129, 210, -129, - -129, 106, -129, 291, -38, -129, -129, 162, -129, -129, - -129, -129, 70, -129, 200, -129, 276, -129, 295, 15, - -37, -129, -129, -129, 68, -129, 14, -129, -129, -129, - -129, -2, -129, -12 + -125, -125, -125, -25, -125, -125, -14, -31, -125, -38, + -125, -125, -125, -125, 138, -125, -125, 80, -125, -125, + -13, -125, 43, -125, -125, -122, -125, -125, 133, -125, + -125, 35, -125, 215, -62, -125, -125, 96, -125, -125, + -125, -125, 12, -125, 125, 198, -125, 216, -117, -37, + -125, -125, -125, 0, -125, -55, -125, -125, -125, -82, + -125, -92 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1130,120 +1122,128 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 137, 131, 207, 95, 113, 103, 104, 96, 87, 160, - 78, 1, 103, 104, 79, 234, 2, 3, 105, 221, - 64, 80, 4, 5, 6, 60, 165, 7, 309, 309, - 135, 8, 9, 114, 115, 116, 10, 11, 222, 182, - 12, 107, 13, 14, 65, 183, 15, 176, 184, 61, - 97, 103, 104, 330, 16, 62, 176, 130, 257, 258, - 81, 262, 17, 335, 63, 235, 129, 18, 19, 67, - 321, 20, 68, 167, 21, 22, 185, 88, 23, 24, - 92, 89, 263, 98, 324, 109, 82, 128, 103, 104, - 201, 106, 99, 25, 105, 161, 100, 186, 110, 83, - 111, 211, 212, 213, 214, 215, 216, 217, 26, 164, - 27, 101, 28, 29, 226, 227, 112, 229, 230, 223, - 30, 257, 258, 120, 31, 32, 84, 33, 34, 210, - 35, 166, 36, 340, 341, 342, 343, 344, 37, 173, - 264, 38, 39, 40, 265, 41, 42, 204, 204, 124, - 187, 168, 126, 127, -6, 43, 132, 136, 169, 266, - 277, 278, 170, 171, 2, 3, 315, 106, 177, 172, - 4, 5, 6, 147, 174, 7, 178, 294, 179, 8, - 9, 148, 181, 149, 10, 11, 190, 203, 12, 138, - 13, 14, 205, 209, 15, 219, 208, 267, 220, 268, - 225, 228, 16, 296, 299, 150, 271, 272, 273, 274, - 17, 239, 231, 139, 232, 18, 19, 238, 261, 20, - 275, 276, 21, 22, 295, 297, 23, 24, 140, 300, - 301, 141, 302, 303, 151, 152, 153, 304, 154, 155, - 305, 25, 156, 340, 341, 342, 343, 344, 314, 316, - 307, 308, 352, 327, 319, 320, 26, 329, 27, 157, - 28, 29, 191, 192, 193, 194, 323, 330, 30, 334, - 317, 318, 31, 32, 337, 33, 34, 339, 35, 347, - 36, 354, 142, 348, 349, 360, 37, 350, 325, 38, - 39, 40, 333, 41, 42, 351, 175, 338, 270, 306, - 180, 233, -6, 43, 94, 279, 298, 218, 143, 144, - 355, 356, 357, 358, 359, 2, 3, 202, 163, 69, - 123, 4, 5, 6, 70, 322, 7, 310, 0, 336, - 8, 9, 0, 353, 0, 10, 11, 0, 195, 12, + 132, 126, 106, 202, 124, 87, 177, 103, 104, 155, + 257, 216, 178, 133, 304, 179, 69, 304, 125, 229, + 160, 70, 130, 171, 64, 323, 103, 104, 252, 253, + 217, 258, 171, 328, 162, 60, 61, 134, 78, 63, + 92, 62, 79, 180, 67, 68, 252, 253, 65, 80, + 108, 109, 135, 110, 316, 136, 333, 334, 335, 336, + 337, 111, 112, 345, 181, 115, 119, 121, 122, 230, + 266, 267, 268, 269, 88, 95, 123, 127, 89, 96, + 71, 131, 72, 197, 105, 156, 105, 73, 81, 259, + 74, 159, 161, 260, 164, 176, 206, 207, 208, 209, + 210, 211, 212, 199, 199, 105, 137, 165, 261, 221, + 222, 218, 224, 225, 82, 163, 205, 182, 1, 166, + 167, 168, 97, 2, 3, 169, 172, 83, 173, 4, + 5, 6, 138, 139, 7, 174, 185, 186, 8, 9, + 200, 203, 214, 10, 11, 204, 262, 12, 263, 13, + 14, 215, 220, 15, 84, 98, 272, 273, 223, 226, + 227, 16, 233, 234, 99, 256, 270, 310, 100, 17, + 290, 271, 289, 292, 18, 19, 295, 296, 20, 297, + 298, 21, 22, 101, 299, 23, 24, 300, 187, 188, + 189, 190, 333, 334, 335, 336, 337, 309, 291, 294, + 25, 302, 303, 311, 314, 315, 318, 320, 330, 322, + 327, 323, 301, 332, 170, 26, 347, 27, 340, 28, + 29, 353, 341, 175, 342, 343, 265, 30, 94, 344, + 274, 31, 32, 228, 33, 34, 213, 35, 198, 36, + 158, 118, 329, 293, 0, 37, 346, 0, 38, 39, + 40, 317, 41, 42, 305, 0, 0, 0, 0, 0, + 0, -6, 43, 0, 191, 312, 313, 0, 0, 0, + 0, 2, 3, 0, 0, 0, 192, 4, 5, 6, + 193, 194, 7, 0, 0, 326, 8, 9, 0, 0, + 331, 10, 11, 0, 0, 12, 0, 13, 14, 0, + 319, 15, 0, 348, 349, 350, 351, 352, 142, 16, + 275, 0, 0, 0, 0, 0, 143, 17, 144, 0, + 276, 0, 18, 19, 0, 0, 20, 0, 277, 21, + 22, 278, 0, 23, 24, 0, 279, 0, 0, 0, + 145, 0, 0, 0, 0, 0, 0, 0, 25, 0, + 0, 0, 0, 0, 280, 0, 281, 282, 0, 283, + 284, 285, 0, 26, 286, 27, 0, 28, 29, 146, + 147, 148, 0, 149, 150, 30, 0, 151, 0, 31, + 32, 0, 33, 34, 0, 35, 0, 36, 0, 0, + 0, 0, 0, 37, 152, 0, 38, 39, 40, 0, + 41, 42, 0, 0, 0, 2, 3, 287, 0, -6, + 43, 4, 5, 6, 0, 0, 7, 0, 0, 0, + 8, 9, 0, 0, 0, 10, 11, 0, 0, 12, 0, 13, 14, 0, 0, 15, 0, 0, 0, 0, - 196, 0, 0, 16, 197, 198, 0, 0, 0, 0, - 240, 17, 0, 0, 0, 241, 18, 19, 0, 242, + 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, + 235, 17, 0, 0, 0, 236, 18, 19, 0, 237, 20, 0, 0, 21, 22, 0, 0, 23, 24, 0, - 0, 0, 0, 71, 0, 72, 0, 0, 0, 0, - 73, 0, 25, 74, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 243, 0, 0, 0, 26, 0, 27, - 244, 28, 29, 0, 0, 0, 0, 0, 0, 30, - 0, 0, 0, 31, 32, 0, 33, 34, 245, 35, - 0, 36, 246, 0, 247, 0, 0, 37, 0, 0, - 38, 39, 40, 248, 41, 42, 0, 0, 0, 280, - 0, 0, 0, 0, 43, 0, 0, 0, 0, 281, - 249, 250, 0, 0, 0, 0, 0, 282, 0, 0, - 283, 0, 0, 0, 0, 284, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 251, 0, - 252, 0, 253, 285, 254, 286, 287, 0, 288, 289, - 290, 0, 0, 291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 238, 0, 0, 0, 26, 0, 27, + 239, 28, 29, 0, 0, 0, 0, 0, 0, 30, + 0, 0, 0, 31, 32, 0, 33, 34, 240, 35, + 0, 36, 241, 0, 242, 0, 0, 37, 0, 0, + 38, 39, 40, 243, 41, 42, 0, 0, 0, 0, + 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, + 244, 245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 292 + 0, 0, 0, 0, 0, 0, 0, 0, 246, 0, + 247, 0, 248, 0, 249 }; static const yytype_int16 yycheck[] = { - 37, 32, 130, 19, 126, 47, 48, 23, 8, 40, - 5, 1, 47, 48, 9, 54, 6, 7, 53, 34, - 29, 16, 12, 13, 14, 144, 45, 17, 117, 117, - 35, 21, 22, 155, 156, 157, 26, 27, 53, 26, - 30, 16, 32, 33, 53, 32, 36, 85, 35, 53, - 66, 47, 48, 149, 44, 53, 94, 32, 146, 147, - 55, 3, 52, 159, 93, 104, 25, 57, 58, 53, - 159, 61, 53, 48, 64, 65, 63, 77, 68, 69, - 126, 81, 24, 99, 126, 126, 81, 53, 47, 48, - 109, 126, 108, 83, 53, 53, 112, 84, 126, 94, - 126, 138, 139, 140, 141, 142, 143, 144, 98, 0, - 100, 127, 102, 103, 151, 152, 126, 154, 155, 134, - 110, 146, 147, 126, 114, 115, 121, 117, 118, 134, - 120, 144, 122, 150, 151, 152, 153, 154, 128, 53, - 82, 131, 132, 133, 86, 135, 136, 122, 123, 126, - 137, 158, 126, 126, 144, 145, 126, 126, 126, 101, - 197, 198, 126, 126, 6, 7, 294, 126, 53, 126, - 12, 13, 14, 10, 126, 17, 53, 208, 53, 21, - 22, 18, 29, 20, 26, 27, 126, 126, 30, 4, - 32, 33, 126, 155, 36, 53, 70, 139, 53, 141, - 53, 53, 44, 234, 241, 42, 191, 192, 193, 194, - 52, 144, 53, 28, 53, 57, 58, 53, 126, 61, - 126, 53, 64, 65, 126, 53, 68, 69, 43, 53, - 53, 46, 53, 53, 71, 72, 73, 53, 75, 76, - 53, 83, 79, 150, 151, 152, 153, 154, 144, 25, - 155, 155, 159, 148, 155, 144, 98, 155, 100, 96, - 102, 103, 37, 38, 39, 40, 158, 149, 110, 155, - 307, 308, 114, 115, 144, 117, 118, 158, 120, 155, - 122, 144, 97, 155, 155, 144, 128, 155, 319, 131, - 132, 133, 329, 135, 136, 155, 76, 334, 188, 255, - 90, 158, 144, 145, 13, 199, 236, 145, 123, 124, - 347, 348, 349, 350, 351, 6, 7, 117, 42, 45, - 25, 12, 13, 14, 50, 311, 17, 259, -1, 331, - 21, 22, -1, 345, -1, 26, 27, -1, 113, 30, + 37, 32, 16, 125, 25, 8, 26, 47, 48, 40, + 3, 34, 32, 4, 117, 35, 45, 117, 32, 54, + 45, 50, 35, 85, 29, 149, 47, 48, 146, 147, + 53, 24, 94, 157, 48, 144, 53, 28, 5, 93, + 126, 53, 9, 63, 53, 53, 146, 147, 53, 16, + 126, 126, 43, 126, 157, 46, 150, 151, 152, 153, + 154, 126, 126, 157, 84, 126, 126, 126, 126, 104, + 187, 188, 189, 190, 77, 19, 53, 126, 81, 23, + 109, 126, 111, 108, 126, 53, 126, 116, 55, 82, + 119, 0, 144, 86, 126, 29, 133, 134, 135, 136, + 137, 138, 139, 117, 118, 126, 97, 126, 101, 146, + 147, 134, 149, 150, 81, 156, 129, 137, 1, 126, + 126, 53, 66, 6, 7, 126, 53, 94, 53, 12, + 13, 14, 123, 124, 17, 53, 126, 126, 21, 22, + 126, 70, 53, 26, 27, 155, 139, 30, 141, 32, + 33, 53, 53, 36, 121, 99, 193, 194, 53, 53, + 53, 44, 53, 144, 108, 126, 126, 289, 112, 52, + 126, 53, 203, 53, 57, 58, 53, 53, 61, 53, + 53, 64, 65, 127, 53, 68, 69, 53, 37, 38, + 39, 40, 150, 151, 152, 153, 154, 144, 229, 236, + 83, 155, 155, 25, 155, 144, 156, 148, 144, 155, + 155, 149, 250, 156, 76, 98, 144, 100, 155, 102, + 103, 144, 155, 90, 155, 155, 183, 110, 13, 155, + 195, 114, 115, 153, 117, 118, 140, 120, 113, 122, + 42, 25, 324, 231, -1, 128, 338, -1, 131, 132, + 133, 306, 135, 136, 254, -1, -1, -1, -1, -1, + -1, 144, 145, -1, 113, 302, 303, -1, -1, -1, + -1, 6, 7, -1, -1, -1, 125, 12, 13, 14, + 129, 130, 17, -1, -1, 322, 21, 22, -1, -1, + 327, 26, 27, -1, -1, 30, -1, 32, 33, -1, + 314, 36, -1, 340, 341, 342, 343, 344, 10, 44, + 41, -1, -1, -1, -1, -1, 18, 52, 20, -1, + 51, -1, 57, 58, -1, -1, 61, -1, 59, 64, + 65, 62, -1, 68, 69, -1, 67, -1, -1, -1, + 42, -1, -1, -1, -1, -1, -1, -1, 83, -1, + -1, -1, -1, -1, 85, -1, 87, 88, -1, 90, + 91, 92, -1, 98, 95, 100, -1, 102, 103, 71, + 72, 73, -1, 75, 76, 110, -1, 79, -1, 114, + 115, -1, 117, 118, -1, 120, -1, 122, -1, -1, + -1, -1, -1, 128, 96, -1, 131, 132, 133, -1, + 135, 136, -1, -1, -1, 6, 7, 138, -1, 144, + 145, 12, 13, 14, -1, -1, 17, -1, -1, -1, + 21, 22, -1, -1, -1, 26, 27, -1, -1, 30, -1, 32, 33, -1, -1, 36, -1, -1, -1, -1, - 125, -1, -1, 44, 129, 130, -1, -1, -1, -1, + -1, -1, -1, 44, -1, -1, -1, -1, -1, -1, 6, 52, -1, -1, -1, 11, 57, 58, -1, 15, 61, -1, -1, 64, 65, -1, -1, 68, 69, -1, - -1, -1, -1, 109, -1, 111, -1, -1, -1, -1, - 116, -1, 83, 119, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, 98, -1, 100, 56, 102, 103, -1, -1, -1, -1, -1, -1, 110, -1, -1, -1, 114, 115, -1, 117, 118, 74, 120, -1, 122, 78, -1, 80, -1, -1, 128, -1, -1, - 131, 132, 133, 89, 135, 136, -1, -1, -1, 41, - -1, -1, -1, -1, 145, -1, -1, -1, -1, 51, - 106, 107, -1, -1, -1, -1, -1, 59, -1, -1, - 62, -1, -1, -1, -1, 67, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 134, -1, - 136, -1, 138, 85, 140, 87, 88, -1, 90, 91, - 92, -1, -1, 95, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 131, 132, 133, 89, 135, 136, -1, -1, -1, -1, + -1, -1, -1, -1, 145, -1, -1, -1, -1, -1, + 106, 107, -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, 138 + -1, -1, -1, -1, -1, -1, -1, -1, 134, -1, + 136, -1, 138, -1, 140 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1254,39 +1254,38 @@ static const yytype_uint8 yystos[] = 26, 27, 30, 32, 33, 36, 44, 52, 57, 58, 61, 64, 65, 68, 69, 83, 98, 100, 102, 103, 110, 114, 115, 117, 118, 120, 122, 128, 131, 132, - 133, 135, 136, 145, 161, 162, 163, 164, 165, 170, - 171, 175, 178, 184, 189, 192, 195, 198, 211, 212, - 144, 53, 53, 93, 29, 53, 210, 53, 53, 45, - 50, 109, 111, 116, 119, 172, 173, 174, 5, 9, - 16, 55, 81, 94, 121, 193, 194, 8, 77, 81, - 187, 188, 126, 199, 193, 19, 23, 66, 99, 108, - 112, 127, 180, 47, 48, 53, 126, 166, 167, 126, - 126, 126, 126, 126, 155, 156, 157, 203, 204, 205, - 126, 166, 208, 208, 126, 207, 126, 126, 53, 25, - 166, 167, 126, 200, 179, 180, 126, 210, 4, 28, - 43, 46, 97, 123, 124, 196, 197, 10, 18, 20, - 42, 71, 72, 73, 75, 76, 79, 96, 176, 177, - 167, 53, 206, 206, 0, 163, 144, 166, 158, 126, - 126, 126, 126, 53, 126, 174, 194, 53, 53, 53, - 188, 29, 26, 32, 35, 63, 84, 137, 181, 182, - 126, 37, 38, 39, 40, 113, 125, 129, 130, 190, - 191, 163, 204, 126, 166, 126, 185, 185, 70, 155, - 180, 210, 210, 210, 210, 210, 210, 210, 197, 53, - 53, 34, 53, 134, 209, 53, 210, 210, 53, 210, - 210, 53, 53, 177, 54, 104, 201, 202, 53, 144, - 6, 11, 15, 49, 56, 74, 78, 80, 89, 106, - 107, 134, 136, 138, 140, 168, 169, 146, 147, 213, - 214, 126, 3, 24, 82, 86, 101, 139, 141, 183, - 182, 209, 209, 209, 209, 126, 53, 210, 210, 191, - 41, 51, 59, 62, 67, 85, 87, 88, 90, 91, - 92, 95, 138, 186, 167, 126, 167, 53, 202, 210, - 53, 53, 53, 53, 53, 53, 169, 155, 155, 117, - 214, 215, 216, 218, 144, 185, 25, 210, 210, 155, - 144, 159, 216, 158, 126, 167, 219, 148, 217, 155, - 149, 220, 221, 210, 155, 159, 221, 144, 210, 158, - 150, 151, 152, 153, 154, 222, 223, 155, 155, 155, - 155, 155, 159, 223, 144, 210, 210, 210, 210, 210, - 144 + 133, 135, 136, 145, 159, 160, 161, 162, 163, 168, + 169, 173, 176, 182, 187, 190, 193, 196, 208, 209, + 144, 53, 53, 93, 29, 53, 207, 53, 53, 45, + 50, 109, 111, 116, 119, 170, 171, 172, 5, 9, + 16, 55, 81, 94, 121, 191, 192, 8, 77, 81, + 185, 186, 126, 197, 191, 19, 23, 66, 99, 108, + 112, 127, 178, 47, 48, 126, 164, 165, 126, 126, + 126, 126, 126, 201, 202, 126, 164, 205, 205, 126, + 204, 126, 126, 53, 25, 164, 165, 126, 198, 177, + 178, 126, 207, 4, 28, 43, 46, 97, 123, 124, + 194, 195, 10, 18, 20, 42, 71, 72, 73, 75, + 76, 79, 96, 174, 175, 165, 53, 203, 203, 0, + 161, 144, 164, 156, 126, 126, 126, 126, 53, 126, + 172, 192, 53, 53, 53, 186, 29, 26, 32, 35, + 63, 84, 137, 179, 180, 126, 126, 37, 38, 39, + 40, 113, 125, 129, 130, 188, 189, 161, 202, 164, + 126, 183, 183, 70, 155, 178, 207, 207, 207, 207, + 207, 207, 207, 195, 53, 53, 34, 53, 134, 206, + 53, 207, 207, 53, 207, 207, 53, 53, 175, 54, + 104, 199, 200, 53, 144, 6, 11, 15, 49, 56, + 74, 78, 80, 89, 106, 107, 134, 136, 138, 140, + 166, 167, 146, 147, 210, 211, 126, 3, 24, 82, + 86, 101, 139, 141, 181, 180, 206, 206, 206, 206, + 126, 53, 207, 207, 189, 41, 51, 59, 62, 67, + 85, 87, 88, 90, 91, 92, 95, 138, 184, 165, + 126, 165, 53, 200, 207, 53, 53, 53, 53, 53, + 53, 167, 155, 155, 117, 211, 212, 213, 215, 144, + 183, 25, 207, 207, 155, 144, 157, 213, 156, 164, + 148, 214, 155, 149, 216, 217, 207, 155, 157, 217, + 144, 207, 156, 150, 151, 152, 153, 154, 218, 219, + 155, 155, 155, 155, 155, 157, 219, 144, 207, 207, + 207, 207, 207, 144 }; #define yyerrok (yyerrstatus = 0) @@ -2101,7 +2100,7 @@ yyreduce: switch (yyn) { case 5: -#line 294 "ntp_parser.y" +#line 291 "ntp_parser.y" { if (input_from_file == 1) { msyslog(LOG_INFO, "parse error %s line %d ignored\n", @@ -2113,7 +2112,7 @@ yyreduce: break; case 18: -#line 324 "ntp_parser.y" +#line 321 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)); if (my_node) @@ -2122,7 +2121,7 @@ yyreduce: break; case 19: -#line 330 "ntp_parser.y" +#line 327 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL); if (my_node) @@ -2131,181 +2130,167 @@ yyreduce: break; case 20: -#line 338 "ntp_parser.y" +#line 335 "ntp_parser.y" { (yyval.Integer) = T_Server; } break; case 21: -#line 339 "ntp_parser.y" +#line 336 "ntp_parser.y" { (yyval.Integer) = T_Pool; } break; case 22: -#line 340 "ntp_parser.y" +#line 337 "ntp_parser.y" { (yyval.Integer) = T_Peer; } break; case 23: -#line 341 "ntp_parser.y" +#line 338 "ntp_parser.y" { (yyval.Integer) = T_Broadcast; } break; case 24: -#line 342 "ntp_parser.y" +#line 339 "ntp_parser.y" { (yyval.Integer) = T_Manycastclient; } break; case 25: -#line 346 "ntp_parser.y" +#line 343 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(1) - (1)].Address_node); } break; case 26: -#line 347 "ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), default_ai_family); } +#line 344 "ntp_parser.y" + { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); } break; case 27: -#line 349 "ntp_parser.y" - { - if ((yyvsp[(1) - (2)].Integer) == -4) - (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); - else if ((yyvsp[(1) - (2)].Integer) == -6) - (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); - else { - yyerror("Invalid address type specified. Assuming default.\n"); - (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), default_ai_family); - } - } +#line 345 "ntp_parser.y" + { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); } break; case 28: -#line 364 "ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_INET); } +#line 349 "ntp_parser.y" + { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); } break; case 29: -#line 365 "ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_INET6); } - break; - - case 30: -#line 369 "ntp_parser.y" +#line 353 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 31: -#line 370 "ntp_parser.y" + case 30: +#line 354 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 32: -#line 375 "ntp_parser.y" + case 31: +#line 359 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_SKEY); } break; - case 33: -#line 376 "ntp_parser.y" + case 32: +#line 360 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Bias, (yyvsp[(2) - (2)].Double)); } break; - case 34: -#line 377 "ntp_parser.y" + case 33: +#line 361 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_BURST); } break; - case 35: -#line 378 "ntp_parser.y" + case 34: +#line 362 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_IBURST); } break; - case 36: -#line 379 "ntp_parser.y" + case 35: +#line 363 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Key, (yyvsp[(2) - (2)].Integer)); } break; - case 37: -#line 380 "ntp_parser.y" + case 36: +#line 364 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Minpoll, (yyvsp[(2) - (2)].Integer)); } break; - case 38: -#line 381 "ntp_parser.y" + case 37: +#line 365 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Maxpoll, (yyvsp[(2) - (2)].Integer)); } break; - case 39: -#line 382 "ntp_parser.y" + case 38: +#line 366 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_NOSELECT);} break; - case 40: -#line 383 "ntp_parser.y" + case 39: +#line 367 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREEMPT); } break; - case 41: -#line 384 "ntp_parser.y" + case 40: +#line 368 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREFER); } break; - case 42: -#line 385 "ntp_parser.y" + case 41: +#line 369 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_TRUE); } break; - case 43: -#line 386 "ntp_parser.y" + case 42: +#line 370 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_XLEAVE); } break; - case 44: -#line 387 "ntp_parser.y" + case 43: +#line 371 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Ttl, (yyvsp[(2) - (2)].Integer)); } break; - case 45: -#line 388 "ntp_parser.y" + case 44: +#line 372 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Mode, (yyvsp[(2) - (2)].Integer)); } break; - case 46: -#line 389 "ntp_parser.y" + case 45: +#line 373 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Version, (yyvsp[(2) - (2)].Integer)); } break; - case 47: -#line 400 "ntp_parser.y" + case 46: +#line 384 "ntp_parser.y" { my_config.broadcastclient = SIMPLE; } break; - case 48: -#line 402 "ntp_parser.y" + case 47: +#line 386 "ntp_parser.y" { my_config.broadcastclient = NOVOLLEY; } break; - case 49: -#line 404 "ntp_parser.y" + case 48: +#line 388 "ntp_parser.y" { append_queue(my_config.manycastserver, (yyvsp[(2) - (2)].Queue)); } break; - case 50: -#line 406 "ntp_parser.y" + case 49: +#line 390 "ntp_parser.y" { append_queue(my_config.multicastclient, (yyvsp[(2) - (2)].Queue)); } break; - case 51: -#line 417 "ntp_parser.y" + case 50: +#line 401 "ntp_parser.y" { my_config.auth.autokey = (yyvsp[(2) - (2)].Integer); } break; - case 52: -#line 419 "ntp_parser.y" + case 51: +#line 403 "ntp_parser.y" { my_config.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; - case 53: -#line 421 "ntp_parser.y" + case 52: +#line 405 "ntp_parser.y" { if (my_config.auth.crypto_cmd_list != NULL) append_queue(my_config.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue)); else @@ -2314,570 +2299,570 @@ yyreduce: } break; - case 54: -#line 428 "ntp_parser.y" + case 53: +#line 412 "ntp_parser.y" { my_config.auth.keys = (yyvsp[(2) - (2)].String); } break; - case 55: -#line 430 "ntp_parser.y" + case 54: +#line 414 "ntp_parser.y" { my_config.auth.keysdir = (yyvsp[(2) - (2)].String); } break; - case 56: -#line 432 "ntp_parser.y" + case 55: +#line 416 "ntp_parser.y" { my_config.auth.requested_key = (yyvsp[(2) - (2)].Integer); } break; - case 57: -#line 434 "ntp_parser.y" + case 56: +#line 418 "ntp_parser.y" { my_config.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } break; - case 59: -#line 440 "ntp_parser.y" + case 58: +#line 424 "ntp_parser.y" { (yyval.Queue) = NULL; } break; - case 60: -#line 444 "ntp_parser.y" + case 59: +#line 428 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 61: -#line 445 "ntp_parser.y" + case 60: +#line 429 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 62: -#line 450 "ntp_parser.y" + case 61: +#line 434 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PRIV, (yyvsp[(2) - (2)].String)); } break; - case 63: -#line 452 "ntp_parser.y" + case 62: +#line 436 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_IDENT, (yyvsp[(2) - (2)].String)); } break; - case 64: -#line 454 "ntp_parser.y" + case 63: +#line 438 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PW, (yyvsp[(2) - (2)].String)); } break; - case 65: -#line 456 "ntp_parser.y" + case 64: +#line 440 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_RAND, (yyvsp[(2) - (2)].String)); } break; - case 66: -#line 458 "ntp_parser.y" + case 65: +#line 442 "ntp_parser.y" { my_config.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; - case 67: -#line 460 "ntp_parser.y" + case 66: +#line 444 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_SIGN, (yyvsp[(2) - (2)].String)); } break; - case 68: -#line 470 "ntp_parser.y" + case 67: +#line 454 "ntp_parser.y" { append_queue(my_config.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; - case 69: -#line 474 "ntp_parser.y" + case 68: +#line 458 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 70: -#line 475 "ntp_parser.y" + case 69: +#line 459 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 71: -#line 480 "ntp_parser.y" + case 70: +#line 464 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_CEILING, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 72: -#line 482 "ntp_parser.y" + case 71: +#line 466 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_FLOOR, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 73: -#line 484 "ntp_parser.y" + case 72: +#line 468 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_COHORT, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 74: -#line 486 "ntp_parser.y" + case 73: +#line 470 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_ORPHAN, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 75: -#line 488 "ntp_parser.y" + case 74: +#line 472 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINDISP, (yyvsp[(2) - (2)].Double)); } break; - case 76: -#line 490 "ntp_parser.y" + case 75: +#line 474 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXDIST, (yyvsp[(2) - (2)].Double)); } break; - case 77: -#line 492 "ntp_parser.y" + case 76: +#line 476 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINCLOCK, (yyvsp[(2) - (2)].Double)); } break; - case 78: -#line 494 "ntp_parser.y" + case 77: +#line 478 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXCLOCK, (yyvsp[(2) - (2)].Double)); } break; - case 79: -#line 496 "ntp_parser.y" + case 78: +#line 480 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINSANE, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 80: -#line 498 "ntp_parser.y" + case 79: +#line 482 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_BEACON, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 81: -#line 500 "ntp_parser.y" + case 80: +#line 484 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXHOP, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 82: -#line 510 "ntp_parser.y" + case 81: +#line 494 "ntp_parser.y" { append_queue(my_config.stats_list, (yyvsp[(2) - (2)].Queue)); } break; - case 83: -#line 512 "ntp_parser.y" + case 82: +#line 496 "ntp_parser.y" { my_config.stats_dir = (yyvsp[(2) - (2)].String); } break; - case 84: -#line 514 "ntp_parser.y" + case 83: +#line 498 "ntp_parser.y" { enqueue(my_config.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].VoidPtr), (yyvsp[(3) - (3)].Queue))); } break; - case 85: -#line 521 "ntp_parser.y" + case 84: +#line 505 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; - case 86: -#line 522 "ntp_parser.y" + case 85: +#line 506 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].VoidPtr)); } break; - case 87: -#line 527 "ntp_parser.y" + case 86: +#line 511 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("clockstats"); } break; - case 88: -#line 529 "ntp_parser.y" + case 87: +#line 513 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("cryptostats"); } break; - case 89: -#line 531 "ntp_parser.y" + case 88: +#line 515 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("loopstats"); } break; - case 90: -#line 533 "ntp_parser.y" + case 89: +#line 517 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("peerstats"); } break; - case 91: -#line 535 "ntp_parser.y" + case 90: +#line 519 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("rawstats"); } break; - case 92: -#line 537 "ntp_parser.y" + case 91: +#line 521 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("sysstats"); } break; - case 93: -#line 539 "ntp_parser.y" + case 92: +#line 523 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("protostats"); } break; - case 94: -#line 543 "ntp_parser.y" + case 93: +#line 527 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 95: -#line 544 "ntp_parser.y" + case 94: +#line 528 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 96: -#line 548 "ntp_parser.y" + case 95: +#line 532 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(T_File, (yyvsp[(2) - (2)].String)); } break; - case 97: -#line 549 "ntp_parser.y" + case 96: +#line 533 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Type, (yyvsp[(2) - (2)].Integer)); } break; - case 98: -#line 550 "ntp_parser.y" + case 97: +#line 534 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Link); } break; - case 99: -#line 551 "ntp_parser.y" + case 98: +#line 535 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Nolink); } break; - case 100: -#line 552 "ntp_parser.y" + case 99: +#line 536 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Enable); } break; - case 101: -#line 553 "ntp_parser.y" + case 100: +#line 537 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Disable); } break; - case 102: -#line 557 "ntp_parser.y" + case 101: +#line 541 "ntp_parser.y" { (yyval.Integer) = FILEGEN_NONE; } break; - case 103: -#line 558 "ntp_parser.y" + case 102: +#line 542 "ntp_parser.y" { (yyval.Integer) = FILEGEN_PID; } break; - case 104: -#line 559 "ntp_parser.y" + case 103: +#line 543 "ntp_parser.y" { (yyval.Integer) = FILEGEN_DAY; } break; - case 105: -#line 560 "ntp_parser.y" + case 104: +#line 544 "ntp_parser.y" { (yyval.Integer) = FILEGEN_WEEK; } break; - case 106: -#line 561 "ntp_parser.y" + case 105: +#line 545 "ntp_parser.y" { (yyval.Integer) = FILEGEN_MONTH; } break; - case 107: -#line 562 "ntp_parser.y" + case 106: +#line 546 "ntp_parser.y" { (yyval.Integer) = FILEGEN_YEAR; } break; - case 108: -#line 563 "ntp_parser.y" + case 107: +#line 547 "ntp_parser.y" { (yyval.Integer) = FILEGEN_AGE; } break; - case 109: -#line 573 "ntp_parser.y" + case 108: +#line 557 "ntp_parser.y" { append_queue(my_config.discard_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 110: -#line 575 "ntp_parser.y" + case 109: +#line 559 "ntp_parser.y" { enqueue(my_config.restrict_opts, create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 111: -#line 580 "ntp_parser.y" + case 110: +#line 564 "ntp_parser.y" { enqueue(my_config.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 112: -#line 585 "ntp_parser.y" + case 111: +#line 569 "ntp_parser.y" { enqueue(my_config.restrict_opts, create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Queue), ip_file->line_no)); } break; - case 113: -#line 592 "ntp_parser.y" + case 112: +#line 576 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 114: -#line 593 "ntp_parser.y" + case 113: +#line 577 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; - case 115: -#line 597 "ntp_parser.y" + case 114: +#line 581 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_TIMEOUT); } break; - case 116: -#line 598 "ntp_parser.y" + case 115: +#line 582 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_IGNORE); } break; - case 117: -#line 599 "ntp_parser.y" + case 116: +#line 583 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_KOD); } break; - case 118: -#line 600 "ntp_parser.y" + case 117: +#line 584 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LIMITED); } break; - case 119: -#line 601 "ntp_parser.y" + case 118: +#line 585 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LPTRAP); } break; - case 120: -#line 602 "ntp_parser.y" + case 119: +#line 586 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOMODIFY); } break; - case 121: -#line 603 "ntp_parser.y" + case 120: +#line 587 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOPEER); } break; - case 122: -#line 604 "ntp_parser.y" + case 121: +#line 588 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOQUERY); } break; - case 123: -#line 605 "ntp_parser.y" + case 122: +#line 589 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTSERVE); } break; - case 124: -#line 606 "ntp_parser.y" + case 123: +#line 590 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOTRAP); } break; - case 125: -#line 607 "ntp_parser.y" + case 124: +#line 591 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTTRUST); } break; - case 126: -#line 608 "ntp_parser.y" + case 125: +#line 592 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RESM_NTPONLY); } break; - case 127: -#line 609 "ntp_parser.y" + case 126: +#line 593 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_VERSION); } break; - case 128: -#line 613 "ntp_parser.y" + case 127: +#line 597 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 129: -#line 614 "ntp_parser.y" + case 128: +#line 598 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 130: -#line 618 "ntp_parser.y" + case 129: +#line 602 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Average, (yyvsp[(2) - (2)].Integer)); } break; - case 131: -#line 619 "ntp_parser.y" + case 130: +#line 603 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Minimum, (yyvsp[(2) - (2)].Integer)); } break; - case 132: -#line 620 "ntp_parser.y" + case 131: +#line 604 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Monitor, (yyvsp[(2) - (2)].Integer)); } break; - case 133: -#line 629 "ntp_parser.y" + case 132: +#line 613 "ntp_parser.y" { enqueue(my_config.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 134: -#line 633 "ntp_parser.y" + case 133: +#line 617 "ntp_parser.y" { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 135: -#line 634 "ntp_parser.y" + case 134: +#line 618 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 136: -#line 639 "ntp_parser.y" + case 135: +#line 623 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME1, (yyvsp[(2) - (2)].Double)); } break; - case 137: -#line 641 "ntp_parser.y" + case 136: +#line 625 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME2, (yyvsp[(2) - (2)].Double)); } break; - case 138: -#line 643 "ntp_parser.y" + case 137: +#line 627 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEVAL1, (yyvsp[(2) - (2)].Integer)); } break; - case 139: -#line 645 "ntp_parser.y" + case 138: +#line 629 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CLK_HAVEVAL2, (yyvsp[(2) - (2)].String)); } break; - case 140: -#line 647 "ntp_parser.y" + case 139: +#line 631 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG1, (yyvsp[(2) - (2)].Integer)); } break; - case 141: -#line 649 "ntp_parser.y" + case 140: +#line 633 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG2, (yyvsp[(2) - (2)].Integer)); } break; - case 142: -#line 651 "ntp_parser.y" + case 141: +#line 635 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG3, (yyvsp[(2) - (2)].Integer)); } break; - case 143: -#line 653 "ntp_parser.y" + case 142: +#line 637 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG4, (yyvsp[(2) - (2)].Integer)); } break; - case 144: -#line 662 "ntp_parser.y" + case 143: +#line 646 "ntp_parser.y" { append_queue(my_config.enable_opts,(yyvsp[(2) - (2)].Queue)); } break; - case 145: -#line 664 "ntp_parser.y" + case 144: +#line 648 "ntp_parser.y" { append_queue(my_config.disable_opts,(yyvsp[(2) - (2)].Queue)); } break; - case 146: -#line 668 "ntp_parser.y" + case 145: +#line 652 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 147: -#line 669 "ntp_parser.y" + case 146: +#line 653 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 148: -#line 673 "ntp_parser.y" + case 147: +#line 657 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); } break; - case 149: -#line 674 "ntp_parser.y" + case 148: +#line 658 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_BROADCLIENT); } break; - case 150: -#line 675 "ntp_parser.y" + case 149: +#line 659 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_CAL); } break; - case 151: -#line 676 "ntp_parser.y" + case 150: +#line 660 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_KERNEL); } break; - case 152: -#line 677 "ntp_parser.y" + case 151: +#line 661 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_MONITOR); } break; - case 153: -#line 678 "ntp_parser.y" + case 152: +#line 662 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_NTP); } break; - case 154: -#line 680 "ntp_parser.y" + case 153: +#line 664 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_FILEGEN); } break; - case 155: -#line 688 "ntp_parser.y" + case 154: +#line 672 "ntp_parser.y" { append_queue(my_config.tinker, (yyvsp[(2) - (2)].Queue)); } break; - case 156: -#line 692 "ntp_parser.y" + case 155: +#line 676 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 157: -#line 693 "ntp_parser.y" + case 156: +#line 677 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 158: -#line 697 "ntp_parser.y" + case 157: +#line 681 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_ALLAN, (yyvsp[(2) - (2)].Double)); } break; - case 159: -#line 698 "ntp_parser.y" + case 158: +#line 682 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PHI, (yyvsp[(2) - (2)].Double)); } break; - case 160: -#line 699 "ntp_parser.y" + case 159: +#line 683 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_FREQ, (yyvsp[(2) - (2)].Double)); } break; - case 161: -#line 700 "ntp_parser.y" + case 160: +#line 684 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_HUFFPUFF, (yyvsp[(2) - (2)].Double)); } break; - case 162: -#line 701 "ntp_parser.y" + case 161: +#line 685 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PANIC, (yyvsp[(2) - (2)].Double)); } break; - case 163: -#line 702 "ntp_parser.y" + case 162: +#line 686 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MAX, (yyvsp[(2) - (2)].Double)); } break; - case 164: -#line 703 "ntp_parser.y" + case 163: +#line 687 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MINSTEP, (yyvsp[(2) - (2)].Double)); } break; - case 165: -#line 712 "ntp_parser.y" + case 164: +#line 696 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -2895,156 +2880,147 @@ yyreduce: } break; - case 166: -#line 728 "ntp_parser.y" + case 165: +#line 712 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); } break; - case 167: -#line 734 "ntp_parser.y" + case 166: +#line 718 "ntp_parser.y" { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, (yyvsp[(2) - (2)].Double))); } break; - case 168: -#line 736 "ntp_parser.y" + case 167: +#line 720 "ntp_parser.y" { enqueue(my_config.vars, create_attr_ival(T_Calldelay, (yyvsp[(2) - (2)].Integer))); } break; - case 169: -#line 738 "ntp_parser.y" + case 168: +#line 722 "ntp_parser.y" { enqueue(my_config.vars, create_attr_dval(T_Tick, (yyvsp[(2) - (2)].Double))); } break; - case 170: -#line 740 "ntp_parser.y" + case 169: +#line 724 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; - case 171: -#line 742 "ntp_parser.y" + case 170: +#line 726 "ntp_parser.y" { enqueue(my_config.vars, create_attr_sval(T_Leapfile, (yyvsp[(2) - (2)].String))); } break; - case 172: -#line 745 "ntp_parser.y" + case 171: +#line 729 "ntp_parser.y" { enqueue(my_config.vars, create_attr_sval(T_Pidfile, (yyvsp[(2) - (2)].String))); } break; - case 173: -#line 747 "ntp_parser.y" + case 172: +#line 731 "ntp_parser.y" { enqueue(my_config.vars, create_attr_sval(T_Logfile, (yyvsp[(2) - (2)].String))); } break; - case 174: -#line 749 "ntp_parser.y" + case 173: +#line 733 "ntp_parser.y" { enqueue(my_config.vars, create_attr_ival(T_Automax, (yyvsp[(2) - (2)].Integer))); } break; - case 175: -#line 752 "ntp_parser.y" + case 174: +#line 736 "ntp_parser.y" { append_queue(my_config.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 176: -#line 754 "ntp_parser.y" + case 175: +#line 738 "ntp_parser.y" { append_queue(my_config.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 177: -#line 756 "ntp_parser.y" + case 176: +#line 740 "ntp_parser.y" { enqueue(my_config.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 178: -#line 758 "ntp_parser.y" + case 177: +#line 742 "ntp_parser.y" { enqueue(my_config.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 179: -#line 760 "ntp_parser.y" + case 178: +#line 744 "ntp_parser.y" { append_queue(my_config.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 180: -#line 762 "ntp_parser.y" + case 179: +#line 746 "ntp_parser.y" { enqueue(my_config.qos, create_attr_sval(T_Qos, (yyvsp[(2) - (2)].String))); } break; - case 181: -#line 766 "ntp_parser.y" + case 180: +#line 750 "ntp_parser.y" { enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 182: -#line 768 "ntp_parser.y" + case 181: +#line 752 "ntp_parser.y" { enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double))); enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); } break; - case 183: -#line 770 "ntp_parser.y" + case 182: +#line 754 "ntp_parser.y" { /* Null driftfile, indicated by null string "\0" */ enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 184: -#line 776 "ntp_parser.y" + case 183: +#line 760 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), DEF); } break; - case 185: -#line 778 "ntp_parser.y" + case 184: +#line 762 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 186: -#line 783 "ntp_parser.y" + case 185: +#line 767 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 187: -#line 784 "ntp_parser.y" + case 186: +#line 768 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 188: -#line 788 "ntp_parser.y" + case 187: +#line 772 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Port, (yyvsp[(2) - (2)].Integer)); } break; - case 189: -#line 789 "ntp_parser.y" + case 188: +#line 773 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval(T_Interface, (yyvsp[(2) - (2)].Address_node)); } break; - case 190: -#line 794 "ntp_parser.y" + case 189: +#line 778 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 191: -#line 795 "ntp_parser.y" + case 190: +#line 779 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 192: -#line 799 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } - break; - - case 193: -#line 801 "ntp_parser.y" + case 191: +#line 784 "ntp_parser.y" { - /* YUCK!! This is needed because '+' and '-' are not special characters - * while '=' is. - * We really need a better way of defining strings - */ char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = &((yyvsp[(1) - (1)].String)[1]); - if (prefix != '+' && prefix != '-') { + if (prefix != '+' && prefix != '-' && prefix != '=') { yyerror("Logconfig prefix is not '+', '-' or '='\n"); } else @@ -3052,53 +3028,38 @@ yyreduce: } break; - case 194: -#line 817 "ntp_parser.y" - { (yyval.Integer) = '+'; } - break; - - case 195: -#line 818 "ntp_parser.y" - { (yyval.Integer) = '-'; } - break; - - case 196: -#line 819 "ntp_parser.y" - { (yyval.Integer) = '='; } - break; - - case 197: -#line 828 "ntp_parser.y" + case 192: +#line 800 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 198: -#line 829 "ntp_parser.y" + case 193: +#line 801 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 199: -#line 833 "ntp_parser.y" + case 194: +#line 805 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 200: -#line 834 "ntp_parser.y" + case 195: +#line 806 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 201: -#line 838 "ntp_parser.y" + case 196: +#line 810 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 202: -#line 839 "ntp_parser.y" + case 197: +#line 811 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 203: -#line 844 "ntp_parser.y" + case 198: +#line 816 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) { yyerror("Integer value is not boolean (0 or 1). Assuming 1"); @@ -3109,28 +3070,28 @@ yyreduce: } break; - case 204: -#line 852 "ntp_parser.y" + case 199: +#line 824 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 205: -#line 853 "ntp_parser.y" + case 200: +#line 825 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 206: -#line 857 "ntp_parser.y" + case 201: +#line 829 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 207: -#line 858 "ntp_parser.y" + case 202: +#line 830 "ntp_parser.y" { (yyval.Double) = (yyvsp[(1) - (1)].Double); } break; - case 208: -#line 867 "ntp_parser.y" + case 203: +#line 839 "ntp_parser.y" { my_config.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3139,119 +3100,109 @@ yyreduce: } break; - case 209: -#line 881 "ntp_parser.y" + case 204: +#line 853 "ntp_parser.y" { old_config_style = 0; } break; - case 210: -#line 885 "ntp_parser.y" + case 205: +#line 857 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 211: -#line 886 "ntp_parser.y" + case 206: +#line 858 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 212: -#line 890 "ntp_parser.y" + case 207: +#line 862 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Beep_Delay, (yyvsp[(3) - (3)].Double)); } break; - case 213: -#line 891 "ntp_parser.y" + case 208: +#line 863 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Sim_Duration, (yyvsp[(3) - (3)].Double)); } break; - case 214: -#line 895 "ntp_parser.y" + case 209: +#line 867 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; - case 215: -#line 896 "ntp_parser.y" + case 210: +#line 868 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; - case 216: -#line 901 "ntp_parser.y" + case 211: +#line 873 "ntp_parser.y" { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } break; - case 217: -#line 905 "ntp_parser.y" + case 212: +#line 877 "ntp_parser.y" { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; - case 218: -#line 909 "ntp_parser.y" + case 213: +#line 881 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; - case 219: -#line 913 "ntp_parser.y" - { (yyval.Address_node) = (yyvsp[(1) - (1)].Address_node); } - break; - - case 220: -#line 914 "ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), T_String); } - break; - - case 221: -#line 918 "ntp_parser.y" + case 214: +#line 885 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; - case 222: -#line 919 "ntp_parser.y" + case 215: +#line 886 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; - case 223: -#line 924 "ntp_parser.y" + case 216: +#line 891 "ntp_parser.y" { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; - case 224: -#line 928 "ntp_parser.y" + case 217: +#line 895 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 225: -#line 929 "ntp_parser.y" + case 218: +#line 896 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 226: -#line 934 "ntp_parser.y" + case 219: +#line 901 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Freq_Offset, (yyvsp[(3) - (3)].Double)); } break; - case 227: -#line 936 "ntp_parser.y" + case 220: +#line 903 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Wander, (yyvsp[(3) - (3)].Double)); } break; - case 228: -#line 938 "ntp_parser.y" + case 221: +#line 905 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Jitter, (yyvsp[(3) - (3)].Double)); } break; - case 229: -#line 940 "ntp_parser.y" + case 222: +#line 907 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Prop_Delay, (yyvsp[(3) - (3)].Double)); } break; - case 230: -#line 942 "ntp_parser.y" + case 223: +#line 909 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Proc_Delay, (yyvsp[(3) - (3)].Double)); } break; /* Line 1267 of yacc.c. */ -#line 3255 "../../ntpd/ntp_parser.c" +#line 3206 "../../ntpd/ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3465,7 +3416,7 @@ yyreturn: } -#line 946 "ntp_parser.y" +#line 913 "ntp_parser.y" /* KEYWORDS