diff --git a/parser/lexer.go b/parser/lexer.go index 2784883..244c307 100644 --- a/parser/lexer.go +++ b/parser/lexer.go @@ -58,6 +58,7 @@ var SYMBOL_TABLES = map[string]int{ "lvs_sync_daemon_interface": LVS_SYNC_DAEMON_INTERFACE, "virtual_router_id": VIRTUAL_ROUTER_ID, "nopreempt": NOPREEMPT, + "preempt_delay": PREEMPT_DELAY, "priority": PRIORITY, "advert_int": ADVERT_INT, "virtual_ipaddress": VIRTUAL_IPADDRESS, diff --git a/parser/parser.go b/parser/parser.go index 4017723..c3a1d4f 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -54,116 +54,117 @@ const UNICAST_PEER = 57385 const LVS_SYNC_DAEMON_INTERFACE = 57386 const VIRTUAL_ROUTER_ID = 57387 const NOPREEMPT = 57388 -const PRIORITY = 57389 -const ADVERT_INT = 57390 -const VIRTUAL_IPADDRESS = 57391 -const VIRTUAL_IPADDRESS_EXCLUDED = 57392 -const VIRTUAL_ROUTES = 57393 -const STATE = 57394 -const MASTER = 57395 -const BACKUP = 57396 -const GARP_MASTER_DELAY = 57397 -const SMTP_ALERT = 57398 -const AUTHENTICATION = 57399 -const AUTH_TYPE = 57400 -const AUTH_PASS = 57401 -const PASS = 57402 -const AH = 57403 -const LABEL = 57404 -const DEV = 57405 -const SCOPE = 57406 -const SITE = 57407 -const LINK = 57408 -const HOST = 57409 -const NOWHERE = 57410 -const GLOBAL = 57411 -const BRD = 57412 -const SRC = 57413 -const FROM = 57414 -const TO = 57415 -const VIA = 57416 -const GW = 57417 -const OR = 57418 -const TABLE = 57419 -const METRIC = 57420 -const TRACK_INTERFACE = 57421 -const TRACK_SCRIPT = 57422 -const DONT_TRACK_PRIMARY = 57423 -const NOTIFY_MASTER = 57424 -const NOTIFY_BACKUP = 57425 -const NOTIFY_FAULT = 57426 -const NOTIFY_STOP = 57427 -const NOTIFY = 57428 -const BLACKHOLE = 57429 -const VRRP_SCRIPT = 57430 -const SCRIPT = 57431 -const INTERVAL = 57432 -const TIMEOUT = 57433 -const WEIGHT = 57434 -const FALL = 57435 -const RISE = 57436 -const VIRTUAL_SERVER_GROUP = 57437 -const VIRTUAL_SERVER = 57438 -const DELAY_LOOP = 57439 -const LB_ALGO = 57440 -const LB_KIND = 57441 -const LVS_SCHED = 57442 -const LVS_METHOD = 57443 -const RR = 57444 -const WRR = 57445 -const LC = 57446 -const WLC = 57447 -const FO = 57448 -const OVF = 57449 -const LBLC = 57450 -const LBLCR = 57451 -const SH = 57452 -const DH = 57453 -const SED = 57454 -const NQ = 57455 -const NAT = 57456 -const DR = 57457 -const TUN = 57458 -const PERSISTENCE_TIMEOUT = 57459 -const PROTOCOL = 57460 -const TCP = 57461 -const UDP = 57462 -const SORRY_SERVER = 57463 -const REAL_SERVER = 57464 -const FWMARK = 57465 -const INHIBIT_ON_FAILURE = 57466 -const TCP_CHECK = 57467 -const HTTP_GET = 57468 -const SSL_GET = 57469 -const SMTP_CHECK = 57470 -const DNS_CHECK = 57471 -const MISC_CHECK = 57472 -const URL = 57473 -const PATH = 57474 -const DIGEST = 57475 -const STATUS_CODE = 57476 -const CONNECT_TIMEOUT = 57477 -const CONNECT_PORT = 57478 -const CONNECT_IP = 57479 -const BINDTO = 57480 -const BIND_PORT = 57481 -const RETRY = 57482 -const HELO_NAME = 57483 -const TYPE = 57484 -const NAME = 57485 -const MISC_PATH = 57486 -const MISC_TIMEOUT = 57487 -const WARMUP = 57488 -const MISC_DYNAMIC = 57489 -const NB_GET_RETRY = 57490 -const DELAY_BEFORE_RETRY = 57491 -const VIRTUALHOST = 57492 -const ALPHA = 57493 -const OMEGA = 57494 -const QUORUM = 57495 -const HYSTERESIS = 57496 -const QUORUM_UP = 57497 -const QUORUM_DOWN = 57498 +const PREEMPT_DELAY = 57389 +const PRIORITY = 57390 +const ADVERT_INT = 57391 +const VIRTUAL_IPADDRESS = 57392 +const VIRTUAL_IPADDRESS_EXCLUDED = 57393 +const VIRTUAL_ROUTES = 57394 +const STATE = 57395 +const MASTER = 57396 +const BACKUP = 57397 +const GARP_MASTER_DELAY = 57398 +const SMTP_ALERT = 57399 +const AUTHENTICATION = 57400 +const AUTH_TYPE = 57401 +const AUTH_PASS = 57402 +const PASS = 57403 +const AH = 57404 +const LABEL = 57405 +const DEV = 57406 +const SCOPE = 57407 +const SITE = 57408 +const LINK = 57409 +const HOST = 57410 +const NOWHERE = 57411 +const GLOBAL = 57412 +const BRD = 57413 +const SRC = 57414 +const FROM = 57415 +const TO = 57416 +const VIA = 57417 +const GW = 57418 +const OR = 57419 +const TABLE = 57420 +const METRIC = 57421 +const TRACK_INTERFACE = 57422 +const TRACK_SCRIPT = 57423 +const DONT_TRACK_PRIMARY = 57424 +const NOTIFY_MASTER = 57425 +const NOTIFY_BACKUP = 57426 +const NOTIFY_FAULT = 57427 +const NOTIFY_STOP = 57428 +const NOTIFY = 57429 +const BLACKHOLE = 57430 +const VRRP_SCRIPT = 57431 +const SCRIPT = 57432 +const INTERVAL = 57433 +const TIMEOUT = 57434 +const WEIGHT = 57435 +const FALL = 57436 +const RISE = 57437 +const VIRTUAL_SERVER_GROUP = 57438 +const VIRTUAL_SERVER = 57439 +const DELAY_LOOP = 57440 +const LB_ALGO = 57441 +const LB_KIND = 57442 +const LVS_SCHED = 57443 +const LVS_METHOD = 57444 +const RR = 57445 +const WRR = 57446 +const LC = 57447 +const WLC = 57448 +const FO = 57449 +const OVF = 57450 +const LBLC = 57451 +const LBLCR = 57452 +const SH = 57453 +const DH = 57454 +const SED = 57455 +const NQ = 57456 +const NAT = 57457 +const DR = 57458 +const TUN = 57459 +const PERSISTENCE_TIMEOUT = 57460 +const PROTOCOL = 57461 +const TCP = 57462 +const UDP = 57463 +const SORRY_SERVER = 57464 +const REAL_SERVER = 57465 +const FWMARK = 57466 +const INHIBIT_ON_FAILURE = 57467 +const TCP_CHECK = 57468 +const HTTP_GET = 57469 +const SSL_GET = 57470 +const SMTP_CHECK = 57471 +const DNS_CHECK = 57472 +const MISC_CHECK = 57473 +const URL = 57474 +const PATH = 57475 +const DIGEST = 57476 +const STATUS_CODE = 57477 +const CONNECT_TIMEOUT = 57478 +const CONNECT_PORT = 57479 +const CONNECT_IP = 57480 +const BINDTO = 57481 +const BIND_PORT = 57482 +const RETRY = 57483 +const HELO_NAME = 57484 +const TYPE = 57485 +const NAME = 57486 +const MISC_PATH = 57487 +const MISC_TIMEOUT = 57488 +const WARMUP = 57489 +const MISC_DYNAMIC = 57490 +const NB_GET_RETRY = 57491 +const DELAY_BEFORE_RETRY = 57492 +const VIRTUALHOST = 57493 +const ALPHA = 57494 +const OMEGA = 57495 +const QUORUM = 57496 +const HYSTERESIS = 57497 +const QUORUM_UP = 57498 +const QUORUM_DOWN = 57499 var yyToknames = [...]string{ "$end", @@ -212,6 +213,7 @@ var yyToknames = [...]string{ "LVS_SYNC_DAEMON_INTERFACE", "VIRTUAL_ROUTER_ID", "NOPREEMPT", + "PREEMPT_DELAY", "PRIORITY", "ADVERT_INT", "VIRTUAL_IPADDRESS", @@ -329,7 +331,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -//line parser/parser.go.y:380 +//line parser/parser.go.y:381 //line yacctab:1 var yyExca = [...]int{ @@ -337,143 +339,139 @@ var yyExca = [...]int{ 1, -1, -2, 0, -1, 19, - 14, 126, - -2, 296, - -1, 201, - 15, 118, - -2, 119, + 14, 127, + -2, 297, + -1, 202, + 15, 119, + -2, 120, } -const yyNprod = 309 const yyPrivate = 57344 -var yyTokenNames []string -var yyStates []string - -const yyLast = 556 +const yyLast = 558 var yyAct = [...]int{ - 407, 487, 482, 63, 430, 419, 405, 396, 389, 368, - 333, 329, 207, 325, 181, 312, 318, 310, 308, 30, - 305, 182, 205, 33, 200, 277, 173, 54, 264, 183, - 34, 35, 64, 59, 143, 398, 364, 392, 391, 399, - 400, 217, 393, 432, 433, 434, 435, 135, 394, 95, - 403, 395, 401, 402, 60, 331, 408, 54, 285, 286, - 105, 484, 485, 486, 216, 115, 116, 215, 214, 118, - 119, 120, 34, 35, 454, 203, 495, 127, 76, 77, - 131, 133, 489, 74, 69, 68, 72, 476, 107, 202, - 60, 426, 212, 61, 114, 62, 65, 66, 67, 70, - 71, 418, 465, 425, 422, 421, 423, 424, 427, 73, - 428, 429, 418, 417, 414, 413, 415, 416, 452, 184, - 185, 186, 187, 188, 417, 414, 413, 415, 416, 410, - 412, 370, 34, 35, 451, 409, 356, 357, 411, 189, - 190, 332, 37, 191, 192, 278, 279, 280, 175, 176, - 177, 178, 179, 180, 229, 230, 327, 328, 32, 130, - 137, 126, 443, 371, 372, 373, 374, 375, 376, 377, - 240, 241, 193, 194, 195, 196, 197, 198, 199, 226, - 52, 87, 436, 388, 219, 379, 362, 204, 138, 34, - 35, 317, 359, 354, 352, 287, 288, 261, 34, 35, - 317, 253, 348, 445, 12, 202, 343, 341, 339, 299, - 212, 294, 260, 60, 282, 252, 281, 262, 13, 14, - 15, 16, 244, 17, 225, 218, 295, 493, 129, 300, - 245, 34, 35, 64, 104, 309, 139, 140, 141, 113, - 142, 316, 316, 313, 314, 103, 86, 31, 491, 387, - 386, 315, 478, 321, 320, 492, 34, 35, 55, 479, - 322, 324, 265, 266, 267, 268, 269, 270, 271, 272, - 273, 274, 275, 276, 89, 385, 18, 108, 109, 110, - 111, 112, 88, 20, 19, 69, 68, 72, 384, 383, - 382, 366, 33, 365, 61, 246, 62, 65, 66, 67, - 70, 71, 243, 239, 238, 237, 231, 220, 337, 85, - 73, 57, 58, 309, 81, 316, 80, 79, 56, 347, - 78, 25, 24, 316, 23, 22, 351, 340, 342, 344, - 101, 96, 212, 34, 35, 320, 349, 475, 100, 353, - 355, 358, 360, 34, 35, 363, 39, 40, 45, 46, - 47, 48, 49, 50, 41, 42, 43, 44, 51, 208, - 90, 209, 210, 34, 35, 213, 494, 211, 34, 35, - 134, 34, 35, 132, 474, 234, 378, 233, 481, 380, - 34, 35, 128, 34, 35, 117, 338, 123, 480, 124, - 34, 35, 404, 458, 335, 350, 346, 345, 307, 437, - 293, 292, 289, 254, 251, 444, 250, 249, 248, 247, - 232, 228, 224, 453, 223, 222, 221, 459, 122, 461, - 121, 106, 99, 98, 83, 467, 466, 469, 36, 28, - 27, 26, 473, 472, 471, 470, 477, 468, 464, 463, - 462, 460, 457, 456, 455, 450, 449, 448, 447, 446, - 442, 441, 440, 439, 438, 488, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 381, 367, 162, 163, 164, 361, 336, - 304, 303, 302, 301, 298, 297, 490, 296, 291, 488, - 496, 290, 283, 263, 259, 258, 257, 256, 255, 165, - 166, 167, 168, 169, 170, 171, 172, 242, 236, 235, - 227, 125, 102, 97, 94, 93, 92, 91, 84, 82, - 1, 53, 206, 21, 319, 311, 431, 420, 406, 483, - 397, 390, 369, 284, 29, 201, 174, 334, 330, 326, - 323, 144, 306, 136, 75, 38, 11, 10, 9, 8, - 7, 6, 5, 4, 3, 2, + 409, 489, 484, 63, 432, 421, 407, 398, 391, 370, + 335, 331, 208, 327, 182, 314, 320, 312, 310, 30, + 307, 183, 206, 33, 201, 279, 174, 54, 266, 184, + 34, 35, 64, 400, 59, 410, 143, 401, 402, 287, + 288, 394, 393, 486, 487, 488, 395, 135, 405, 95, + 403, 404, 396, 366, 60, 397, 218, 54, 217, 216, + 105, 434, 435, 436, 437, 115, 116, 34, 35, 118, + 119, 120, 34, 35, 333, 204, 215, 127, 76, 77, + 131, 133, 497, 107, 491, 69, 68, 72, 52, 203, + 60, 420, 213, 32, 61, 114, 62, 65, 66, 67, + 70, 71, 478, 419, 416, 415, 417, 418, 412, 414, + 73, 74, 456, 428, 411, 358, 359, 413, 467, 454, + 185, 186, 187, 188, 189, 427, 424, 423, 425, 426, + 429, 372, 430, 431, 420, 280, 281, 282, 329, 330, + 190, 191, 104, 12, 192, 193, 419, 416, 415, 417, + 418, 242, 243, 453, 230, 231, 126, 13, 14, 15, + 16, 334, 17, 373, 374, 375, 376, 377, 378, 379, + 37, 137, 445, 194, 195, 196, 197, 198, 199, 200, + 447, 227, 438, 31, 220, 390, 381, 130, 205, 176, + 177, 178, 179, 180, 181, 364, 289, 290, 263, 138, + 361, 356, 255, 354, 350, 345, 203, 343, 341, 87, + 301, 213, 296, 262, 60, 284, 18, 283, 254, 264, + 34, 35, 55, 20, 19, 226, 246, 297, 219, 129, + 302, 34, 35, 64, 247, 389, 311, 113, 495, 103, + 34, 35, 319, 318, 318, 86, 100, 388, 139, 140, + 141, 387, 142, 34, 35, 319, 322, 108, 109, 110, + 111, 112, 386, 326, 267, 268, 269, 270, 271, 272, + 273, 274, 275, 276, 277, 278, 57, 58, 493, 385, + 384, 89, 368, 56, 480, 494, 69, 68, 72, 88, + 367, 481, 101, 248, 33, 61, 323, 62, 65, 66, + 67, 70, 71, 324, 245, 241, 240, 239, 315, 316, + 339, 73, 232, 221, 85, 311, 317, 318, 81, 80, + 79, 349, 78, 25, 24, 318, 23, 22, 353, 342, + 344, 346, 90, 96, 213, 34, 35, 322, 351, 477, + 476, 355, 357, 360, 362, 34, 35, 365, 39, 40, + 45, 46, 47, 48, 49, 50, 41, 42, 43, 44, + 51, 209, 460, 210, 211, 34, 35, 214, 496, 212, + 34, 35, 134, 34, 35, 132, 337, 235, 380, 234, + 483, 382, 34, 35, 128, 34, 35, 117, 340, 123, + 482, 124, 34, 35, 406, 352, 348, 347, 309, 295, + 294, 439, 291, 256, 253, 252, 251, 446, 250, 249, + 233, 229, 225, 224, 223, 455, 222, 122, 121, 461, + 106, 463, 99, 98, 83, 36, 28, 469, 468, 471, + 27, 26, 475, 474, 473, 472, 470, 466, 479, 465, + 464, 462, 459, 458, 457, 452, 451, 450, 449, 448, + 444, 443, 442, 441, 440, 383, 369, 490, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, + 157, 158, 159, 160, 161, 162, 363, 338, 163, 164, + 165, 306, 305, 304, 303, 300, 299, 298, 492, 293, + 292, 490, 498, 285, 265, 261, 260, 259, 258, 257, + 244, 238, 166, 167, 168, 169, 170, 171, 172, 173, + 237, 236, 228, 125, 102, 97, 94, 93, 92, 91, + 84, 82, 1, 53, 207, 21, 321, 313, 433, 422, + 408, 485, 399, 392, 371, 286, 29, 202, 175, 336, + 332, 328, 325, 144, 308, 136, 75, 38, 11, 10, + 9, 8, 7, 6, 5, 4, 3, 2, } var yyPact = [...]int{ - 188, -1000, 188, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 311, 310, 308, 307, 425, 424, 423, 124, - 422, -1000, 329, 248, 223, 6, 306, 303, 302, 300, - -1000, 515, 418, 514, -1000, -1000, 295, 231, 329, 268, - 353, 513, 512, 511, 510, 325, 509, 417, 416, 330, - 321, 508, 230, 248, -1000, -1000, 335, 415, 212, 224, - 223, 335, 375, -1000, -1000, 335, 335, 335, 414, 412, - 383, 507, 212, 372, 213, 6, 363, 360, 154, 420, - 59, 22, -1000, -1000, -1000, 64, -1000, -1000, 355, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 127, -1000, 127, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 313, 312, 310, 309, 425, 424, 420, 59, + 419, -1000, 331, 212, 223, 5, 308, 306, 305, 304, + -1000, 517, 418, 516, -1000, -1000, 300, 230, 331, 275, + 325, 515, 514, 513, 512, 327, 511, 417, 416, 238, + 283, 510, 224, 212, -1000, -1000, 337, 414, 191, 222, + 223, 337, 377, -1000, -1000, 337, 337, 337, 412, 411, + 385, 509, 191, 374, 214, 5, 365, 362, 165, 422, + 99, 22, -1000, -1000, -1000, 64, -1000, -1000, 357, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -9, -10, -13, -36, 210, 154, -1000, 293, 410, - 409, 408, 406, 209, 420, -1000, 506, -1000, -1000, 405, - 335, 335, 292, 404, 371, -1000, 505, 504, 291, 290, - 289, 117, 503, -1000, 288, 216, 281, -1000, 403, 402, - 401, 400, 398, 200, 59, 397, 494, 493, 492, 491, - 490, 197, 22, 223, 489, 160, 31, 160, 31, 488, - -61, 335, 335, 396, -1000, -1000, 487, 484, 395, 394, - 196, 64, 483, 481, 480, 194, 355, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 479, 478, 477, 476, -1000, -1000, - 392, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, 335, -1000, -1000, -1000, -1000, -1000, 181, 190, 22, - -1000, -1000, -1000, 98, -1000, 49, 388, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -2, -19, -20, -22, 213, 165, -1000, 299, 410, + 408, 407, 406, 210, 422, -1000, 508, -1000, -1000, 405, + 337, 337, 298, 404, 373, -1000, 507, 506, 497, 293, + 292, 291, 97, 496, -1000, 290, 220, 279, -1000, 403, + 402, 400, 399, 398, 203, 99, 397, 495, 494, 493, + 492, 491, 198, 22, 223, 490, 161, 20, 161, 20, + 489, -81, 337, 337, 396, -1000, -1000, 486, 485, 394, + 393, 197, 64, 483, 482, 481, 195, 357, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 480, 479, 478, 477, -1000, + -1000, 392, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 337, -1000, -1000, -1000, -1000, -1000, -1000, 245, + 232, 22, -1000, -1000, -1000, 79, -1000, 68, 370, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 475, 382, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 193, 392, -1000, 192, 335, - 191, 181, -1000, 391, 390, 335, -1000, -1000, 187, 190, - -1000, 389, 335, 179, 22, 178, 98, 76, 355, 177, - 49, -1000, 474, 171, 388, -56, -1000, 279, 277, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 473, + 384, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, 193, 392, -1000, + 192, 337, 190, 245, -1000, 391, 390, 337, -1000, -1000, + 189, 232, -1000, 389, 337, 188, 22, 186, 79, 54, + 357, 185, 68, -1000, 472, 180, 370, -40, -1000, 276, + 268, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 452, 38, 38, -1000, + 171, 38, 451, -1000, 266, 265, 248, 237, 233, 221, + 170, -1000, -1000, -1000, -95, -99, -99, -33, -11, -84, + -1000, 167, -95, 450, 449, 448, 447, 446, 157, -99, + 166, 445, 444, 443, 442, 441, 138, 104, -33, -1000, + 98, 440, 439, 438, 356, 337, 437, 337, 436, 435, + 433, 103, -11, 337, 432, 337, 431, 430, 429, 428, + 334, 333, 87, -84, 278, 386, 376, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -90, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 10, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 470, 39, 39, -1000, 170, 39, - 469, -1000, 276, 275, 274, 261, 236, 235, 168, -1000, - -1000, -1000, -98, -96, -96, -11, -32, -101, -1000, 167, - -98, 450, 449, 448, 447, 446, 147, -96, 189, 445, - 444, 443, 442, 441, 119, 103, -11, -1000, 60, 440, - 439, 438, 387, 335, 437, 335, 436, 435, 434, 87, - -32, 335, 433, 335, 431, 430, 429, 428, 368, 331, - 72, -101, 246, 384, 374, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -71, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -22, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 67, -71, 242, 215, 362, 61, -22, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 69, -90, 272, 226, 364, 67, + 10, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, } var yyPgo = [...]int{ - 0, 520, 555, 554, 553, 552, 551, 550, 549, 548, - 547, 546, 142, 545, 22, 3, 180, 33, 83, 544, - 47, 543, 20, 542, 34, 541, 18, 17, 16, 540, - 13, 11, 10, 539, 12, 538, 537, 26, 536, 21, - 14, 29, 24, 535, 534, 19, 28, 25, 533, 9, - 532, 8, 7, 6, 5, 4, 531, 530, 2, 529, - 528, 0, 1, 527, 526, 525, 524, 15, 522, 521, - 88, + 0, 522, 557, 556, 555, 554, 553, 552, 551, 550, + 549, 548, 170, 547, 22, 3, 88, 34, 111, 546, + 47, 545, 20, 544, 36, 543, 18, 17, 16, 542, + 13, 11, 10, 541, 12, 540, 539, 26, 538, 21, + 14, 29, 24, 537, 536, 19, 28, 25, 535, 9, + 534, 8, 7, 6, 5, 4, 533, 532, 2, 531, + 530, 0, 1, 529, 528, 527, 526, 15, 524, 523, + 83, } var yyR1 = [...]int{ @@ -485,29 +483,29 @@ var yyR1 = [...]int{ 8, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 30, 30, 33, 33, 33, - 33, 31, 31, 35, 35, 26, 26, 32, 32, 36, - 36, 36, 9, 37, 37, 38, 38, 38, 38, 38, - 38, 38, 29, 29, 39, 39, 11, 42, 42, 43, - 43, 43, 43, 10, 40, 40, 44, 44, 44, 44, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 49, 49, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 51, - 51, 56, 56, 56, 56, 56, 56, 52, 52, 57, - 57, 57, 57, 57, 57, 57, 58, 58, 59, 59, - 59, 59, 59, 53, 53, 60, 60, 60, 60, 60, - 60, 60, 62, 62, 61, 61, 61, 61, 61, 61, - 61, 54, 54, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 55, 55, 64, 64, 64, 64, 64, - 64, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 47, 47, 47, 47, 48, 48, - 48, 27, 27, 28, 28, 65, 65, 65, 65, 66, - 66, 66, 14, 14, 68, 16, 16, 69, 69, 69, - 69, 69, 69, 17, 17, 41, 41, 41, 41, 41, + 25, 25, 25, 25, 25, 25, 30, 30, 33, 33, + 33, 33, 31, 31, 35, 35, 26, 26, 32, 32, + 36, 36, 36, 9, 37, 37, 38, 38, 38, 38, + 38, 38, 38, 29, 29, 39, 39, 11, 42, 42, + 43, 43, 43, 43, 10, 40, 40, 44, 44, 44, + 44, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 39, 49, + 49, 50, 50, 50, 50, 50, 50, 50, 50, 50, + 51, 51, 56, 56, 56, 56, 56, 56, 52, 52, + 57, 57, 57, 57, 57, 57, 57, 58, 58, 59, + 59, 59, 59, 59, 53, 53, 60, 60, 60, 60, + 60, 60, 60, 62, 62, 61, 61, 61, 61, 61, + 61, 61, 54, 54, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 55, 55, 64, 64, 64, 64, + 64, 64, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 47, 47, 47, 47, 48, + 48, 48, 27, 27, 28, 28, 65, 65, 65, 65, + 66, 66, 66, 14, 14, 68, 16, 16, 69, 69, + 69, 69, 69, 69, 17, 17, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 19, 19, 19, 19, 19, 70, 70, 70, - 70, 70, 70, 67, 67, 67, 15, 15, 15, 45, - 45, 45, 34, 34, 34, 34, 34, 34, 34, + 41, 41, 41, 19, 19, 19, 19, 19, 70, 70, + 70, 70, 70, 70, 67, 67, 67, 15, 15, 15, + 45, 45, 45, 34, 34, 34, 34, 34, 34, 34, } var yyR2 = [...]int{ @@ -517,137 +515,137 @@ var yyR2 = [...]int{ 2, 2, 4, 4, 4, 2, 1, 5, 2, 1, 0, 1, 4, 2, 2, 2, 2, 2, 1, 1, 5, 2, 1, 0, 1, 2, 1, 1, 2, 2, - 2, 4, 2, 2, 2, 1, 2, 2, 4, 4, - 4, 2, 2, 2, 1, 4, 2, 4, 4, 1, - 2, 2, 2, 2, 2, 2, 1, 0, 2, 2, - 2, 2, 1, 1, 2, 2, 1, 2, 1, 0, - 1, 3, 5, 2, 1, 0, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 1, 5, 2, 1, 0, - 2, 2, 2, 5, 2, 1, 0, 1, 2, 2, - 0, 2, 2, 2, 2, 2, 2, 2, 3, 6, - 6, 2, 1, 1, 2, 2, 2, 2, 2, 1, - 0, 2, 1, 4, 4, 4, 4, 4, 4, 2, - 1, 0, 2, 2, 2, 2, 2, 2, 1, 0, - 4, 2, 2, 2, 2, 2, 2, 1, 0, 2, - 2, 2, 2, 2, 1, 0, 1, 4, 2, 2, - 2, 2, 2, 1, 0, 2, 2, 2, 2, 2, - 2, 2, 1, 0, 2, 2, 2, 2, 2, 2, + 2, 4, 2, 2, 2, 1, 2, 2, 2, 4, + 4, 4, 2, 2, 2, 1, 4, 2, 4, 4, + 1, 2, 2, 2, 2, 2, 2, 1, 0, 2, + 2, 2, 2, 1, 1, 2, 2, 1, 2, 1, + 0, 1, 3, 5, 2, 1, 0, 2, 2, 2, + 2, 2, 2, 2, 1, 2, 1, 5, 2, 1, + 0, 2, 2, 2, 5, 2, 1, 0, 1, 2, + 2, 0, 2, 2, 2, 2, 2, 2, 2, 3, + 6, 6, 2, 1, 1, 2, 2, 2, 2, 2, + 1, 0, 2, 1, 4, 4, 4, 4, 4, 4, + 2, 1, 0, 2, 2, 2, 2, 2, 2, 1, + 0, 4, 2, 2, 2, 2, 2, 2, 1, 0, + 2, 2, 2, 2, 2, 1, 0, 1, 4, 2, 2, 2, 2, 2, 1, 0, 2, 2, 2, 2, - 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, - 1, 2, 1, 2, 1, 1, 2, 2, 2, 1, - 2, 2, 2, 1, 1, 2, 1, 0, 1, 1, - 2, 2, 2, 2, 1, 0, 2, 2, 2, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 0, 4, 4, 4, 4, 0, 1, 1, - 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, - 1, 2, 0, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 1, 0, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 1, 0, 2, 2, 2, + 2, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, + 1, 1, 2, 1, 2, 1, 1, 2, 2, 2, + 1, 2, 2, 2, 1, 1, 2, 1, 0, 1, + 1, 2, 2, 2, 2, 1, 0, 2, 2, 2, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 0, 4, 4, 4, 4, 0, 1, + 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, + 0, 1, 2, 0, 1, 1, 1, 1, 1, 1, } var yyChk = [...]int{ -1000, -1, -2, -3, -4, -5, -6, -7, -8, -9, - -10, -11, 16, 30, 31, 32, 33, 35, 88, 96, - 95, -1, 14, 14, 14, 14, 6, 6, 6, -44, - -45, 123, 34, -15, 8, 9, 6, -12, -13, 17, + -10, -11, 16, 30, 31, 32, 33, 35, 89, 97, + 96, -1, 14, 14, 14, 14, 6, 6, 6, -44, + -45, 124, 34, -15, 8, 9, 6, -12, -13, 17, 18, 25, 26, 27, 28, 19, 20, 21, 22, 23, - 24, 29, -16, -69, -15, 10, 70, 63, 64, -17, - -41, 71, 73, -15, 10, 74, 75, 76, 63, 62, - 77, 78, 64, 87, -18, -19, 72, 73, 14, 14, + 24, 29, -16, -69, -15, 10, 71, 64, 65, -17, + -41, 72, 74, -15, 10, 75, 76, 77, 64, 63, + 78, 79, 65, 88, -18, -19, 73, 74, 14, 14, 14, 14, 4, 6, 4, 14, 15, -12, 14, 6, 7, 4, 4, 4, 4, -15, 6, 4, 6, 6, - 8, 9, 4, 15, -16, -15, 6, -70, 65, 66, - 67, 68, 69, 15, -17, -15, -15, 10, -15, -15, + 8, 9, 4, 15, -16, -15, 6, -70, 66, 67, + 68, 69, 70, 15, -17, -15, -15, 10, -15, -15, -15, 6, 6, 4, 6, 4, -70, -15, 10, 15, - -18, -15, 10, -15, 10, -20, -21, 6, 34, 82, - 83, 84, 86, -24, -25, 36, 37, 38, 39, 40, + -18, -15, 10, -15, 10, -20, -21, 6, 34, 83, + 84, 85, 87, -24, -25, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 55, 56, 57, 79, 80, 81, 82, 83, - 84, 85, 86, -37, -38, 89, 90, 91, 92, 93, - 94, -40, -39, -41, 97, 98, 99, 100, 101, 117, - 118, 121, 122, 150, 151, 152, 153, 154, 155, 156, - -42, -43, -15, 11, 123, -14, -68, -34, 4, 6, - 7, 12, -15, 10, 77, 77, 77, 77, 15, -20, - 14, 6, 6, 6, 6, 15, -24, 4, 6, -15, - -15, 14, 6, 6, 4, 4, 4, 14, 14, 14, - 53, 54, 4, 14, 6, 14, 14, 6, 6, 6, - 6, 6, 15, -37, 6, 4, 4, 4, 4, 4, - 15, -40, -17, 4, -46, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, -47, 114, 115, - 116, -46, -47, 4, -48, 119, 120, -15, -15, 6, - 4, 4, 6, 6, 15, -42, 4, 4, 4, 15, - -14, 4, 4, 4, 4, -22, -23, 6, -26, -15, - -27, -65, -67, 62, 63, 70, -15, 10, -28, -66, - -67, 63, 70, -29, -39, -30, -33, 58, 59, -31, - -35, 6, 92, -32, -36, 6, 4, -45, 4, 15, - -22, 15, -26, 15, -27, 6, 6, -15, 15, -28, - 6, -15, 15, -40, 15, -30, 60, 61, -34, 15, - -31, 4, 15, -32, 92, 14, 14, 4, -49, -50, - 92, 124, 125, 126, 127, 128, 129, 130, -49, 15, - -49, 4, 14, 14, 14, 14, 14, 14, 15, -51, - -56, 136, 135, 140, 146, 149, -52, -57, 131, 135, - 136, 148, 149, 146, -52, -53, -60, -61, 67, 146, - 140, 149, 141, 137, 136, 138, 139, 135, 123, -54, - -63, 137, 136, 138, 139, 135, 123, 140, 142, 143, - -55, -64, 144, 145, 146, 147, 15, -51, 4, 4, - 4, 4, 4, 15, -52, 14, 4, 4, 4, 4, - 4, 15, 15, -53, 14, 4, 4, 4, 6, -15, - 4, -15, 4, 4, 4, 15, -54, -15, 4, -15, - 4, 4, 4, 4, 6, 6, 15, -55, 6, 13, - 4, 4, -58, -59, 132, 133, 134, -62, -61, 15, - -58, 6, 13, 12, 4, 15, -62, + 51, 52, 53, 56, 57, 58, 80, 81, 82, 83, + 84, 85, 86, 87, -37, -38, 90, 91, 92, 93, + 94, 95, -40, -39, -41, 98, 99, 100, 101, 102, + 118, 119, 122, 123, 151, 152, 153, 154, 155, 156, + 157, -42, -43, -15, 11, 124, -14, -68, -34, 4, + 6, 7, 12, -15, 10, 78, 78, 78, 78, 15, + -20, 14, 6, 6, 6, 6, 15, -24, 4, 6, + -15, -15, 14, 6, 6, 4, 4, 4, 4, 14, + 14, 14, 54, 55, 4, 14, 6, 14, 14, 6, + 6, 6, 6, 6, 15, -37, 6, 4, 4, 4, + 4, 4, 15, -40, -17, 4, -46, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, -47, + 115, 116, 117, -46, -47, 4, -48, 120, 121, -15, + -15, 6, 4, 4, 6, 6, 15, -42, 4, 4, + 4, 15, -14, 4, 4, 4, 4, -22, -23, 6, + -26, -15, -27, -65, -67, 63, 64, 71, -15, 10, + -28, -66, -67, 64, 71, -29, -39, -30, -33, 59, + 60, -31, -35, 6, 93, -32, -36, 6, 4, -45, + 4, 15, -22, 15, -26, 15, -27, 6, 6, -15, + 15, -28, 6, -15, 15, -40, 15, -30, 61, 62, + -34, 15, -31, 4, 15, -32, 93, 14, 14, 4, + -49, -50, 93, 125, 126, 127, 128, 129, 130, 131, + -49, 15, -49, 4, 14, 14, 14, 14, 14, 14, + 15, -51, -56, 137, 136, 141, 147, 150, -52, -57, + 132, 136, 137, 149, 150, 147, -52, -53, -60, -61, + 68, 147, 141, 150, 142, 138, 137, 139, 140, 136, + 124, -54, -63, 138, 137, 139, 140, 136, 124, 141, + 143, 144, -55, -64, 145, 146, 147, 148, 15, -51, + 4, 4, 4, 4, 4, 15, -52, 14, 4, 4, + 4, 4, 4, 15, 15, -53, 14, 4, 4, 4, + 6, -15, 4, -15, 4, 4, 4, 15, -54, -15, + 4, -15, 4, 4, 4, 4, 6, 6, 15, -55, + 6, 13, 4, 4, -58, -59, 133, 134, 135, -62, + -61, 15, -58, 6, 13, 12, 4, 15, -62, } var yyDef = [...]int{ 3, -2, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, -2, - 0, 1, 16, 257, 265, 282, 0, 0, 0, 0, - 127, 0, 0, 300, 297, 298, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 296, 0, 0, 0, 0, - 0, 0, 0, 256, 258, 259, 296, 0, 287, 0, - 264, 296, 296, 269, 270, 296, 296, 296, 0, 0, - 0, 0, 287, 296, 0, 36, 296, 296, 40, 53, - 105, 130, 128, 129, 301, 119, 13, 14, 296, 18, + 0, 1, 16, 258, 266, 283, 0, 0, 0, 0, + 128, 0, 0, 301, 298, 299, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 297, 0, 0, 0, 0, + 0, 0, 0, 257, 259, 260, 297, 0, 288, 0, + 265, 297, 297, 270, 271, 297, 297, 297, 0, 0, + 0, 0, 288, 297, 0, 36, 297, 297, 40, 53, + 106, 131, 129, 130, 302, 120, 13, 14, 297, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 255, 260, 261, 262, 288, 289, - 290, 291, 292, 33, 263, 266, 267, 268, 271, 272, - 273, 274, 275, 276, 277, 278, 279, 280, 281, 34, + 29, 30, 31, 32, 256, 261, 262, 263, 289, 290, + 291, 292, 293, 33, 264, 267, 268, 269, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 34, 35, 0, 0, 0, 0, 0, 39, 41, 0, 0, 0, 0, 0, 0, 52, 54, 0, 56, 57, 0, - 296, 296, 0, 0, 0, 65, 0, 0, 0, 0, - 0, 0, 0, 74, 0, 0, 0, 79, 0, 0, - 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, - 0, 0, 125, 115, 0, 221, 234, 221, 234, 0, - 238, 296, 296, 0, 142, 143, 0, 0, 0, 0, - 0, -2, 0, 0, 0, 0, 253, 254, 303, 304, - 305, 306, 307, 308, 0, 0, 0, 0, 37, 38, - 0, 43, 44, 45, 46, 50, 51, 55, 58, 59, - 60, 296, 62, 63, 64, 66, 67, 293, 293, 130, - 71, 72, 73, 87, 76, 0, 99, 80, 81, 82, - 83, 84, 102, 103, 106, 107, 108, 109, 110, 111, - 123, 124, 114, 131, 132, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 231, 232, 233, 133, 235, 236, - 237, 134, 135, 136, 137, 239, 240, 0, 296, 141, - 144, 145, 146, 147, 116, 117, 120, 121, 122, 17, - 252, 283, 285, 284, 286, 0, 48, 49, 0, 96, - 0, 242, 245, 0, 0, 296, 294, 295, 0, 244, - 249, 0, 296, 0, 113, 0, 86, 0, 296, 0, - 92, 93, 0, 0, 98, 100, 138, 0, 0, 42, - 47, 61, 95, 68, 241, 246, 247, 248, 69, 243, - 250, 251, 70, 112, 75, 85, 88, 89, 90, 77, - 91, 94, 78, 97, 0, 150, 150, 101, 0, 149, - 0, 152, 0, 0, 0, 0, 0, 0, 0, 139, - 148, 151, 161, 169, 169, 185, 203, 215, 140, 0, - 160, 0, 0, 0, 0, 0, 0, 168, 0, 0, - 0, 0, 0, 0, 0, 0, 184, 186, 0, 0, - 0, 0, 0, 296, 0, 296, 0, 0, 0, 0, - 202, 296, 0, 296, 0, 0, 0, 0, 0, 0, - 0, 214, 0, 0, 0, 220, 153, 159, 162, 163, - 164, 165, 166, 154, 167, 178, 171, 172, 173, 174, - 175, 155, 156, 183, 194, 188, 189, 190, 191, 195, - 196, 197, 198, 199, 200, 157, 201, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 158, 213, 216, 217, - 218, 219, 0, 177, 0, 0, 0, 0, 193, 170, - 176, 179, 180, 181, 182, 187, 192, + 297, 297, 0, 0, 0, 65, 0, 0, 0, 0, + 0, 0, 0, 0, 75, 0, 0, 0, 80, 0, + 0, 0, 0, 0, 0, 105, 0, 0, 0, 0, + 0, 0, 0, 126, 116, 0, 222, 235, 222, 235, + 0, 239, 297, 297, 0, 143, 144, 0, 0, 0, + 0, 0, -2, 0, 0, 0, 0, 254, 255, 304, + 305, 306, 307, 308, 309, 0, 0, 0, 0, 37, + 38, 0, 43, 44, 45, 46, 50, 51, 55, 58, + 59, 60, 297, 62, 63, 64, 66, 67, 68, 294, + 294, 131, 72, 73, 74, 88, 77, 0, 100, 81, + 82, 83, 84, 85, 103, 104, 107, 108, 109, 110, + 111, 112, 124, 125, 115, 132, 133, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 134, + 236, 237, 238, 135, 136, 137, 138, 240, 241, 0, + 297, 142, 145, 146, 147, 148, 117, 118, 121, 122, + 123, 17, 253, 284, 286, 285, 287, 0, 48, 49, + 0, 97, 0, 243, 246, 0, 0, 297, 295, 296, + 0, 245, 250, 0, 297, 0, 114, 0, 87, 0, + 297, 0, 93, 94, 0, 0, 99, 101, 139, 0, + 0, 42, 47, 61, 96, 69, 242, 247, 248, 249, + 70, 244, 251, 252, 71, 113, 76, 86, 89, 90, + 91, 78, 92, 95, 79, 98, 0, 151, 151, 102, + 0, 150, 0, 153, 0, 0, 0, 0, 0, 0, + 0, 140, 149, 152, 162, 170, 170, 186, 204, 216, + 141, 0, 161, 0, 0, 0, 0, 0, 0, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 185, 187, + 0, 0, 0, 0, 0, 297, 0, 297, 0, 0, + 0, 0, 203, 297, 0, 297, 0, 0, 0, 0, + 0, 0, 0, 215, 0, 0, 0, 221, 154, 160, + 163, 164, 165, 166, 167, 155, 168, 179, 172, 173, + 174, 175, 176, 156, 157, 184, 195, 189, 190, 191, + 192, 196, 197, 198, 199, 200, 201, 158, 202, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 159, 214, + 217, 218, 219, 220, 0, 178, 0, 0, 0, 0, + 194, 171, 177, 180, 181, 182, 183, 188, 193, } var yyTok1 = [...]int{ @@ -670,7 +668,7 @@ var yyTok2 = [...]int{ 122, 123, 124, 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, + 152, 153, 154, 155, 156, 157, } var yyTok3 = [...]int{ 0, @@ -1253,9 +1251,9 @@ yydefault: //line parser/parser.go.y:105 { } - case 71: + case 68: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.go.y:109 + //line parser/parser.go.y:106 { } case 72: @@ -1269,22 +1267,22 @@ yydefault: { } case 74: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.go.y:112 { } case 75: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:113 { } case 76: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line parser/parser.go.y:114 { } case 77: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.go.y:115 { } @@ -1294,12 +1292,12 @@ yydefault: { } case 79: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line parser/parser.go.y:117 { } case 80: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:118 { } @@ -1323,13 +1321,13 @@ yydefault: //line parser/parser.go.y:122 { } - case 87: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:126 + case 85: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:123 { } case 88: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:127 { } @@ -1343,33 +1341,33 @@ yydefault: //line parser/parser.go.y:129 { } - case 94: + case 91: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.go.y:134 + //line parser/parser.go.y:130 { } - case 99: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:140 + case 95: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:135 { } case 100: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:141 { } case 101: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:142 { } - case 105: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:148 + case 102: + yyDollar = yyS[yypt-3 : yypt+1] + //line parser/parser.go.y:143 { } case 106: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:149 { } @@ -1398,13 +1396,13 @@ yydefault: //line parser/parser.go.y:154 { } - case 119: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:164 + case 112: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:155 { } case 120: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:165 { } @@ -1418,9 +1416,9 @@ yydefault: //line parser/parser.go.y:167 { } - case 128: + case 123: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.go.y:175 + //line parser/parser.go.y:168 { } case 129: @@ -1429,12 +1427,12 @@ yydefault: { } case 130: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:178 + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:177 { } case 131: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:179 { } @@ -1469,18 +1467,18 @@ yydefault: { } case 138: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.go.y:186 { } - case 141: - yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.go.y:189 + case 139: + yyDollar = yyS[yypt-3 : yypt+1] + //line parser/parser.go.y:187 { } - case 144: + case 142: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.go.y:192 + //line parser/parser.go.y:190 { } case 145: @@ -1498,28 +1496,28 @@ yydefault: //line parser/parser.go.y:195 { } - case 149: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:197 + case 148: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:196 { } case 150: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:199 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:198 { } case 151: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:200 { } case 152: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.go.y:201 { } case 153: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:202 { } @@ -1548,18 +1546,18 @@ yydefault: //line parser/parser.go.y:207 { } - case 160: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:209 + case 159: + yyDollar = yyS[yypt-4 : yypt+1] + //line parser/parser.go.y:208 { } case 161: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:211 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:210 { } case 162: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:212 { } @@ -1583,23 +1581,23 @@ yydefault: //line parser/parser.go.y:216 { } - case 168: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:218 + case 167: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:217 { } case 169: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:220 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:219 { } case 170: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:221 { } case 171: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line parser/parser.go.y:222 { } @@ -1623,18 +1621,18 @@ yydefault: //line parser/parser.go.y:226 { } - case 177: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:228 + case 176: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:227 { } case 178: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:230 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:229 { } case 179: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:231 { } @@ -1653,33 +1651,33 @@ yydefault: //line parser/parser.go.y:234 { } - case 184: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:236 + case 183: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:235 { } case 185: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:238 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:237 { } case 186: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:239 { } - case 193: + case 187: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:246 + //line parser/parser.go.y:240 { } case 194: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:248 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:247 { } case 195: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:249 { } @@ -1708,18 +1706,18 @@ yydefault: //line parser/parser.go.y:254 { } - case 202: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:256 + case 201: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:255 { } case 203: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:258 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:257 { } case 204: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:259 { } @@ -1763,18 +1761,18 @@ yydefault: //line parser/parser.go.y:267 { } - case 214: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:269 + case 213: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:268 { } case 215: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:271 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:270 { } case 216: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:272 { } @@ -1794,17 +1792,17 @@ yydefault: { } case 220: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.go.y:276 { } case 221: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:278 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:277 { } case 222: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:279 { } @@ -1864,12 +1862,12 @@ yydefault: { } case 234: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:292 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:291 { } case 235: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:293 { } @@ -1884,12 +1882,12 @@ yydefault: { } case 238: - yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:297 + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:296 { } case 239: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line parser/parser.go.y:298 { } @@ -1898,23 +1896,23 @@ yydefault: //line parser/parser.go.y:299 { } - case 242: + case 241: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:301 + //line parser/parser.go.y:300 { } - case 244: + case 243: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:303 + //line parser/parser.go.y:302 { } case 245: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:305 + //line parser/parser.go.y:304 { } case 246: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:306 { } @@ -1929,12 +1927,12 @@ yydefault: { } case 249: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:310 + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:309 { } case 250: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line parser/parser.go.y:311 { } @@ -1943,54 +1941,59 @@ yydefault: //line parser/parser.go.y:312 { } - case 253: - yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:314 + case 252: + yyDollar = yyS[yypt-2 : yypt+1] + //line parser/parser.go.y:313 { } case 254: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.go.y:316 + //line parser/parser.go.y:315 + { + } + case 255: + yyDollar = yyS[yypt-1 : yypt+1] + //line parser/parser.go.y:317 { } - case 257: + case 258: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:320 + //line parser/parser.go.y:321 { } - case 265: + case 266: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:329 + //line parser/parser.go.y:330 { } - case 282: + case 283: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:347 + //line parser/parser.go.y:348 { } - case 287: + case 288: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:353 + //line parser/parser.go.y:354 { } - case 293: + case 294: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:360 + //line parser/parser.go.y:361 { } - case 296: + case 297: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:364 + //line parser/parser.go.y:365 { } - case 299: + case 300: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:368 + //line parser/parser.go.y:369 { } - case 302: + case 303: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.go.y:372 + //line parser/parser.go.y:373 { } } diff --git a/parser/parser.go.y b/parser/parser.go.y index 8bfadde..e9b6f75 100644 --- a/parser/parser.go.y +++ b/parser/parser.go.y @@ -17,7 +17,7 @@ package parser %token STATIC_RULES %token VRRP_SYNC_GROUP GROUP %token VRRP_INSTANCE -%token USE_VMAC VERSION VMAC_XMIT_BASE NATIVE_IPV6 INTERFACE MCAST_SRC_IP UNICAST_SRC_IP UNICAST_PEER LVS_SYNC_DAEMON_INTERFACE VIRTUAL_ROUTER_ID NOPREEMPT PRIORITY ADVERT_INT VIRTUAL_IPADDRESS VIRTUAL_IPADDRESS_EXCLUDED VIRTUAL_ROUTES STATE MASTER BACKUP GARP_MASTER_DELAY SMTP_ALERT AUTHENTICATION AUTH_TYPE AUTH_PASS PASS AH LABEL DEV SCOPE SITE LINK HOST NOWHERE GLOBAL BRD SRC FROM TO VIA GW OR TABLE METRIC TRACK_INTERFACE TRACK_SCRIPT DONT_TRACK_PRIMARY NOTIFY_MASTER NOTIFY_BACKUP NOTIFY_FAULT NOTIFY_STOP NOTIFY BLACKHOLE +%token USE_VMAC VERSION VMAC_XMIT_BASE NATIVE_IPV6 INTERFACE MCAST_SRC_IP UNICAST_SRC_IP UNICAST_PEER LVS_SYNC_DAEMON_INTERFACE VIRTUAL_ROUTER_ID NOPREEMPT PREEMPT_DELAY PRIORITY ADVERT_INT VIRTUAL_IPADDRESS VIRTUAL_IPADDRESS_EXCLUDED VIRTUAL_ROUTES STATE MASTER BACKUP GARP_MASTER_DELAY SMTP_ALERT AUTHENTICATION AUTH_TYPE AUTH_PASS PASS AH LABEL DEV SCOPE SITE LINK HOST NOWHERE GLOBAL BRD SRC FROM TO VIA GW OR TABLE METRIC TRACK_INTERFACE TRACK_SCRIPT DONT_TRACK_PRIMARY NOTIFY_MASTER NOTIFY_BACKUP NOTIFY_FAULT NOTIFY_STOP NOTIFY BLACKHOLE %token VRRP_SCRIPT %token SCRIPT INTERVAL TIMEOUT WEIGHT FALL RISE %token VIRTUAL_SERVER_GROUP @@ -101,6 +101,7 @@ vrrp_instance_statement: { } | VIRTUAL_ROUTER_ID STRING { } | VIRTUAL_ROUTER_ID NUMBER { } | NOPREEMPT +| PREEMPT_DELAY NUMBER { } | PRIORITY NUMBER { } | ADVERT_INT NUMBER { } | VIRTUAL_IPADDRESS LB vips RB