From: Francis Dupont Date: Mon, 25 Jun 2018 15:56:43 +0000 (+0000) Subject: [trac3543] Regen flex X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16f718505852adcdaf45a23b8b753d4d87302552;p=thirdparty%2Fkea.git [trac3543] Regen flex --- diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index adb0b01fd9..2878cf69c7 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/src/bin/d2/d2_lexer.cc @@ -691,8 +691,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 64 -#define YY_END_OF_BUFFER 65 +#define YY_NUM_RULES 67 +#define YY_END_OF_BUFFER 68 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -700,52 +700,54 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[393] = +static const flex_int16_t yy_accept[417] = { 0, - 57, 57, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 63, 10, 11, 63, 1, 57, 54, 57, 57, - 63, 56, 55, 63, 63, 63, 63, 63, 50, 51, - 63, 63, 63, 52, 53, 5, 5, 5, 63, 63, - 63, 10, 11, 0, 0, 46, 0, 0, 0, 0, + 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, + 68, 66, 10, 11, 66, 1, 60, 57, 60, 60, + 66, 59, 58, 66, 66, 66, 66, 66, 53, 54, + 66, 66, 66, 55, 56, 5, 5, 5, 66, 66, + 66, 10, 11, 0, 0, 49, 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, 49, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 60, 60, 0, 59, 60, 3, 2, 6, 0, 60, + 0, 0, 0, 0, 0, 0, 4, 0, 0, 9, + 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, + 52, 0, 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, 51, 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, 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, 65, 63, + 0, 62, 61, 0, 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, - 61, 58, 0, 0, 0, 0, 0, 0, 20, 0, + 0, 0, 0, 0, 0, 0, 0, 64, 61, 0, + 0, 0, 0, 0, 0, 20, 0, 0, 0, 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, 43, 0, 0, 0, 14, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 47, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 40, 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, 7, 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, 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, 42, 0, 0, 39, 0, 0, 32, 0, + + 0, 0, 0, 0, 0, 36, 0, 22, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 37, 41, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, + 0, 0, 0, 0, 0, 0, 0, 28, 0, 26, + 0, 0, 0, 0, 45, 0, 0, 0, 0, 0, + 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 44, 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 + 0, 0, 0, 0, 0, 31, 0, 27, 0, 0, + 0, 0, 35, 34, 0, 0, 0, 25, 0, 23, + 16, 0, 24, 21, 48, 0, 0, 0, 33, 0, + 38, 0, 0, 0, 15, 0 } ; static const YY_CHAR yy_ec[256] = @@ -791,105 +793,109 @@ static const YY_CHAR yy_meta[67] = 3, 3, 3, 3, 3, 3 } ; -static const flex_int16_t yy_base[404] = +static const flex_int16_t yy_base[428] = { 0, 0, 0, 65, 68, 71, 0, 69, 73, 54, 70, - 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 + 735, 736, 89, 731, 137, 0, 192, 736, 197, 200, + 86, 212, 736, 713, 97, 74, 63, 69, 736, 736, + 83, 68, 78, 736, 736, 736, 124, 719, 678, 0, + 711, 128, 726, 212, 234, 736, 674, 680, 172, 672, + 196, 196, 257, 674, 670, 187, 191, 669, 667, 677, + 666, 679, 91, 659, 663, 672, 179, 209, 210, 0, + 281, 289, 308, 314, 293, 736, 0, 736, 232, 257, + 224, 227, 276, 292, 293, 277, 736, 673, 708, 736, + 294, 736, 328, 660, 670, 297, 665, 301, 307, 704, + + 0, 374, 663, 207, 655, 666, 660, 648, 645, 647, + 645, 690, 637, 653, 636, 645, 640, 637, 638, 633, + 300, 650, 643, 646, 0, 307, 317, 255, 313, 320, + 322, 638, 736, 0, 630, 632, 321, 640, 679, 678, + 677, 736, 406, 628, 629, 622, 622, 619, 633, 665, + 618, 613, 615, 632, 660, 624, 292, 625, 657, 612, + 608, 621, 608, 619, 612, 615, 604, 328, 736, 736, + 332, 736, 736, 600, 0, 602, 339, 651, 608, 736, + 736, 438, 599, 610, 597, 641, 605, 593, 592, 601, + 607, 593, 602, 591, 599, 594, 597, 634, 209, 580, + + 632, 581, 592, 579, 590, 622, 621, 736, 736, 588, + 0, 576, 623, 622, 584, 736, 573, 470, 577, 571, + 569, 579, 570, 562, 575, 612, 561, 576, 572, 574, + 557, 548, 555, 736, 556, 553, 550, 736, 550, 548, + 557, 546, 553, 560, 557, 0, 549, 736, 736, 546, + 552, 539, 538, 544, 540, 549, 581, 535, 736, 547, + 537, 532, 535, 529, 541, 578, 527, 528, 204, 537, + 574, 521, 567, 533, 522, 736, 564, 517, 567, 525, + 565, 559, 517, 508, 526, 506, 554, 520, 519, 518, + 555, 554, 736, 507, 500, 736, 503, 545, 736, 492, + + 322, 491, 500, 512, 545, 736, 498, 736, 492, 502, + 485, 479, 478, 466, 502, 450, 500, 736, 736, 465, + 450, 448, 459, 495, 460, 436, 441, 439, 444, 736, + 483, 434, 439, 426, 418, 419, 431, 736, 416, 736, + 414, 429, 412, 426, 736, 416, 412, 460, 421, 414, + 736, 415, 403, 449, 388, 348, 391, 437, 436, 387, + 392, 386, 394, 393, 736, 374, 382, 384, 376, 736, + 420, 367, 418, 366, 736, 736, 362, 358, 354, 404, + 403, 350, 349, 362, 398, 736, 355, 736, 396, 395, + 341, 387, 736, 736, 386, 385, 327, 736, 331, 736, + + 736, 325, 736, 736, 736, 373, 334, 371, 736, 313, + 736, 302, 207, 244, 736, 736, 515, 520, 525, 530, + 535, 540, 543, 216, 130, 115, 87 } ; -static const flex_int16_t yy_def[404] = +static const flex_int16_t yy_def[428] = { 0, - 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, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 398, 392, 392, 392, 392, 392, 392, 392, 392, - 400, 45, 45, 45, 45, 45, 399, 392, 397, 45, + 416, 1, 417, 417, 1, 5, 5, 5, 5, 5, + 416, 416, 416, 416, 416, 418, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 419, + 416, 416, 416, 420, 15, 416, 45, 45, 45, 45, + 45, 45, 421, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 418, + 416, 416, 416, 416, 416, 416, 422, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 419, 416, + 420, 416, 416, 45, 45, 45, 45, 45, 45, 423, + + 45, 421, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 422, 416, 416, 416, 416, 416, + 416, 416, 416, 424, 45, 45, 45, 45, 45, 45, + 423, 416, 421, 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, 416, 416, 416, + 416, 416, 416, 416, 425, 45, 45, 45, 45, 416, + 416, 421, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 392, 392, 392, 402, 45, 45, 45, 45, 392, 397, + 45, 45, 45, 45, 45, 45, 45, 416, 416, 416, + 426, 45, 45, 45, 45, 416, 45, 421, 45, 45, 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, 416, 45, 45, 45, 416, 45, 45, + 45, 45, 45, 45, 416, 427, 45, 416, 416, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 416, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 392, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 416, 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 + 45, 45, 416, 45, 45, 416, 45, 45, 416, 45, + + 45, 45, 45, 45, 45, 416, 45, 416, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 416, 416, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 416, + 45, 45, 45, 45, 45, 45, 45, 416, 45, 416, + 45, 45, 45, 45, 416, 45, 45, 45, 45, 45, + 416, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 416, 45, 45, 45, 45, 416, + 45, 45, 45, 45, 416, 416, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 416, 45, 416, 45, 45, + 45, 45, 416, 416, 45, 45, 45, 416, 45, 416, + + 416, 45, 416, 416, 416, 45, 45, 45, 416, 45, + 416, 45, 45, 45, 416, 0, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416 } ; -static const flex_int16_t yy_nxt[779] = +static const flex_int16_t yy_nxt[803] = { 0, 12, 13, 14, 13, 12, 15, 16, 12, 17, 18, 19, 20, 21, 22, 22, 22, 23, 24, 12, 12, @@ -900,85 +906,89 @@ static const flex_int16_t yy_nxt[779] = 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, 90, 42, 75, 80, 12, 12, 81, 76, 12, + 42, 91, 42, 76, 81, 12, 12, 82, 77, 12, - 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, + 83, 12, 82, 81, 12, 79, 12, 79, 12, 83, + 80, 80, 80, 81, 12, 12, 12, 12, 39, 246, + 12, 82, 84, 12, 83, 42, 85, 42, 12, 42, + 116, 42, 117, 86, 211, 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, 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, + 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, 296, + 74, 74, 74, 75, 75, 75, 73, 92, 98, 99, + 175, 73, 121, 71, 73, 74, 74, 74, 96, 105, + 106, 98, 122, 99, 107, 73, 73, 98, 99, 108, + 73, 109, 297, 73, 110, 80, 80, 80, 93, 415, + 98, 126, 99, 235, 127, 73, 45, 45, 145, 146, + 45, 45, 101, 236, 414, 123, 124, 45, 45, 45, + 80, 80, 80, 45, 126, 45, 45, 127, 45, 170, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 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 + 45, 45, 45, 45, 75, 75, 75, 45, 170, 92, + + 71, 45, 72, 72, 72, 73, 75, 75, 75, 45, + 128, 128, 45, 73, 45, 102, 79, 73, 79, 126, + 127, 80, 80, 80, 73, 71, 137, 74, 74, 74, + 93, 139, 73, 91, 128, 131, 73, 140, 73, 168, + 91, 163, 129, 130, 169, 168, 170, 169, 196, 178, + 137, 197, 208, 213, 214, 139, 208, 73, 372, 164, + 413, 140, 215, 168, 91, 173, 412, 169, 91, 171, + 172, 208, 91, 178, 325, 209, 411, 410, 409, 326, + 91, 408, 407, 91, 406, 91, 134, 143, 143, 143, + 405, 404, 403, 402, 143, 143, 143, 143, 143, 143, + + 401, 400, 399, 398, 373, 397, 396, 395, 394, 393, + 392, 391, 390, 143, 143, 143, 143, 143, 143, 182, + 182, 182, 389, 388, 387, 386, 182, 182, 182, 182, + 182, 182, 385, 384, 383, 382, 381, 380, 379, 378, + 377, 376, 375, 374, 371, 182, 182, 182, 182, 182, + 182, 218, 218, 218, 370, 369, 368, 367, 218, 218, + 218, 218, 218, 218, 366, 365, 364, 363, 362, 361, + 360, 359, 358, 357, 356, 355, 354, 218, 218, 218, + 218, 218, 218, 45, 45, 45, 353, 352, 351, 350, + 45, 45, 45, 45, 45, 45, 349, 348, 347, 346, + + 345, 344, 343, 342, 341, 340, 339, 338, 337, 45, + 45, 45, 45, 45, 45, 36, 36, 36, 36, 36, + 70, 336, 70, 70, 70, 89, 335, 89, 334, 89, + 91, 91, 91, 91, 91, 100, 100, 100, 100, 100, + 125, 333, 125, 125, 125, 141, 141, 141, 332, 331, + 330, 329, 328, 327, 324, 323, 322, 321, 320, 319, + 318, 317, 316, 315, 314, 313, 312, 311, 310, 309, + 308, 307, 306, 305, 304, 303, 302, 301, 300, 299, + 298, 295, 294, 293, 292, 291, 290, 289, 288, 287, + 286, 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, + 245, 244, 243, 242, 241, 240, 239, 238, 237, 234, + 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, + 223, 222, 221, 220, 219, 217, 216, 212, 210, 207, + 206, 205, 204, 203, 202, 201, 200, 199, 198, 195, + 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, + 184, 183, 142, 181, 180, 179, 177, 176, 174, 167, + 166, 165, 162, 161, 160, 159, 158, 157, 156, 155, + + 154, 153, 152, 151, 150, 149, 148, 147, 144, 142, + 138, 136, 135, 133, 132, 120, 119, 118, 115, 114, + 113, 112, 111, 104, 103, 97, 95, 94, 43, 90, + 88, 87, 78, 43, 416, 11, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + + 416, 416 } ; -static const flex_int16_t yy_chk[779] = +static const flex_int16_t yy_chk[803] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -989,12 +999,12 @@ static const flex_int16_t yy_chk[779] = 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, 403, 13, 21, 26, 5, 5, 27, 21, 5, + 13, 427, 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, 402, + 25, 25, 25, 26, 5, 5, 7, 10, 5, 426, 8, 27, 31, 5, 28, 37, 32, 37, 5, 42, - 62, 42, 62, 33, 401, 5, 5, 15, 15, 15, + 63, 42, 63, 33, 425, 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, @@ -1002,69 +1012,73 @@ static const flex_int16_t yy_chk[779] = 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, 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, + 15, 15, 15, 17, 49, 17, 17, 17, 19, 269, + 19, 19, 19, 20, 20, 20, 17, 44, 51, 52, + 424, 19, 67, 22, 20, 22, 22, 22, 49, 56, + 56, 68, 67, 69, 56, 17, 22, 51, 52, 56, + 19, 57, 269, 20, 57, 79, 79, 79, 44, 414, + 68, 81, 69, 199, 82, 22, 45, 45, 104, 104, + 45, 45, 53, 199, 413, 68, 69, 45, 45, 53, + 80, 80, 80, 45, 81, 45, 45, 82, 45, 128, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 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 + 45, 45, 45, 53, 71, 71, 71, 53, 128, 91, + + 72, 53, 72, 72, 72, 71, 75, 75, 75, 53, + 83, 86, 53, 72, 53, 53, 73, 75, 73, 84, + 85, 73, 73, 73, 71, 74, 96, 74, 74, 74, + 91, 98, 72, 93, 83, 86, 75, 99, 74, 126, + 93, 121, 84, 85, 127, 129, 131, 130, 157, 137, + 96, 157, 168, 177, 177, 98, 171, 74, 356, 121, + 412, 99, 177, 126, 93, 131, 410, 127, 93, 129, + 130, 168, 93, 137, 301, 171, 408, 407, 406, 301, + 93, 402, 399, 93, 397, 93, 93, 102, 102, 102, + 396, 395, 392, 391, 102, 102, 102, 102, 102, 102, + + 390, 389, 387, 385, 356, 384, 383, 382, 381, 380, + 379, 378, 377, 102, 102, 102, 102, 102, 102, 143, + 143, 143, 374, 373, 372, 371, 143, 143, 143, 143, + 143, 143, 369, 368, 367, 366, 364, 363, 362, 361, + 360, 359, 358, 357, 355, 143, 143, 143, 143, 143, + 143, 182, 182, 182, 354, 353, 352, 350, 182, 182, + 182, 182, 182, 182, 349, 348, 347, 346, 344, 343, + 342, 341, 339, 337, 336, 335, 334, 182, 182, 182, + 182, 182, 182, 218, 218, 218, 333, 332, 331, 329, + 218, 218, 218, 218, 218, 218, 328, 327, 326, 325, + + 324, 323, 322, 321, 320, 317, 316, 315, 314, 218, + 218, 218, 218, 218, 218, 417, 417, 417, 417, 417, + 418, 313, 418, 418, 418, 419, 312, 419, 311, 419, + 420, 420, 420, 420, 420, 421, 421, 421, 421, 421, + 422, 310, 422, 422, 422, 423, 423, 423, 309, 307, + 305, 304, 303, 302, 300, 298, 297, 295, 294, 292, + 291, 290, 289, 288, 287, 286, 285, 284, 283, 282, + 281, 280, 279, 278, 277, 275, 274, 273, 272, 271, + 270, 268, 267, 266, 265, 264, 263, 262, 261, 260, + 258, 257, 256, 255, 254, 253, 252, 251, 250, 247, + + 245, 244, 243, 242, 241, 240, 239, 237, 236, 235, + 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, + 223, 222, 221, 220, 219, 217, 215, 214, 213, 212, + 210, 207, 206, 205, 204, 203, 202, 201, 200, 198, + 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, + 187, 186, 185, 184, 183, 179, 178, 176, 174, 167, + 166, 165, 164, 163, 162, 161, 160, 159, 158, 156, + 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, + 145, 144, 141, 140, 139, 138, 136, 135, 132, 124, + 123, 122, 120, 119, 118, 117, 116, 115, 114, 113, + + 112, 111, 110, 109, 108, 107, 106, 105, 103, 100, + 97, 95, 94, 89, 88, 66, 65, 64, 62, 61, + 60, 59, 58, 55, 54, 50, 48, 47, 43, 41, + 39, 38, 24, 14, 11, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + 416, 416, 416, 416, 416, 416, 416, 416, 416, 416, + + 416, 416 } ; static yy_state_type yy_last_accepting_state; @@ -1073,15 +1087,15 @@ static char *yy_last_accepting_cpos; extern int yy_flex_debug; int yy_flex_debug = 1; -static const flex_int16_t yy_rule_linenum[64] = +static const flex_int16_t yy_rule_linenum[67] = { 0, 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, 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 + 374, 384, 394, 403, 412, 422, 431, 440, 449, 458, + 467, 476, 485, 498, 507, 516, 525, 534, 544, 643, + 648, 653, 658, 659, 660, 661, 662, 663, 665, 683, + 696, 701, 705, 707, 709, 711 } ; /* The intent behind this definition is that it'll catch @@ -1132,7 +1146,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 1135 "d2_lexer.cc" +#line 1149 "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 @@ -1158,8 +1172,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 1161 "d2_lexer.cc" -#line 1162 "d2_lexer.cc" +#line 1175 "d2_lexer.cc" +#line 1176 "d2_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1477,7 +1491,7 @@ YY_DECL } -#line 1480 "d2_lexer.cc" +#line 1494 "d2_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1506,13 +1520,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 >= 393 ) + if ( yy_current_state >= 417 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 392 ); + while ( yy_current_state != 416 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1531,13 +1545,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 64 ) + else if ( yy_act < 67 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 64 ) + else if ( yy_act == 67 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 65 ) + else if ( yy_act == 68 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1932,8 +1946,11 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_STRING("control-socket", driver.loc_); } } - -\"socket-type\" { + YY_BREAK +case 34: +YY_RULE_SETUP +#line 403 "d2_lexer.ll" +{ switch(driver.ctx_) { case isc::d2::D2ParserContext::CONTROL_SOCKET: return isc::d2::D2Parser::make_SOCKET_TYPE(driver.loc_); @@ -1941,8 +1958,11 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_STRING("socket-type", driver.loc_); } } - -\"socket-name\" { + YY_BREAK +case 35: +YY_RULE_SETUP +#line 412 "d2_lexer.ll" +{ switch(driver.ctx_) { case isc::d2::D2ParserContext::CONTROL_SOCKET: return isc::d2::D2Parser::make_SOCKET_NAME(driver.loc_); @@ -1950,9 +1970,11 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_STRING("socket-name", driver.loc_); } } - - -\"Logging\" { + YY_BREAK +case 36: +YY_RULE_SETUP +#line 422 "d2_lexer.ll" +{ switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: return isc::d2::D2Parser::make_LOGGING(driver.loc_); @@ -1961,9 +1983,9 @@ YY_RULE_SETUP } } YY_BREAK -case 34: +case 37: YY_RULE_SETUP -#line 428 "d2_lexer.ll" +#line 431 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGING: @@ -1973,9 +1995,9 @@ YY_RULE_SETUP } } YY_BREAK -case 35: +case 38: YY_RULE_SETUP -#line 437 "d2_lexer.ll" +#line 440 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -1985,9 +2007,9 @@ YY_RULE_SETUP } } YY_BREAK -case 36: +case 39: YY_RULE_SETUP -#line 446 "d2_lexer.ll" +#line 449 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -1997,9 +2019,9 @@ YY_RULE_SETUP } } YY_BREAK -case 37: +case 40: YY_RULE_SETUP -#line 455 "d2_lexer.ll" +#line 458 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2009,9 +2031,9 @@ YY_RULE_SETUP } } YY_BREAK -case 38: +case 41: YY_RULE_SETUP -#line 464 "d2_lexer.ll" +#line 467 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2021,9 +2043,9 @@ YY_RULE_SETUP } } YY_BREAK -case 39: +case 42: YY_RULE_SETUP -#line 473 "d2_lexer.ll" +#line 476 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2033,9 +2055,9 @@ YY_RULE_SETUP } } YY_BREAK -case 40: +case 43: YY_RULE_SETUP -#line 482 "d2_lexer.ll" +#line 485 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2049,9 +2071,9 @@ YY_RULE_SETUP } } YY_BREAK -case 41: +case 44: YY_RULE_SETUP -#line 495 "d2_lexer.ll" +#line 498 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2061,9 +2083,9 @@ YY_RULE_SETUP } } YY_BREAK -case 42: +case 45: YY_RULE_SETUP -#line 504 "d2_lexer.ll" +#line 507 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2073,9 +2095,9 @@ YY_RULE_SETUP } } YY_BREAK -case 43: +case 46: YY_RULE_SETUP -#line 513 "d2_lexer.ll" +#line 516 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2085,9 +2107,9 @@ YY_RULE_SETUP } } YY_BREAK -case 44: +case 47: YY_RULE_SETUP -#line 522 "d2_lexer.ll" +#line 525 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2097,9 +2119,9 @@ YY_RULE_SETUP } } YY_BREAK -case 45: +case 48: YY_RULE_SETUP -#line 531 "d2_lexer.ll" +#line 534 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2109,9 +2131,9 @@ YY_RULE_SETUP } } YY_BREAK -case 46: +case 49: YY_RULE_SETUP -#line 541 "d2_lexer.ll" +#line 544 "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. @@ -2211,65 +2233,65 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 47: -/* rule 47 can match eol */ +case 50: +/* rule 50 can match eol */ YY_RULE_SETUP -#line 640 "d2_lexer.ll" +#line 643 "d2_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK -case 48: -/* rule 48 can match eol */ +case 51: +/* rule 51 can match eol */ YY_RULE_SETUP -#line 645 "d2_lexer.ll" +#line 648 "d2_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK -case 49: +case 52: YY_RULE_SETUP -#line 650 "d2_lexer.ll" +#line 653 "d2_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK -case 50: +case 53: YY_RULE_SETUP -#line 655 "d2_lexer.ll" +#line 658 "d2_lexer.ll" { return isc::d2::D2Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 51: +case 54: YY_RULE_SETUP -#line 656 "d2_lexer.ll" +#line 659 "d2_lexer.ll" { return isc::d2::D2Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 52: +case 55: YY_RULE_SETUP -#line 657 "d2_lexer.ll" +#line 660 "d2_lexer.ll" { return isc::d2::D2Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK -case 53: +case 56: YY_RULE_SETUP -#line 658 "d2_lexer.ll" +#line 661 "d2_lexer.ll" { return isc::d2::D2Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK -case 54: +case 57: YY_RULE_SETUP -#line 659 "d2_lexer.ll" +#line 662 "d2_lexer.ll" { return isc::d2::D2Parser::make_COMMA(driver.loc_); } YY_BREAK -case 55: +case 58: YY_RULE_SETUP -#line 660 "d2_lexer.ll" +#line 663 "d2_lexer.ll" { return isc::d2::D2Parser::make_COLON(driver.loc_); } YY_BREAK -case 56: +case 59: YY_RULE_SETUP -#line 662 "d2_lexer.ll" +#line 665 "d2_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2288,9 +2310,9 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 57: +case 60: YY_RULE_SETUP -#line 680 "d2_lexer.ll" +#line 683 "d2_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2304,43 +2326,43 @@ YY_RULE_SETUP return isc::d2::D2Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 58: +case 61: YY_RULE_SETUP -#line 693 "d2_lexer.ll" +#line 696 "d2_lexer.ll" { string tmp(yytext); return isc::d2::D2Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 59: +case 62: YY_RULE_SETUP -#line 698 "d2_lexer.ll" +#line 701 "d2_lexer.ll" { return isc::d2::D2Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 60: +case 63: YY_RULE_SETUP -#line 702 "d2_lexer.ll" +#line 705 "d2_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK -case 61: +case 64: YY_RULE_SETUP -#line 704 "d2_lexer.ll" +#line 707 "d2_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK -case 62: +case 65: YY_RULE_SETUP -#line 706 "d2_lexer.ll" +#line 709 "d2_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK -case 63: +case 66: YY_RULE_SETUP -#line 708 "d2_lexer.ll" +#line 711 "d2_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 710 "d2_lexer.ll" +#line 713 "d2_lexer.ll" { if (driver.states_.empty()) { return isc::d2::D2Parser::make_END(driver.loc_); @@ -2364,12 +2386,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 64: +case 67: YY_RULE_SETUP -#line 733 "d2_lexer.ll" +#line 736 "d2_lexer.ll" ECHO; YY_BREAK -#line 2369 "d2_lexer.cc" +#line 2394 "d2_lexer.cc" case YY_END_OF_BUFFER: { @@ -2688,7 +2710,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 >= 393 ) + if ( yy_current_state >= 417 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2721,11 +2743,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 >= 393 ) + if ( yy_current_state >= 417 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 392); + yy_is_jam = (yy_current_state == 416); return yy_is_jam ? 0 : yy_current_state; } @@ -3474,7 +3496,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 733 "d2_lexer.ll" +#line 736 "d2_lexer.ll" using namespace isc::dhcp;