From: Francis Dupont Date: Mon, 25 Jun 2018 15:31:28 +0000 (+0000) Subject: [trac3543] Regen flex/bison X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f583c98055317acca73865aa029ce687e1ad5ca9;p=thirdparty%2Fkea.git [trac3543] Regen flex/bison --- diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index 915f94cab7..ff5ca19023 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/src/bin/d2/d2_lexer.cc @@ -700,7 +700,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[388] = +static const flex_int16_t yy_accept[393] = { 0, 57, 57, 0, 0, 0, 0, 0, 0, 0, 0, 65, 63, 10, 11, 63, 1, 57, 54, 57, 57, @@ -708,42 +708,44 @@ static const flex_int16_t yy_accept[388] = 63, 63, 63, 52, 53, 5, 5, 5, 63, 63, 63, 10, 11, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 57, 57, 0, 56, 57, 3, 2, 6, 0, 57, - 0, 0, 0, 0, 0, 0, 4, 0, 0, 9, - 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 57, + 57, 0, 56, 57, 3, 2, 6, 0, 57, 0, + 0, 0, 0, 0, 0, 4, 0, 0, 9, 0, + 47, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, - 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 62, 60, 0, 59, 58, - 0, 0, 0, 0, 0, 0, 19, 18, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 0, 0, 0, 0, 0, 48, 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, 62, 60, 0, 59, 58, 0, 0, + 0, 0, 0, 19, 18, 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, 61, 58, 0, 0, 0, 0, 0, 0, - 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, - 43, 44, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, + 61, 58, 0, 0, 0, 0, 0, 0, 20, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 0, 0, 14, + 0, 0, 0, 0, 0, 0, 0, 0, 43, 44, + 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 39, 0, 0, 36, 0, 0, 32, 0, - 0, 0, 0, 0, 33, 0, 22, 0, 0, 0, - - 0, 0, 0, 0, 0, 34, 38, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 0, 28, 0, 26, 0, 0, 0, 0, 42, - 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 0, 0, 0, 41, 0, - 0, 0, 0, 13, 17, 0, 0, 0, 0, 0, - 0, 31, 0, 27, 0, 0, 0, 0, 0, 0, - 25, 0, 23, 16, 0, 24, 21, 45, 0, 0, - 0, 35, 0, 0, 0, 15, 0 + 39, 0, 0, 36, 0, 0, 32, 0, 0, 0, + 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 34, 38, 0, 0, 0, 0, 0, + 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, + 0, 28, 0, 26, 0, 0, 0, 0, 42, 0, + 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 41, + 0, 0, 0, 0, 13, 17, 0, 0, 0, 0, + 0, 0, 0, 31, 0, 27, 0, 0, 0, 0, + 0, 0, 0, 25, 0, 23, 16, 0, 24, 21, + 45, 0, 0, 0, 33, 0, 35, 0, 0, 0, + 15, 0 + } ; static const YY_CHAR yy_ec[256] = @@ -789,103 +791,105 @@ static const YY_CHAR yy_meta[67] = 3, 3, 3, 3, 3, 3 } ; -static const flex_int16_t yy_base[399] = +static const flex_int16_t yy_base[404] = { 0, 0, 0, 65, 68, 71, 0, 69, 73, 54, 70, - 706, 707, 89, 702, 137, 0, 192, 707, 197, 200, - 86, 212, 707, 684, 97, 74, 63, 69, 707, 707, - 83, 68, 78, 707, 707, 707, 124, 690, 649, 0, - 682, 128, 697, 212, 234, 707, 645, 651, 172, 643, - 196, 196, 257, 645, 641, 187, 191, 640, 638, 648, - 637, 650, 91, 630, 634, 643, 642, 209, 210, 0, - 281, 289, 308, 314, 293, 707, 0, 707, 232, 257, - 182, 224, 219, 283, 284, 285, 707, 643, 678, 707, - 294, 707, 330, 630, 640, 291, 635, 296, 301, 674, - - 0, 376, 633, 626, 624, 635, 629, 617, 614, 616, - 614, 659, 606, 622, 605, 614, 609, 606, 607, 602, - 299, 613, 616, 0, 305, 312, 255, 309, 318, 324, - 608, 707, 0, 600, 602, 319, 610, 649, 648, 647, - 707, 408, 598, 599, 593, 590, 604, 636, 589, 584, - 586, 603, 631, 595, 290, 596, 628, 583, 579, 592, - 579, 590, 587, 576, 329, 707, 707, 330, 707, 707, - 572, 0, 574, 337, 623, 580, 707, 707, 440, 571, - 582, 614, 578, 566, 565, 574, 580, 566, 575, 564, - 572, 567, 570, 607, 205, 553, 605, 554, 565, 552, - - 596, 595, 707, 707, 562, 0, 550, 597, 596, 558, - 707, 547, 472, 551, 545, 554, 545, 537, 550, 587, - 536, 551, 547, 549, 532, 523, 530, 707, 531, 528, - 525, 707, 525, 523, 532, 529, 536, 533, 0, 525, - 707, 707, 522, 528, 515, 514, 517, 526, 558, 512, - 707, 524, 514, 509, 512, 506, 518, 555, 504, 505, - 354, 514, 551, 498, 511, 500, 707, 542, 495, 545, - 497, 525, 477, 464, 470, 450, 498, 464, 463, 462, - 499, 498, 707, 451, 444, 707, 447, 489, 707, 436, - 429, 438, 450, 483, 707, 427, 707, 438, 433, 428, - - 431, 431, 467, 415, 465, 707, 707, 430, 415, 413, - 424, 454, 402, 400, 411, 707, 441, 398, 394, 386, - 387, 399, 707, 384, 707, 382, 397, 380, 394, 707, - 430, 391, 384, 707, 374, 420, 368, 346, 362, 408, - 407, 358, 363, 357, 707, 347, 355, 350, 707, 400, - 347, 398, 339, 707, 707, 344, 340, 330, 327, 326, - 376, 707, 333, 707, 374, 373, 325, 371, 370, 364, - 707, 313, 707, 707, 307, 707, 707, 707, 221, 258, - 205, 707, 196, 185, 217, 707, 707, 517, 522, 527, - 532, 537, 542, 545, 216, 130, 115, 87 - + 711, 712, 89, 707, 137, 0, 192, 712, 197, 200, + 86, 212, 712, 689, 97, 74, 63, 69, 712, 712, + 83, 68, 78, 712, 712, 712, 124, 695, 654, 0, + 687, 128, 702, 212, 234, 712, 650, 656, 172, 196, + 196, 257, 651, 647, 187, 191, 646, 644, 654, 643, + 656, 91, 636, 640, 649, 648, 209, 210, 0, 281, + 289, 308, 314, 293, 712, 0, 712, 232, 257, 182, + 224, 219, 283, 284, 285, 712, 649, 684, 712, 294, + 712, 330, 636, 646, 291, 296, 301, 681, 0, 376, + + 640, 207, 632, 643, 637, 625, 622, 624, 622, 667, + 614, 630, 613, 622, 617, 614, 615, 610, 220, 621, + 624, 0, 305, 312, 316, 309, 318, 324, 616, 712, + 0, 608, 610, 319, 658, 657, 656, 712, 408, 607, + 608, 601, 601, 598, 612, 644, 597, 592, 594, 611, + 639, 603, 290, 604, 636, 591, 587, 600, 587, 598, + 595, 584, 329, 712, 712, 330, 712, 712, 580, 0, + 582, 337, 631, 712, 712, 440, 580, 591, 578, 622, + 586, 574, 573, 582, 588, 574, 583, 572, 580, 575, + 578, 615, 210, 561, 613, 562, 573, 560, 604, 603, + + 712, 712, 570, 0, 558, 605, 604, 566, 712, 472, + 560, 554, 552, 562, 553, 545, 558, 595, 544, 559, + 555, 557, 540, 531, 538, 712, 539, 536, 533, 712, + 533, 531, 540, 537, 544, 541, 0, 533, 712, 712, + 530, 524, 523, 529, 525, 534, 566, 520, 712, 532, + 522, 517, 520, 514, 526, 563, 512, 513, 364, 522, + 559, 506, 519, 508, 712, 550, 503, 512, 552, 546, + 504, 495, 513, 493, 541, 507, 500, 487, 523, 518, + 712, 459, 452, 712, 455, 497, 712, 444, 443, 452, + 464, 497, 450, 712, 444, 460, 455, 444, 447, 447, + + 483, 422, 472, 712, 712, 437, 422, 420, 431, 467, + 415, 413, 424, 712, 463, 414, 419, 409, 401, 402, + 414, 712, 390, 712, 388, 403, 386, 400, 712, 436, + 397, 396, 712, 397, 385, 431, 379, 348, 382, 422, + 421, 372, 377, 362, 712, 352, 360, 362, 354, 712, + 404, 351, 402, 350, 712, 712, 355, 350, 339, 337, + 336, 349, 381, 712, 337, 712, 378, 376, 328, 374, + 373, 372, 319, 712, 324, 712, 712, 308, 712, 712, + 712, 358, 313, 293, 712, 210, 712, 191, 185, 217, + 712, 712, 517, 522, 527, 532, 537, 542, 545, 216, + + 130, 115, 87 } ; -static const flex_int16_t yy_def[399] = +static const flex_int16_t yy_def[404] = { 0, - 387, 1, 388, 388, 1, 5, 5, 5, 5, 5, - 387, 387, 387, 387, 387, 389, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 390, - 387, 387, 387, 391, 15, 387, 45, 45, 45, 45, - 45, 45, 392, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 389, - 387, 387, 387, 387, 387, 387, 393, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 390, 387, - 391, 387, 387, 45, 45, 45, 45, 45, 45, 394, + 392, 1, 393, 393, 1, 5, 5, 5, 5, 5, + 392, 392, 392, 392, 392, 394, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 395, + 392, 392, 392, 396, 15, 392, 45, 45, 45, 45, + 45, 397, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 394, 392, + 392, 392, 392, 392, 392, 398, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 395, 392, 396, + 392, 392, 45, 45, 45, 45, 45, 399, 45, 397, - 45, 392, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 393, 387, 387, 387, 387, 387, 387, - 387, 387, 395, 45, 45, 45, 45, 45, 45, 394, - 387, 392, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 387, 387, 387, 387, 387, 387, - 387, 396, 45, 45, 45, 45, 387, 387, 392, 45, + 45, 398, 392, 392, 392, 392, 392, 392, 392, 392, + 400, 45, 45, 45, 45, 45, 399, 392, 397, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 392, 392, 392, 392, 392, 392, 392, 401, + 45, 45, 45, 392, 392, 397, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 387, 387, 387, 397, 45, 45, 45, 45, - 387, 45, 392, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 387, 45, 45, - 45, 387, 45, 45, 45, 45, 45, 387, 398, 45, - 387, 387, 45, 45, 45, 45, 45, 45, 45, 45, - 387, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 387, 45, 45, 45, + 392, 392, 392, 402, 45, 45, 45, 45, 392, 397, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 392, 45, 45, 45, 392, + 45, 45, 45, 45, 45, 392, 403, 45, 392, 392, + 45, 45, 45, 45, 45, 45, 45, 45, 392, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 387, 45, 45, 387, 45, 45, 387, 45, - 45, 45, 45, 45, 387, 45, 387, 45, 45, 45, - - 45, 45, 45, 45, 45, 387, 387, 45, 45, 45, - 45, 45, 45, 45, 45, 387, 45, 45, 45, 45, - 45, 45, 387, 45, 387, 45, 45, 45, 45, 387, - 45, 45, 45, 387, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 387, 45, 45, 45, 387, 45, - 45, 45, 45, 387, 387, 45, 45, 45, 45, 45, - 45, 387, 45, 387, 45, 45, 45, 45, 45, 45, - 387, 45, 387, 387, 45, 387, 387, 387, 45, 45, - 45, 387, 45, 45, 45, 387, 0, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387 + 45, 45, 45, 45, 392, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 392, 45, 45, 392, 45, 45, 392, 45, 45, 45, + 45, 45, 45, 392, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 392, 392, 45, 45, 45, 45, 45, + 45, 45, 45, 392, 45, 45, 45, 45, 45, 45, + 45, 392, 45, 392, 45, 45, 45, 45, 392, 45, + 45, 45, 392, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 392, 45, 45, 45, 45, 392, + 45, 45, 45, 45, 392, 392, 45, 45, 45, 45, + 45, 45, 45, 392, 45, 392, 45, 45, 45, 45, + 45, 45, 45, 392, 45, 392, 392, 45, 392, 392, + 392, 45, 45, 45, 392, 45, 392, 45, 45, 45, + 392, 0, 392, 392, 392, 392, 392, 392, 392, 392, + + 392, 392, 392 } ; -static const flex_int16_t yy_nxt[774] = +static const flex_int16_t yy_nxt[779] = { 0, 12, 13, 14, 13, 12, 15, 16, 12, 17, 18, 19, 20, 21, 22, 22, 22, 23, 24, 12, 12, @@ -896,85 +900,85 @@ static const flex_int16_t yy_nxt[774] = 12, 12, 12, 12, 34, 35, 37, 14, 37, 37, 14, 37, 38, 41, 40, 38, 12, 12, 40, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 41, - 42, 91, 42, 76, 81, 12, 12, 82, 77, 12, + 42, 90, 42, 75, 80, 12, 12, 81, 76, 12, - 83, 12, 82, 81, 12, 79, 12, 79, 12, 83, - 80, 80, 80, 81, 12, 12, 12, 12, 39, 239, - 12, 82, 84, 12, 83, 42, 85, 42, 12, 42, - 116, 42, 117, 86, 206, 12, 12, 44, 44, 44, + 82, 12, 81, 80, 12, 78, 12, 78, 12, 82, + 79, 79, 79, 80, 12, 12, 12, 12, 39, 237, + 12, 81, 83, 12, 82, 42, 84, 42, 12, 42, + 114, 42, 115, 85, 204, 12, 12, 44, 44, 44, 45, 45, 46, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47, - 48, 45, 45, 49, 50, 45, 45, 45, 45, 45, - 51, 52, 45, 53, 45, 45, 54, 45, 55, 56, - 45, 57, 45, 58, 59, 49, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 45, 45, 45, 45, - - 45, 45, 45, 71, 96, 72, 72, 72, 71, 125, - 74, 74, 74, 75, 75, 75, 73, 92, 98, 99, - 172, 73, 386, 71, 73, 74, 74, 74, 96, 105, - 106, 98, 125, 99, 107, 73, 73, 98, 99, 108, - 73, 109, 385, 73, 110, 80, 80, 80, 93, 229, - 98, 126, 99, 127, 384, 73, 45, 45, 383, 230, - 45, 45, 101, 382, 381, 122, 123, 45, 45, 45, - 80, 80, 80, 45, 126, 45, 45, 127, 45, 167, + 48, 45, 45, 49, 45, 45, 45, 45, 45, 45, + 50, 51, 45, 52, 45, 45, 53, 45, 54, 55, + 45, 56, 45, 57, 58, 49, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 45, 45, 45, 45, + + 45, 45, 45, 70, 95, 71, 71, 71, 70, 123, + 73, 73, 73, 74, 74, 74, 72, 91, 96, 97, + 170, 72, 391, 70, 72, 73, 73, 73, 95, 103, + 104, 96, 123, 97, 105, 72, 72, 96, 97, 106, + 72, 107, 390, 72, 108, 79, 79, 79, 92, 389, + 96, 124, 97, 125, 227, 72, 45, 45, 141, 142, + 45, 159, 99, 388, 228, 120, 121, 45, 45, 45, + 79, 79, 79, 45, 124, 45, 45, 125, 45, 160, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 75, 75, 75, 45, 167, 92, - - 71, 45, 72, 72, 72, 73, 75, 75, 75, 45, - 125, 126, 45, 73, 45, 102, 79, 73, 79, 127, - 136, 80, 80, 80, 73, 71, 138, 74, 74, 74, - 93, 139, 73, 128, 129, 91, 73, 165, 73, 166, - 161, 165, 91, 130, 136, 166, 192, 175, 167, 193, - 138, 208, 209, 203, 203, 139, 351, 73, 162, 286, - 210, 165, 166, 380, 379, 168, 91, 170, 169, 378, - 91, 175, 203, 204, 91, 377, 376, 375, 374, 373, - 372, 371, 91, 370, 369, 91, 368, 91, 133, 142, - 142, 142, 287, 367, 366, 365, 142, 142, 142, 142, - - 142, 142, 352, 364, 363, 362, 361, 360, 359, 358, - 357, 356, 355, 354, 353, 142, 142, 142, 142, 142, - 142, 179, 179, 179, 350, 349, 348, 347, 179, 179, - 179, 179, 179, 179, 346, 345, 344, 343, 342, 341, - 340, 339, 338, 337, 336, 335, 334, 179, 179, 179, - 179, 179, 179, 213, 213, 213, 333, 332, 331, 330, - 213, 213, 213, 213, 213, 213, 329, 328, 327, 326, - 325, 324, 323, 322, 321, 320, 319, 318, 317, 213, - 213, 213, 213, 213, 213, 45, 45, 45, 316, 315, - 314, 313, 45, 45, 45, 45, 45, 45, 312, 311, - - 310, 309, 308, 307, 306, 305, 304, 303, 302, 301, - 300, 45, 45, 45, 45, 45, 45, 36, 36, 36, - 36, 36, 70, 299, 70, 70, 70, 89, 298, 89, - 297, 89, 91, 91, 91, 91, 91, 100, 100, 100, - 100, 100, 124, 296, 124, 124, 124, 140, 140, 140, - 295, 294, 293, 292, 291, 290, 289, 288, 285, 284, - 283, 282, 281, 280, 279, 278, 277, 276, 275, 274, - 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, - 263, 262, 261, 260, 259, 258, 257, 256, 255, 254, - 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, - - 243, 242, 241, 240, 238, 237, 236, 235, 234, 233, - 232, 231, 228, 227, 226, 225, 224, 223, 222, 221, - 220, 219, 218, 217, 216, 215, 214, 212, 211, 207, - 205, 202, 201, 200, 199, 198, 197, 196, 195, 194, - 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, - 181, 180, 141, 178, 177, 176, 174, 173, 171, 164, - 163, 160, 159, 158, 157, 156, 155, 154, 153, 152, - 151, 150, 149, 148, 147, 146, 145, 144, 143, 141, - 137, 135, 134, 132, 131, 121, 120, 119, 118, 115, - 114, 113, 112, 111, 104, 103, 97, 95, 94, 43, - - 90, 88, 87, 78, 43, 387, 11, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387 + 45, 45, 45, 45, 74, 74, 74, 45, 387, 91, + + 70, 45, 71, 71, 71, 72, 74, 74, 74, 45, + 123, 124, 45, 72, 45, 100, 78, 72, 78, 125, + 134, 79, 79, 79, 72, 70, 135, 73, 73, 73, + 92, 136, 72, 126, 127, 90, 72, 163, 72, 164, + 165, 163, 90, 128, 134, 164, 190, 173, 165, 191, + 135, 206, 207, 201, 201, 136, 386, 72, 352, 165, + 208, 163, 164, 385, 384, 166, 90, 168, 167, 284, + 90, 173, 201, 202, 90, 383, 382, 381, 380, 379, + 378, 377, 90, 376, 375, 90, 374, 90, 131, 139, + 139, 139, 373, 372, 371, 370, 139, 139, 139, 139, + + 139, 139, 285, 369, 353, 368, 367, 366, 365, 364, + 363, 362, 361, 360, 359, 139, 139, 139, 139, 139, + 139, 176, 176, 176, 358, 357, 356, 355, 176, 176, + 176, 176, 176, 176, 354, 351, 350, 349, 348, 347, + 346, 345, 344, 343, 342, 341, 340, 176, 176, 176, + 176, 176, 176, 210, 210, 210, 339, 338, 337, 336, + 210, 210, 210, 210, 210, 210, 335, 334, 333, 332, + 331, 330, 329, 328, 327, 326, 325, 324, 323, 210, + 210, 210, 210, 210, 210, 45, 45, 45, 322, 321, + 320, 319, 45, 45, 45, 45, 45, 45, 318, 317, + + 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, + 306, 45, 45, 45, 45, 45, 45, 36, 36, 36, + 36, 36, 69, 305, 69, 69, 69, 88, 304, 88, + 303, 88, 90, 90, 90, 90, 90, 98, 98, 98, + 98, 98, 122, 302, 122, 122, 122, 137, 137, 137, + 301, 300, 299, 298, 297, 296, 295, 294, 293, 292, + 291, 290, 289, 288, 287, 286, 283, 282, 281, 280, + 279, 278, 277, 276, 275, 274, 273, 272, 271, 270, + 269, 268, 267, 266, 265, 264, 263, 262, 261, 260, + 259, 258, 257, 256, 255, 254, 253, 252, 251, 250, + + 249, 248, 247, 246, 245, 244, 243, 242, 241, 240, + 239, 238, 236, 235, 234, 233, 232, 231, 230, 229, + 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, + 216, 215, 214, 213, 212, 211, 209, 205, 203, 200, + 199, 198, 197, 196, 195, 194, 193, 192, 189, 188, + 187, 186, 185, 184, 183, 182, 181, 180, 179, 178, + 177, 138, 175, 174, 172, 171, 169, 162, 161, 158, + 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, + 147, 146, 145, 144, 143, 140, 138, 133, 132, 130, + 129, 119, 118, 117, 116, 113, 112, 111, 110, 109, + + 102, 101, 94, 93, 43, 89, 87, 86, 77, 43, + 392, 11, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392 } ; -static const flex_int16_t yy_chk[774] = +static const flex_int16_t yy_chk[779] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -985,12 +989,12 @@ static const flex_int16_t yy_chk[774] = 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 3, 9, 7, 4, 5, 5, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, - 13, 398, 13, 21, 26, 5, 5, 27, 21, 5, + 13, 403, 13, 21, 26, 5, 5, 27, 21, 5, 28, 9, 32, 31, 5, 25, 5, 25, 5, 33, - 25, 25, 25, 26, 5, 5, 7, 10, 5, 397, + 25, 25, 25, 26, 5, 5, 7, 10, 5, 402, 8, 27, 31, 5, 28, 37, 32, 37, 5, 42, - 63, 42, 63, 33, 396, 5, 5, 15, 15, 15, + 62, 42, 62, 33, 401, 5, 5, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, @@ -998,69 +1002,69 @@ static const flex_int16_t yy_chk[774] = 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 17, 49, 17, 17, 17, 19, 81, - 19, 19, 19, 20, 20, 20, 17, 44, 51, 52, - 395, 19, 385, 22, 20, 22, 22, 22, 49, 56, - 56, 68, 81, 69, 56, 17, 22, 51, 52, 56, - 19, 57, 384, 20, 57, 79, 79, 79, 44, 195, - 68, 82, 69, 83, 383, 22, 45, 45, 381, 195, - 45, 45, 53, 380, 379, 68, 69, 45, 45, 53, - 80, 80, 80, 45, 82, 45, 45, 83, 45, 127, + 15, 15, 15, 17, 49, 17, 17, 17, 19, 80, + 19, 19, 19, 20, 20, 20, 17, 44, 50, 51, + 400, 19, 390, 22, 20, 22, 22, 22, 49, 55, + 55, 67, 80, 68, 55, 17, 22, 50, 51, 55, + 19, 56, 389, 20, 56, 78, 78, 78, 44, 388, + 67, 81, 68, 82, 193, 22, 45, 45, 102, 102, + 45, 119, 52, 386, 193, 67, 68, 45, 45, 52, + 79, 79, 79, 45, 81, 45, 45, 82, 45, 119, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 53, 71, 71, 71, 53, 127, 91, - - 72, 53, 72, 72, 72, 71, 75, 75, 75, 53, - 84, 85, 53, 72, 53, 53, 73, 75, 73, 86, - 96, 73, 73, 73, 71, 74, 98, 74, 74, 74, - 91, 99, 72, 84, 85, 93, 75, 125, 74, 126, - 121, 128, 93, 86, 96, 129, 155, 136, 130, 155, - 98, 174, 174, 165, 168, 99, 338, 74, 121, 261, - 174, 125, 126, 375, 372, 128, 93, 130, 129, 370, - 93, 136, 165, 168, 93, 369, 368, 367, 366, 365, - 363, 361, 93, 360, 359, 93, 358, 93, 93, 102, - 102, 102, 261, 357, 356, 353, 102, 102, 102, 102, - - 102, 102, 338, 352, 351, 350, 348, 347, 346, 344, - 343, 342, 341, 340, 339, 102, 102, 102, 102, 102, - 102, 142, 142, 142, 337, 336, 335, 333, 142, 142, - 142, 142, 142, 142, 332, 331, 329, 328, 327, 326, - 324, 322, 321, 320, 319, 318, 317, 142, 142, 142, - 142, 142, 142, 179, 179, 179, 315, 314, 313, 312, - 179, 179, 179, 179, 179, 179, 311, 310, 309, 308, - 305, 304, 303, 302, 301, 300, 299, 298, 296, 179, - 179, 179, 179, 179, 179, 213, 213, 213, 294, 293, - 292, 291, 213, 213, 213, 213, 213, 213, 290, 288, - - 287, 285, 284, 282, 281, 280, 279, 278, 277, 276, - 275, 213, 213, 213, 213, 213, 213, 388, 388, 388, - 388, 388, 389, 274, 389, 389, 389, 390, 273, 390, - 272, 390, 391, 391, 391, 391, 391, 392, 392, 392, - 392, 392, 393, 271, 393, 393, 393, 394, 394, 394, - 270, 269, 268, 266, 265, 264, 263, 262, 260, 259, - 258, 257, 256, 255, 254, 253, 252, 250, 249, 248, - 247, 246, 245, 244, 243, 240, 238, 237, 236, 235, - 234, 233, 231, 230, 229, 227, 226, 225, 224, 223, - 222, 221, 220, 219, 218, 217, 216, 215, 214, 212, - - 210, 209, 208, 207, 205, 202, 201, 200, 199, 198, - 197, 196, 194, 193, 192, 191, 190, 189, 188, 187, - 186, 185, 184, 183, 182, 181, 180, 176, 175, 173, - 171, 164, 163, 162, 161, 160, 159, 158, 157, 156, - 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, - 144, 143, 140, 139, 138, 137, 135, 134, 131, 123, - 122, 120, 119, 118, 117, 116, 115, 114, 113, 112, - 111, 110, 109, 108, 107, 106, 105, 104, 103, 100, - 97, 95, 94, 89, 88, 67, 66, 65, 64, 62, - 61, 60, 59, 58, 55, 54, 50, 48, 47, 43, - - 41, 39, 38, 24, 14, 11, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 387, 387 + 45, 45, 45, 52, 70, 70, 70, 52, 384, 90, + + 71, 52, 71, 71, 71, 70, 74, 74, 74, 52, + 83, 84, 52, 71, 52, 52, 72, 74, 72, 85, + 95, 72, 72, 72, 70, 73, 96, 73, 73, 73, + 90, 97, 71, 83, 84, 92, 74, 123, 73, 124, + 125, 126, 92, 85, 95, 127, 153, 134, 128, 153, + 96, 172, 172, 163, 166, 97, 383, 73, 338, 125, + 172, 123, 124, 382, 378, 126, 92, 128, 127, 259, + 92, 134, 163, 166, 92, 375, 373, 372, 371, 370, + 369, 368, 92, 367, 365, 92, 363, 92, 92, 100, + 100, 100, 362, 361, 360, 359, 100, 100, 100, 100, + + 100, 100, 259, 358, 338, 357, 354, 353, 352, 351, + 349, 348, 347, 346, 344, 100, 100, 100, 100, 100, + 100, 139, 139, 139, 343, 342, 341, 340, 139, 139, + 139, 139, 139, 139, 339, 337, 336, 335, 334, 332, + 331, 330, 328, 327, 326, 325, 323, 139, 139, 139, + 139, 139, 139, 176, 176, 176, 321, 320, 319, 318, + 176, 176, 176, 176, 176, 176, 317, 316, 315, 313, + 312, 311, 310, 309, 308, 307, 306, 303, 302, 176, + 176, 176, 176, 176, 176, 210, 210, 210, 301, 300, + 299, 298, 210, 210, 210, 210, 210, 210, 297, 296, + + 295, 293, 292, 291, 290, 289, 288, 286, 285, 283, + 282, 210, 210, 210, 210, 210, 210, 393, 393, 393, + 393, 393, 394, 280, 394, 394, 394, 395, 279, 395, + 278, 395, 396, 396, 396, 396, 396, 397, 397, 397, + 397, 397, 398, 277, 398, 398, 398, 399, 399, 399, + 276, 275, 274, 273, 272, 271, 270, 269, 268, 267, + 266, 264, 263, 262, 261, 260, 258, 257, 256, 255, + 254, 253, 252, 251, 250, 248, 247, 246, 245, 244, + 243, 242, 241, 238, 236, 235, 234, 233, 232, 231, + 229, 228, 227, 225, 224, 223, 222, 221, 220, 219, + + 218, 217, 216, 215, 214, 213, 212, 211, 208, 207, + 206, 205, 203, 200, 199, 198, 197, 196, 195, 194, + 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, + 182, 181, 180, 179, 178, 177, 173, 171, 169, 162, + 161, 160, 159, 158, 157, 156, 155, 154, 152, 151, + 150, 149, 148, 147, 146, 145, 144, 143, 142, 141, + 140, 137, 136, 135, 133, 132, 129, 121, 120, 118, + 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, + 107, 106, 105, 104, 103, 101, 98, 94, 93, 88, + 87, 66, 65, 64, 63, 61, 60, 59, 58, 57, + + 54, 53, 48, 47, 43, 41, 39, 38, 24, 14, + 11, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392 } ; static yy_state_type yy_last_accepting_state; @@ -1074,10 +1078,10 @@ static const flex_int16_t yy_rule_linenum[64] = 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, 170, 176, 185, 196, 207, 216, 225, 234, 244, 254, 264, 280, 296, 305, 314, 324, 334, 344, 355, 364, - 374, 384, 395, 404, 413, 422, 431, 440, 449, 458, - 471, 480, 489, 498, 507, 517, 616, 621, 626, 631, - 632, 633, 634, 635, 636, 638, 656, 669, 674, 678, - 680, 682, 684 + 374, 384, 394, 428, 437, 446, 455, 464, 473, 482, + 495, 504, 513, 522, 531, 541, 640, 645, 650, 655, + 656, 657, 658, 659, 660, 662, 680, 693, 698, 702, + 704, 706, 708 } ; /* The intent behind this definition is that it'll catch @@ -1128,7 +1132,7 @@ unsigned int comment_start_line = 0; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg) -#line 1131 "d2_lexer.cc" +#line 1135 "d2_lexer.cc" /* noyywrap disables automatic rewinding for the next file to parse. Since we always parse only a single string, there's no need to do any wraps. And using yywrap requires linking with -lfl, which provides the default yywrap @@ -1154,8 +1158,8 @@ unsigned int comment_start_line = 0; by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION driver.loc_.columns(yyleng); -#line 1157 "d2_lexer.cc" -#line 1158 "d2_lexer.cc" +#line 1161 "d2_lexer.cc" +#line 1162 "d2_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1473,7 +1477,7 @@ YY_DECL } -#line 1476 "d2_lexer.cc" +#line 1480 "d2_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1502,13 +1506,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 388 ) + if ( yy_current_state >= 393 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 387 ); + while ( yy_current_state != 392 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1919,8 +1923,33 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 395 "d2_lexer.ll" +#line 394 "d2_lexer.ll" { + switch(driver.ctx_) { + case isc::d2::D2ParserContext::DHCPDDNS: + return isc::d2::D2Parser::make_CONTROL_SOCKET(driver.loc_); + default: + return isc::d2::D2Parser::make_STRING("control-socket", driver.loc_); +} + +\"socket-type\" { + switch(driver.ctx_) { + case isc::d2::D2ParserContext::CONTROL_SOCKET + return isc::d2::D2Parser::make_SOCKET_TYPE(driver.loc_); + default: + return isc::d2::D2Parser::make_STRING("socket-type", driver.loc_); +} + +\"socket-name\" { + switch(driver.ctx_) { + case isc::d2::D2ParserContext::CONTROL_SOCKET + return isc::d2::D2Parser::make_SOCKET_NAME(driver.loc_); + default: + return isc::d2::D2Parser::make_STRING("socket-name", driver.loc_); +} + + +\"Logging\" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: return isc::d2::D2Parser::make_LOGGING(driver.loc_); @@ -1931,7 +1960,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 404 "d2_lexer.ll" +#line 428 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGING: @@ -1943,7 +1972,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 413 "d2_lexer.ll" +#line 437 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -1955,7 +1984,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 422 "d2_lexer.ll" +#line 446 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -1967,7 +1996,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 431 "d2_lexer.ll" +#line 455 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -1979,7 +2008,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 440 "d2_lexer.ll" +#line 464 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -1991,7 +2020,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 449 "d2_lexer.ll" +#line 473 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2003,7 +2032,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 458 "d2_lexer.ll" +#line 482 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2019,7 +2048,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 471 "d2_lexer.ll" +#line 495 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2031,7 +2060,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 480 "d2_lexer.ll" +#line 504 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2043,7 +2072,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 489 "d2_lexer.ll" +#line 513 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2055,7 +2084,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 498 "d2_lexer.ll" +#line 522 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2067,7 +2096,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 507 "d2_lexer.ll" +#line 531 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2079,7 +2108,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 517 "d2_lexer.ll" +#line 541 "d2_lexer.ll" { /* A string has been matched. It contains the actual string and single quotes. We need to get those quotes out of the way and just use its content, e.g. @@ -2182,7 +2211,7 @@ YY_RULE_SETUP case 47: /* rule 47 can match eol */ YY_RULE_SETUP -#line 616 "d2_lexer.ll" +#line 640 "d2_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); @@ -2191,7 +2220,7 @@ YY_RULE_SETUP case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 621 "d2_lexer.ll" +#line 645 "d2_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); @@ -2199,7 +2228,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 626 "d2_lexer.ll" +#line 650 "d2_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); @@ -2207,37 +2236,37 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 631 "d2_lexer.ll" +#line 655 "d2_lexer.ll" { return isc::d2::D2Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 51: YY_RULE_SETUP -#line 632 "d2_lexer.ll" +#line 656 "d2_lexer.ll" { return isc::d2::D2Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 52: YY_RULE_SETUP -#line 633 "d2_lexer.ll" +#line 657 "d2_lexer.ll" { return isc::d2::D2Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 53: YY_RULE_SETUP -#line 634 "d2_lexer.ll" +#line 658 "d2_lexer.ll" { return isc::d2::D2Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 54: YY_RULE_SETUP -#line 635 "d2_lexer.ll" +#line 659 "d2_lexer.ll" { return isc::d2::D2Parser::make_COMMA(driver.loc_); } YY_BREAK case 55: YY_RULE_SETUP -#line 636 "d2_lexer.ll" +#line 660 "d2_lexer.ll" { return isc::d2::D2Parser::make_COLON(driver.loc_); } YY_BREAK case 56: YY_RULE_SETUP -#line 638 "d2_lexer.ll" +#line 662 "d2_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2258,7 +2287,7 @@ YY_RULE_SETUP YY_BREAK case 57: YY_RULE_SETUP -#line 656 "d2_lexer.ll" +#line 680 "d2_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2274,7 +2303,7 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 669 "d2_lexer.ll" +#line 693 "d2_lexer.ll" { string tmp(yytext); return isc::d2::D2Parser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2282,33 +2311,33 @@ YY_RULE_SETUP YY_BREAK case 59: YY_RULE_SETUP -#line 674 "d2_lexer.ll" +#line 698 "d2_lexer.ll" { return isc::d2::D2Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 60: YY_RULE_SETUP -#line 678 "d2_lexer.ll" +#line 702 "d2_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 61: YY_RULE_SETUP -#line 680 "d2_lexer.ll" +#line 704 "d2_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 62: YY_RULE_SETUP -#line 682 "d2_lexer.ll" +#line 706 "d2_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 63: YY_RULE_SETUP -#line 684 "d2_lexer.ll" +#line 708 "d2_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 686 "d2_lexer.ll" +#line 710 "d2_lexer.ll" { if (driver.states_.empty()) { return isc::d2::D2Parser::make_END(driver.loc_); @@ -2334,10 +2363,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 64: YY_RULE_SETUP -#line 709 "d2_lexer.ll" +#line 733 "d2_lexer.ll" ECHO; YY_BREAK -#line 2340 "d2_lexer.cc" +#line 2369 "d2_lexer.cc" case YY_END_OF_BUFFER: { @@ -2656,7 +2685,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 388 ) + if ( yy_current_state >= 393 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2689,11 +2718,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 388 ) + if ( yy_current_state >= 393 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 387); + yy_is_jam = (yy_current_state == 392); return yy_is_jam ? 0 : yy_current_state; } @@ -3442,7 +3471,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 709 "d2_lexer.ll" +#line 733 "d2_lexer.ll" using namespace isc::dhcp;