From: Dave Hart Date: Sun, 16 Aug 2009 09:31:04 +0000 (+0000) Subject: ntp_parser.h, ntp_parser.c: X-Git-Tag: NTP_4_2_5P203~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=344b57fb91d194ccd8e631dc6b6f01bfd5c4563d;p=thirdparty%2Fntp.git ntp_parser.h, ntp_parser.c: Bison products bk: 4a87d1d8xrMEGrIN5-QJ89qSkQosxA --- diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index 2c92dce7e..a2bb1bfdf 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -103,7 +103,7 @@ /* Line 189 of yacc.c */ -#line 107 "../../ntpd/ntp_parser.c" +#line 107 "ntp_parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -220,73 +220,72 @@ T_Noserve = 345, T_Notrap = 346, T_Notrust = 347, - T_Novolley = 348, - T_Ntp = 349, - T_Ntpport = 350, - T_NtpSignDsocket = 351, - T_Orphan = 352, - T_Panic = 353, - T_Peer = 354, - T_Peerstats = 355, - T_Phone = 356, - T_Pid = 357, - T_Pidfile = 358, - T_Pool = 359, - T_Port = 360, - T_Pps = 361, - T_Preempt = 362, - T_Prefer = 363, - T_Protostats = 364, - T_Pw = 365, - T_Qos = 366, - T_RandFile = 367, - T_Rawstats = 368, - T_Refid = 369, - T_Requestkey = 370, - T_Restrict = 371, - T_Revoke = 372, - T_Server = 373, - T_Setvar = 374, - T_Sign = 375, - T_Statistics = 376, - T_Stats = 377, - T_Statsdir = 378, - T_Step = 379, - T_Stepout = 380, - T_Stratum = 381, - T_String = 382, - T_Sysstats = 383, - T_Tick = 384, - T_Time1 = 385, - T_Time2 = 386, - T_Timingstats = 387, - T_Tinker = 388, - T_Tos = 389, - T_Trap = 390, - T_True = 391, - T_Trustedkey = 392, - T_Ttl = 393, - T_Type = 394, - T_Unconfig = 395, - T_Unpeer = 396, - T_Version = 397, - T_WanderThreshold = 398, - T_Week = 399, - T_Xleave = 400, - T_Year = 401, - T_Flag = 402, - T_Void = 403, - T_EOC = 404, - T_Simulate = 405, - T_Beep_Delay = 406, - T_Sim_Duration = 407, - T_Server_Offset = 408, - T_Duration = 409, - T_Freq_Offset = 410, - T_Wander = 411, - T_Jitter = 412, - T_Prop_Delay = 413, - T_Proc_Delay = 414 + T_Ntp = 348, + T_Ntpport = 349, + T_NtpSignDsocket = 350, + T_Orphan = 351, + T_Panic = 352, + T_Peer = 353, + T_Peerstats = 354, + T_Phone = 355, + T_Pid = 356, + T_Pidfile = 357, + T_Pool = 358, + T_Port = 359, + T_Pps = 360, + T_Preempt = 361, + T_Prefer = 362, + T_Protostats = 363, + T_Pw = 364, + T_Qos = 365, + T_RandFile = 366, + T_Rawstats = 367, + T_Refid = 368, + T_Requestkey = 369, + T_Restrict = 370, + T_Revoke = 371, + T_Server = 372, + T_Setvar = 373, + T_Sign = 374, + T_Statistics = 375, + T_Stats = 376, + T_Statsdir = 377, + T_Step = 378, + T_Stepout = 379, + T_Stratum = 380, + T_String = 381, + T_Sysstats = 382, + T_Tick = 383, + T_Time1 = 384, + T_Time2 = 385, + T_Timingstats = 386, + T_Tinker = 387, + T_Tos = 388, + T_Trap = 389, + T_True = 390, + T_Trustedkey = 391, + T_Ttl = 392, + T_Type = 393, + T_Unconfig = 394, + T_Unpeer = 395, + T_Version = 396, + T_WanderThreshold = 397, + T_Week = 398, + T_Xleave = 399, + T_Year = 400, + T_Flag = 401, + T_Void = 402, + T_EOC = 403, + T_Simulate = 404, + T_Beep_Delay = 405, + T_Sim_Duration = 406, + T_Server_Offset = 407, + T_Duration = 408, + T_Freq_Offset = 409, + T_Wander = 410, + T_Jitter = 411, + T_Prop_Delay = 412, + T_Proc_Delay = 413 }; #endif /* Tokens. */ @@ -380,73 +379,72 @@ #define T_Noserve 345 #define T_Notrap 346 #define T_Notrust 347 -#define T_Novolley 348 -#define T_Ntp 349 -#define T_Ntpport 350 -#define T_NtpSignDsocket 351 -#define T_Orphan 352 -#define T_Panic 353 -#define T_Peer 354 -#define T_Peerstats 355 -#define T_Phone 356 -#define T_Pid 357 -#define T_Pidfile 358 -#define T_Pool 359 -#define T_Port 360 -#define T_Pps 361 -#define T_Preempt 362 -#define T_Prefer 363 -#define T_Protostats 364 -#define T_Pw 365 -#define T_Qos 366 -#define T_RandFile 367 -#define T_Rawstats 368 -#define T_Refid 369 -#define T_Requestkey 370 -#define T_Restrict 371 -#define T_Revoke 372 -#define T_Server 373 -#define T_Setvar 374 -#define T_Sign 375 -#define T_Statistics 376 -#define T_Stats 377 -#define T_Statsdir 378 -#define T_Step 379 -#define T_Stepout 380 -#define T_Stratum 381 -#define T_String 382 -#define T_Sysstats 383 -#define T_Tick 384 -#define T_Time1 385 -#define T_Time2 386 -#define T_Timingstats 387 -#define T_Tinker 388 -#define T_Tos 389 -#define T_Trap 390 -#define T_True 391 -#define T_Trustedkey 392 -#define T_Ttl 393 -#define T_Type 394 -#define T_Unconfig 395 -#define T_Unpeer 396 -#define T_Version 397 -#define T_WanderThreshold 398 -#define T_Week 399 -#define T_Xleave 400 -#define T_Year 401 -#define T_Flag 402 -#define T_Void 403 -#define T_EOC 404 -#define T_Simulate 405 -#define T_Beep_Delay 406 -#define T_Sim_Duration 407 -#define T_Server_Offset 408 -#define T_Duration 409 -#define T_Freq_Offset 410 -#define T_Wander 411 -#define T_Jitter 412 -#define T_Prop_Delay 413 -#define T_Proc_Delay 414 +#define T_Ntp 348 +#define T_Ntpport 349 +#define T_NtpSignDsocket 350 +#define T_Orphan 351 +#define T_Panic 352 +#define T_Peer 353 +#define T_Peerstats 354 +#define T_Phone 355 +#define T_Pid 356 +#define T_Pidfile 357 +#define T_Pool 358 +#define T_Port 359 +#define T_Pps 360 +#define T_Preempt 361 +#define T_Prefer 362 +#define T_Protostats 363 +#define T_Pw 364 +#define T_Qos 365 +#define T_RandFile 366 +#define T_Rawstats 367 +#define T_Refid 368 +#define T_Requestkey 369 +#define T_Restrict 370 +#define T_Revoke 371 +#define T_Server 372 +#define T_Setvar 373 +#define T_Sign 374 +#define T_Statistics 375 +#define T_Stats 376 +#define T_Statsdir 377 +#define T_Step 378 +#define T_Stepout 379 +#define T_Stratum 380 +#define T_String 381 +#define T_Sysstats 382 +#define T_Tick 383 +#define T_Time1 384 +#define T_Time2 385 +#define T_Timingstats 386 +#define T_Tinker 387 +#define T_Tos 388 +#define T_Trap 389 +#define T_True 390 +#define T_Trustedkey 391 +#define T_Ttl 392 +#define T_Type 393 +#define T_Unconfig 394 +#define T_Unpeer 395 +#define T_Version 396 +#define T_WanderThreshold 397 +#define T_Week 398 +#define T_Xleave 399 +#define T_Year 400 +#define T_Flag 401 +#define T_Void 402 +#define T_EOC 403 +#define T_Simulate 404 +#define T_Beep_Delay 405 +#define T_Sim_Duration 406 +#define T_Server_Offset 407 +#define T_Duration 408 +#define T_Freq_Offset 409 +#define T_Wander 410 +#define T_Jitter 411 +#define T_Prop_Delay 412 +#define T_Proc_Delay 413 @@ -474,7 +472,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 478 "../../ntpd/ntp_parser.c" +#line 476 "ntp_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -486,7 +484,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 490 "../../ntpd/ntp_parser.c" +#line 488 "ntp_parser.c" #ifdef short # undef short @@ -699,22 +697,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 168 +#define YYFINAL 167 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 635 +#define YYLAST 631 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 163 +#define YYNTOKENS 162 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 64 /* YYNRULES -- Number of rules. */ -#define YYNRULES 232 +#define YYNRULES 231 /* YYNRULES -- Number of states. */ -#define YYNSTATES 369 +#define YYNSTATES 368 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 414 +#define YYMAXUTOK 413 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -728,13 +726,13 @@ 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, 160, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 159, 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, 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, 161, 2, 162, 2, 2, 2, 2, + 2, 2, 2, 160, 2, 161, 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, @@ -763,7 +761,7 @@ static const yytype_uint8 yytranslate[] = 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159 + 155, 156, 157, 158 }; #if YYDEBUG @@ -777,122 +775,121 @@ static const yytype_uint16 yyprhs[] = 67, 70, 72, 74, 77, 79, 81, 84, 87, 90, 92, 94, 96, 98, 100, 103, 106, 109, 112, 114, 116, 118, 121, 124, 127, 130, 133, 136, 139, 142, - 145, 148, 151, 153, 154, 157, 159, 162, 165, 168, - 171, 174, 177, 180, 183, 185, 188, 191, 194, 197, - 200, 203, 206, 209, 212, 215, 218, 221, 224, 228, - 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, - 252, 254, 257, 260, 262, 264, 266, 268, 270, 272, - 274, 276, 278, 280, 282, 285, 289, 293, 298, 303, - 309, 310, 313, 315, 317, 319, 321, 323, 325, 327, - 329, 331, 333, 335, 337, 339, 341, 344, 346, 349, - 352, 355, 359, 362, 364, 367, 370, 373, 376, 379, - 382, 385, 388, 391, 394, 397, 399, 401, 403, 405, - 407, 409, 411, 413, 416, 419, 421, 424, 427, 430, - 433, 436, 439, 442, 446, 448, 451, 454, 457, 460, - 463, 466, 469, 472, 475, 478, 481, 485, 488, 491, - 493, 496, 497, 502, 506, 509, 511, 514, 517, 520, - 522, 524, 527, 529, 532, 534, 537, 539, 541, 543, - 545, 547, 549, 555, 557, 561, 564, 568, 572, 575, - 577, 583, 588, 592, 595, 597, 604, 608, 611, 615, - 619, 623, 627 + 145, 148, 150, 151, 154, 156, 159, 162, 165, 168, + 171, 174, 177, 180, 182, 185, 188, 191, 194, 197, + 200, 203, 206, 209, 212, 215, 218, 221, 225, 228, + 230, 232, 234, 236, 238, 240, 242, 244, 246, 249, + 251, 254, 257, 259, 261, 263, 265, 267, 269, 271, + 273, 275, 277, 279, 282, 286, 290, 295, 300, 306, + 307, 310, 312, 314, 316, 318, 320, 322, 324, 326, + 328, 330, 332, 334, 336, 338, 341, 343, 346, 349, + 352, 356, 359, 361, 364, 367, 370, 373, 376, 379, + 382, 385, 388, 391, 394, 396, 398, 400, 402, 404, + 406, 408, 410, 413, 416, 418, 421, 424, 427, 430, + 433, 436, 439, 443, 445, 448, 451, 454, 457, 460, + 463, 466, 469, 472, 475, 478, 482, 485, 488, 490, + 493, 494, 499, 503, 506, 508, 511, 514, 517, 519, + 521, 524, 526, 529, 531, 534, 536, 538, 540, 542, + 544, 546, 552, 554, 558, 561, 565, 569, 572, 574, + 580, 585, 589, 592, 594, 601, 605, 608, 612, 616, + 620, 624 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 164, 0, -1, 165, -1, 165, 166, 149, -1, 166, - 149, -1, 1, 149, -1, -1, 167, -1, 173, -1, - 175, -1, 176, -1, 183, -1, 189, -1, 180, -1, - 194, -1, 197, -1, 200, -1, 203, -1, 215, -1, - 168, 169, 171, -1, 168, 169, -1, 118, -1, 104, - -1, 99, -1, 12, -1, 68, -1, 170, -1, 52, - 127, -1, 53, 127, -1, 127, -1, 171, 172, -1, - 172, -1, 6, -1, 11, 214, -1, 15, -1, 46, + 163, 0, -1, 164, -1, 164, 165, 148, -1, 165, + 148, -1, 1, 148, -1, -1, 166, -1, 172, -1, + 174, -1, 175, -1, 182, -1, 188, -1, 179, -1, + 193, -1, 196, -1, 199, -1, 202, -1, 214, -1, + 167, 168, 170, -1, 167, 168, -1, 117, -1, 103, + -1, 98, -1, 12, -1, 68, -1, 169, -1, 52, + 126, -1, 53, 126, -1, 126, -1, 170, 171, -1, + 171, -1, 6, -1, 11, 213, -1, 15, -1, 46, -1, 55, 50, -1, 78, 50, -1, 74, 50, -1, - 89, -1, 107, -1, 108, -1, 136, -1, 145, -1, - 138, 50, -1, 80, 50, -1, 142, 50, -1, 174, - 169, -1, 140, -1, 141, -1, 13, -1, 13, 93, - -1, 69, 212, -1, 83, 212, -1, 6, 50, -1, - 21, 50, -1, 22, 177, -1, 56, 127, -1, 57, - 127, -1, 115, 50, -1, 137, 210, -1, 96, 127, - -1, 178, -1, -1, 178, 179, -1, 179, -1, 44, - 127, -1, 47, 127, -1, 110, 127, -1, 112, 127, - -1, 117, 50, -1, 120, 127, -1, 134, 181, -1, - 181, 182, -1, 182, -1, 18, 50, -1, 41, 50, - -1, 20, 213, -1, 97, 50, -1, 76, 214, -1, - 72, 214, -1, 75, 214, -1, 71, 214, -1, 79, - 50, -1, 10, 50, -1, 73, 50, -1, 121, 184, - -1, 123, 127, -1, 35, 185, 186, -1, 184, 185, - -1, 185, -1, 19, -1, 23, -1, 66, -1, 100, - -1, 113, -1, 128, -1, 132, -1, 109, -1, 186, - 187, -1, 187, -1, 34, 127, -1, 139, 188, -1, - 63, -1, 84, -1, 31, -1, 26, -1, 86, -1, - 102, -1, 24, -1, 144, -1, 82, -1, 146, -1, - 3, -1, 27, 192, -1, 116, 169, 190, -1, 116, - 25, 190, -1, 116, 52, 25, 190, -1, 116, 53, - 25, 190, -1, 116, 170, 70, 170, 190, -1, -1, - 190, 191, -1, 40, -1, 48, -1, 58, -1, 59, - -1, 62, -1, 67, -1, 85, -1, 87, -1, 88, - -1, 90, -1, 91, -1, 92, -1, 95, -1, 142, - -1, 192, 193, -1, 193, -1, 8, 50, -1, 77, - 50, -1, 81, 50, -1, 43, 169, 195, -1, 195, - 196, -1, 196, -1, 130, 214, -1, 131, 214, -1, - 126, 50, -1, 114, 127, -1, 36, 213, -1, 37, - 213, -1, 38, 213, -1, 39, 213, -1, 31, 198, - -1, 26, 198, -1, 198, 199, -1, 199, -1, 5, - -1, 9, -1, 16, -1, 54, -1, 81, -1, 94, - -1, 122, -1, 133, 201, -1, 201, 202, -1, 202, - -1, 4, 214, -1, 28, 214, -1, 42, 214, -1, - 45, 214, -1, 98, 214, -1, 124, 214, -1, 125, - 214, -1, 49, 127, 166, -1, 32, -1, 14, 214, - -1, 17, 50, -1, 129, 214, -1, 30, 204, -1, - 61, 127, -1, 103, 127, -1, 65, 127, -1, 7, - 50, -1, 64, 208, -1, 101, 211, -1, 119, 205, - -1, 135, 170, 206, -1, 138, 210, -1, 111, 127, - -1, 127, -1, 127, 29, -1, -1, 127, 160, 127, - 25, -1, 127, 160, 127, -1, 206, 207, -1, 207, - -1, 105, 50, -1, 51, 170, -1, 208, 209, -1, - 209, -1, 127, -1, 210, 50, -1, 50, -1, 211, - 127, -1, 127, -1, 212, 169, -1, 169, -1, 50, - -1, 136, -1, 33, -1, 50, -1, 29, -1, 216, - 161, 217, 219, 162, -1, 150, -1, 217, 218, 149, - -1, 218, 149, -1, 151, 160, 214, -1, 152, 160, - 214, -1, 219, 220, -1, 220, -1, 222, 161, 221, - 223, 162, -1, 153, 160, 214, 149, -1, 118, 160, - 169, -1, 223, 224, -1, 224, -1, 154, 160, 214, - 161, 225, 162, -1, 225, 226, 149, -1, 226, 149, - -1, 155, 160, 214, -1, 156, 160, 214, -1, 157, - 160, 214, -1, 158, 160, 214, -1, 159, 160, 214, - -1 + 89, -1, 106, -1, 107, -1, 135, -1, 144, -1, + 137, 50, -1, 80, 50, -1, 141, 50, -1, 173, + 168, -1, 139, -1, 140, -1, 13, -1, 69, 211, + -1, 83, 211, -1, 6, 50, -1, 21, 50, -1, + 22, 176, -1, 56, 126, -1, 57, 126, -1, 114, + 50, -1, 136, 209, -1, 95, 126, -1, 177, -1, + -1, 177, 178, -1, 178, -1, 44, 126, -1, 47, + 126, -1, 109, 126, -1, 111, 126, -1, 116, 50, + -1, 119, 126, -1, 133, 180, -1, 180, 181, -1, + 181, -1, 18, 50, -1, 41, 50, -1, 20, 212, + -1, 96, 50, -1, 76, 213, -1, 72, 213, -1, + 75, 213, -1, 71, 213, -1, 79, 50, -1, 10, + 50, -1, 73, 50, -1, 120, 183, -1, 122, 126, + -1, 35, 184, 185, -1, 183, 184, -1, 184, -1, + 19, -1, 23, -1, 66, -1, 99, -1, 112, -1, + 127, -1, 131, -1, 108, -1, 185, 186, -1, 186, + -1, 34, 126, -1, 138, 187, -1, 63, -1, 84, + -1, 31, -1, 26, -1, 86, -1, 101, -1, 24, + -1, 143, -1, 82, -1, 145, -1, 3, -1, 27, + 191, -1, 115, 168, 189, -1, 115, 25, 189, -1, + 115, 52, 25, 189, -1, 115, 53, 25, 189, -1, + 115, 169, 70, 169, 189, -1, -1, 189, 190, -1, + 40, -1, 48, -1, 58, -1, 59, -1, 62, -1, + 67, -1, 85, -1, 87, -1, 88, -1, 90, -1, + 91, -1, 92, -1, 94, -1, 141, -1, 191, 192, + -1, 192, -1, 8, 50, -1, 77, 50, -1, 81, + 50, -1, 43, 168, 194, -1, 194, 195, -1, 195, + -1, 129, 213, -1, 130, 213, -1, 125, 50, -1, + 113, 126, -1, 36, 212, -1, 37, 212, -1, 38, + 212, -1, 39, 212, -1, 31, 197, -1, 26, 197, + -1, 197, 198, -1, 198, -1, 5, -1, 9, -1, + 16, -1, 54, -1, 81, -1, 93, -1, 121, -1, + 132, 200, -1, 200, 201, -1, 201, -1, 4, 213, + -1, 28, 213, -1, 42, 213, -1, 45, 213, -1, + 97, 213, -1, 123, 213, -1, 124, 213, -1, 49, + 126, 165, -1, 32, -1, 14, 213, -1, 17, 50, + -1, 128, 213, -1, 30, 203, -1, 61, 126, -1, + 102, 126, -1, 65, 126, -1, 7, 50, -1, 64, + 207, -1, 100, 210, -1, 118, 204, -1, 134, 169, + 205, -1, 137, 209, -1, 110, 126, -1, 126, -1, + 126, 29, -1, -1, 126, 159, 126, 25, -1, 126, + 159, 126, -1, 205, 206, -1, 206, -1, 104, 50, + -1, 51, 169, -1, 207, 208, -1, 208, -1, 126, + -1, 209, 50, -1, 50, -1, 210, 126, -1, 126, + -1, 211, 168, -1, 168, -1, 50, -1, 135, -1, + 33, -1, 50, -1, 29, -1, 215, 160, 216, 218, + 161, -1, 149, -1, 216, 217, 148, -1, 217, 148, + -1, 150, 159, 213, -1, 151, 159, 213, -1, 218, + 219, -1, 219, -1, 221, 160, 220, 222, 161, -1, + 152, 159, 213, 148, -1, 117, 159, 168, -1, 222, + 223, -1, 223, -1, 153, 159, 213, 160, 224, 161, + -1, 224, 225, 148, -1, 225, 148, -1, 154, 159, + 213, -1, 155, 159, 213, -1, 156, 159, 213, -1, + 157, 159, 213, -1, 158, 159, 213, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 281, 281, 285, 286, 287, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, 319, 320, 328, - 334, 343, 344, 345, 346, 347, 351, 352, 353, 357, - 361, 362, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 377, 378, 379, 380, 389, 397, 398, - 408, 410, 412, 414, 425, 427, 429, 437, 439, 441, - 443, 445, 450, 452, 456, 457, 461, 463, 465, 467, - 469, 471, 481, 486, 487, 491, 493, 495, 497, 499, - 501, 503, 505, 507, 509, 511, 521, 523, 525, 533, - 534, 538, 540, 542, 544, 546, 548, 550, 552, 557, - 558, 562, 564, 566, 567, 568, 569, 573, 574, 575, - 576, 577, 578, 579, 588, 592, 597, 602, 615, 628, - 636, 637, 641, 642, 643, 644, 645, 646, 647, 648, - 649, 650, 651, 652, 653, 654, 658, 659, 663, 664, - 665, 673, 678, 679, 683, 685, 687, 689, 691, 693, - 695, 697, 706, 708, 713, 714, 718, 719, 720, 721, - 722, 723, 725, 733, 737, 738, 742, 743, 744, 745, - 746, 747, 748, 756, 772, 778, 780, 782, 784, 786, - 789, 791, 793, 796, 798, 800, 802, 804, 806, 810, - 812, 816, 820, 822, 828, 829, 833, 834, 839, 840, - 844, 863, 864, 868, 869, 873, 874, 878, 887, 888, - 892, 893, 901, 916, 920, 921, 925, 926, 930, 931, - 935, 940, 944, 948, 949, 953, 958, 959, 963, 965, - 967, 969, 971 + 0, 280, 280, 284, 285, 286, 307, 308, 309, 310, + 311, 312, 313, 314, 315, 316, 317, 318, 319, 327, + 333, 342, 343, 344, 345, 346, 350, 351, 352, 356, + 360, 361, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 388, 396, 397, + 407, 409, 411, 422, 424, 426, 434, 436, 438, 440, + 442, 447, 449, 453, 454, 458, 460, 462, 464, 466, + 468, 478, 483, 484, 488, 490, 492, 494, 496, 498, + 500, 502, 504, 506, 508, 518, 520, 522, 530, 531, + 535, 537, 539, 541, 543, 545, 547, 549, 554, 555, + 559, 561, 563, 564, 565, 566, 570, 571, 572, 573, + 574, 575, 576, 585, 589, 594, 599, 612, 625, 633, + 634, 638, 639, 640, 641, 642, 643, 644, 645, 646, + 647, 648, 649, 650, 651, 655, 656, 660, 661, 662, + 670, 675, 676, 680, 682, 684, 686, 688, 690, 692, + 694, 703, 705, 710, 711, 715, 716, 717, 718, 719, + 720, 722, 730, 734, 735, 739, 740, 741, 742, 743, + 744, 745, 753, 769, 775, 777, 779, 781, 783, 786, + 788, 790, 793, 795, 797, 799, 801, 803, 807, 809, + 813, 817, 819, 825, 826, 830, 831, 836, 837, 841, + 860, 861, 865, 866, 870, 871, 875, 884, 885, 889, + 890, 898, 913, 917, 918, 922, 923, 927, 928, 932, + 937, 941, 945, 946, 950, 955, 956, 960, 962, 964, + 966, 968 }; #endif @@ -918,25 +915,25 @@ static const char *const yytname[] = "T_Maxpoll", "T_Minclock", "T_Mindist", "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", "T_Multicastclient", "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", "T_Noquery", - "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Novolley", - "T_Ntp", "T_Ntpport", "T_NtpSignDsocket", "T_Orphan", "T_Panic", - "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", - "T_Port", "T_Pps", "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", - "T_Qos", "T_RandFile", "T_Rawstats", "T_Refid", "T_Requestkey", - "T_Restrict", "T_Revoke", "T_Server", "T_Setvar", "T_Sign", - "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", "T_Stepout", - "T_Stratum", "T_String", "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", - "T_Timingstats", "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", - "T_Ttl", "T_Type", "T_Unconfig", "T_Unpeer", "T_Version", - "T_WanderThreshold", "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", - "unpeer_command", "unpeer_keyword", "other_mode_command", - "authentication_command", "crypto_command_line", "crypto_command_list", - "crypto_command", "orphan_mode_command", "tos_option_list", "tos_option", + "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Ntp", "T_Ntpport", + "T_NtpSignDsocket", "T_Orphan", "T_Panic", "T_Peer", "T_Peerstats", + "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Pps", + "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Qos", "T_RandFile", + "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke", + "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats", + "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", + "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timingstats", + "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", + "T_Type", "T_Unconfig", "T_Unpeer", "T_Version", "T_WanderThreshold", + "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", "unpeer_command", + "unpeer_keyword", "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", @@ -973,38 +970,38 @@ 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, 410, 411, 412, 413, 414, - 61, 123, 125 + 405, 406, 407, 408, 409, 410, 411, 412, 413, 61, + 123, 125 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 163, 164, 165, 165, 165, 166, 166, 166, 166, - 166, 166, 166, 166, 166, 166, 166, 166, 166, 167, - 167, 168, 168, 168, 168, 168, 169, 169, 169, 170, - 171, 171, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 173, 174, 174, - 175, 175, 175, 175, 176, 176, 176, 176, 176, 176, - 176, 176, 177, 177, 178, 178, 179, 179, 179, 179, - 179, 179, 180, 181, 181, 182, 182, 182, 182, 182, - 182, 182, 182, 182, 182, 182, 183, 183, 183, 184, - 184, 185, 185, 185, 185, 185, 185, 185, 185, 186, - 186, 187, 187, 187, 187, 187, 187, 188, 188, 188, - 188, 188, 188, 188, 189, 189, 189, 189, 189, 189, - 190, 190, 191, 191, 191, 191, 191, 191, 191, 191, - 191, 191, 191, 191, 191, 191, 192, 192, 193, 193, - 193, 194, 195, 195, 196, 196, 196, 196, 196, 196, - 196, 196, 197, 197, 198, 198, 199, 199, 199, 199, - 199, 199, 199, 200, 201, 201, 202, 202, 202, 202, - 202, 202, 202, 203, 203, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 203, 203, 203, 203, 204, - 204, 204, 205, 205, 206, 206, 207, 207, 208, 208, - 209, 210, 210, 211, 211, 212, 212, 213, 213, 213, - 214, 214, 215, 216, 217, 217, 218, 218, 219, 219, - 220, 221, 222, 223, 223, 224, 225, 225, 226, 226, - 226, 226, 226 + 0, 162, 163, 164, 164, 164, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 166, + 166, 167, 167, 167, 167, 167, 168, 168, 168, 169, + 170, 170, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 172, 173, 173, + 174, 174, 174, 175, 175, 175, 175, 175, 175, 175, + 175, 176, 176, 177, 177, 178, 178, 178, 178, 178, + 178, 179, 180, 180, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 182, 182, 182, 183, 183, + 184, 184, 184, 184, 184, 184, 184, 184, 185, 185, + 186, 186, 186, 186, 186, 186, 187, 187, 187, 187, + 187, 187, 187, 188, 188, 188, 188, 188, 188, 189, + 189, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 190, 191, 191, 192, 192, 192, + 193, 194, 194, 195, 195, 195, 195, 195, 195, 195, + 195, 196, 196, 197, 197, 198, 198, 198, 198, 198, + 198, 198, 199, 200, 200, 201, 201, 201, 201, 201, + 201, 201, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 203, 203, + 203, 204, 204, 205, 205, 206, 206, 207, 207, 208, + 209, 209, 210, 210, 211, 211, 212, 212, 212, 213, + 213, 214, 215, 216, 216, 217, 217, 218, 218, 219, + 220, 221, 222, 222, 223, 224, 224, 225, 225, 225, + 225, 225 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1016,24 +1013,24 @@ static const yytype_uint8 yyr2[] = 2, 1, 1, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 2, 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, 1, 2, - 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 3, 3, 4, 4, 5, - 0, 2, 1, 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 + 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, 1, 2, 1, + 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 3, 3, 4, 4, 5, 0, + 2, 1, 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 @@ -1041,111 +1038,111 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 0, 24, 50, 0, 0, 0, 63, - 0, 0, 191, 0, 174, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 24, 50, 0, 0, 0, 62, + 0, 0, 190, 0, 173, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 23, 0, 0, 22, 0, 0, 0, 21, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 48, 49, 213, 0, 2, 0, + 0, 0, 0, 0, 48, 49, 212, 0, 2, 0, 7, 0, 8, 0, 9, 10, 13, 11, 12, 14, - 15, 16, 17, 18, 0, 5, 54, 182, 51, 211, - 210, 175, 176, 55, 0, 0, 0, 0, 0, 0, - 56, 62, 65, 156, 157, 158, 159, 160, 161, 162, - 153, 155, 0, 0, 0, 114, 137, 189, 178, 152, - 91, 92, 93, 94, 98, 95, 96, 97, 0, 0, - 0, 29, 0, 26, 6, 57, 58, 179, 200, 183, - 199, 181, 206, 52, 53, 61, 204, 184, 180, 188, - 59, 120, 0, 0, 120, 26, 0, 185, 86, 90, - 87, 177, 0, 0, 0, 0, 0, 0, 0, 163, - 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 72, 74, 0, 202, 60, 187, 1, 0, - 4, 20, 47, 0, 66, 67, 68, 69, 70, 71, - 64, 154, 138, 139, 140, 136, 190, 106, 105, 0, - 103, 104, 0, 88, 100, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 141, 143, 173, 198, 205, - 203, 116, 120, 120, 115, 0, 0, 89, 166, 167, - 168, 169, 170, 171, 172, 164, 84, 75, 209, 207, - 208, 77, 76, 82, 80, 85, 81, 79, 83, 78, - 73, 0, 0, 186, 195, 201, 3, 32, 0, 34, - 35, 0, 0, 0, 0, 39, 40, 41, 42, 0, - 0, 43, 19, 31, 0, 0, 0, 0, 101, 113, - 109, 111, 107, 108, 110, 112, 102, 99, 148, 149, - 150, 151, 147, 146, 144, 145, 142, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 121, 117, 118, 120, 193, 197, 196, 194, 33, - 36, 38, 37, 45, 44, 46, 30, 0, 0, 0, - 0, 0, 219, 0, 215, 119, 192, 216, 217, 0, - 214, 212, 218, 0, 222, 0, 0, 0, 0, 0, - 224, 0, 0, 220, 223, 221, 0, 0, 0, 0, + 15, 16, 17, 18, 0, 5, 53, 181, 210, 209, + 174, 175, 54, 0, 0, 0, 0, 0, 0, 55, + 61, 64, 155, 156, 157, 158, 159, 160, 161, 152, + 154, 0, 0, 0, 113, 136, 188, 177, 151, 90, + 91, 92, 93, 97, 94, 95, 96, 0, 0, 0, + 29, 0, 26, 6, 56, 57, 178, 199, 182, 198, + 180, 205, 51, 52, 60, 203, 183, 179, 187, 58, + 119, 0, 0, 119, 26, 0, 184, 85, 89, 86, + 176, 0, 0, 0, 0, 0, 0, 0, 162, 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 225, 0, 227, 228, 229, 230, 231, 232, 226 + 0, 71, 73, 0, 201, 59, 186, 1, 0, 4, + 20, 47, 0, 65, 66, 67, 68, 69, 70, 63, + 153, 137, 138, 139, 135, 189, 105, 104, 0, 102, + 103, 0, 87, 99, 27, 28, 0, 0, 0, 0, + 0, 0, 0, 0, 140, 142, 172, 197, 204, 202, + 115, 119, 119, 114, 0, 0, 88, 165, 166, 167, + 168, 169, 170, 171, 163, 83, 74, 208, 206, 207, + 76, 75, 81, 79, 84, 80, 78, 82, 77, 72, + 0, 0, 185, 194, 200, 3, 32, 0, 34, 35, + 0, 0, 0, 0, 39, 40, 41, 42, 0, 0, + 43, 19, 31, 0, 0, 0, 0, 100, 112, 108, + 110, 106, 107, 109, 111, 101, 98, 147, 148, 149, + 150, 146, 145, 143, 144, 141, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 120, 116, 117, 119, 192, 196, 195, 193, 33, 36, + 38, 37, 45, 44, 46, 30, 0, 0, 0, 0, + 0, 218, 0, 214, 118, 191, 215, 216, 0, 213, + 211, 217, 0, 221, 0, 0, 0, 0, 0, 223, + 0, 0, 219, 222, 220, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, + 0, 226, 227, 228, 229, 230, 231, 225 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 47, 48, 49, 50, 51, 122, 113, 262, 263, - 52, 53, 54, 55, 80, 81, 82, 56, 162, 163, - 57, 138, 108, 193, 194, 276, 58, 211, 301, 95, - 96, 59, 205, 206, 60, 90, 91, 61, 149, 150, - 62, 98, 137, 243, 244, 119, 120, 166, 127, 123, - 231, 71, 63, 64, 266, 267, 321, 322, 336, 323, - 339, 340, 353, 354 + -1, 47, 48, 49, 50, 51, 121, 112, 261, 262, + 52, 53, 54, 55, 79, 80, 81, 56, 161, 162, + 57, 137, 107, 192, 193, 275, 58, 210, 300, 94, + 95, 59, 204, 205, 60, 89, 90, 61, 148, 149, + 62, 97, 136, 242, 243, 118, 119, 165, 126, 122, + 230, 70, 63, 64, 265, 266, 320, 321, 335, 322, + 338, 339, 352, 353 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -143 +#define YYPACT_NINF -151 static const yytype_int16 yypact[] = { - 124, -125, -21, -15, -143, -56, -6, -9, 1, -26, - 17, 8, -78, 17, -143, 69, -49, -67, -66, -57, - -54, -52, -51, -143, -49, -49, -50, -143, -48, -45, - -143, -44, 12, -13, -143, -37, 69, -34, -6, 3, - 314, -30, 37, 37, -143, -143, -143, 95, 280, -47, - -143, -49, -143, -49, -143, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -62, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -24, -3, 2, 7, 62, 13, - -143, -26, -143, -143, -143, -143, -143, -143, -143, -143, - 17, -143, 76, 83, 92, 8, -143, 114, -143, 17, - -143, -143, -143, -143, -143, -143, -143, -143, -20, 20, - 21, -143, 212, -143, 419, -143, -143, -143, -143, -52, - -143, -143, -143, -49, -49, -143, -143, 22, -143, -143, - -143, -143, -12, 5, -143, 82, -7, -143, 69, -143, - -143, -143, -6, -6, -6, -6, -6, -6, -6, 3, - -143, 107, 111, -23, 112, -6, -6, 113, -6, -6, - 118, 120, 314, -143, -46, -143, 121, 121, -143, 15, - -143, 490, -143, -105, -143, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, 47, - -143, -143, 14, -20, -143, -143, -143, -23, -23, -23, - -23, 48, 126, -6, -6, 212, -143, -143, -143, -143, - -143, 146, -143, -143, 146, -30, 50, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, -143, - -143, -30, 129, -46, -143, -143, -143, -143, -6, -143, - -143, 134, 137, 140, 141, -143, -143, -143, -143, 145, - 148, -143, 490, -143, 36, 39, -98, 51, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -143, -143, -143, - -143, -143, 146, 146, -143, 177, -143, -143, -143, -143, - -143, -143, -143, -143, -143, -143, -143, -6, -6, 43, - 57, -99, -143, 58, -143, 146, -143, -143, -143, -49, - -143, -143, -143, 68, -143, 52, 70, -6, 66, -126, - -143, 73, -6, -143, -143, -143, 71, 59, 84, 86, - 94, 96, 100, -90, 80, -6, -6, -6, -6, -6, - -143, 81, -143, -143, -143, -143, -143, -143, -143 + 124, -126, -25, -20, -151, -151, -6, -11, -9, -27, + 5, 10, -75, 5, -151, 35, -47, -73, -71, -66, + -62, -59, -58, -151, -47, -47, -56, -151, -55, -48, + -151, -43, 38, 13, -151, -36, 35, -33, -6, 0, + 506, -31, 44, 44, -151, -151, -151, 85, 279, -52, + -151, -47, -151, -47, -151, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -61, -151, -151, -151, -151, -151, + -151, -151, -151, -26, -24, -16, -15, 62, 1, -151, + -27, -151, -151, -151, -151, -151, -151, -151, -151, 5, + -151, 79, 90, 92, 10, -151, 115, -151, 5, -151, + -151, -151, -151, -151, -151, -151, -151, -23, 22, 23, + -151, 212, -151, 417, -151, -151, -151, -151, -59, -151, + -151, -151, -47, -47, -151, -151, 27, -151, -151, -151, + -151, -13, 6, -151, 87, 2, -151, 35, -151, -151, + -151, -6, -6, -6, -6, -6, -6, -6, 0, -151, + 108, 113, -7, 118, -6, -6, 119, -6, -6, 126, + 128, 506, -151, -35, -151, 133, 133, -151, 36, -151, + 487, -151, -114, -151, -151, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, 60, -151, + -151, 32, -23, -151, -151, -151, -7, -7, -7, -7, + 61, 140, -6, -6, 212, -151, -151, -151, -151, -151, + 112, -151, -151, 112, -31, 65, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, -151, -151, + -31, 144, -35, -151, -151, -151, -151, -6, -151, -151, + 145, 146, 148, 151, -151, -151, -151, -151, 155, 165, + -151, 487, -151, 57, 59, -88, 72, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -151, -151, -151, -151, + -151, 112, 112, -151, 196, -151, -151, -151, -151, -151, + -151, -151, -151, -151, -151, -151, -6, -6, 64, 77, + -104, -151, 68, -151, 112, -151, -151, -151, -47, -151, + -151, -151, 78, -151, 70, 80, -6, 73, -134, -151, + 83, -6, -151, -151, -151, 75, -81, 81, 84, 86, + 88, 95, 56, 89, -6, -6, -6, -6, -6, -151, + 107, -151, -151, -151, -151, -151, -151, -151 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -143, -143, -143, -40, -143, -143, -1, -32, -143, -10, - -143, -143, -143, -143, -143, -143, 130, -143, -143, 93, - -143, -143, 6, -143, 74, -143, -143, -132, -143, -143, - 168, -143, -143, 61, -143, 255, -65, -143, -143, 122, - -143, -143, -143, -143, 26, -143, 151, 229, -143, 250, - -142, -38, -143, -143, -143, 10, -143, -43, -143, -143, - -143, -58, -143, -76 + -151, -151, -151, -41, -151, -151, -1, -32, -151, 4, + -151, -151, -151, -151, -151, -151, 156, -151, -151, 98, + -151, -151, -2, -151, 74, -151, -151, -131, -151, -151, + 168, -151, -151, 63, -151, 255, -65, -151, -151, 121, + -151, -151, -151, -151, 28, -151, 153, 231, -151, 250, + -150, -38, -151, -151, -151, 11, -151, -40, -151, -151, + -151, -57, -151, -70 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1155,138 +1152,138 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 141, 135, 214, 109, 110, 241, 187, 142, 169, 164, - 228, 188, 131, 212, 189, 112, 92, 269, 74, 319, - 319, 75, 83, 69, 65, 181, 84, 229, 338, 66, - 213, 143, 134, 85, 181, 67, 343, 68, 270, 132, - 133, 72, 139, 190, 70, 144, 264, 265, 145, 97, - 171, 73, 172, 264, 265, 278, 279, 280, 281, 242, - 114, 115, 130, 331, 191, 348, 349, 350, 351, 352, - 116, 86, 360, 117, 207, 118, 121, 125, 111, 126, - 302, 303, 128, 129, 76, 93, 77, 165, 100, 94, - 136, 78, 101, 140, 79, 168, 271, 111, 87, 173, - 272, 146, 170, 174, 218, 219, 220, 221, 222, 223, - 224, 88, 178, 230, 111, 195, 273, 233, 234, 192, - 236, 237, 209, 209, 175, 1, 182, 147, 148, 176, - 2, 3, 196, 183, 177, 102, 4, 5, 6, 89, - 179, 7, 184, 186, 217, 8, 9, 195, 196, 210, - 10, 11, 215, 216, 12, 13, 14, 226, 274, 15, - 275, 227, 232, 235, 246, 284, 285, 16, 238, 103, - 239, 245, 325, 17, 268, 282, 283, 305, 104, 307, - 18, 19, 105, 304, 310, 20, 287, 311, 21, 22, - 312, 313, 23, 24, 288, 314, 317, 106, 315, 318, - 324, 107, 326, 329, 289, 290, 330, 25, 291, 306, - 309, 180, 337, 292, 348, 349, 350, 351, 352, 333, - 26, 335, 345, 27, 338, 28, 342, 29, 30, 362, - 368, 293, 347, 294, 295, 31, 296, 297, 298, 32, - 33, 299, 34, 35, 355, 36, 356, 37, 197, 198, - 199, 200, 316, 38, 357, 240, 358, 39, 40, 41, - 359, 42, 43, 185, 44, 45, 286, 277, 99, 308, - 208, 225, 167, -6, 46, 124, 320, 361, 332, 327, - 328, 344, 0, 0, 0, 0, 2, 3, 300, 0, - 0, 0, 4, 5, 6, 0, 0, 7, 0, 341, - 0, 8, 9, 0, 346, 0, 10, 11, 0, 0, - 12, 13, 14, 0, 0, 15, 0, 363, 364, 365, - 366, 367, 0, 16, 151, 0, 201, 0, 334, 17, - 0, 0, 152, 0, 153, 0, 18, 19, 202, 0, - 0, 20, 203, 204, 21, 22, 0, 0, 23, 24, - 0, 0, 0, 0, 0, 154, 0, 0, 0, 0, - 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 26, 0, 0, 27, - 0, 28, 0, 29, 30, 155, 156, 157, 0, 158, - 159, 31, 0, 160, 0, 32, 33, 0, 34, 35, - 0, 36, 0, 37, 0, 0, 0, 0, 0, 38, - 0, 161, 0, 39, 40, 41, 0, 42, 43, 0, - 44, 45, 0, 0, 0, 2, 3, 0, 0, -6, - 46, 4, 5, 6, 0, 0, 7, 0, 0, 0, - 8, 9, 0, 0, 0, 10, 11, 0, 0, 12, - 13, 14, 0, 0, 15, 0, 0, 0, 0, 0, - 0, 0, 16, 0, 0, 0, 0, 0, 17, 0, - 0, 0, 0, 0, 0, 18, 19, 0, 0, 0, - 20, 0, 0, 21, 22, 0, 0, 23, 24, 0, - 0, 0, 0, 0, 0, 0, 247, 0, 0, 0, - 0, 248, 25, 0, 0, 249, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 26, 0, 0, 27, 0, - 28, 0, 29, 30, 0, 0, 0, 0, 0, 0, - 31, 0, 0, 0, 32, 33, 250, 34, 35, 0, - 36, 0, 37, 0, 0, 251, 0, 0, 38, 0, - 0, 0, 39, 40, 41, 0, 42, 43, 0, 44, - 45, 0, 0, 0, 252, 0, 0, 0, 253, 46, - 254, 0, 0, 0, 0, 0, 0, 0, 0, 255, + 140, 134, 213, 186, 141, 108, 109, 168, 187, 163, + 82, 188, 211, 318, 83, 111, 240, 73, 91, 337, + 74, 84, 65, 68, 180, 66, 227, 342, 142, 318, + 67, 212, 133, 180, 138, 268, 263, 264, 130, 71, + 189, 72, 143, 228, 69, 144, 277, 278, 279, 280, + 170, 96, 171, 113, 99, 114, 269, 330, 100, 85, + 115, 190, 263, 264, 116, 131, 132, 117, 120, 241, + 124, 125, 206, 347, 348, 349, 350, 351, 127, 110, + 301, 302, 75, 128, 76, 167, 86, 92, 129, 77, + 135, 93, 78, 139, 164, 110, 169, 145, 87, 172, + 173, 101, 174, 217, 218, 219, 220, 221, 222, 223, + 175, 176, 177, 194, 270, 191, 232, 233, 271, 235, + 236, 208, 208, 146, 147, 1, 88, 178, 229, 181, + 2, 3, 195, 272, 102, 216, 4, 5, 6, 110, + 182, 7, 183, 103, 185, 8, 9, 104, 194, 195, + 10, 11, 286, 209, 12, 13, 14, 214, 225, 15, + 287, 215, 105, 226, 283, 284, 106, 16, 231, 234, + 288, 289, 324, 17, 290, 273, 237, 274, 238, 291, + 18, 19, 303, 244, 245, 20, 267, 281, 21, 22, + 282, 304, 23, 24, 306, 309, 310, 292, 311, 293, + 294, 312, 295, 296, 297, 313, 298, 25, 305, 308, + 347, 348, 349, 350, 351, 314, 316, 359, 317, 26, + 323, 325, 27, 328, 28, 329, 29, 30, 332, 336, + 334, 344, 341, 337, 31, 346, 179, 361, 32, 33, + 354, 34, 35, 355, 36, 356, 37, 357, 196, 197, + 198, 199, 38, 299, 358, 367, 39, 40, 41, 239, + 42, 43, 184, 44, 45, 315, 276, 285, 98, 224, + 307, 207, -6, 46, 166, 123, 319, 0, 326, 327, + 331, 343, 360, 0, 0, 2, 3, 0, 0, 0, + 0, 4, 5, 6, 0, 0, 7, 0, 340, 0, + 8, 9, 0, 345, 0, 10, 11, 0, 0, 12, + 13, 14, 0, 0, 15, 0, 362, 363, 364, 365, + 366, 0, 16, 0, 0, 200, 0, 333, 17, 0, + 0, 0, 0, 0, 0, 18, 19, 201, 0, 0, + 20, 202, 203, 21, 22, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 256, 257, 0, + 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 26, 0, 0, 27, 0, 28, + 0, 29, 30, 0, 0, 0, 0, 0, 0, 31, + 0, 0, 0, 32, 33, 0, 34, 35, 0, 36, + 0, 37, 0, 0, 0, 0, 0, 38, 0, 0, + 0, 39, 40, 41, 0, 42, 43, 0, 44, 45, + 0, 0, 0, 2, 3, 0, 0, -6, 46, 4, + 5, 6, 0, 0, 7, 0, 0, 0, 8, 9, + 0, 0, 0, 10, 11, 0, 0, 12, 13, 14, + 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 17, 0, 0, 0, + 0, 0, 0, 18, 19, 0, 0, 0, 20, 0, + 0, 21, 22, 0, 0, 23, 24, 0, 0, 0, + 0, 0, 0, 246, 0, 0, 0, 0, 247, 0, + 25, 0, 248, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 26, 0, 0, 27, 150, 28, 0, 29, + 30, 0, 0, 0, 151, 0, 152, 31, 0, 0, + 0, 32, 33, 249, 34, 35, 0, 36, 0, 37, + 0, 0, 250, 0, 0, 38, 0, 153, 0, 39, + 40, 41, 0, 42, 43, 0, 44, 45, 0, 0, + 0, 251, 0, 0, 0, 252, 46, 253, 0, 0, + 0, 0, 0, 0, 0, 0, 254, 154, 155, 156, + 0, 157, 158, 0, 0, 159, 0, 0, 0, 0, + 0, 0, 0, 255, 256, 0, 0, 0, 0, 0, + 0, 0, 160, 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, 258, 0, 259, 0, - 0, 0, 260, 0, 0, 261 + 0, 0, 257, 0, 258, 0, 0, 0, 259, 0, + 0, 260 }; static const yytype_int16 yycheck[] = { - 38, 33, 134, 52, 53, 51, 26, 4, 48, 41, - 33, 31, 25, 25, 34, 16, 8, 3, 44, 118, - 118, 47, 5, 29, 149, 90, 9, 50, 154, 50, - 25, 28, 33, 16, 99, 50, 162, 93, 24, 52, - 53, 50, 36, 63, 50, 42, 151, 152, 45, 127, - 51, 50, 53, 151, 152, 197, 198, 199, 200, 105, - 127, 127, 50, 162, 84, 155, 156, 157, 158, 159, - 127, 54, 162, 127, 114, 127, 127, 127, 127, 127, - 212, 213, 127, 127, 110, 77, 112, 50, 19, 81, - 127, 117, 23, 127, 120, 0, 82, 127, 81, 161, - 86, 98, 149, 127, 142, 143, 144, 145, 146, 147, - 148, 94, 50, 136, 127, 127, 102, 155, 156, 139, - 158, 159, 123, 124, 127, 1, 50, 124, 125, 127, - 6, 7, 127, 50, 127, 66, 12, 13, 14, 122, - 127, 17, 50, 29, 138, 21, 22, 127, 127, 127, - 26, 27, 70, 160, 30, 31, 32, 50, 144, 35, - 146, 50, 50, 50, 149, 203, 204, 43, 50, 100, - 50, 50, 304, 49, 127, 127, 50, 127, 109, 50, - 56, 57, 113, 215, 50, 61, 40, 50, 64, 65, - 50, 50, 68, 69, 48, 50, 160, 128, 50, 160, - 149, 132, 25, 160, 58, 59, 149, 83, 62, 241, - 248, 81, 160, 67, 155, 156, 157, 158, 159, 161, - 96, 153, 149, 99, 154, 101, 160, 103, 104, 149, - 149, 85, 161, 87, 88, 111, 90, 91, 92, 115, - 116, 95, 118, 119, 160, 121, 160, 123, 36, 37, - 38, 39, 262, 129, 160, 162, 160, 133, 134, 135, - 160, 137, 138, 95, 140, 141, 205, 193, 13, 243, - 119, 149, 43, 149, 150, 25, 266, 353, 321, 317, - 318, 339, -1, -1, -1, -1, 6, 7, 142, -1, - -1, -1, 12, 13, 14, -1, -1, 17, -1, 337, - -1, 21, 22, -1, 342, -1, 26, 27, -1, -1, - 30, 31, 32, -1, -1, 35, -1, 355, 356, 357, - 358, 359, -1, 43, 10, -1, 114, -1, 329, 49, - -1, -1, 18, -1, 20, -1, 56, 57, 126, -1, - -1, 61, 130, 131, 64, 65, -1, -1, 68, 69, - -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, - -1, -1, -1, 83, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 96, -1, -1, 99, - -1, 101, -1, 103, 104, 71, 72, 73, -1, 75, - 76, 111, -1, 79, -1, 115, 116, -1, 118, 119, - -1, 121, -1, 123, -1, -1, -1, -1, -1, 129, - -1, 97, -1, 133, 134, 135, -1, 137, 138, -1, - 140, 141, -1, -1, -1, 6, 7, -1, -1, 149, - 150, 12, 13, 14, -1, -1, 17, -1, -1, -1, - 21, 22, -1, -1, -1, 26, 27, -1, -1, 30, - 31, 32, -1, -1, 35, -1, -1, -1, -1, -1, - -1, -1, 43, -1, -1, -1, -1, -1, 49, -1, - -1, -1, -1, -1, -1, 56, 57, -1, -1, -1, - 61, -1, -1, 64, 65, -1, -1, 68, 69, -1, - -1, -1, -1, -1, -1, -1, 6, -1, -1, -1, - -1, 11, 83, -1, -1, 15, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 96, -1, -1, 99, -1, - 101, -1, 103, 104, -1, -1, -1, -1, -1, -1, - 111, -1, -1, -1, 115, 116, 46, 118, 119, -1, - 121, -1, 123, -1, -1, 55, -1, -1, 129, -1, - -1, -1, 133, 134, 135, -1, 137, 138, -1, 140, - 141, -1, -1, -1, 74, -1, -1, -1, 78, 150, - 80, -1, -1, -1, -1, -1, -1, -1, -1, 89, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 107, 108, -1, + 38, 33, 133, 26, 4, 52, 53, 48, 31, 41, + 5, 34, 25, 117, 9, 16, 51, 44, 8, 153, + 47, 16, 148, 29, 89, 50, 33, 161, 28, 117, + 50, 25, 33, 98, 36, 3, 150, 151, 25, 50, + 63, 50, 42, 50, 50, 45, 196, 197, 198, 199, + 51, 126, 53, 126, 19, 126, 24, 161, 23, 54, + 126, 84, 150, 151, 126, 52, 53, 126, 126, 104, + 126, 126, 113, 154, 155, 156, 157, 158, 126, 126, + 211, 212, 109, 126, 111, 0, 81, 77, 50, 116, + 126, 81, 119, 126, 50, 126, 148, 97, 93, 160, + 126, 66, 126, 141, 142, 143, 144, 145, 146, 147, + 126, 126, 50, 126, 82, 138, 154, 155, 86, 157, + 158, 122, 123, 123, 124, 1, 121, 126, 135, 50, + 6, 7, 126, 101, 99, 137, 12, 13, 14, 126, + 50, 17, 50, 108, 29, 21, 22, 112, 126, 126, + 26, 27, 40, 126, 30, 31, 32, 70, 50, 35, + 48, 159, 127, 50, 202, 203, 131, 43, 50, 50, + 58, 59, 303, 49, 62, 143, 50, 145, 50, 67, + 56, 57, 214, 50, 148, 61, 126, 126, 64, 65, + 50, 126, 68, 69, 50, 50, 50, 85, 50, 87, + 88, 50, 90, 91, 92, 50, 94, 83, 240, 247, + 154, 155, 156, 157, 158, 50, 159, 161, 159, 95, + 148, 25, 98, 159, 100, 148, 102, 103, 160, 159, + 152, 148, 159, 153, 110, 160, 80, 148, 114, 115, + 159, 117, 118, 159, 120, 159, 122, 159, 36, 37, + 38, 39, 128, 141, 159, 148, 132, 133, 134, 161, + 136, 137, 94, 139, 140, 261, 192, 204, 13, 148, + 242, 118, 148, 149, 43, 25, 265, -1, 316, 317, + 320, 338, 352, -1, -1, 6, 7, -1, -1, -1, + -1, 12, 13, 14, -1, -1, 17, -1, 336, -1, + 21, 22, -1, 341, -1, 26, 27, -1, -1, 30, + 31, 32, -1, -1, 35, -1, 354, 355, 356, 357, + 358, -1, 43, -1, -1, 113, -1, 328, 49, -1, + -1, -1, -1, -1, -1, 56, 57, 125, -1, -1, + 61, 129, 130, 64, 65, -1, -1, 68, 69, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 83, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 95, -1, -1, 98, -1, 100, + -1, 102, 103, -1, -1, -1, -1, -1, -1, 110, + -1, -1, -1, 114, 115, -1, 117, 118, -1, 120, + -1, 122, -1, -1, -1, -1, -1, 128, -1, -1, + -1, 132, 133, 134, -1, 136, 137, -1, 139, 140, + -1, -1, -1, 6, 7, -1, -1, 148, 149, 12, + 13, 14, -1, -1, 17, -1, -1, -1, 21, 22, + -1, -1, -1, 26, 27, -1, -1, 30, 31, 32, + -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, + 43, -1, -1, -1, -1, -1, 49, -1, -1, -1, + -1, -1, -1, 56, 57, -1, -1, -1, 61, -1, + -1, 64, 65, -1, -1, 68, 69, -1, -1, -1, + -1, -1, -1, 6, -1, -1, -1, -1, 11, -1, + 83, -1, 15, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 95, -1, -1, 98, 10, 100, -1, 102, + 103, -1, -1, -1, 18, -1, 20, 110, -1, -1, + -1, 114, 115, 46, 117, 118, -1, 120, -1, 122, + -1, -1, 55, -1, -1, 128, -1, 41, -1, 132, + 133, 134, -1, 136, 137, -1, 139, 140, -1, -1, + -1, 74, -1, -1, -1, 78, 149, 80, -1, -1, + -1, -1, -1, -1, -1, -1, 89, 71, 72, 73, + -1, 75, 76, -1, -1, 79, -1, -1, -1, -1, + -1, -1, -1, 106, 107, -1, -1, -1, -1, -1, + -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 136, -1, 138, -1, - -1, -1, 142, -1, -1, 145 + -1, -1, 135, -1, 137, -1, -1, -1, 141, -1, + -1, 144 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1295,41 +1292,41 @@ static const yytype_uint8 yystos[] = { 0, 1, 6, 7, 12, 13, 14, 17, 21, 22, 26, 27, 30, 31, 32, 35, 43, 49, 56, 57, - 61, 64, 65, 68, 69, 83, 96, 99, 101, 103, - 104, 111, 115, 116, 118, 119, 121, 123, 129, 133, - 134, 135, 137, 138, 140, 141, 150, 164, 165, 166, - 167, 168, 173, 174, 175, 176, 180, 183, 189, 194, - 197, 200, 203, 215, 216, 149, 50, 50, 93, 29, - 50, 214, 50, 50, 44, 47, 110, 112, 117, 120, - 177, 178, 179, 5, 9, 16, 54, 81, 94, 122, - 198, 199, 8, 77, 81, 192, 193, 127, 204, 198, - 19, 23, 66, 100, 109, 113, 128, 132, 185, 52, - 53, 127, 169, 170, 127, 127, 127, 127, 127, 208, - 209, 127, 169, 212, 212, 127, 127, 211, 127, 127, - 50, 25, 52, 53, 169, 170, 127, 205, 184, 185, - 127, 214, 4, 28, 42, 45, 98, 124, 125, 201, - 202, 10, 18, 20, 41, 71, 72, 73, 75, 76, - 79, 97, 181, 182, 170, 50, 210, 210, 0, 166, - 149, 169, 169, 161, 127, 127, 127, 127, 50, 127, - 179, 199, 50, 50, 50, 193, 29, 26, 31, 34, - 63, 84, 139, 186, 187, 127, 127, 36, 37, 38, - 39, 114, 126, 130, 131, 195, 196, 166, 209, 169, - 127, 190, 25, 25, 190, 70, 160, 185, 214, 214, - 214, 214, 214, 214, 214, 202, 50, 50, 33, 50, - 136, 213, 50, 214, 214, 50, 214, 214, 50, 50, - 182, 51, 105, 206, 207, 50, 149, 6, 11, 15, - 46, 55, 74, 78, 80, 89, 107, 108, 136, 138, - 142, 145, 171, 172, 151, 152, 217, 218, 127, 3, - 24, 82, 86, 102, 144, 146, 188, 187, 213, 213, - 213, 213, 127, 50, 214, 214, 196, 40, 48, 58, - 59, 62, 67, 85, 87, 88, 90, 91, 92, 95, - 142, 191, 190, 190, 170, 127, 170, 50, 207, 214, - 50, 50, 50, 50, 50, 50, 172, 160, 160, 118, - 218, 219, 220, 222, 149, 190, 25, 214, 214, 160, - 149, 162, 220, 161, 169, 153, 221, 160, 154, 223, - 224, 214, 160, 162, 224, 149, 214, 161, 155, 156, - 157, 158, 159, 225, 226, 160, 160, 160, 160, 160, - 162, 226, 149, 214, 214, 214, 214, 214, 149 + 61, 64, 65, 68, 69, 83, 95, 98, 100, 102, + 103, 110, 114, 115, 117, 118, 120, 122, 128, 132, + 133, 134, 136, 137, 139, 140, 149, 163, 164, 165, + 166, 167, 172, 173, 174, 175, 179, 182, 188, 193, + 196, 199, 202, 214, 215, 148, 50, 50, 29, 50, + 213, 50, 50, 44, 47, 109, 111, 116, 119, 176, + 177, 178, 5, 9, 16, 54, 81, 93, 121, 197, + 198, 8, 77, 81, 191, 192, 126, 203, 197, 19, + 23, 66, 99, 108, 112, 127, 131, 184, 52, 53, + 126, 168, 169, 126, 126, 126, 126, 126, 207, 208, + 126, 168, 211, 211, 126, 126, 210, 126, 126, 50, + 25, 52, 53, 168, 169, 126, 204, 183, 184, 126, + 213, 4, 28, 42, 45, 97, 123, 124, 200, 201, + 10, 18, 20, 41, 71, 72, 73, 75, 76, 79, + 96, 180, 181, 169, 50, 209, 209, 0, 165, 148, + 168, 168, 160, 126, 126, 126, 126, 50, 126, 178, + 198, 50, 50, 50, 192, 29, 26, 31, 34, 63, + 84, 138, 185, 186, 126, 126, 36, 37, 38, 39, + 113, 125, 129, 130, 194, 195, 165, 208, 168, 126, + 189, 25, 25, 189, 70, 159, 184, 213, 213, 213, + 213, 213, 213, 213, 201, 50, 50, 33, 50, 135, + 212, 50, 213, 213, 50, 213, 213, 50, 50, 181, + 51, 104, 205, 206, 50, 148, 6, 11, 15, 46, + 55, 74, 78, 80, 89, 106, 107, 135, 137, 141, + 144, 170, 171, 150, 151, 216, 217, 126, 3, 24, + 82, 86, 101, 143, 145, 187, 186, 212, 212, 212, + 212, 126, 50, 213, 213, 195, 40, 48, 58, 59, + 62, 67, 85, 87, 88, 90, 91, 92, 94, 141, + 190, 189, 189, 169, 126, 169, 50, 206, 213, 50, + 50, 50, 50, 50, 50, 171, 159, 159, 117, 217, + 218, 219, 221, 148, 189, 25, 213, 213, 159, 148, + 161, 219, 160, 168, 152, 220, 159, 153, 222, 223, + 213, 159, 161, 223, 148, 213, 160, 154, 155, 156, + 157, 158, 224, 225, 159, 159, 159, 159, 159, 161, + 225, 148, 213, 213, 213, 213, 213, 148 }; #define yyerrok (yyerrstatus = 0) @@ -2143,7 +2140,7 @@ yyreduce: case 5: /* Line 1455 of yacc.c */ -#line 288 "ntp_parser.y" +#line 287 "ntp_parser.y" { /* I will need to incorporate much more fine grained * error messages. The following should suffice for @@ -2167,7 +2164,7 @@ yyreduce: case 19: /* Line 1455 of yacc.c */ -#line 329 "ntp_parser.y" +#line 328 "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) @@ -2178,7 +2175,7 @@ yyreduce: case 20: /* Line 1455 of yacc.c */ -#line 335 "ntp_parser.y" +#line 334 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL); if (my_node) @@ -2189,189 +2186,189 @@ yyreduce: case 21: /* Line 1455 of yacc.c */ -#line 343 "ntp_parser.y" +#line 342 "ntp_parser.y" { (yyval.Integer) = T_Server; } break; case 22: /* Line 1455 of yacc.c */ -#line 344 "ntp_parser.y" +#line 343 "ntp_parser.y" { (yyval.Integer) = T_Pool; } break; case 23: /* Line 1455 of yacc.c */ -#line 345 "ntp_parser.y" +#line 344 "ntp_parser.y" { (yyval.Integer) = T_Peer; } break; case 24: /* Line 1455 of yacc.c */ -#line 346 "ntp_parser.y" +#line 345 "ntp_parser.y" { (yyval.Integer) = T_Broadcast; } break; case 25: /* Line 1455 of yacc.c */ -#line 347 "ntp_parser.y" +#line 346 "ntp_parser.y" { (yyval.Integer) = T_Manycastclient; } break; case 26: /* Line 1455 of yacc.c */ -#line 351 "ntp_parser.y" +#line 350 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(1) - (1)].Address_node); } break; case 27: /* Line 1455 of yacc.c */ -#line 352 "ntp_parser.y" +#line 351 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); } break; case 28: /* Line 1455 of yacc.c */ -#line 353 "ntp_parser.y" +#line 352 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); } break; case 29: /* Line 1455 of yacc.c */ -#line 357 "ntp_parser.y" +#line 356 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); } break; case 30: /* Line 1455 of yacc.c */ -#line 361 "ntp_parser.y" +#line 360 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 31: /* Line 1455 of yacc.c */ -#line 362 "ntp_parser.y" +#line 361 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 32: /* Line 1455 of yacc.c */ -#line 366 "ntp_parser.y" +#line 365 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_SKEY); } break; case 33: /* Line 1455 of yacc.c */ -#line 367 "ntp_parser.y" +#line 366 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Bias, (yyvsp[(2) - (2)].Double)); } break; case 34: /* Line 1455 of yacc.c */ -#line 368 "ntp_parser.y" +#line 367 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_BURST); } break; case 35: /* Line 1455 of yacc.c */ -#line 369 "ntp_parser.y" +#line 368 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_IBURST); } break; case 36: /* Line 1455 of yacc.c */ -#line 370 "ntp_parser.y" +#line 369 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Key, (yyvsp[(2) - (2)].Integer)); } break; case 37: /* Line 1455 of yacc.c */ -#line 371 "ntp_parser.y" +#line 370 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Minpoll, (yyvsp[(2) - (2)].Integer)); } break; case 38: /* Line 1455 of yacc.c */ -#line 372 "ntp_parser.y" +#line 371 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Maxpoll, (yyvsp[(2) - (2)].Integer)); } break; case 39: /* Line 1455 of yacc.c */ -#line 373 "ntp_parser.y" +#line 372 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_NOSELECT); } break; case 40: /* Line 1455 of yacc.c */ -#line 374 "ntp_parser.y" +#line 373 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREEMPT); } break; case 41: /* Line 1455 of yacc.c */ -#line 375 "ntp_parser.y" +#line 374 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREFER); } break; case 42: /* Line 1455 of yacc.c */ -#line 376 "ntp_parser.y" +#line 375 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_TRUE); } break; case 43: /* Line 1455 of yacc.c */ -#line 377 "ntp_parser.y" +#line 376 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_XLEAVE); } break; case 44: /* Line 1455 of yacc.c */ -#line 378 "ntp_parser.y" +#line 377 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Ttl, (yyvsp[(2) - (2)].Integer)); } break; case 45: /* Line 1455 of yacc.c */ -#line 379 "ntp_parser.y" +#line 378 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Mode, (yyvsp[(2) - (2)].Integer)); } break; case 46: /* Line 1455 of yacc.c */ -#line 380 "ntp_parser.y" +#line 379 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Version, (yyvsp[(2) - (2)].Integer)); } break; case 47: /* Line 1455 of yacc.c */ -#line 390 "ntp_parser.y" +#line 389 "ntp_parser.y" { struct unpeer_node *my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); if (my_node) @@ -2382,63 +2379,56 @@ yyreduce: case 48: /* Line 1455 of yacc.c */ -#line 397 "ntp_parser.y" +#line 396 "ntp_parser.y" { (yyval.Integer) = T_Unconfig; } break; case 49: /* Line 1455 of yacc.c */ -#line 398 "ntp_parser.y" +#line 397 "ntp_parser.y" { (yyval.Integer) = T_Unpeer; } break; case 50: /* Line 1455 of yacc.c */ -#line 409 "ntp_parser.y" - { cfgt.broadcastclient = SIMPLE; } +#line 408 "ntp_parser.y" + { cfgt.broadcastclient = 1; } break; case 51: /* Line 1455 of yacc.c */ -#line 411 "ntp_parser.y" - { cfgt.broadcastclient = NOVOLLEY; } - break; - - case 52: - -/* Line 1455 of yacc.c */ -#line 413 "ntp_parser.y" +#line 410 "ntp_parser.y" { append_queue(cfgt.manycastserver, (yyvsp[(2) - (2)].Queue)); } break; - case 53: + case 52: /* Line 1455 of yacc.c */ -#line 415 "ntp_parser.y" +#line 412 "ntp_parser.y" { append_queue(cfgt.multicastclient, (yyvsp[(2) - (2)].Queue)); } break; - case 54: + case 53: /* Line 1455 of yacc.c */ -#line 426 "ntp_parser.y" +#line 423 "ntp_parser.y" { cfgt.auth.autokey = (yyvsp[(2) - (2)].Integer); } break; - case 55: + case 54: /* Line 1455 of yacc.c */ -#line 428 "ntp_parser.y" +#line 425 "ntp_parser.y" { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; - case 56: + case 55: /* Line 1455 of yacc.c */ -#line 430 "ntp_parser.y" +#line 427 "ntp_parser.y" { if (cfgt.auth.crypto_cmd_list != NULL) append_queue(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue)); @@ -2448,434 +2438,434 @@ yyreduce: } break; - case 57: + case 56: /* Line 1455 of yacc.c */ -#line 438 "ntp_parser.y" +#line 435 "ntp_parser.y" { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; - case 58: + case 57: /* Line 1455 of yacc.c */ -#line 440 "ntp_parser.y" +#line 437 "ntp_parser.y" { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; - case 59: + case 58: /* Line 1455 of yacc.c */ -#line 442 "ntp_parser.y" +#line 439 "ntp_parser.y" { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; - case 60: + case 59: /* Line 1455 of yacc.c */ -#line 444 "ntp_parser.y" +#line 441 "ntp_parser.y" { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } break; - case 61: + case 60: /* Line 1455 of yacc.c */ -#line 446 "ntp_parser.y" +#line 443 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; - case 63: + case 62: /* Line 1455 of yacc.c */ -#line 452 "ntp_parser.y" +#line 449 "ntp_parser.y" { (yyval.Queue) = NULL; } break; - case 64: + case 63: /* Line 1455 of yacc.c */ -#line 456 "ntp_parser.y" +#line 453 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 65: + case 64: /* Line 1455 of yacc.c */ -#line 457 "ntp_parser.y" +#line 454 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 66: + case 65: /* Line 1455 of yacc.c */ -#line 462 "ntp_parser.y" +#line 459 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PRIV, (yyvsp[(2) - (2)].String)); } break; - case 67: + case 66: /* Line 1455 of yacc.c */ -#line 464 "ntp_parser.y" +#line 461 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_IDENT, (yyvsp[(2) - (2)].String)); } break; - case 68: + case 67: /* Line 1455 of yacc.c */ -#line 466 "ntp_parser.y" +#line 463 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PW, (yyvsp[(2) - (2)].String)); } break; - case 69: + case 68: /* Line 1455 of yacc.c */ -#line 468 "ntp_parser.y" +#line 465 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_RAND, (yyvsp[(2) - (2)].String)); } break; - case 70: + case 69: /* Line 1455 of yacc.c */ -#line 470 "ntp_parser.y" +#line 467 "ntp_parser.y" { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; - case 71: + case 70: /* Line 1455 of yacc.c */ -#line 472 "ntp_parser.y" +#line 469 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_SIGN, (yyvsp[(2) - (2)].String)); } break; - case 72: + case 71: /* Line 1455 of yacc.c */ -#line 482 "ntp_parser.y" +#line 479 "ntp_parser.y" { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; - case 73: + case 72: /* Line 1455 of yacc.c */ -#line 486 "ntp_parser.y" +#line 483 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 74: + case 73: /* Line 1455 of yacc.c */ -#line 487 "ntp_parser.y" +#line 484 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 75: + case 74: /* Line 1455 of yacc.c */ -#line 492 "ntp_parser.y" +#line 489 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_CEILING, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 76: + case 75: /* Line 1455 of yacc.c */ -#line 494 "ntp_parser.y" +#line 491 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_FLOOR, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 77: + case 76: /* Line 1455 of yacc.c */ -#line 496 "ntp_parser.y" +#line 493 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_COHORT, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 78: + case 77: /* Line 1455 of yacc.c */ -#line 498 "ntp_parser.y" +#line 495 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_ORPHAN, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 79: + case 78: /* Line 1455 of yacc.c */ -#line 500 "ntp_parser.y" +#line 497 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINDISP, (yyvsp[(2) - (2)].Double)); } break; - case 80: + case 79: /* Line 1455 of yacc.c */ -#line 502 "ntp_parser.y" +#line 499 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXDIST, (yyvsp[(2) - (2)].Double)); } break; - case 81: + case 80: /* Line 1455 of yacc.c */ -#line 504 "ntp_parser.y" +#line 501 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINCLOCK, (yyvsp[(2) - (2)].Double)); } break; - case 82: + case 81: /* Line 1455 of yacc.c */ -#line 506 "ntp_parser.y" +#line 503 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXCLOCK, (yyvsp[(2) - (2)].Double)); } break; - case 83: + case 82: /* Line 1455 of yacc.c */ -#line 508 "ntp_parser.y" +#line 505 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINSANE, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 84: + case 83: /* Line 1455 of yacc.c */ -#line 510 "ntp_parser.y" +#line 507 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_BEACON, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 85: + case 84: /* Line 1455 of yacc.c */ -#line 512 "ntp_parser.y" +#line 509 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXHOP, (double)(yyvsp[(2) - (2)].Integer)); } break; - case 86: + case 85: /* Line 1455 of yacc.c */ -#line 522 "ntp_parser.y" +#line 519 "ntp_parser.y" { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } break; - case 87: + case 86: /* Line 1455 of yacc.c */ -#line 524 "ntp_parser.y" +#line 521 "ntp_parser.y" { cfgt.stats_dir = (yyvsp[(2) - (2)].String); } break; - case 88: + case 87: /* Line 1455 of yacc.c */ -#line 526 "ntp_parser.y" +#line 523 "ntp_parser.y" { enqueue(cfgt.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].VoidPtr), (yyvsp[(3) - (3)].Queue))); } break; - case 89: + case 88: /* Line 1455 of yacc.c */ -#line 533 "ntp_parser.y" +#line 530 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; - case 90: + case 89: /* Line 1455 of yacc.c */ -#line 534 "ntp_parser.y" +#line 531 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].VoidPtr)); } break; - case 91: + case 90: /* Line 1455 of yacc.c */ -#line 539 "ntp_parser.y" +#line 536 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("clockstats"); } break; - case 92: + case 91: /* Line 1455 of yacc.c */ -#line 541 "ntp_parser.y" +#line 538 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("cryptostats"); } break; - case 93: + case 92: /* Line 1455 of yacc.c */ -#line 543 "ntp_parser.y" +#line 540 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("loopstats"); } break; - case 94: + case 93: /* Line 1455 of yacc.c */ -#line 545 "ntp_parser.y" +#line 542 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("peerstats"); } break; - case 95: + case 94: /* Line 1455 of yacc.c */ -#line 547 "ntp_parser.y" +#line 544 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("rawstats"); } break; - case 96: + case 95: /* Line 1455 of yacc.c */ -#line 549 "ntp_parser.y" +#line 546 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("sysstats"); } break; - case 97: + case 96: /* Line 1455 of yacc.c */ -#line 551 "ntp_parser.y" +#line 548 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("timingstats"); } break; - case 98: + case 97: /* Line 1455 of yacc.c */ -#line 553 "ntp_parser.y" +#line 550 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("protostats"); } break; - case 99: + case 98: /* Line 1455 of yacc.c */ -#line 557 "ntp_parser.y" +#line 554 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 100: + case 99: /* Line 1455 of yacc.c */ -#line 558 "ntp_parser.y" +#line 555 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 101: + case 100: /* Line 1455 of yacc.c */ -#line 563 "ntp_parser.y" +#line 560 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(T_File, (yyvsp[(2) - (2)].String)); } break; - case 102: + case 101: /* Line 1455 of yacc.c */ -#line 565 "ntp_parser.y" +#line 562 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Type, (yyvsp[(2) - (2)].Integer)); } break; - case 103: + case 102: /* Line 1455 of yacc.c */ -#line 566 "ntp_parser.y" +#line 563 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Link); } break; - case 104: + case 103: /* Line 1455 of yacc.c */ -#line 567 "ntp_parser.y" +#line 564 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Nolink); } break; - case 105: + case 104: /* Line 1455 of yacc.c */ -#line 568 "ntp_parser.y" +#line 565 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Enable); } break; - case 106: + case 105: /* Line 1455 of yacc.c */ -#line 569 "ntp_parser.y" +#line 566 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Disable); } break; - case 107: + case 106: /* Line 1455 of yacc.c */ -#line 573 "ntp_parser.y" +#line 570 "ntp_parser.y" { (yyval.Integer) = FILEGEN_NONE; } break; - case 108: + case 107: /* Line 1455 of yacc.c */ -#line 574 "ntp_parser.y" +#line 571 "ntp_parser.y" { (yyval.Integer) = FILEGEN_PID; } break; - case 109: + case 108: /* Line 1455 of yacc.c */ -#line 575 "ntp_parser.y" +#line 572 "ntp_parser.y" { (yyval.Integer) = FILEGEN_DAY; } break; - case 110: + case 109: /* Line 1455 of yacc.c */ -#line 576 "ntp_parser.y" +#line 573 "ntp_parser.y" { (yyval.Integer) = FILEGEN_WEEK; } break; - case 111: + case 110: /* Line 1455 of yacc.c */ -#line 577 "ntp_parser.y" +#line 574 "ntp_parser.y" { (yyval.Integer) = FILEGEN_MONTH; } break; - case 112: + case 111: /* Line 1455 of yacc.c */ -#line 578 "ntp_parser.y" +#line 575 "ntp_parser.y" { (yyval.Integer) = FILEGEN_YEAR; } break; - case 113: + case 112: /* Line 1455 of yacc.c */ -#line 579 "ntp_parser.y" +#line 576 "ntp_parser.y" { (yyval.Integer) = FILEGEN_AGE; } break; - case 114: + case 113: /* Line 1455 of yacc.c */ -#line 589 "ntp_parser.y" +#line 586 "ntp_parser.y" { append_queue(cfgt.discard_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 115: + case 114: /* Line 1455 of yacc.c */ -#line 593 "ntp_parser.y" +#line 590 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 116: + case 115: /* Line 1455 of yacc.c */ -#line 598 "ntp_parser.y" +#line 595 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 117: + case 116: /* Line 1455 of yacc.c */ -#line 603 "ntp_parser.y" +#line 600 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2890,10 +2880,10 @@ yyreduce: } break; - case 118: + case 117: /* Line 1455 of yacc.c */ -#line 616 "ntp_parser.y" +#line 613 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2908,391 +2898,391 @@ yyreduce: } break; - case 119: + case 118: /* Line 1455 of yacc.c */ -#line 629 "ntp_parser.y" +#line 626 "ntp_parser.y" { enqueue(cfgt.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 120: + case 119: /* Line 1455 of yacc.c */ -#line 636 "ntp_parser.y" +#line 633 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 121: + case 120: /* Line 1455 of yacc.c */ -#line 637 "ntp_parser.y" +#line 634 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; - case 122: + case 121: /* Line 1455 of yacc.c */ -#line 641 "ntp_parser.y" +#line 638 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_TIMEOUT); } break; - case 123: + case 122: /* Line 1455 of yacc.c */ -#line 642 "ntp_parser.y" +#line 639 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_IGNORE); } break; - case 124: + case 123: /* Line 1455 of yacc.c */ -#line 643 "ntp_parser.y" +#line 640 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_KOD); } break; - case 125: + case 124: /* Line 1455 of yacc.c */ -#line 644 "ntp_parser.y" +#line 641 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_MSSNTP); } break; - case 126: + case 125: /* Line 1455 of yacc.c */ -#line 645 "ntp_parser.y" +#line 642 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LIMITED); } break; - case 127: + case 126: /* Line 1455 of yacc.c */ -#line 646 "ntp_parser.y" +#line 643 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LPTRAP); } break; - case 128: + case 127: /* Line 1455 of yacc.c */ -#line 647 "ntp_parser.y" +#line 644 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOMODIFY); } break; - case 129: + case 128: /* Line 1455 of yacc.c */ -#line 648 "ntp_parser.y" +#line 645 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOPEER); } break; - case 130: + case 129: /* Line 1455 of yacc.c */ -#line 649 "ntp_parser.y" +#line 646 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOQUERY); } break; - case 131: + case 130: /* Line 1455 of yacc.c */ -#line 650 "ntp_parser.y" +#line 647 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTSERVE); } break; - case 132: + case 131: /* Line 1455 of yacc.c */ -#line 651 "ntp_parser.y" +#line 648 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOTRAP); } break; - case 133: + case 132: /* Line 1455 of yacc.c */ -#line 652 "ntp_parser.y" +#line 649 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTTRUST); } break; - case 134: + case 133: /* Line 1455 of yacc.c */ -#line 653 "ntp_parser.y" +#line 650 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RESM_NTPONLY); } break; - case 135: + case 134: /* Line 1455 of yacc.c */ -#line 654 "ntp_parser.y" +#line 651 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_VERSION); } break; - case 136: + case 135: /* Line 1455 of yacc.c */ -#line 658 "ntp_parser.y" +#line 655 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 137: + case 136: /* Line 1455 of yacc.c */ -#line 659 "ntp_parser.y" +#line 656 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 138: + case 137: /* Line 1455 of yacc.c */ -#line 663 "ntp_parser.y" +#line 660 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Average, (yyvsp[(2) - (2)].Integer)); } break; - case 139: + case 138: /* Line 1455 of yacc.c */ -#line 664 "ntp_parser.y" +#line 661 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Minimum, (yyvsp[(2) - (2)].Integer)); } break; - case 140: + case 139: /* Line 1455 of yacc.c */ -#line 665 "ntp_parser.y" +#line 662 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Monitor, (yyvsp[(2) - (2)].Integer)); } break; - case 141: + case 140: /* Line 1455 of yacc.c */ -#line 674 "ntp_parser.y" +#line 671 "ntp_parser.y" { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 142: + case 141: /* Line 1455 of yacc.c */ -#line 678 "ntp_parser.y" +#line 675 "ntp_parser.y" { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 143: + case 142: /* Line 1455 of yacc.c */ -#line 679 "ntp_parser.y" +#line 676 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 144: + case 143: /* Line 1455 of yacc.c */ -#line 684 "ntp_parser.y" +#line 681 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME1, (yyvsp[(2) - (2)].Double)); } break; - case 145: + case 144: /* Line 1455 of yacc.c */ -#line 686 "ntp_parser.y" +#line 683 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME2, (yyvsp[(2) - (2)].Double)); } break; - case 146: + case 145: /* Line 1455 of yacc.c */ -#line 688 "ntp_parser.y" +#line 685 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEVAL1, (yyvsp[(2) - (2)].Integer)); } break; - case 147: + case 146: /* Line 1455 of yacc.c */ -#line 690 "ntp_parser.y" +#line 687 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CLK_HAVEVAL2, (yyvsp[(2) - (2)].String)); } break; - case 148: + case 147: /* Line 1455 of yacc.c */ -#line 692 "ntp_parser.y" +#line 689 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG1, (yyvsp[(2) - (2)].Integer)); } break; - case 149: + case 148: /* Line 1455 of yacc.c */ -#line 694 "ntp_parser.y" +#line 691 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG2, (yyvsp[(2) - (2)].Integer)); } break; - case 150: + case 149: /* Line 1455 of yacc.c */ -#line 696 "ntp_parser.y" +#line 693 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG3, (yyvsp[(2) - (2)].Integer)); } break; - case 151: + case 150: /* Line 1455 of yacc.c */ -#line 698 "ntp_parser.y" +#line 695 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG4, (yyvsp[(2) - (2)].Integer)); } break; - case 152: + case 151: /* Line 1455 of yacc.c */ -#line 707 "ntp_parser.y" +#line 704 "ntp_parser.y" { append_queue(cfgt.enable_opts,(yyvsp[(2) - (2)].Queue)); } break; - case 153: + case 152: /* Line 1455 of yacc.c */ -#line 709 "ntp_parser.y" +#line 706 "ntp_parser.y" { append_queue(cfgt.disable_opts,(yyvsp[(2) - (2)].Queue)); } break; - case 154: + case 153: /* Line 1455 of yacc.c */ -#line 713 "ntp_parser.y" +#line 710 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 155: + case 154: /* Line 1455 of yacc.c */ -#line 714 "ntp_parser.y" +#line 711 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 156: + case 155: /* Line 1455 of yacc.c */ -#line 718 "ntp_parser.y" +#line 715 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); } break; - case 157: + case 156: /* Line 1455 of yacc.c */ -#line 719 "ntp_parser.y" +#line 716 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_BROADCLIENT); } break; - case 158: + case 157: /* Line 1455 of yacc.c */ -#line 720 "ntp_parser.y" +#line 717 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_CAL); } break; - case 159: + case 158: /* Line 1455 of yacc.c */ -#line 721 "ntp_parser.y" +#line 718 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_KERNEL); } break; - case 160: + case 159: /* Line 1455 of yacc.c */ -#line 722 "ntp_parser.y" +#line 719 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_MONITOR); } break; - case 161: + case 160: /* Line 1455 of yacc.c */ -#line 723 "ntp_parser.y" +#line 720 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_NTP); } break; - case 162: + case 161: /* Line 1455 of yacc.c */ -#line 725 "ntp_parser.y" +#line 722 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_FILEGEN); } break; - case 163: + case 162: /* Line 1455 of yacc.c */ -#line 733 "ntp_parser.y" +#line 730 "ntp_parser.y" { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } break; - case 164: + case 163: /* Line 1455 of yacc.c */ -#line 737 "ntp_parser.y" +#line 734 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 165: + case 164: /* Line 1455 of yacc.c */ -#line 738 "ntp_parser.y" +#line 735 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 166: + case 165: /* Line 1455 of yacc.c */ -#line 742 "ntp_parser.y" +#line 739 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_ALLAN, (yyvsp[(2) - (2)].Double)); } break; - case 167: + case 166: /* Line 1455 of yacc.c */ -#line 743 "ntp_parser.y" +#line 740 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PHI, (yyvsp[(2) - (2)].Double)); } break; - case 168: + case 167: /* Line 1455 of yacc.c */ -#line 744 "ntp_parser.y" +#line 741 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_FREQ, (yyvsp[(2) - (2)].Double)); } break; - case 169: + case 168: /* Line 1455 of yacc.c */ -#line 745 "ntp_parser.y" +#line 742 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_HUFFPUFF, (yyvsp[(2) - (2)].Double)); } break; - case 170: + case 169: /* Line 1455 of yacc.c */ -#line 746 "ntp_parser.y" +#line 743 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PANIC, (yyvsp[(2) - (2)].Double)); } break; - case 171: + case 170: /* Line 1455 of yacc.c */ -#line 747 "ntp_parser.y" +#line 744 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MAX, (yyvsp[(2) - (2)].Double)); } break; - case 172: + case 171: /* Line 1455 of yacc.c */ -#line 748 "ntp_parser.y" +#line 745 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MINSTEP, (yyvsp[(2) - (2)].Double)); } break; - case 173: + case 172: /* Line 1455 of yacc.c */ -#line 757 "ntp_parser.y" +#line 754 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -3310,196 +3300,196 @@ yyreduce: } break; - case 174: + case 173: /* Line 1455 of yacc.c */ -#line 773 "ntp_parser.y" +#line 770 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); } break; - case 175: + case 174: /* Line 1455 of yacc.c */ -#line 779 "ntp_parser.y" +#line 776 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval(T_Broadcastdelay, (yyvsp[(2) - (2)].Double))); } break; - case 176: + case 175: /* Line 1455 of yacc.c */ -#line 781 "ntp_parser.y" +#line 778 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival(T_Calldelay, (yyvsp[(2) - (2)].Integer))); } break; - case 177: + case 176: /* Line 1455 of yacc.c */ -#line 783 "ntp_parser.y" +#line 780 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval(T_Tick, (yyvsp[(2) - (2)].Double))); } break; - case 178: + case 177: /* Line 1455 of yacc.c */ -#line 785 "ntp_parser.y" +#line 782 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; - case 179: + case 178: /* Line 1455 of yacc.c */ -#line 787 "ntp_parser.y" +#line 784 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Leapfile, (yyvsp[(2) - (2)].String))); } break; - case 180: + case 179: /* Line 1455 of yacc.c */ -#line 790 "ntp_parser.y" +#line 787 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Pidfile, (yyvsp[(2) - (2)].String))); } break; - case 181: + case 180: /* Line 1455 of yacc.c */ -#line 792 "ntp_parser.y" +#line 789 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Logfile, (yyvsp[(2) - (2)].String))); } break; - case 182: + case 181: /* Line 1455 of yacc.c */ -#line 794 "ntp_parser.y" +#line 791 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival(T_Automax, (yyvsp[(2) - (2)].Integer))); } break; - case 183: + case 182: /* Line 1455 of yacc.c */ -#line 797 "ntp_parser.y" +#line 794 "ntp_parser.y" { append_queue(cfgt.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 184: + case 183: /* Line 1455 of yacc.c */ -#line 799 "ntp_parser.y" +#line 796 "ntp_parser.y" { append_queue(cfgt.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 185: + case 184: /* Line 1455 of yacc.c */ -#line 801 "ntp_parser.y" +#line 798 "ntp_parser.y" { enqueue(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 186: + case 185: /* Line 1455 of yacc.c */ -#line 803 "ntp_parser.y" +#line 800 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 187: + case 186: /* Line 1455 of yacc.c */ -#line 805 "ntp_parser.y" +#line 802 "ntp_parser.y" { append_queue(cfgt.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 188: + case 187: /* Line 1455 of yacc.c */ -#line 807 "ntp_parser.y" +#line 804 "ntp_parser.y" { enqueue(cfgt.qos, create_attr_sval(T_Qos, (yyvsp[(2) - (2)].String))); } break; - case 189: + case 188: /* Line 1455 of yacc.c */ -#line 811 "ntp_parser.y" +#line 808 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 190: + case 189: /* Line 1455 of yacc.c */ -#line 813 "ntp_parser.y" +#line 810 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double))); enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); } break; - case 191: + case 190: /* Line 1455 of yacc.c */ -#line 816 "ntp_parser.y" +#line 813 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 192: + case 191: /* Line 1455 of yacc.c */ -#line 821 "ntp_parser.y" +#line 818 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), DEF); } break; - case 193: + case 192: /* Line 1455 of yacc.c */ -#line 823 "ntp_parser.y" +#line 820 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 194: + case 193: /* Line 1455 of yacc.c */ -#line 828 "ntp_parser.y" +#line 825 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 195: + case 194: /* Line 1455 of yacc.c */ -#line 829 "ntp_parser.y" +#line 826 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 196: + case 195: /* Line 1455 of yacc.c */ -#line 833 "ntp_parser.y" +#line 830 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Port, (yyvsp[(2) - (2)].Integer)); } break; - case 197: + case 196: /* Line 1455 of yacc.c */ -#line 834 "ntp_parser.y" +#line 831 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval(T_Interface, (yyvsp[(2) - (2)].Address_node)); } break; - case 198: + case 197: /* Line 1455 of yacc.c */ -#line 839 "ntp_parser.y" +#line 836 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 199: + case 198: /* Line 1455 of yacc.c */ -#line 840 "ntp_parser.y" +#line 837 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 200: + case 199: /* Line 1455 of yacc.c */ -#line 845 "ntp_parser.y" +#line 842 "ntp_parser.y" { char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = (yyvsp[(1) - (1)].String) + 1; @@ -3513,52 +3503,52 @@ yyreduce: } break; - case 201: + case 200: /* Line 1455 of yacc.c */ -#line 863 "ntp_parser.y" +#line 860 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 202: + case 201: /* Line 1455 of yacc.c */ -#line 864 "ntp_parser.y" +#line 861 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 203: + case 202: /* Line 1455 of yacc.c */ -#line 868 "ntp_parser.y" +#line 865 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 204: + case 203: /* Line 1455 of yacc.c */ -#line 869 "ntp_parser.y" +#line 866 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 205: + case 204: /* Line 1455 of yacc.c */ -#line 873 "ntp_parser.y" +#line 870 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 206: + case 205: /* Line 1455 of yacc.c */ -#line 874 "ntp_parser.y" +#line 871 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 207: + case 206: /* Line 1455 of yacc.c */ -#line 879 "ntp_parser.y" +#line 876 "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"); @@ -3569,38 +3559,38 @@ yyreduce: } break; - case 208: + case 207: /* Line 1455 of yacc.c */ -#line 887 "ntp_parser.y" +#line 884 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 209: + case 208: /* Line 1455 of yacc.c */ -#line 888 "ntp_parser.y" +#line 885 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 210: + case 209: /* Line 1455 of yacc.c */ -#line 892 "ntp_parser.y" +#line 889 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 211: + case 210: /* Line 1455 of yacc.c */ -#line 893 "ntp_parser.y" +#line 890 "ntp_parser.y" { (yyval.Double) = (yyvsp[(1) - (1)].Double); } break; - case 212: + case 211: /* Line 1455 of yacc.c */ -#line 902 "ntp_parser.y" +#line 899 "ntp_parser.y" { cfgt.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3609,150 +3599,150 @@ yyreduce: } break; - case 213: + case 212: /* Line 1455 of yacc.c */ -#line 916 "ntp_parser.y" +#line 913 "ntp_parser.y" { old_config_style = 0; } break; - case 214: + case 213: /* Line 1455 of yacc.c */ -#line 920 "ntp_parser.y" +#line 917 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 215: + case 214: /* Line 1455 of yacc.c */ -#line 921 "ntp_parser.y" +#line 918 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 216: + case 215: /* Line 1455 of yacc.c */ -#line 925 "ntp_parser.y" +#line 922 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Beep_Delay, (yyvsp[(3) - (3)].Double)); } break; - case 217: + case 216: /* Line 1455 of yacc.c */ -#line 926 "ntp_parser.y" +#line 923 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Sim_Duration, (yyvsp[(3) - (3)].Double)); } break; - case 218: + case 217: /* Line 1455 of yacc.c */ -#line 930 "ntp_parser.y" +#line 927 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; - case 219: + case 218: /* Line 1455 of yacc.c */ -#line 931 "ntp_parser.y" +#line 928 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; - case 220: + case 219: /* Line 1455 of yacc.c */ -#line 936 "ntp_parser.y" +#line 933 "ntp_parser.y" { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } break; - case 221: + case 220: /* Line 1455 of yacc.c */ -#line 940 "ntp_parser.y" +#line 937 "ntp_parser.y" { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; - case 222: + case 221: /* Line 1455 of yacc.c */ -#line 944 "ntp_parser.y" +#line 941 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; - case 223: + case 222: /* Line 1455 of yacc.c */ -#line 948 "ntp_parser.y" +#line 945 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; - case 224: + case 223: /* Line 1455 of yacc.c */ -#line 949 "ntp_parser.y" +#line 946 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; - case 225: + case 224: /* Line 1455 of yacc.c */ -#line 954 "ntp_parser.y" +#line 951 "ntp_parser.y" { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; - case 226: + case 225: /* Line 1455 of yacc.c */ -#line 958 "ntp_parser.y" +#line 955 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 227: + case 226: /* Line 1455 of yacc.c */ -#line 959 "ntp_parser.y" +#line 956 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 228: + case 227: /* Line 1455 of yacc.c */ -#line 964 "ntp_parser.y" +#line 961 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Freq_Offset, (yyvsp[(3) - (3)].Double)); } break; - case 229: + case 228: /* Line 1455 of yacc.c */ -#line 966 "ntp_parser.y" +#line 963 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Wander, (yyvsp[(3) - (3)].Double)); } break; - case 230: + case 229: /* Line 1455 of yacc.c */ -#line 968 "ntp_parser.y" +#line 965 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Jitter, (yyvsp[(3) - (3)].Double)); } break; - case 231: + case 230: /* Line 1455 of yacc.c */ -#line 970 "ntp_parser.y" +#line 967 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Prop_Delay, (yyvsp[(3) - (3)].Double)); } break; - case 232: + case 231: /* Line 1455 of yacc.c */ -#line 972 "ntp_parser.y" +#line 969 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(T_Proc_Delay, (yyvsp[(3) - (3)].Double)); } break; /* Line 1455 of yacc.c */ -#line 3756 "../../ntpd/ntp_parser.c" +#line 3746 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3964,7 +3954,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 976 "ntp_parser.y" +#line 973 "ntp_parser.y" /* KEYWORDS diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h index ff1dd9d68..d2d0f63cf 100644 --- a/ntpd/ntp_parser.h +++ b/ntpd/ntp_parser.h @@ -129,73 +129,72 @@ T_Noserve = 345, T_Notrap = 346, T_Notrust = 347, - T_Novolley = 348, - T_Ntp = 349, - T_Ntpport = 350, - T_NtpSignDsocket = 351, - T_Orphan = 352, - T_Panic = 353, - T_Peer = 354, - T_Peerstats = 355, - T_Phone = 356, - T_Pid = 357, - T_Pidfile = 358, - T_Pool = 359, - T_Port = 360, - T_Pps = 361, - T_Preempt = 362, - T_Prefer = 363, - T_Protostats = 364, - T_Pw = 365, - T_Qos = 366, - T_RandFile = 367, - T_Rawstats = 368, - T_Refid = 369, - T_Requestkey = 370, - T_Restrict = 371, - T_Revoke = 372, - T_Server = 373, - T_Setvar = 374, - T_Sign = 375, - T_Statistics = 376, - T_Stats = 377, - T_Statsdir = 378, - T_Step = 379, - T_Stepout = 380, - T_Stratum = 381, - T_String = 382, - T_Sysstats = 383, - T_Tick = 384, - T_Time1 = 385, - T_Time2 = 386, - T_Timingstats = 387, - T_Tinker = 388, - T_Tos = 389, - T_Trap = 390, - T_True = 391, - T_Trustedkey = 392, - T_Ttl = 393, - T_Type = 394, - T_Unconfig = 395, - T_Unpeer = 396, - T_Version = 397, - T_WanderThreshold = 398, - T_Week = 399, - T_Xleave = 400, - T_Year = 401, - T_Flag = 402, - T_Void = 403, - T_EOC = 404, - T_Simulate = 405, - T_Beep_Delay = 406, - T_Sim_Duration = 407, - T_Server_Offset = 408, - T_Duration = 409, - T_Freq_Offset = 410, - T_Wander = 411, - T_Jitter = 412, - T_Prop_Delay = 413, - T_Proc_Delay = 414 + T_Ntp = 348, + T_Ntpport = 349, + T_NtpSignDsocket = 350, + T_Orphan = 351, + T_Panic = 352, + T_Peer = 353, + T_Peerstats = 354, + T_Phone = 355, + T_Pid = 356, + T_Pidfile = 357, + T_Pool = 358, + T_Port = 359, + T_Pps = 360, + T_Preempt = 361, + T_Prefer = 362, + T_Protostats = 363, + T_Pw = 364, + T_Qos = 365, + T_RandFile = 366, + T_Rawstats = 367, + T_Refid = 368, + T_Requestkey = 369, + T_Restrict = 370, + T_Revoke = 371, + T_Server = 372, + T_Setvar = 373, + T_Sign = 374, + T_Statistics = 375, + T_Stats = 376, + T_Statsdir = 377, + T_Step = 378, + T_Stepout = 379, + T_Stratum = 380, + T_String = 381, + T_Sysstats = 382, + T_Tick = 383, + T_Time1 = 384, + T_Time2 = 385, + T_Timingstats = 386, + T_Tinker = 387, + T_Tos = 388, + T_Trap = 389, + T_True = 390, + T_Trustedkey = 391, + T_Ttl = 392, + T_Type = 393, + T_Unconfig = 394, + T_Unpeer = 395, + T_Version = 396, + T_WanderThreshold = 397, + T_Week = 398, + T_Xleave = 399, + T_Year = 400, + T_Flag = 401, + T_Void = 402, + T_EOC = 403, + T_Simulate = 404, + T_Beep_Delay = 405, + T_Sim_Duration = 406, + T_Server_Offset = 407, + T_Duration = 408, + T_Freq_Offset = 409, + T_Wander = 410, + T_Jitter = 411, + T_Prop_Delay = 412, + T_Proc_Delay = 413 }; #endif /* Tokens. */ @@ -289,73 +288,72 @@ #define T_Noserve 345 #define T_Notrap 346 #define T_Notrust 347 -#define T_Novolley 348 -#define T_Ntp 349 -#define T_Ntpport 350 -#define T_NtpSignDsocket 351 -#define T_Orphan 352 -#define T_Panic 353 -#define T_Peer 354 -#define T_Peerstats 355 -#define T_Phone 356 -#define T_Pid 357 -#define T_Pidfile 358 -#define T_Pool 359 -#define T_Port 360 -#define T_Pps 361 -#define T_Preempt 362 -#define T_Prefer 363 -#define T_Protostats 364 -#define T_Pw 365 -#define T_Qos 366 -#define T_RandFile 367 -#define T_Rawstats 368 -#define T_Refid 369 -#define T_Requestkey 370 -#define T_Restrict 371 -#define T_Revoke 372 -#define T_Server 373 -#define T_Setvar 374 -#define T_Sign 375 -#define T_Statistics 376 -#define T_Stats 377 -#define T_Statsdir 378 -#define T_Step 379 -#define T_Stepout 380 -#define T_Stratum 381 -#define T_String 382 -#define T_Sysstats 383 -#define T_Tick 384 -#define T_Time1 385 -#define T_Time2 386 -#define T_Timingstats 387 -#define T_Tinker 388 -#define T_Tos 389 -#define T_Trap 390 -#define T_True 391 -#define T_Trustedkey 392 -#define T_Ttl 393 -#define T_Type 394 -#define T_Unconfig 395 -#define T_Unpeer 396 -#define T_Version 397 -#define T_WanderThreshold 398 -#define T_Week 399 -#define T_Xleave 400 -#define T_Year 401 -#define T_Flag 402 -#define T_Void 403 -#define T_EOC 404 -#define T_Simulate 405 -#define T_Beep_Delay 406 -#define T_Sim_Duration 407 -#define T_Server_Offset 408 -#define T_Duration 409 -#define T_Freq_Offset 410 -#define T_Wander 411 -#define T_Jitter 412 -#define T_Prop_Delay 413 -#define T_Proc_Delay 414 +#define T_Ntp 348 +#define T_Ntpport 349 +#define T_NtpSignDsocket 350 +#define T_Orphan 351 +#define T_Panic 352 +#define T_Peer 353 +#define T_Peerstats 354 +#define T_Phone 355 +#define T_Pid 356 +#define T_Pidfile 357 +#define T_Pool 358 +#define T_Port 359 +#define T_Pps 360 +#define T_Preempt 361 +#define T_Prefer 362 +#define T_Protostats 363 +#define T_Pw 364 +#define T_Qos 365 +#define T_RandFile 366 +#define T_Rawstats 367 +#define T_Refid 368 +#define T_Requestkey 369 +#define T_Restrict 370 +#define T_Revoke 371 +#define T_Server 372 +#define T_Setvar 373 +#define T_Sign 374 +#define T_Statistics 375 +#define T_Stats 376 +#define T_Statsdir 377 +#define T_Step 378 +#define T_Stepout 379 +#define T_Stratum 380 +#define T_String 381 +#define T_Sysstats 382 +#define T_Tick 383 +#define T_Time1 384 +#define T_Time2 385 +#define T_Timingstats 386 +#define T_Tinker 387 +#define T_Tos 388 +#define T_Trap 389 +#define T_True 390 +#define T_Trustedkey 391 +#define T_Ttl 392 +#define T_Type 393 +#define T_Unconfig 394 +#define T_Unpeer 395 +#define T_Version 396 +#define T_WanderThreshold 397 +#define T_Week 398 +#define T_Xleave 399 +#define T_Year 400 +#define T_Flag 401 +#define T_Void 402 +#define T_EOC 403 +#define T_Simulate 404 +#define T_Beep_Delay 405 +#define T_Sim_Duration 406 +#define T_Server_Offset 407 +#define T_Duration 408 +#define T_Freq_Offset 409 +#define T_Wander 410 +#define T_Jitter 411 +#define T_Prop_Delay 412 +#define T_Proc_Delay 413 @@ -383,7 +381,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 387 "../../ntpd/ntp_parser.h" +#line 385 "ntp_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */