From 1385ea95f09b896645a211cbc96f56d58c765c25 Mon Sep 17 00:00:00 2001 From: Jin Xu Date: Fri, 6 Nov 2026 19:41:04 +0800 Subject: [PATCH 1/2] Parse single-precision floating column declarations completely Adapt the single-precision length rule from Vitess 7314463f4658. FLOAT(24), DOUBLE(24), and REAL(24) previously fell back to partial DDL without a TableSpec, hiding following defaults from consumer checks. Preserve the SQLite-compatible type spellings and two-number forms. This changes the DDL AST and exposes CURRENT_TIMESTAMP defaults to the CovenantSQL sanitizer, intentionally tightening consensus acceptance. --- parse_test.go | 38 +- sql.go | 2369 +++++++++++++++++++++++++------------------------ sql.y | 4 + 3 files changed, 1232 insertions(+), 1179 deletions(-) diff --git a/parse_test.go b/parse_test.go index 7e40ba9..9700ef1 100644 --- a/parse_test.go +++ b/parse_test.go @@ -393,12 +393,12 @@ var ( input: "select /* quote in double quoted string */ \"a'a\" from t", output: "select /* quote in double quoted string */ 'a''a' from t", }, { - input: "select /* backslash quote in string */ 'a''a' from t", + input: "select /* backslash quote in string */ 'a''a' from t", output: "select /* backslash quote in string */ 'a''a' from t", }, { input: "select /* literal backslash in string */ 'a\\\\na' from t", }, { - input: "select /* non-escape */ '\\x' from t", + input: "select /* non-escape */ '\\x' from t", }, { input: "select /* unescaped backslash */ '\\n' from t", }, { @@ -688,6 +688,40 @@ func TestValid(t *testing.T) { } } +func TestFloatColumnPrecision(t *testing.T) { + for _, typ := range []string{"float", "double", "real"} { + input := "create table t (a " + typ + "(24) default current_timestamp)" + queries, statements, err := ParseMultiple(NewStringTokenizer(input)) + if err != nil { + t.Errorf("ParseMultiple(%q): %v", input, err) + continue + } + if len(queries) != 1 || queries[0] != input || len(statements) != 1 { + t.Errorf("ParseMultiple(%q): unexpected result %v, %v", input, queries, statements) + continue + } + ddl := statements[0].(*DDL) + if ddl.TableSpec == nil || len(ddl.TableSpec.Columns) != 1 { + t.Errorf("ParseMultiple(%q): missing column specification", input) + continue + } + column := ddl.TableSpec.Columns[0].Type + if column.Type != typ || column.Length == nil || string(column.Length.Val) != "24" || column.Scale != nil { + t.Errorf("ParseMultiple(%q): unexpected column type %+v", input, column) + } + foundDefault := false + Walk(func(node SQLNode) (bool, error) { + if value, ok := node.(*SQLVal); ok && value.Type == ValArg && bytes.EqualFold(value.Val, []byte("current_timestamp")) { + foundDefault = true + } + return true, nil + }, column.Default) + if !foundDefault { + t.Errorf("ParseMultiple(%q): missing stateful default", input) + } + } +} + func TestCaseSensitivity(t *testing.T) { validSQL := []struct { input string diff --git a/sql.go b/sql.go index 663f85a..deb956e 100644 --- a/sql.go +++ b/sql.go @@ -402,523 +402,532 @@ var yyExca = [...]int{ 5, 17, -2, 4, -1, 119, - 1, 158, - 5, 158, - 11, 158, - 12, 158, - 13, 158, - 14, 158, - 16, 158, - 27, 158, - 30, 158, - 31, 158, - 33, 158, - 35, 158, - 36, 158, - 37, 158, - 38, 158, - 40, 158, - 41, 158, - 157, 158, - -2, 171, + 1, 159, + 5, 159, + 11, 159, + 12, 159, + 13, 159, + 14, 159, + 16, 159, + 27, 159, + 30, 159, + 31, 159, + 33, 159, + 35, 159, + 36, 159, + 37, 159, + 38, 159, + 40, 159, + 41, 159, + 157, 159, + -2, 172, -1, 190, - 94, 359, - -2, 355, - -1, 191, 94, 360, -2, 356, + -1, 191, + 94, 361, + -2, 357, -1, 409, 5, 17, - -2, 328, + -2, 329, -1, 417, - 94, 177, - -2, 151, + 94, 178, + -2, 152, -1, 527, - 94, 362, - -2, 358, + 94, 363, + -2, 359, -1, 559, 5, 18, - -2, 229, + -2, 230, -1, 617, 5, 18, - -2, 329, - -1, 681, + -2, 330, + -1, 682, 5, 17, - -2, 331, - -1, 742, - 5, 18, -2, 332, + -1, 743, + 5, 18, + -2, 333, } const yyPrivate = 57344 -const yyLast = 4330 +const yyLast = 4413 var yyAct = [...]int{ - 191, 389, 541, 467, 632, 437, 176, 414, 542, 699, - 522, 32, 415, 597, 436, 533, 413, 213, 448, 48, - 496, 344, 178, 98, 98, 46, 433, 554, 104, 473, - 524, 193, 442, 267, 463, 116, 94, 144, 412, 98, - 124, 31, 48, 725, 115, 146, 214, 3, 126, 204, - 574, 140, 455, 636, 125, 142, 114, 130, 438, 717, - 715, 474, 131, 346, 695, 475, 637, 638, 639, 134, - 474, 92, 450, 102, 640, 25, 27, 15, 16, 112, - 648, 86, 129, 87, 265, 136, 98, 260, 259, 568, - 128, 98, 22, 362, 361, 371, 372, 364, 365, 366, - 367, 368, 369, 370, 363, 85, 729, 687, 29, 651, - 133, 88, 98, 620, 603, 552, 90, 485, 89, 195, - 388, 98, 98, 98, 141, 363, 350, 551, 598, 348, - 676, 98, 349, 348, 98, 534, 98, 98, 456, 678, - 179, 26, 98, 139, 350, 696, 694, 504, 350, 449, - 366, 367, 368, 369, 370, 363, 196, 605, 217, 258, - 501, 502, 503, 500, 18, 19, 20, 26, 121, 147, - 194, 641, 103, 343, 269, 109, 572, 349, 348, 120, - 21, 23, 402, 403, 24, 29, 255, 256, 534, 200, - 609, 93, 99, 350, 349, 348, 499, 698, 135, 98, - 489, 491, 492, 98, 98, 98, 98, 490, 126, 697, - 350, 577, 98, 353, 576, 575, 98, 349, 348, 98, - 452, 28, 48, 48, 404, 741, 634, 453, 441, 126, - 589, 590, 591, 350, 405, 125, 731, 732, 416, 419, - 569, 421, 352, 390, 409, 145, 395, 418, 737, 420, - 26, 429, 430, 736, 132, 432, 98, 98, 469, 138, - 427, 215, 431, 443, 642, 351, 98, 98, 362, 361, + 191, 389, 414, 467, 632, 541, 176, 542, 700, 178, + 522, 32, 415, 94, 436, 597, 413, 267, 533, 48, + 437, 496, 213, 98, 98, 46, 554, 433, 214, 3, + 524, 344, 124, 438, 412, 442, 473, 144, 142, 98, + 104, 448, 48, 193, 156, 31, 463, 726, 126, 146, + 204, 637, 638, 639, 125, 102, 140, 574, 116, 640, + 115, 114, 455, 346, 636, 130, 362, 361, 371, 372, + 364, 365, 366, 367, 368, 369, 370, 363, 718, 716, + 696, 474, 475, 119, 649, 131, 98, 474, 134, 450, + 112, 98, 25, 27, 15, 16, 86, 129, 87, 92, + 730, 598, 265, 260, 259, 363, 568, 688, 136, 22, + 128, 85, 98, 366, 367, 368, 369, 370, 363, 195, + 652, 98, 98, 98, 620, 29, 603, 552, 485, 388, + 141, 98, 179, 26, 98, 217, 98, 98, 196, 88, + 350, 551, 98, 133, 90, 348, 89, 677, 139, 258, + 452, 534, 349, 348, 103, 456, 641, 453, 572, 26, + 350, 697, 695, 200, 699, 119, 449, 109, 350, 147, + 194, 120, 698, 343, 402, 403, 534, 269, 609, 577, + 576, 18, 19, 20, 371, 372, 364, 365, 366, 367, + 368, 369, 370, 363, 255, 256, 380, 21, 23, 98, + 29, 24, 575, 98, 98, 98, 98, 742, 126, 349, + 348, 499, 98, 353, 634, 416, 98, 349, 348, 98, + 732, 733, 48, 48, 679, 350, 409, 569, 441, 126, + 528, 135, 432, 350, 405, 125, 404, 145, 28, 589, + 590, 591, 26, 390, 431, 738, 395, 119, 119, 119, + 119, 429, 430, 215, 737, 443, 98, 98, 469, 642, + 119, 427, 419, 418, 421, 420, 98, 98, 362, 361, 371, 372, 364, 365, 366, 367, 368, 369, 370, 363, - 199, 528, 349, 348, 691, 690, 465, 466, 480, 145, - 476, 220, 381, 645, 644, 619, 145, 33, 350, 257, - 528, 145, 261, 434, 263, 264, 361, 371, 372, 364, - 365, 366, 367, 368, 369, 370, 363, 387, 202, 145, - 391, 392, 393, 480, 396, 222, 221, 201, 397, 398, - 399, 615, 550, 202, 643, 550, 481, 156, 410, 25, - 202, 25, 480, 120, 120, 120, 120, 48, 562, 25, - 400, 29, 457, 126, 468, 627, 215, 206, 209, 483, - 207, 680, 208, 210, 555, 556, 480, 411, 458, 459, - 407, 408, 29, 565, 29, 464, 119, 41, 497, 460, - 461, 462, 29, 206, 209, 578, 207, 48, 208, 210, - 558, 555, 556, 521, 579, 441, 424, 426, 209, 423, - 425, 12, 422, 126, 535, 571, 735, 734, 566, 472, - 262, 48, 486, 487, 126, 493, 494, 548, 212, 143, - 110, 527, 526, 547, 470, 471, 105, 529, 536, 537, - 538, 543, 539, 416, 477, 478, 108, 48, 431, 549, - 706, 106, 563, 441, 416, 560, 540, 525, 557, 531, - 33, 36, 705, 266, 650, 390, 530, 545, 119, 434, - 137, 122, 35, 37, 194, 100, 567, 38, 39, 559, - 30, 1, 91, 631, 48, 445, 98, 101, 435, 123, - 126, 40, 98, 126, 582, 48, 125, 444, 693, 380, - 635, 126, 441, 451, 573, 454, 570, 586, 561, 585, - 225, 226, 584, 224, 228, 227, 583, 223, 659, 211, - 216, 482, 43, 416, 580, 111, 150, 688, 527, 588, - 546, 592, 26, 497, 364, 365, 366, 367, 368, 369, - 370, 363, 391, 401, 192, 704, 649, 607, 394, 532, - 119, 119, 119, 119, 525, 154, 155, 488, 608, 544, - 165, 26, 162, 119, 601, 164, 163, 126, 152, 441, - 600, 621, 606, 48, 406, 48, 48, 622, 354, 441, - 630, 441, 633, 611, 612, 613, 614, 629, 177, 98, - 98, 153, 616, 617, 618, 527, 625, 416, 148, 628, - 118, 197, 604, 205, 203, 553, 117, 479, 610, 724, - 14, 95, 95, 34, 48, 113, 11, 652, 390, 10, - 441, 624, 17, 657, 9, 623, 8, 95, 675, 626, - 48, 48, 120, 7, 679, 6, 684, 685, 48, 5, - 48, 4, 683, 107, 126, 563, 441, 13, 543, 656, - 689, 2, 0, 0, 581, 0, 0, 48, 48, 0, - 686, 0, 48, 441, 441, 126, 703, 702, 441, 0, - 0, 0, 658, 0, 95, 681, 602, 713, 0, 95, - 0, 0, 0, 677, 382, 383, 384, 385, 386, 0, - 0, 0, 0, 727, 0, 416, 0, 0, 48, 0, - 95, 0, 48, 498, 441, 709, 733, 710, 633, 95, - 219, 95, 0, 543, 0, 701, 701, 0, 739, 95, - 658, 0, 95, 0, 95, 95, 0, 0, 0, 0, - 268, 347, 0, 0, 0, 0, 0, 0, 0, 728, - 48, 0, 48, 0, 0, 0, 743, 0, 126, 0, - 0, 0, 726, 0, 744, 0, 730, 646, 647, 0, - 0, 0, 0, 0, 0, 0, 544, 0, 0, 682, - 0, 0, 740, 0, 0, 0, 742, 0, 0, 738, - 390, 0, 692, 0, 0, 0, 0, 95, 0, 0, - 219, 95, 95, 95, 95, 0, 0, 700, 700, 0, - 428, 0, 0, 0, 95, 0, 0, 219, 0, 711, - 0, 712, 0, 714, 0, 716, 0, 718, 719, 720, - 721, 722, 723, 0, 0, 0, 0, 0, 0, 119, - 0, 544, 0, 26, 0, 69, 0, 523, 0, 151, - 0, 0, 0, 0, 95, 95, 183, 61, 498, 0, - 0, 0, 0, 0, 95, 95, 0, 29, 0, 0, - 190, 167, 166, 168, 169, 170, 171, 172, 0, 0, - 173, 174, 175, 0, 0, 0, 0, 149, 160, 0, - 182, 495, 0, 0, 505, 506, 507, 508, 509, 510, - 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, - 0, 157, 158, 345, 0, 0, 0, 188, 0, 159, - 0, 161, 371, 372, 364, 365, 366, 367, 368, 369, - 370, 363, 0, 187, 0, 70, 0, 0, 58, 0, - 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, - 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, - 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, - 64, 62, 0, 72, 80, 84, 674, 184, 185, 186, - 189, 180, 181, 0, 81, 0, 347, 268, 0, 0, - 0, 0, 0, 0, 0, 219, 347, 347, 347, 0, - 0, 0, 0, 0, 239, 0, 219, 244, 245, 246, - 247, 248, 249, 0, 250, 251, 252, 253, 254, 240, - 241, 242, 243, 229, 230, 0, 0, 231, 232, 233, - 234, 235, 236, 237, 238, 0, 0, 0, 593, 594, - 595, 596, 0, 0, 0, 661, 0, 0, 670, 671, - 672, 669, 0, 673, 0, 0, 0, 0, 663, 0, - 666, 668, 662, 0, 660, 0, 0, 664, 0, 0, - 0, 0, 0, 0, 95, 219, 0, 665, 667, 347, - 95, 356, 0, 360, 268, 0, 0, 0, 0, 373, - 374, 375, 376, 377, 378, 0, 357, 358, 359, 355, - 379, 362, 361, 371, 372, 364, 365, 366, 367, 368, - 369, 370, 363, 0, 0, 0, 653, 0, 0, 0, - 0, 0, 347, 0, 0, 0, 0, 0, 0, 0, - 347, 599, 0, 0, 0, 654, 655, 362, 361, 371, - 372, 364, 365, 366, 367, 368, 369, 370, 363, 219, - 0, 268, 362, 361, 371, 372, 364, 365, 366, 367, - 368, 369, 370, 363, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 95, 95, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 708, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 347, 334, 325, 303, 336, 284, 295, 341, 296, - 297, 319, 276, 311, 69, 0, 287, 272, 293, 273, - 285, 305, 308, 283, 327, 338, 61, 307, 309, 324, - 302, 320, 279, 314, 317, 337, 0, 0, 0, 47, - 0, 439, 440, 0, 0, 0, 0, 219, 0, 316, - 333, 294, 0, 0, 318, 271, 315, 0, 275, 277, - 340, 331, 290, 291, 564, 0, 0, 0, 0, 0, - 306, 310, 321, 312, 300, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 288, 0, 313, 0, 0, 0, - 304, 0, 278, 0, 289, 322, 270, 329, 339, 301, - 332, 299, 298, 335, 70, 0, 0, 58, 328, 286, - 53, 292, 342, 78, 73, 65, 59, 60, 49, 0, - 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, - 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, - 62, 274, 72, 80, 84, 330, 282, 280, 281, 323, - 0, 0, 326, 81, 334, 325, 303, 336, 284, 295, - 341, 296, 297, 319, 276, 311, 69, 0, 287, 272, - 293, 273, 285, 305, 308, 283, 327, 338, 61, 307, - 309, 324, 302, 320, 279, 314, 317, 337, 0, 0, - 0, 47, 0, 439, 440, 0, 0, 0, 0, 0, - 0, 316, 333, 294, 0, 0, 318, 271, 315, 0, - 275, 277, 340, 331, 290, 291, 0, 0, 0, 0, - 0, 0, 306, 310, 321, 312, 300, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 288, 0, 313, 0, - 0, 0, 304, 0, 278, 0, 289, 322, 270, 329, - 339, 301, 332, 299, 298, 335, 70, 0, 0, 58, - 328, 286, 53, 292, 342, 78, 73, 65, 59, 60, - 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, - 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, - 77, 64, 62, 274, 72, 80, 84, 330, 282, 280, - 281, 323, 0, 0, 326, 81, 334, 325, 303, 336, - 284, 295, 341, 296, 297, 319, 276, 311, 69, 0, - 287, 272, 293, 273, 285, 305, 308, 283, 327, 338, - 61, 307, 309, 324, 302, 320, 279, 314, 317, 337, - 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 316, 333, 294, 0, 0, 318, 271, - 315, 0, 275, 277, 340, 331, 290, 291, 0, 0, - 0, 0, 0, 0, 306, 310, 321, 312, 300, 0, - 0, 0, 0, 0, 0, 0, 707, 0, 288, 0, - 313, 0, 0, 0, 304, 0, 278, 0, 289, 322, - 270, 329, 339, 301, 332, 299, 298, 335, 70, 0, - 0, 58, 328, 286, 53, 292, 342, 78, 73, 65, - 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, - 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, - 63, 50, 77, 64, 62, 274, 72, 80, 84, 330, - 282, 280, 281, 323, 0, 0, 326, 81, 334, 325, - 303, 336, 284, 295, 341, 296, 297, 319, 276, 311, - 69, 0, 287, 272, 293, 273, 285, 305, 308, 283, - 327, 338, 61, 307, 309, 324, 302, 320, 279, 314, - 317, 337, 29, 0, 0, 47, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 316, 333, 294, 0, 0, - 318, 271, 315, 0, 275, 277, 340, 331, 290, 291, - 0, 0, 0, 0, 0, 0, 306, 310, 321, 312, - 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 288, 0, 313, 0, 0, 0, 304, 0, 278, 0, - 289, 322, 270, 329, 339, 301, 332, 299, 298, 335, - 70, 0, 0, 58, 328, 286, 53, 292, 342, 78, - 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, - 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, - 79, 66, 63, 50, 77, 64, 62, 274, 72, 80, - 84, 330, 282, 280, 281, 323, 0, 0, 326, 81, - 334, 325, 303, 336, 284, 295, 341, 296, 297, 319, - 276, 311, 69, 0, 287, 272, 293, 273, 285, 305, - 308, 283, 327, 338, 61, 307, 309, 324, 302, 320, - 279, 314, 317, 337, 0, 0, 0, 190, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 316, 333, 294, - 0, 0, 318, 271, 315, 0, 275, 277, 340, 331, - 290, 291, 0, 0, 0, 0, 0, 0, 306, 310, - 321, 312, 300, 0, 0, 0, 0, 0, 0, 0, - 587, 0, 288, 0, 313, 0, 0, 0, 304, 0, - 278, 0, 289, 322, 270, 329, 339, 301, 332, 299, - 298, 335, 70, 0, 0, 58, 328, 286, 53, 292, - 342, 78, 73, 65, 59, 60, 49, 0, 71, 56, - 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, - 67, 74, 79, 66, 63, 50, 77, 64, 62, 274, - 72, 80, 84, 330, 282, 280, 281, 323, 0, 0, - 326, 81, 334, 325, 303, 336, 284, 295, 341, 296, - 297, 319, 276, 311, 69, 0, 287, 272, 293, 273, - 285, 305, 308, 283, 327, 338, 61, 307, 309, 324, - 302, 320, 279, 314, 317, 337, 0, 0, 0, 47, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 316, - 333, 294, 0, 0, 318, 271, 315, 0, 275, 277, - 340, 331, 290, 291, 0, 0, 0, 0, 0, 0, - 306, 310, 321, 312, 300, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 288, 0, 313, 0, 0, 0, - 304, 0, 278, 0, 289, 322, 270, 329, 339, 301, - 332, 299, 298, 335, 70, 0, 0, 58, 328, 286, - 53, 292, 342, 78, 73, 65, 59, 60, 49, 0, - 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, - 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, - 62, 274, 72, 80, 84, 330, 282, 280, 281, 323, - 0, 0, 326, 81, 334, 325, 303, 336, 284, 295, - 341, 296, 297, 319, 276, 311, 69, 0, 287, 272, - 293, 273, 285, 305, 308, 283, 327, 338, 61, 307, - 309, 324, 302, 320, 279, 314, 317, 337, 0, 0, - 0, 190, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 316, 333, 294, 0, 0, 318, 271, 315, 0, - 275, 277, 340, 331, 290, 291, 0, 0, 0, 0, - 0, 0, 306, 310, 321, 312, 300, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 288, 0, 313, 0, - 0, 0, 304, 0, 278, 0, 289, 322, 270, 329, - 339, 301, 332, 299, 298, 335, 70, 0, 0, 58, - 328, 286, 53, 292, 342, 78, 73, 65, 59, 60, - 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, - 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, - 77, 64, 62, 274, 72, 80, 84, 330, 282, 280, - 281, 323, 0, 0, 326, 81, 334, 325, 303, 336, - 284, 295, 341, 296, 297, 319, 276, 311, 69, 0, - 287, 272, 293, 273, 285, 305, 308, 283, 327, 338, - 61, 307, 309, 324, 302, 320, 279, 314, 317, 337, - 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 316, 333, 294, 0, 0, 318, 271, - 315, 0, 275, 277, 340, 331, 290, 291, 0, 0, - 0, 0, 0, 0, 306, 310, 321, 312, 300, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 288, 0, - 313, 0, 0, 0, 304, 0, 278, 0, 289, 322, - 270, 329, 339, 301, 332, 299, 298, 335, 70, 0, - 0, 58, 328, 286, 53, 292, 342, 78, 73, 65, - 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, - 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, - 63, 50, 77, 64, 62, 274, 72, 80, 84, 330, - 282, 280, 281, 323, 69, 0, 326, 81, 151, 0, - 0, 0, 0, 0, 0, 183, 61, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 29, 0, 0, 190, - 167, 166, 168, 169, 170, 171, 172, 0, 0, 173, - 174, 175, 0, 0, 0, 0, 149, 160, 0, 182, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 158, 345, 0, 0, 0, 188, 0, 159, 0, - 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 187, 0, 70, 0, 0, 58, 0, 0, - 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, - 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, - 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, - 62, 0, 72, 80, 84, 0, 184, 185, 186, 189, - 180, 181, 69, 81, 0, 0, 151, 0, 0, 0, - 0, 0, 0, 183, 61, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 0, 145, 190, 167, 166, - 168, 169, 170, 171, 172, 0, 0, 173, 174, 175, - 0, 0, 0, 0, 149, 160, 0, 182, 0, 0, + 504, 605, 692, 691, 381, 352, 480, 145, 434, 675, + 646, 645, 615, 501, 502, 503, 500, 476, 465, 466, + 364, 365, 366, 367, 368, 369, 370, 363, 351, 387, + 644, 643, 391, 392, 393, 481, 396, 550, 349, 348, + 397, 398, 399, 619, 145, 349, 348, 528, 145, 33, + 410, 202, 145, 202, 350, 120, 120, 120, 120, 222, + 221, 350, 489, 491, 492, 480, 25, 48, 215, 490, + 25, 25, 550, 126, 480, 480, 201, 562, 662, 483, + 400, 671, 672, 673, 670, 497, 674, 407, 408, 202, + 29, 664, 681, 667, 669, 663, 457, 661, 468, 29, + 665, 627, 565, 29, 29, 458, 459, 48, 555, 556, + 666, 668, 464, 521, 41, 441, 460, 461, 462, 535, + 498, 578, 579, 126, 424, 558, 526, 423, 425, 422, + 416, 48, 486, 487, 126, 493, 494, 548, 543, 571, + 431, 416, 525, 547, 527, 426, 209, 529, 536, 537, + 538, 736, 531, 735, 566, 12, 472, 48, 262, 545, + 549, 212, 540, 441, 539, 560, 143, 557, 206, 209, + 110, 207, 105, 208, 210, 390, 530, 563, 707, 106, + 206, 209, 33, 207, 194, 208, 210, 555, 556, 559, + 108, 706, 651, 434, 48, 266, 98, 137, 122, 582, + 126, 35, 98, 126, 150, 48, 125, 37, 100, 567, + 416, 126, 441, 30, 1, 91, 631, 586, 561, 36, + 445, 435, 123, 588, 585, 40, 580, 583, 654, 444, + 497, 694, 584, 635, 26, 38, 39, 451, 573, 525, + 454, 527, 592, 570, 391, 101, 119, 225, 226, 362, + 361, 371, 372, 364, 365, 366, 367, 368, 369, 370, + 363, 544, 224, 26, 228, 498, 227, 223, 660, 211, + 216, 608, 482, 43, 601, 111, 689, 126, 546, 441, + 600, 621, 606, 48, 416, 48, 48, 622, 401, 441, + 625, 441, 633, 611, 612, 613, 614, 629, 192, 98, + 98, 705, 616, 617, 618, 630, 624, 650, 527, 607, + 394, 532, 604, 154, 155, 488, 165, 162, 610, 164, + 163, 628, 152, 406, 48, 354, 153, 148, 390, 653, + 441, 118, 197, 658, 120, 623, 205, 203, 676, 626, + 48, 48, 553, 680, 117, 543, 685, 686, 48, 479, + 48, 725, 684, 14, 126, 34, 441, 659, 113, 657, + 690, 121, 382, 383, 384, 385, 386, 682, 48, 48, + 563, 11, 704, 48, 441, 441, 126, 703, 602, 441, + 10, 177, 687, 416, 93, 99, 17, 9, 714, 8, + 7, 6, 5, 678, 4, 107, 13, 2, 0, 0, + 0, 702, 702, 0, 95, 95, 659, 728, 0, 48, + 0, 543, 0, 48, 0, 441, 710, 734, 711, 633, + 95, 0, 0, 0, 0, 0, 0, 0, 0, 740, + 0, 0, 729, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 731, 0, 0, 0, 0, 132, 0, 0, + 0, 48, 138, 48, 0, 0, 0, 744, 0, 126, + 0, 0, 0, 727, 0, 745, 0, 95, 544, 0, + 0, 683, 95, 199, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 741, 220, 0, 0, 743, 0, 0, + 739, 390, 257, 95, 0, 261, 0, 263, 264, 0, + 701, 701, 95, 219, 95, 0, 0, 0, 0, 693, + 0, 0, 95, 0, 0, 95, 0, 95, 95, 0, + 0, 0, 0, 268, 347, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 544, 0, 26, 712, 0, 713, + 0, 715, 0, 717, 0, 719, 720, 721, 722, 723, + 724, 0, 0, 0, 0, 0, 0, 0, 0, 495, + 411, 0, 505, 506, 507, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 517, 518, 519, 520, 0, 0, + 95, 599, 0, 219, 95, 95, 95, 95, 0, 0, + 0, 0, 0, 428, 0, 0, 0, 95, 0, 0, + 219, 0, 362, 361, 371, 372, 364, 365, 366, 367, + 368, 369, 370, 363, 0, 0, 0, 470, 471, 0, + 0, 0, 0, 0, 0, 0, 0, 477, 478, 69, + 0, 523, 0, 151, 0, 0, 0, 95, 95, 0, + 183, 61, 0, 0, 0, 0, 0, 95, 95, 0, + 0, 29, 0, 0, 190, 167, 166, 168, 169, 170, + 171, 172, 0, 0, 173, 174, 175, 0, 0, 0, + 0, 149, 160, 0, 182, 361, 371, 372, 364, 365, + 366, 367, 368, 369, 370, 363, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 157, 158, 345, 0, 0, + 0, 188, 0, 159, 0, 161, 593, 594, 595, 596, + 0, 0, 0, 0, 0, 0, 0, 187, 0, 70, + 0, 0, 58, 0, 0, 53, 0, 0, 78, 73, + 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, + 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, + 66, 63, 50, 77, 64, 62, 0, 72, 80, 84, + 0, 184, 185, 186, 189, 180, 181, 0, 81, 347, + 268, 0, 0, 0, 0, 0, 0, 0, 219, 347, + 347, 347, 0, 0, 0, 0, 0, 0, 0, 219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, - 0, 0, 0, 0, 188, 0, 159, 0, 161, 0, + 0, 0, 239, 655, 656, 244, 245, 246, 247, 248, + 249, 0, 250, 251, 252, 253, 254, 240, 241, 242, + 243, 229, 230, 0, 0, 231, 232, 233, 234, 235, + 236, 237, 238, 0, 0, 0, 0, 581, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 187, 0, 70, 0, 0, 58, 0, 0, 53, 0, - 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, - 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, - 67, 74, 79, 66, 63, 50, 77, 64, 62, 25, - 72, 80, 84, 0, 184, 185, 186, 189, 180, 181, - 69, 81, 0, 0, 151, 0, 0, 0, 0, 0, - 0, 183, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 29, 0, 0, 190, 167, 166, 168, 169, - 170, 171, 172, 0, 0, 173, 174, 175, 0, 0, - 0, 0, 149, 160, 0, 182, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 95, 219, 709, + 0, 0, 347, 95, 356, 0, 360, 268, 0, 0, + 0, 0, 373, 374, 375, 376, 377, 378, 0, 357, + 358, 359, 355, 379, 362, 361, 371, 372, 364, 365, + 366, 367, 368, 369, 370, 363, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 347, 0, 0, 0, 0, + 0, 0, 0, 347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 157, 158, 0, 0, - 0, 0, 188, 0, 159, 0, 161, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 187, 0, - 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, - 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, - 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, - 79, 66, 63, 50, 77, 64, 62, 0, 72, 80, - 84, 0, 184, 185, 186, 189, 180, 181, 69, 81, - 0, 0, 151, 0, 0, 0, 0, 0, 0, 183, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 190, 167, 166, 168, 169, 170, 171, - 172, 0, 0, 173, 174, 175, 0, 0, 0, 0, - 149, 160, 0, 182, 0, 0, 0, 0, 0, 0, + 0, 0, 219, 0, 268, 0, 0, 0, 0, 0, + 647, 648, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 157, 158, 0, 0, 0, 0, - 188, 0, 159, 0, 161, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 187, 0, 70, 0, - 0, 58, 0, 0, 53, 0, 0, 78, 73, 65, - 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, - 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, - 63, 50, 77, 64, 62, 0, 72, 80, 84, 69, - 184, 185, 186, 189, 180, 181, 0, 81, 0, 0, - 183, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 29, 0, 0, 190, 167, 166, 168, 169, 170, - 171, 172, 0, 0, 173, 174, 175, 0, 0, 0, - 0, 0, 160, 0, 182, 0, 0, 0, 0, 0, + 95, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 157, 158, 0, 0, 0, - 0, 188, 0, 159, 0, 161, 0, 0, 0, 69, - 0, 0, 0, 0, 0, 0, 0, 187, 0, 70, - 0, 61, 58, 0, 0, 53, 0, 0, 78, 73, - 65, 59, 60, 49, 47, 71, 56, 57, 55, 68, + 0, 0, 0, 0, 347, 334, 325, 303, 336, 284, + 295, 341, 296, 297, 319, 276, 311, 69, 0, 287, + 272, 293, 273, 285, 305, 308, 283, 327, 338, 61, + 307, 309, 324, 302, 320, 279, 314, 317, 337, 0, + 0, 0, 47, 0, 439, 440, 0, 0, 0, 0, + 0, 219, 316, 333, 294, 0, 0, 318, 271, 315, + 0, 275, 277, 340, 331, 290, 291, 564, 0, 0, + 0, 0, 0, 306, 310, 321, 312, 300, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 288, 0, 313, + 0, 0, 0, 304, 0, 278, 0, 289, 322, 270, + 329, 339, 301, 332, 299, 298, 335, 70, 0, 0, + 58, 328, 286, 53, 292, 342, 78, 73, 65, 59, + 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, + 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, + 50, 77, 64, 62, 274, 72, 80, 84, 330, 282, + 280, 281, 323, 0, 0, 326, 81, 334, 325, 303, + 336, 284, 295, 341, 296, 297, 319, 276, 311, 69, + 0, 287, 272, 293, 273, 285, 305, 308, 283, 327, + 338, 61, 307, 309, 324, 302, 320, 279, 314, 317, + 337, 0, 0, 0, 47, 0, 439, 440, 0, 0, + 0, 0, 0, 0, 316, 333, 294, 0, 0, 318, + 271, 315, 0, 275, 277, 340, 331, 290, 291, 0, + 0, 0, 0, 0, 0, 306, 310, 321, 312, 300, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 288, + 0, 313, 0, 0, 0, 304, 0, 278, 0, 289, + 322, 270, 329, 339, 301, 332, 299, 298, 335, 70, + 0, 0, 58, 328, 286, 53, 292, 342, 78, 73, + 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, - 66, 63, 50, 77, 64, 62, 0, 72, 80, 84, - 0, 184, 185, 186, 189, 180, 181, 0, 81, 0, - 0, 362, 361, 371, 372, 364, 365, 366, 367, 368, - 369, 370, 363, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, - 0, 0, 58, 0, 0, 53, 0, 0, 78, 73, + 66, 63, 50, 77, 64, 62, 274, 72, 80, 84, + 330, 282, 280, 281, 323, 0, 0, 326, 81, 334, + 325, 303, 336, 284, 295, 341, 296, 297, 319, 276, + 311, 69, 0, 287, 272, 293, 273, 285, 305, 308, + 283, 327, 338, 61, 307, 309, 324, 302, 320, 279, + 314, 317, 337, 0, 0, 0, 47, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 316, 333, 294, 0, + 0, 318, 271, 315, 0, 275, 277, 340, 331, 290, + 291, 0, 0, 0, 0, 0, 0, 306, 310, 321, + 312, 300, 0, 0, 0, 0, 0, 0, 0, 708, + 0, 288, 0, 313, 0, 0, 0, 304, 0, 278, + 0, 289, 322, 270, 329, 339, 301, 332, 299, 298, + 335, 70, 0, 0, 58, 328, 286, 53, 292, 342, + 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, + 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, + 74, 79, 66, 63, 50, 77, 64, 62, 274, 72, + 80, 84, 330, 282, 280, 281, 323, 0, 0, 326, + 81, 334, 325, 303, 336, 284, 295, 341, 296, 297, + 319, 276, 311, 69, 0, 287, 272, 293, 273, 285, + 305, 308, 283, 327, 338, 61, 307, 309, 324, 302, + 320, 279, 314, 317, 337, 29, 0, 0, 47, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 316, 333, + 294, 0, 0, 318, 271, 315, 0, 275, 277, 340, + 331, 290, 291, 0, 0, 0, 0, 0, 0, 306, + 310, 321, 312, 300, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 288, 0, 313, 0, 0, 0, 304, + 0, 278, 0, 289, 322, 270, 329, 339, 301, 332, + 299, 298, 335, 70, 0, 0, 58, 328, 286, 53, + 292, 342, 78, 73, 65, 59, 60, 49, 0, 71, + 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, + 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, + 274, 72, 80, 84, 330, 282, 280, 281, 323, 0, + 0, 326, 81, 334, 325, 303, 336, 284, 295, 341, + 296, 297, 319, 276, 311, 69, 0, 287, 272, 293, + 273, 285, 305, 308, 283, 327, 338, 61, 307, 309, + 324, 302, 320, 279, 314, 317, 337, 0, 0, 0, + 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 316, 333, 294, 0, 0, 318, 271, 315, 0, 275, + 277, 340, 331, 290, 291, 0, 0, 0, 0, 0, + 0, 306, 310, 321, 312, 300, 0, 0, 0, 0, + 0, 0, 0, 587, 0, 288, 0, 313, 0, 0, + 0, 304, 0, 278, 0, 289, 322, 270, 329, 339, + 301, 332, 299, 298, 335, 70, 0, 0, 58, 328, + 286, 53, 292, 342, 78, 73, 65, 59, 60, 49, + 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, + 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, + 64, 62, 274, 72, 80, 84, 330, 282, 280, 281, + 323, 0, 0, 326, 81, 334, 325, 303, 336, 284, + 295, 341, 296, 297, 319, 276, 311, 69, 0, 287, + 272, 293, 273, 285, 305, 308, 283, 327, 338, 61, + 307, 309, 324, 302, 320, 279, 314, 317, 337, 0, + 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 316, 333, 294, 0, 0, 318, 271, 315, + 0, 275, 277, 340, 331, 290, 291, 0, 0, 0, + 0, 0, 0, 306, 310, 321, 312, 300, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 288, 0, 313, + 0, 0, 0, 304, 0, 278, 0, 289, 322, 270, + 329, 339, 301, 332, 299, 298, 335, 70, 0, 0, + 58, 328, 286, 53, 292, 342, 78, 73, 65, 59, + 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, + 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, + 50, 77, 64, 62, 274, 72, 80, 84, 330, 282, + 280, 281, 323, 0, 0, 326, 81, 334, 325, 303, + 336, 284, 295, 341, 296, 297, 319, 276, 311, 69, + 0, 287, 272, 293, 273, 285, 305, 308, 283, 327, + 338, 61, 307, 309, 324, 302, 320, 279, 314, 317, + 337, 0, 0, 0, 190, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 316, 333, 294, 0, 0, 318, + 271, 315, 0, 275, 277, 340, 331, 290, 291, 0, + 0, 0, 0, 0, 0, 306, 310, 321, 312, 300, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 288, + 0, 313, 0, 0, 0, 304, 0, 278, 0, 289, + 322, 270, 329, 339, 301, 332, 299, 298, 335, 70, + 0, 0, 58, 328, 286, 53, 292, 342, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, - 66, 63, 50, 77, 64, 62, 0, 72, 80, 84, - 69, 0, 0, 484, 0, 0, 0, 0, 81, 0, - 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 47, 0, 127, 0, 0, + 66, 63, 50, 77, 64, 62, 274, 72, 80, 84, + 330, 282, 280, 281, 323, 0, 0, 326, 81, 334, + 325, 303, 336, 284, 295, 341, 296, 297, 319, 276, + 311, 69, 0, 287, 272, 293, 273, 285, 305, 308, + 283, 327, 338, 61, 307, 309, 324, 302, 320, 279, + 314, 317, 337, 0, 0, 0, 97, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 316, 333, 294, 0, + 0, 318, 271, 315, 0, 275, 277, 340, 331, 290, + 291, 0, 0, 0, 0, 0, 0, 306, 310, 321, + 312, 300, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 288, 0, 313, 0, 0, 0, 304, 0, 278, + 0, 289, 322, 270, 329, 339, 301, 332, 299, 298, + 335, 70, 0, 0, 58, 328, 286, 53, 292, 342, + 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, + 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, + 74, 79, 66, 63, 50, 77, 64, 62, 274, 72, + 80, 84, 330, 282, 280, 281, 323, 69, 0, 326, + 81, 151, 0, 0, 0, 0, 0, 0, 183, 61, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, + 0, 0, 190, 167, 166, 168, 169, 170, 171, 172, + 0, 0, 173, 174, 175, 0, 0, 0, 0, 149, + 160, 0, 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 349, 348, 69, 0, 0, 0, 0, 0, 0, 0, - 450, 0, 0, 0, 61, 0, 350, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 47, 0, 127, + 0, 0, 0, 157, 158, 345, 0, 0, 0, 188, + 0, 159, 0, 161, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 187, 0, 70, 0, 0, + 58, 0, 0, 53, 0, 0, 78, 73, 65, 59, + 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, + 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, + 50, 77, 64, 62, 0, 72, 80, 84, 0, 184, + 185, 186, 189, 180, 181, 69, 81, 0, 0, 151, + 0, 0, 0, 0, 0, 0, 183, 61, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 29, 0, 145, + 190, 167, 166, 168, 169, 170, 171, 172, 0, 0, + 173, 174, 175, 0, 0, 0, 0, 149, 160, 0, + 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 157, 158, 0, 0, 0, 0, 188, 0, 159, + 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 187, 0, 70, 0, 0, 58, 0, + 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, + 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, + 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, + 64, 62, 25, 72, 80, 84, 0, 184, 185, 186, + 189, 180, 181, 69, 81, 0, 0, 151, 0, 0, + 0, 0, 0, 0, 183, 61, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 190, 167, + 166, 168, 169, 170, 171, 172, 0, 0, 173, 174, + 175, 0, 0, 0, 0, 149, 160, 0, 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, - 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, - 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, - 79, 66, 63, 50, 77, 64, 62, 449, 72, 80, - 84, 447, 446, 0, 0, 58, 0, 0, 53, 81, - 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, - 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, - 67, 74, 79, 66, 63, 50, 77, 64, 62, 25, - 72, 80, 84, 0, 0, 0, 0, 0, 0, 0, - 69, 81, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 29, 0, 0, 47, 0, 127, 0, 0, - 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 29, 0, 0, 97, 0, 96, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, + 158, 0, 0, 0, 0, 188, 0, 159, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 187, 0, 70, 0, 0, 58, 0, 0, 53, + 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, + 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, + 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, + 0, 72, 80, 84, 0, 184, 185, 186, 189, 180, + 181, 69, 81, 0, 0, 151, 0, 0, 0, 0, + 0, 0, 183, 61, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 29, 0, 0, 190, 167, 166, 168, + 169, 170, 171, 172, 0, 0, 173, 174, 175, 0, + 0, 0, 0, 149, 160, 0, 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, - 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, - 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, - 79, 66, 63, 50, 77, 64, 62, 0, 72, 80, - 84, 70, 0, 0, 58, 0, 0, 53, 0, 81, + 0, 0, 0, 0, 0, 0, 0, 157, 158, 0, + 0, 0, 0, 188, 0, 159, 0, 161, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, + 0, 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, 0, 72, - 80, 84, 69, 0, 0, 0, 0, 0, 0, 0, - 81, 0, 0, 0, 61, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 80, 84, 69, 184, 185, 186, 189, 180, 181, 0, + 81, 0, 0, 183, 61, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 29, 0, 0, 190, 167, 166, + 168, 169, 170, 171, 172, 0, 0, 173, 174, 175, + 0, 0, 0, 0, 0, 160, 0, 182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 29, 0, 0, 97, 0, - 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 44, 42, 0, 0, 0, - 0, 45, 70, 0, 0, 58, 0, 0, 53, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 157, 158, + 0, 0, 0, 0, 188, 0, 159, 0, 161, 0, + 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, + 187, 0, 70, 0, 61, 58, 0, 0, 53, 0, + 0, 78, 73, 65, 59, 60, 49, 47, 71, 56, + 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, + 67, 74, 79, 66, 63, 50, 77, 64, 62, 0, + 72, 80, 84, 0, 184, 185, 186, 189, 180, 181, + 0, 81, 0, 0, 362, 361, 371, 372, 364, 365, + 366, 367, 368, 369, 370, 363, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, 0, - 72, 80, 84, 70, 0, 0, 58, 0, 0, 53, - 0, 81, 78, 73, 65, 59, 60, 49, 0, 71, + 72, 80, 84, 69, 0, 0, 484, 0, 0, 0, + 0, 81, 0, 0, 0, 61, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 47, 0, + 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 349, 348, 69, 0, 0, 0, 0, + 0, 0, 0, 450, 0, 0, 0, 61, 0, 350, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 47, 0, 127, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 0, 0, 58, 0, 0, 53, + 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, - 0, 72, 80, 84, 69, 0, 0, 218, 0, 0, - 0, 0, 81, 0, 0, 0, 61, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, + 449, 72, 80, 84, 447, 446, 0, 0, 58, 0, + 0, 53, 81, 0, 78, 73, 65, 59, 60, 49, + 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, + 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, + 64, 62, 25, 72, 80, 84, 0, 0, 0, 0, + 0, 0, 0, 69, 81, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 47, 0, + 127, 0, 0, 25, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 29, 0, 0, 97, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, - 0, 0, 198, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 97, 0, 96, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 0, 0, 58, 0, 0, - 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, + 0, 0, 0, 70, 0, 0, 58, 0, 0, 53, + 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, + 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, + 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, + 0, 72, 80, 84, 70, 0, 0, 58, 0, 0, + 53, 0, 81, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, - 62, 0, 72, 80, 84, 70, 0, 0, 58, 0, - 0, 53, 0, 81, 78, 73, 65, 59, 60, 49, + 62, 0, 72, 80, 84, 69, 0, 0, 0, 0, + 0, 0, 0, 81, 0, 0, 0, 61, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 69, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, + 0, 97, 0, 96, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 44, 42, + 0, 0, 0, 0, 45, 70, 0, 0, 58, 0, + 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, - 64, 62, 0, 72, 80, 84, 69, 0, 0, 0, - 0, 0, 0, 0, 81, 0, 0, 0, 61, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 47, 0, 127, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 69, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 61, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 190, 0, 417, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 0, 0, 58, - 0, 0, 53, 0, 0, 78, 73, 65, 59, 60, + 64, 62, 0, 72, 80, 84, 70, 0, 0, 58, + 0, 0, 53, 0, 81, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, - 77, 64, 62, 0, 72, 80, 84, 70, 0, 0, - 58, 0, 0, 53, 0, 81, 78, 73, 65, 59, - 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, - 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, - 50, 77, 64, 62, 0, 72, 80, 84, 69, 0, - 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, + 77, 64, 62, 0, 72, 80, 84, 69, 0, 0, + 218, 0, 0, 0, 0, 81, 0, 0, 0, 61, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 97, 0, 96, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, + 0, 0, 0, 0, 0, 198, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 0, 96, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 69, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, - 0, 58, 0, 0, 53, 0, 0, 78, 73, 65, + 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, + 58, 0, 0, 53, 0, 0, 78, 73, 65, 59, + 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, + 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, + 50, 77, 64, 62, 0, 72, 80, 84, 70, 0, + 0, 58, 0, 0, 53, 0, 81, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, - 63, 50, 77, 64, 62, 0, 72, 80, 84, 70, - 0, 0, 58, 0, 0, 53, 0, 81, 78, 73, + 63, 50, 77, 64, 62, 0, 72, 80, 84, 69, + 0, 0, 0, 0, 0, 0, 0, 81, 0, 0, + 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 47, 0, 127, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 190, 0, 417, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, + 0, 0, 58, 0, 0, 53, 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, 0, 72, 80, 84, - 69, 0, 0, 0, 0, 0, 0, 0, 81, 0, - 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 97, 0, 0, 0, 0, + 70, 0, 0, 58, 0, 0, 53, 0, 81, 78, + 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, + 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, + 79, 66, 63, 50, 77, 64, 62, 0, 72, 80, + 84, 69, 0, 0, 0, 0, 0, 0, 0, 81, + 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 97, 0, 96, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 0, 0, 58, 0, 0, 53, 0, 0, + 78, 73, 65, 59, 60, 49, 0, 71, 56, 57, + 55, 68, 75, 76, 54, 83, 52, 82, 51, 67, + 74, 79, 66, 63, 50, 77, 64, 62, 0, 72, + 80, 84, 70, 0, 0, 58, 0, 0, 53, 0, + 81, 78, 73, 65, 59, 60, 49, 0, 71, 56, + 57, 55, 68, 75, 76, 54, 83, 52, 82, 51, + 67, 74, 79, 66, 63, 50, 77, 64, 62, 0, + 72, 80, 84, 69, 0, 0, 0, 0, 0, 0, + 0, 81, 0, 0, 0, 61, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, - 70, 0, 0, 58, 0, 0, 53, 0, 0, 78, - 73, 65, 59, 60, 49, 0, 71, 56, 57, 55, - 68, 75, 76, 54, 83, 52, 82, 51, 67, 74, - 79, 66, 63, 50, 77, 64, 62, 0, 72, 80, - 84, 0, 0, 0, 0, 0, 0, 0, 0, 81, + 0, 0, 0, 70, 0, 0, 58, 0, 0, 53, + 0, 0, 78, 73, 65, 59, 60, 49, 0, 71, + 56, 57, 55, 68, 75, 76, 54, 83, 52, 82, + 51, 67, 74, 79, 66, 63, 50, 77, 64, 62, + 0, 72, 80, 84, 0, 0, 0, 0, 0, 0, + 0, 0, 81, } var yyPact = [...]int{ - 69, -1000, -116, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 436, 457, -1000, -1000, -1000, 338, 3485, 5, - -19, 16, 4001, 4001, -1000, -1000, 335, 115, -1000, -1000, - -1000, -1000, 410, 426, 335, 402, -25, -1000, 3526, 451, - -1000, 3829, -10, -20, -43, -1000, -1000, -1000, -1000, -1000, + 86, -1000, -112, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 448, 476, -1000, -1000, -1000, 355, 3568, 11, + -4, 44, 4084, 4084, -1000, -1000, 345, 97, -1000, -1000, + -1000, -1000, 436, 444, 345, 432, -14, -1000, 3609, 468, + -1000, 3912, 10, -5, -20, -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, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 4001, -36, -36, -15, 450, - 4001, -5, -1000, -1000, -1000, 30, -1000, -1000, -1000, -1000, - -1000, 400, 204, -107, -1000, 2791, 2791, 436, -1000, 335, - -1000, 3698, -1000, 138, 300, 353, -1000, -1000, -1000, 398, - 3354, 3657, 4001, 285, -1000, 871, -1000, -1000, -43, -43, - 4001, 100, -11, 4001, 389, 4001, 4001, -16, -1000, -1000, - 443, 2241, 2377, -1000, -1000, -1000, -1000, 225, -1000, 2791, - 1002, 312, -1000, -1000, -1000, -1000, -1000, 2922, 2922, 2922, - 2922, 2922, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, 312, 26, -1000, 2653, - 312, 312, 2791, 312, -1000, -1000, -1000, 312, 312, 312, - -1000, -1000, 310, -1000, 160, 410, 204, 343, 4001, -1000, - -1000, 3870, 3526, 3526, 3526, 3526, -1000, 372, 369, 366, - 367, 4173, -1000, 278, 204, 3354, -1000, -1000, 4001, -1000, - 448, 1329, 3175, 168, -94, -1000, -1000, 313, -1000, 313, - 313, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - 313, 313, 313, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - 336, 336, 336, 315, 315, 4001, 4001, -1000, 388, -47, - -38, -1000, -1000, -1000, -1000, 4001, 4001, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 4084, -17, -17, 8, 467, + 4084, 0, -1000, -1000, -1000, 36, -1000, -1000, -1000, -1000, + -1000, 427, 196, -103, -1000, 2874, 2874, 448, -1000, 345, + -1000, 3781, -1000, 112, 329, 418, -1000, -1000, -1000, 421, + 3437, 3740, 4084, 299, -1000, 969, -1000, -1000, -20, -20, + 4084, 90, 5, 4084, 417, 4084, 4084, 2, -1000, -1000, + 465, 2324, 2460, -1000, -1000, -1000, -1000, 268, -1000, 2874, + 1085, 331, -1000, -1000, -1000, -1000, -1000, 3005, 3005, 3005, + 3005, 3005, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 331, 35, -1000, 2736, + 331, 331, 2874, 331, -1000, -1000, -1000, 331, 331, 331, + -1000, -1000, 320, -1000, 152, 436, 196, 340, 4084, -1000, + -1000, 3953, 3609, 3609, 3609, 3609, -1000, 379, 377, 374, + 395, 4256, -1000, 291, 196, 3437, -1000, -1000, 4084, -1000, + 462, 1412, 3258, 98, -84, -1000, -1000, 337, -1000, 337, + 337, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 337, 337, 337, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 353, 353, 353, 339, 339, 4084, 4084, -1000, 415, -27, + -21, -1000, -1000, -1000, -1000, 4084, 4084, -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, -1000, @@ -926,63 +935,63 @@ var yyPact = [...]int{ -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, -1000, 326, -1000, -1000, 3133, 23, 2791, 2791, - 148, 2791, 2791, 53, 2922, 146, 86, 2922, 2922, 2922, - 2922, 2922, 2922, 2922, 2922, 2922, 2922, 2922, 2922, 2922, - 2922, 2922, 2922, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, 335, -1000, -1000, -1000, -1000, 3002, 808, 2089, 260, - 120, 2653, 2791, 400, 72, 120, 3870, 2377, 2377, 2377, - 2791, -1000, -1000, -1000, -1000, -1000, -1000, 3870, 312, -1000, - 3313, -1000, 292, -1000, 60, -1000, 21, -1000, 353, 354, - 327, -1000, -1000, -1000, -1000, 360, -1000, -1000, -1000, -1000, - -1000, 204, -1000, 436, 2791, 308, 1177, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 334, 383, 47, 198, -1000, - -1000, 379, -1000, 124, -97, -1000, -1000, 170, -1000, -1000, - -1000, -1000, -1000, -1000, 169, -1000, -1000, -1000, 166, -1000, - 347, 357, -1000, 3829, -1000, 4001, 3870, -1000, -1000, 448, - 2377, 3526, -1000, -1000, 3829, 1785, 53, 71, -1000, -1000, - 178, -1000, -1000, 120, 120, 189, -1000, -1000, -1000, -1000, - 146, 2922, 2922, 2922, 2922, 14, 189, 189, 1053, 821, - 226, -1000, 65, 65, 35, 35, 35, 35, 35, 441, - 441, -1000, 204, 2377, 302, 312, 20, -1000, 2791, -1000, - 137, 2377, 125, -1000, 2791, 204, 248, 248, 248, -1000, - 295, 291, -1000, -1000, 2515, 204, 255, -1000, 19, 436, - 3870, 2791, 2089, -1000, -1000, 2791, 316, -1000, -1000, -1000, - 410, 120, 1329, -1000, 1329, 4042, -1000, 184, -1000, -1000, - -91, 22, -1000, -1000, -1000, 223, 294, 253, 4001, 4001, - -1000, -1000, -23, 442, -1000, 293, -1000, -1000, 15, -1000, - -1000, -1000, -1000, 14, 189, 189, 1038, -1000, 2922, 2922, - -1000, 248, 2377, 1937, 120, 912, 283, 64, -1000, 2791, - 75, -1000, -1000, -1000, -1000, 312, -1000, -1000, 333, 3829, - 4042, 410, -1000, 120, -1000, 13, 120, 3829, -1000, 1177, - -1000, 244, -1000, 313, -1000, 39, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, 164, -1000, 152, 1633, 1633, 3870, 439, - 425, 1481, -1000, 2922, 189, 189, -1000, 204, -1000, 204, - 313, -1000, 313, 315, 313, -60, 313, -61, 313, 313, - 313, 313, 313, 313, -1000, -112, -1000, 120, 2791, -1000, - 312, -1000, 335, -1000, 12, -1000, -1000, 1937, 196, -1000, - -1000, 4042, -1000, -1000, 382, -1000, 381, 212, 207, -1000, - -1000, -1000, -1000, -1000, -1000, 2791, 2791, -1000, 189, -1000, + -1000, -1000, -1000, 305, -1000, -1000, 3216, 34, 2874, 2874, + 290, 2874, 2874, 67, 3005, 161, 219, 3005, 3005, 3005, + 3005, 3005, 3005, 3005, 3005, 3005, 3005, 3005, 3005, 3005, + 3005, 3005, 3005, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, 345, -1000, -1000, -1000, -1000, 3085, 892, 2172, 287, + 95, 2736, 2874, 427, 88, 95, 3953, 2460, 2460, 2460, + 2874, -1000, -1000, -1000, -1000, -1000, -1000, 3953, 331, -1000, + 3396, -1000, 277, -1000, 74, -1000, 33, -1000, 418, 351, + 430, -1000, -1000, -1000, -1000, 375, -1000, -1000, -1000, -1000, + -1000, 196, -1000, 448, 2874, 317, 1260, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 343, 409, 64, 185, -1000, + -1000, 393, -1000, 106, -90, -1000, -1000, 157, -1000, -1000, + -1000, -1000, -1000, -1000, 135, -1000, -1000, -1000, 134, -1000, + 363, 365, -1000, 3912, -1000, 4084, 3953, -1000, -1000, 462, + 2460, 3609, -1000, -1000, 3912, 1868, 67, 87, -1000, -1000, + 187, -1000, -1000, 95, 95, 189, -1000, -1000, -1000, -1000, + 161, 3005, 3005, 3005, 3005, -13, 189, 189, 803, 103, + 875, -1000, 28, 28, 15, 15, 15, 15, 15, 217, + 217, -1000, 196, 2460, 314, 331, 32, -1000, 2874, -1000, + 261, 2460, 113, -1000, 2874, 196, 246, 246, 246, -1000, + 312, 252, -1000, -1000, 2598, 196, 283, -1000, 30, 448, + 3953, 2874, 2172, -1000, -1000, 2874, 342, -1000, -1000, -1000, + 436, 95, 1412, -1000, 1412, 4125, -1000, 172, -1000, -1000, + -80, 7, -1000, -1000, -1000, 218, 270, 250, 4084, 4084, + -1000, -1000, -19, 460, -1000, 293, -1000, -1000, 26, -1000, + -1000, -1000, -1000, -13, 189, 189, 450, -1000, 3005, 3005, + -1000, 246, 2460, 2020, 95, 245, 315, 81, -1000, 2874, + 160, -1000, -1000, -1000, -1000, 331, -1000, -1000, 344, 3912, + 4125, 436, -1000, 95, -1000, 13, 95, 3912, -1000, 1260, + -1000, 242, -1000, 337, -1000, 55, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 127, -1000, 119, 1716, 1716, 3953, + 458, 443, 1564, -1000, 3005, 189, 189, -1000, 196, -1000, + 196, 337, -1000, 337, 339, 337, -41, 337, -42, 337, + 337, 337, 337, 337, 337, -1000, -108, -1000, 95, 2874, + -1000, 331, -1000, 345, -1000, 6, -1000, -1000, 2020, 180, + -1000, -1000, 4125, -1000, -1000, 408, -1000, 406, 213, 204, + -1000, -1000, -1000, -1000, -1000, -1000, 2874, 2874, -1000, 189, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, 204, 181, 120, 291, 204, 4042, - -1000, 3829, -1000, -1000, -1000, -1000, -1000, -1000, 120, 241, - -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 196, 163, 95, 252, 196, + 4125, -1000, 3912, -1000, -1000, -1000, -1000, -1000, -1000, 95, + 190, -1000, -1000, -1000, -1000, -1000, } var yyPgo = [...]int{ - 0, 641, 46, 401, 637, 633, 631, 629, 625, 623, - 616, 614, 612, 609, 606, 451, 605, 603, 600, 55, - 599, 13, 30, 10, 21, 63, 597, 17, 44, 35, - 596, 27, 595, 594, 49, 593, 168, 591, 590, 26, - 588, 581, 568, 564, 558, 516, 556, 555, 552, 550, - 547, 20, 1, 2, 22, 8, 546, 337, 7, 545, - 539, 15, 538, 537, 536, 535, 11, 534, 31, 533, - 28, 520, 517, 38, 16, 515, 110, 57, 512, 32, - 0, 6, 58, 12, 511, 578, 33, 36, 510, 509, - 9, 508, 507, 505, 504, 503, 501, 500, 138, 496, - 495, 494, 34, 3, 493, 490, 488, 40, 487, 18, - 481, 479, 478, 14, 5, 475, 4, 473, 29, 472, - 471, 470, 140, 37, 465, 463, + 0, 677, 28, 435, 676, 675, 674, 672, 671, 670, + 669, 667, 666, 660, 651, 499, 638, 635, 633, 38, + 631, 15, 30, 10, 31, 63, 629, 22, 60, 58, + 624, 26, 622, 617, 50, 616, 641, 612, 611, 27, + 607, 606, 605, 603, 602, 484, 600, 599, 597, 596, + 595, 21, 1, 5, 9, 7, 594, 44, 2, 593, + 591, 18, 590, 589, 587, 581, 11, 578, 43, 568, + 40, 558, 556, 34, 16, 555, 143, 65, 553, 35, + 0, 6, 33, 12, 552, 661, 17, 13, 550, 549, + 8, 548, 547, 546, 544, 542, 528, 527, 155, 523, + 520, 518, 46, 3, 517, 513, 511, 32, 509, 41, + 505, 502, 501, 14, 20, 500, 4, 496, 36, 495, + 494, 493, 132, 37, 488, 487, } var yyR1 = [...]int{ @@ -993,47 +1002,47 @@ var yyR1 = [...]int{ 95, 95, 93, 93, 93, 93, 93, 93, 94, 94, 94, 94, 94, 96, 96, 96, 96, 96, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 98, 98, - 102, 102, 103, 103, 103, 100, 100, 101, 101, 104, - 104, 104, 99, 99, 99, 99, 99, 99, 105, 105, - 106, 106, 106, 106, 106, 108, 115, 115, 115, 115, - 109, 109, 117, 117, 116, 112, 112, 112, 113, 113, - 113, 114, 114, 114, 10, 10, 10, 118, 118, 11, - 11, 13, 13, 13, 13, 13, 119, 119, 14, 14, - 14, 125, 15, 16, 16, 17, 17, 19, 19, 23, - 23, 22, 22, 24, 24, 24, 24, 84, 84, 84, - 83, 83, 26, 27, 27, 28, 28, 29, 29, 29, - 29, 38, 72, 72, 30, 30, 30, 31, 31, 32, - 32, 89, 89, 88, 88, 88, 87, 87, 33, 33, - 33, 34, 34, 35, 35, 37, 37, 36, 36, 39, - 39, 25, 25, 25, 25, 25, 25, 41, 41, 40, + 102, 102, 102, 103, 103, 103, 100, 100, 101, 101, + 104, 104, 104, 99, 99, 99, 99, 99, 99, 105, + 105, 106, 106, 106, 106, 106, 108, 115, 115, 115, + 115, 109, 109, 117, 117, 116, 112, 112, 112, 113, + 113, 113, 114, 114, 114, 10, 10, 10, 118, 118, + 11, 11, 13, 13, 13, 13, 13, 119, 119, 14, + 14, 14, 125, 15, 16, 16, 17, 17, 19, 19, + 23, 23, 22, 22, 24, 24, 24, 24, 84, 84, + 84, 83, 83, 26, 27, 27, 28, 28, 29, 29, + 29, 29, 38, 72, 72, 30, 30, 30, 31, 31, + 32, 32, 89, 89, 88, 88, 88, 87, 87, 33, + 33, 33, 34, 34, 35, 35, 37, 37, 36, 36, + 39, 39, 25, 25, 25, 25, 25, 25, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 50, 50, 50, 50, 50, 50, 42, 42, 42, - 42, 42, 42, 42, 21, 21, 51, 51, 51, 57, - 52, 52, 45, 45, 45, 45, 45, 45, 45, 45, + 40, 40, 50, 50, 50, 50, 50, 50, 42, 42, + 42, 42, 42, 42, 42, 21, 21, 51, 51, 51, + 57, 52, 52, 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, 48, 48, - 48, 46, 46, 46, 46, 47, 47, 47, 49, 49, - 49, 91, 91, 91, 91, 91, 91, 91, 91, 91, - 91, 91, 91, 91, 91, 91, 91, 91, 62, 62, - 20, 20, 60, 60, 61, 63, 63, 58, 58, 58, - 59, 59, 59, 44, 44, 44, 44, 44, 44, 44, - 44, 64, 64, 65, 65, 66, 66, 67, 67, 68, - 69, 69, 69, 70, 70, 70, 70, 43, 43, 43, - 43, 43, 43, 71, 71, 71, 71, 53, 53, 55, - 55, 54, 56, 73, 73, 74, 76, 76, 77, 77, - 75, 75, 78, 78, 78, 81, 81, 82, 82, 85, - 85, 86, 86, 79, 79, 79, 79, 79, 79, 79, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 48, + 48, 48, 46, 46, 46, 46, 47, 47, 47, 49, + 49, 49, 91, 91, 91, 91, 91, 91, 91, 91, + 91, 91, 91, 91, 91, 91, 91, 91, 91, 62, + 62, 20, 20, 60, 60, 61, 63, 63, 58, 58, + 58, 59, 59, 59, 44, 44, 44, 44, 44, 44, + 44, 44, 64, 64, 65, 65, 66, 66, 67, 67, + 68, 69, 69, 69, 70, 70, 70, 70, 43, 43, + 43, 43, 43, 43, 71, 71, 71, 71, 53, 53, + 55, 55, 54, 56, 73, 73, 74, 76, 76, 77, + 77, 75, 75, 78, 78, 78, 81, 81, 82, 82, + 85, 85, 86, 86, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, + 79, 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 122, 123, 124, 90, 90, 90, + 80, 80, 80, 122, 123, 124, 90, 90, 90, } var yyR2 = [...]int{ @@ -1044,35 +1053,35 @@ var yyR2 = [...]int{ 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 0, 3, - 0, 5, 0, 3, 5, 0, 1, 0, 1, 0, - 1, 2, 0, 2, 2, 2, 2, 2, 0, 1, - 0, 2, 1, 2, 1, 4, 2, 3, 2, 2, - 1, 1, 1, 3, 2, 0, 1, 3, 1, 2, - 3, 1, 1, 1, 6, 6, 8, 0, 1, 4, - 4, 4, 5, 3, 3, 5, 0, 1, 2, 2, - 2, 0, 2, 0, 2, 1, 2, 0, 1, 0, - 1, 1, 3, 1, 2, 3, 5, 0, 1, 2, - 1, 1, 2, 1, 3, 1, 1, 1, 1, 3, - 3, 2, 1, 3, 4, 4, 3, 2, 4, 0, - 1, 0, 1, 0, 1, 2, 1, 1, 1, 2, - 2, 2, 3, 2, 2, 2, 1, 1, 3, 0, - 2, 1, 3, 3, 2, 3, 1, 1, 1, 3, - 3, 4, 4, 5, 3, 4, 3, 4, 5, 6, - 2, 1, 2, 1, 2, 1, 2, 1, 1, 1, - 1, 1, 1, 1, 0, 2, 1, 1, 1, 3, - 1, 3, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 2, 2, 2, 3, 1, 1, 1, 1, 4, 5, - 6, 6, 7, 5, 4, 1, 1, 1, 4, 4, - 4, 2, 1, 2, 2, 2, 1, 2, 2, 1, - 2, 2, 2, 2, 2, 2, 2, 1, 0, 1, - 0, 2, 1, 2, 4, 0, 2, 1, 3, 5, - 1, 3, 5, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 3, 0, 2, 0, 3, 1, 3, 2, - 0, 1, 1, 0, 2, 4, 4, 2, 1, 3, - 5, 4, 6, 1, 3, 3, 5, 1, 3, 1, - 2, 3, 1, 1, 3, 3, 0, 2, 0, 3, - 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 3, 5, 0, 3, 5, 0, 1, 0, 1, + 0, 1, 2, 0, 2, 2, 2, 2, 2, 0, + 1, 0, 2, 1, 2, 1, 4, 2, 3, 2, + 2, 1, 1, 1, 3, 2, 0, 1, 3, 1, + 2, 3, 1, 1, 1, 6, 6, 8, 0, 1, + 4, 4, 4, 5, 3, 3, 5, 0, 1, 2, + 2, 2, 0, 2, 0, 2, 1, 2, 0, 1, + 0, 1, 1, 3, 1, 2, 3, 5, 0, 1, + 2, 1, 1, 2, 1, 3, 1, 1, 1, 1, + 3, 3, 2, 1, 3, 4, 4, 3, 2, 4, + 0, 1, 0, 1, 0, 1, 2, 1, 1, 1, + 2, 2, 2, 3, 2, 2, 2, 1, 1, 3, + 0, 2, 1, 3, 3, 2, 3, 1, 1, 1, + 3, 3, 4, 4, 5, 3, 4, 3, 4, 5, + 6, 2, 1, 2, 1, 2, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 0, 2, 1, 1, 1, + 3, 1, 3, 1, 1, 1, 1, 1, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 3, 1, 1, 1, 1, 4, + 5, 6, 6, 7, 5, 4, 1, 1, 1, 4, + 4, 4, 2, 1, 2, 2, 2, 1, 2, 2, + 1, 2, 2, 2, 2, 2, 2, 2, 1, 0, + 1, 0, 2, 1, 2, 4, 0, 2, 1, 3, + 5, 1, 3, 5, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 3, 0, 2, 0, 3, 1, 3, + 2, 0, 1, 1, 0, 2, 4, 4, 2, 1, + 3, 5, 4, 6, 1, 3, 3, 5, 1, 3, + 1, 2, 3, 1, 1, 3, 3, 0, 2, 0, + 3, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1084,7 +1093,7 @@ var yyR2 = [...]int{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 0, 0, 1, 1, } var yyChk = [...]int{ @@ -1152,95 +1161,95 @@ var yyChk = [...]int{ -25, -123, -123, -123, -123, 40, -123, -123, -123, 40, 94, -66, -74, -25, -82, -86, -25, 39, -70, -113, -114, -117, -116, -81, 42, -105, 144, 44, 45, 46, - 52, 149, 41, 40, 41, 40, -36, -36, 103, -64, - 12, 94, -21, 58, -45, -45, -123, -23, -82, -91, - 132, 113, 130, 126, 135, 145, 128, 146, 129, 119, - 116, 117, 118, 121, 44, -66, 66, -25, 64, -55, - 28, -2, -122, -83, -81, -81, -70, 94, -72, -83, - 41, 40, -98, -106, 107, 25, 106, 45, 45, -90, - -122, -82, -90, -58, -65, 13, 15, 85, -45, -123, - -123, -98, -98, -103, -98, 120, -98, 120, -98, -98, - -98, -98, -98, -98, -20, 155, -25, -53, -2, 94, - -82, 40, 41, -116, 25, 25, 41, 41, -25, -52, - -123, 44, -123, -81, -83, + 52, 149, 41, 41, 40, 41, 40, -36, -36, 103, + -64, 12, 94, -21, 58, -45, -45, -123, -23, -82, + -91, 132, 113, 130, 126, 135, 145, 128, 146, 129, + 119, 116, 117, 118, 121, 44, -66, 66, -25, 64, + -55, 28, -2, -122, -83, -81, -81, -70, 94, -72, + -83, 41, 40, -98, -106, 107, 25, 106, 45, 45, + -90, -122, -82, -90, -58, -65, 13, 15, 85, -45, + -123, -123, -98, -98, -103, -98, 120, -98, 120, -98, + -98, -98, -98, -98, -98, -20, 155, -25, -53, -2, + 94, -82, 40, 41, -116, 25, 25, 41, 41, -25, + -52, -123, 44, -123, -81, -83, } var yyDef = [...]int{ 0, -2, 2, -2, 5, 6, 7, 8, 9, 10, - 11, 12, 315, 0, 131, 131, 131, 0, 352, 0, - 0, 126, 0, 0, 474, 131, 0, 23, 24, 472, - 1, 3, 323, 0, 0, 135, 350, 133, 0, 0, - 28, 0, 0, 0, 348, 353, 354, 355, 356, 436, - 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, - 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, - 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, - 467, 468, 469, 470, 471, 0, 346, 346, 0, 0, - 0, 0, 127, 128, 187, 176, 177, 359, 360, 129, - 130, 137, 17, 0, 13, 0, 0, 315, 19, 0, - 136, 0, 351, 132, 0, 153, 155, 156, 157, -2, - 0, 173, 0, 0, 33, 0, 150, 151, 348, 348, - 0, 0, 0, 0, 0, 0, 0, 0, 123, 124, - 0, 0, 0, 138, 18, 473, 25, 324, 191, 0, - 196, 0, 232, 233, 234, 235, 236, 0, 0, 0, - 0, 0, 254, 255, 256, 257, 303, 304, 305, 306, - 307, 308, 309, 310, 197, 198, 300, 0, 342, 0, - 0, 0, 288, 0, 265, 266, 267, 0, 0, 0, - -2, -2, 316, 317, 320, 323, 17, 0, 0, 186, - 134, 0, 0, 0, 0, 0, 178, 0, 0, 0, - 0, 0, 172, 0, 17, 0, 161, 174, 0, 176, - 189, 105, 0, 79, 75, 38, 39, 68, 41, 68, + 11, 12, 316, 0, 132, 132, 132, 0, 353, 0, + 0, 127, 0, 0, 475, 132, 0, 23, 24, 473, + 1, 3, 324, 0, 0, 136, 351, 134, 0, 0, + 28, 0, 0, 0, 349, 354, 355, 356, 357, 437, + 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, + 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, + 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 0, 347, 347, 0, 0, + 0, 0, 128, 129, 188, 177, 178, 360, 361, 130, + 131, 138, 17, 0, 13, 0, 0, 316, 19, 0, + 137, 0, 352, 133, 0, 154, 156, 157, 158, -2, + 0, 174, 0, 0, 33, 0, 151, 152, 349, 349, + 0, 0, 0, 0, 0, 0, 0, 0, 124, 125, + 0, 0, 0, 139, 18, 474, 25, 325, 192, 0, + 197, 0, 233, 234, 235, 236, 237, 0, 0, 0, + 0, 0, 255, 256, 257, 258, 304, 305, 306, 307, + 308, 309, 310, 311, 198, 199, 301, 0, 343, 0, + 0, 0, 289, 0, 266, 267, 268, 0, 0, 0, + -2, -2, 317, 318, 321, 324, 17, 0, 0, 187, + 135, 0, 0, 0, 0, 0, 179, 0, 0, 0, + 0, 0, 173, 0, 17, 0, 162, 175, 0, 177, + 190, 106, 0, 80, 76, 38, 39, 68, 41, 68, 68, 60, 61, 62, 63, 64, 65, 66, 67, 53, 68, 68, 68, 57, 42, 43, 44, 45, 46, 47, - 70, 70, 70, 72, 72, 0, 0, 31, 0, 117, - 117, 119, 347, 120, 121, 0, 0, 188, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, - 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, - 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, - 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, - 433, 434, 435, 16, 141, 143, 147, 0, 0, 0, - 0, 0, 0, 194, 0, 0, 0, 0, 0, 0, + 70, 70, 70, 73, 73, 0, 0, 31, 0, 118, + 118, 120, 348, 121, 122, 0, 0, 189, 362, 363, + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, + 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, + 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, + 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, + 434, 435, 436, 16, 142, 144, 148, 0, 0, 0, + 0, 0, 0, 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 217, 218, 219, 220, 221, 222, 223, - 210, 0, 249, 250, 251, 252, 0, 139, 0, 0, - 230, 0, 0, 137, 0, 289, 0, 0, 0, 0, - 0, 319, 321, 322, 14, 20, 21, 0, 0, -2, - 0, 185, 189, 343, 0, 297, 0, -2, 154, 169, - 0, 166, 179, 180, 181, 0, 183, 184, 159, 160, - 229, 17, 175, 315, 0, 32, 106, 108, 111, 112, - 113, 357, 358, 34, 35, 0, 457, 0, 0, 100, - 101, 82, 80, 0, 77, 76, 40, 0, 58, 59, + 0, 0, 0, 218, 219, 220, 221, 222, 223, 224, + 211, 0, 250, 251, 252, 253, 0, 140, 0, 0, + 231, 0, 0, 138, 0, 290, 0, 0, 0, 0, + 0, 320, 322, 323, 14, 20, 21, 0, 0, -2, + 0, 186, 190, 344, 0, 298, 0, -2, 155, 170, + 0, 167, 180, 181, 182, 0, 184, 185, 160, 161, + 230, 17, 176, 316, 0, 32, 107, 109, 112, 113, + 114, 358, 359, 34, 35, 0, 458, 0, 0, 101, + 102, 83, 81, 0, 78, 77, 40, 0, 58, 59, 54, 55, 56, 48, 0, 49, 50, 51, 0, 52, - 0, 0, 349, 0, 118, 0, 0, 122, 125, 189, - 0, 0, 144, 148, 0, 0, 192, 193, 195, 211, - 0, 213, 215, 325, 326, 199, 200, 226, 227, 228, - 0, 0, 0, 0, 0, 224, 204, 206, 0, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 253, 0, 0, 140, 301, 0, -2, 0, 341, - 0, 0, 295, 292, 0, 0, 0, 0, 0, 318, - 22, 327, 337, 339, 0, 17, 0, 333, 150, 315, - 0, 0, 0, 164, 170, 0, 0, 165, 182, -2, - 323, 190, 0, 109, 0, 0, 96, 0, 98, 99, - 88, 0, 81, 37, 78, 0, 0, 0, 0, 0, - 114, 115, 0, 311, 142, 152, 149, 145, 0, 212, - 214, 216, 201, 224, 205, 207, 0, 202, 0, 0, - 258, 0, 139, 0, 231, 0, 315, 0, 293, 0, - 0, 264, 268, 269, 270, 0, 340, -2, 0, 0, - 0, 323, 344, 345, 298, 0, 167, 0, 27, 107, - 110, 0, 102, 68, 97, 90, 89, 83, 84, 85, - 86, 87, 69, 0, 73, 0, 475, 475, 0, 313, - 0, 0, 203, 0, 225, 208, 259, 0, 302, 0, - 68, 272, 68, 72, 68, 276, 68, 279, 68, 68, - 68, 68, 68, 68, 287, 290, 263, 296, 0, 338, - 0, -2, 0, 335, 150, 334, 26, 0, 0, 162, - 95, 0, 104, 36, 0, 92, 94, 0, 0, 29, - 476, 477, 30, 116, 15, 0, 0, 146, 209, 260, - 261, 271, 273, 274, 275, 277, 278, 280, 281, 282, - 283, 284, 285, 286, 0, 0, 294, 330, 17, 0, - 299, 0, 168, 103, 91, 93, 71, 74, 314, 312, - 262, 291, -2, 336, 163, + 0, 0, 350, 0, 119, 0, 0, 123, 126, 190, + 0, 0, 145, 149, 0, 0, 193, 194, 196, 212, + 0, 214, 216, 326, 327, 200, 201, 227, 228, 229, + 0, 0, 0, 0, 0, 225, 205, 207, 0, 238, + 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, + 249, 254, 0, 0, 141, 302, 0, -2, 0, 342, + 0, 0, 296, 293, 0, 0, 0, 0, 0, 319, + 22, 328, 338, 340, 0, 17, 0, 334, 151, 316, + 0, 0, 0, 165, 171, 0, 0, 166, 183, -2, + 324, 191, 0, 110, 0, 0, 97, 0, 99, 100, + 89, 0, 82, 37, 79, 0, 0, 0, 0, 0, + 115, 116, 0, 312, 143, 153, 150, 146, 0, 213, + 215, 217, 202, 225, 206, 208, 0, 203, 0, 0, + 259, 0, 140, 0, 232, 0, 316, 0, 294, 0, + 0, 265, 269, 270, 271, 0, 341, -2, 0, 0, + 0, 324, 345, 346, 299, 0, 168, 0, 27, 108, + 111, 0, 103, 68, 98, 91, 90, 84, 85, 86, + 87, 88, 69, 71, 0, 74, 0, 476, 476, 0, + 314, 0, 0, 204, 0, 226, 209, 260, 0, 303, + 0, 68, 273, 68, 73, 68, 277, 68, 280, 68, + 68, 68, 68, 68, 68, 288, 291, 264, 297, 0, + 339, 0, -2, 0, 336, 151, 335, 26, 0, 0, + 163, 96, 0, 105, 36, 0, 93, 95, 0, 0, + 29, 477, 478, 30, 117, 15, 0, 0, 147, 210, + 261, 262, 272, 274, 275, 276, 278, 279, 281, 282, + 283, 284, 285, 286, 287, 0, 0, 295, 331, 17, + 0, 300, 0, 169, 104, 92, 94, 72, 75, 315, + 313, 263, 292, -2, 337, 164, } var yyTok1 = [...]int{ @@ -2012,108 +2021,108 @@ yydefault: yyVAL.LengthScaleOption = LengthScaleOption{} } case 71: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:569 + { + yyVAL.LengthScaleOption = LengthScaleOption{Length: NewIntVal(yyDollar[2].bytes)} + } + case 72: + yyDollar = yyS[yypt-5 : yypt+1] +//line sql.y:573 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), Scale: NewIntVal(yyDollar[4].bytes), } } - case 72: + case 73: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:577 +//line sql.y:581 { yyVAL.LengthScaleOption = LengthScaleOption{} } - case 73: + case 74: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:581 +//line sql.y:585 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), } } - case 74: + case 75: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:587 +//line sql.y:591 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), Scale: NewIntVal(yyDollar[4].bytes), } } - case 75: + case 76: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:595 +//line sql.y:599 { yyVAL.boolVal = BoolVal(false) } - case 76: + case 77: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:599 +//line sql.y:603 { yyVAL.boolVal = BoolVal(true) } - case 77: + case 78: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:604 +//line sql.y:608 { yyVAL.boolVal = BoolVal(false) } - case 78: + case 79: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:608 +//line sql.y:612 { yyVAL.boolVal = BoolVal(true) } - case 79: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:614 - { - yyVAL.boolVal = BoolVal(false) - } case 80: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:618 { yyVAL.boolVal = BoolVal(false) } case 81: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:622 { - yyVAL.boolVal = BoolVal(true) + yyVAL.boolVal = BoolVal(false) } case 82: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:627 + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:626 { - yyVAL.optVal = nil + yyVAL.boolVal = BoolVal(true) } case 83: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:631 { - yyVAL.optVal = NewStrVal(yyDollar[2].bytes) + yyVAL.optVal = nil } case 84: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:635 { - yyVAL.optVal = NewIntVal(yyDollar[2].bytes) + yyVAL.optVal = NewStrVal(yyDollar[2].bytes) } case 85: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:639 { - yyVAL.optVal = NewFloatVal(yyDollar[2].bytes) + yyVAL.optVal = NewIntVal(yyDollar[2].bytes) } case 86: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:643 { - yyVAL.optVal = NewValArg(yyDollar[2].bytes) + yyVAL.optVal = NewFloatVal(yyDollar[2].bytes) } case 87: yyDollar = yyS[yypt-2 : yypt+1] @@ -2122,189 +2131,195 @@ yydefault: yyVAL.optVal = NewValArg(yyDollar[2].bytes) } case 88: + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:651 + { + yyVAL.optVal = NewValArg(yyDollar[2].bytes) + } + case 89: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:652 +//line sql.y:656 { yyVAL.boolVal = BoolVal(false) } - case 89: + case 90: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:656 +//line sql.y:660 { yyVAL.boolVal = BoolVal(true) } - case 90: + case 91: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:661 +//line sql.y:665 { yyVAL.colKeyOpt = colKeyNone } - case 91: + case 92: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:665 +//line sql.y:669 { yyVAL.colKeyOpt = colKeyPrimary } - case 92: + case 93: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:669 +//line sql.y:673 { yyVAL.colKeyOpt = colKey } - case 93: + case 94: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:673 +//line sql.y:677 { yyVAL.colKeyOpt = colKeyUniqueKey } - case 94: + case 95: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:677 +//line sql.y:681 { yyVAL.colKeyOpt = colKeyUnique } - case 95: + case 96: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:683 +//line sql.y:687 { yyVAL.indexDefinition = &IndexDefinition{Info: yyDollar[1].indexInfo, Columns: yyDollar[3].indexColumns} } - case 96: + case 97: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:689 +//line sql.y:693 { yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].bytes), Name: NewColIdent("PRIMARY"), Primary: true, Unique: true} } - case 97: + case 98: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:693 +//line sql.y:697 { yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Unique: true} } - case 98: + case 99: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:697 +//line sql.y:701 { yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: true} } - case 99: + case 100: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:701 +//line sql.y:705 { yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].str), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: false} } - case 100: + case 101: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:707 +//line sql.y:711 { yyVAL.str = string(yyDollar[1].bytes) } - case 101: + case 102: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:711 +//line sql.y:715 { yyVAL.str = string(yyDollar[1].bytes) } - case 102: + case 103: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:717 +//line sql.y:721 { yyVAL.indexColumns = []*IndexColumn{yyDollar[1].indexColumn} } - case 103: + case 104: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:721 +//line sql.y:725 { yyVAL.indexColumns = append(yyVAL.indexColumns, yyDollar[3].indexColumn) } - case 104: + case 105: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:727 +//line sql.y:731 { yyVAL.indexColumn = &IndexColumn{Column: yyDollar[1].colIdent, Length: yyDollar[2].optVal} } - case 105: + case 106: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:732 +//line sql.y:736 { yyVAL.str = "" } - case 106: + case 107: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:736 +//line sql.y:740 { yyVAL.str = " " + string(yyDollar[1].str) } - case 107: + case 108: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:740 +//line sql.y:744 { yyVAL.str = string(yyDollar[1].str) + ", " + string(yyDollar[3].str) } - case 108: + case 109: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:748 +//line sql.y:752 { yyVAL.str = yyDollar[1].str } - case 109: + case 110: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:752 +//line sql.y:756 { yyVAL.str = yyDollar[1].str + " " + yyDollar[2].str } - case 110: + case 111: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:756 +//line sql.y:760 { yyVAL.str = yyDollar[1].str + "=" + yyDollar[3].str } - case 111: + case 112: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:762 +//line sql.y:766 { yyVAL.str = yyDollar[1].colIdent.String() } - case 112: + case 113: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:766 +//line sql.y:770 { yyVAL.str = "'" + string(yyDollar[1].bytes) + "'" } - case 113: + case 114: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:770 +//line sql.y:774 { yyVAL.str = string(yyDollar[1].bytes) } - case 114: + case 115: yyDollar = yyS[yypt-6 : yypt+1] -//line sql.y:776 +//line sql.y:780 { yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName, NewName: yyDollar[3].tableName} } - case 115: + case 116: yyDollar = yyS[yypt-6 : yypt+1] -//line sql.y:780 +//line sql.y:784 { // Change this to a rename statement yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[3].tableName, NewName: yyDollar[6].tableName} } - case 116: + case 117: yyDollar = yyS[yypt-8 : yypt+1] -//line sql.y:785 +//line sql.y:789 { // Rename an index can just be an alter yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName, NewName: yyDollar[3].tableName} } - case 117: + case 118: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:791 +//line sql.y:795 { } - case 119: + case 120: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:795 +//line sql.y:799 { var exists bool if yyDollar[3].byt != 0 { @@ -2312,9 +2327,9 @@ yydefault: } yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName, IfExists: exists} } - case 120: + case 121: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:803 +//line sql.y:807 { var exists bool if yyDollar[3].byt != 0 { @@ -2322,53 +2337,47 @@ yydefault: } yyVAL.statement = &DDL{Action: DropIndexStr, Table: yyDollar[4].tableName, IfExists: exists} } - case 121: - yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:813 - { - yyVAL.statement = &Show{Type: string(yyDollar[3].bytes), ShowCreate: true, OnTable: yyDollar[4].tableName} - } case 122: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:817 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[5].tableName} + yyVAL.statement = &Show{Type: string(yyDollar[3].bytes), ShowCreate: true, OnTable: yyDollar[4].tableName} } case 123: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:821 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[3].tableName} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[5].tableName} } case 124: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:825 { - yyVAL.statement = &Show{Type: string(yyDollar[3].bytes)} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[3].tableName} } case 125: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:829 { - yyVAL.statement = &Show{Type: "table", OnTable: yyDollar[5].tableName} + yyVAL.statement = &Show{Type: string(yyDollar[3].bytes)} } case 126: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:834 + yyDollar = yyS[yypt-5 : yypt+1] +//line sql.y:833 { - yyVAL.bytes = nil + yyVAL.statement = &Show{Type: "table", OnTable: yyDollar[5].tableName} } case 127: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:838 { yyVAL.bytes = nil } case 128: - yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:844 + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:842 { - yyVAL.statement = &Show{Type: "table", OnTable: yyDollar[2].tableName} + yyVAL.bytes = nil } case 129: yyDollar = yyS[yypt-2 : yypt+1] @@ -2380,674 +2389,674 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:852 { - yyVAL.statement = &Explain{} + yyVAL.statement = &Show{Type: "table", OnTable: yyDollar[2].tableName} } case 131: + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:856 + { + yyVAL.statement = &Explain{} + } + case 132: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:857 +//line sql.y:861 { setAllowComments(yylex, true) } - case 132: + case 133: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:861 +//line sql.y:865 { yyVAL.bytes2 = yyDollar[2].bytes2 setAllowComments(yylex, false) } - case 133: + case 134: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:867 +//line sql.y:871 { yyVAL.bytes2 = nil } - case 134: + case 135: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:871 +//line sql.y:875 { yyVAL.bytes2 = append(yyDollar[1].bytes2, yyDollar[2].bytes) } - case 135: + case 136: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:877 +//line sql.y:881 { yyVAL.str = UnionStr } - case 136: + case 137: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:881 +//line sql.y:885 { yyVAL.str = UnionAllStr } - case 137: + case 138: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:886 +//line sql.y:890 { yyVAL.str = "" } - case 138: + case 139: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:890 +//line sql.y:894 { yyVAL.str = DistinctStr } - case 139: + case 140: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:895 +//line sql.y:899 { yyVAL.selectExprs = nil } - case 140: + case 141: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:899 +//line sql.y:903 { yyVAL.selectExprs = yyDollar[1].selectExprs } - case 141: + case 142: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:905 +//line sql.y:909 { yyVAL.selectExprs = SelectExprs{yyDollar[1].selectExpr} } - case 142: + case 143: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:909 +//line sql.y:913 { yyVAL.selectExprs = append(yyVAL.selectExprs, yyDollar[3].selectExpr) } - case 143: + case 144: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:915 +//line sql.y:919 { yyVAL.selectExpr = &StarExpr{} } - case 144: + case 145: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:919 +//line sql.y:923 { yyVAL.selectExpr = &AliasedExpr{Expr: yyDollar[1].expr, As: yyDollar[2].colIdent} } - case 145: + case 146: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:923 +//line sql.y:927 { yyVAL.selectExpr = &StarExpr{TableName: TableName{Name: yyDollar[1].tableIdent}} } - case 146: + case 147: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:927 +//line sql.y:931 { yyVAL.selectExpr = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}} } - case 147: + case 148: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:932 +//line sql.y:936 { yyVAL.colIdent = ColIdent{} } - case 148: + case 149: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:936 +//line sql.y:940 { yyVAL.colIdent = yyDollar[1].colIdent } - case 149: + case 150: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:940 +//line sql.y:944 { yyVAL.colIdent = yyDollar[2].colIdent } - case 151: + case 152: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:947 +//line sql.y:951 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 152: + case 153: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:953 +//line sql.y:957 { yyVAL.tableExprs = yyDollar[2].tableExprs } - case 153: + case 154: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:959 +//line sql.y:963 { yyVAL.tableExprs = TableExprs{yyDollar[1].tableExpr} } - case 154: + case 155: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:963 +//line sql.y:967 { yyVAL.tableExprs = append(yyVAL.tableExprs, yyDollar[3].tableExpr) } - case 157: + case 158: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:973 +//line sql.y:977 { yyVAL.tableExpr = yyDollar[1].aliasedTableName } - case 158: + case 159: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:977 +//line sql.y:981 { yyVAL.tableExpr = &AliasedTableExpr{Expr: yyDollar[1].subquery} } - case 159: + case 160: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:981 +//line sql.y:985 { yyVAL.tableExpr = &AliasedTableExpr{Expr: yyDollar[1].subquery, As: yyDollar[3].tableIdent} } - case 160: + case 161: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:985 +//line sql.y:989 { yyVAL.tableExpr = &ParenTableExpr{Exprs: yyDollar[2].tableExprs} } - case 161: + case 162: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:991 +//line sql.y:995 { yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].tableIdent} } - case 162: + case 163: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:997 +//line sql.y:1001 { yyVAL.columns = Columns{yyDollar[1].colIdent} } - case 163: + case 164: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1001 +//line sql.y:1005 { yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent) } - case 164: + case 165: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1007 +//line sql.y:1011 { yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition} } - case 165: + case 166: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1011 +//line sql.y:1015 { yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition} } - case 166: + case 167: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1015 +//line sql.y:1019 { yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr} } - case 167: + case 168: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1021 +//line sql.y:1025 { yyVAL.joinCondition = JoinCondition{On: yyDollar[2].expr} } - case 168: + case 169: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1023 +//line sql.y:1027 { yyVAL.joinCondition = JoinCondition{Using: yyDollar[3].columns} } - case 169: + case 170: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1027 +//line sql.y:1031 { yyVAL.joinCondition = JoinCondition{} } - case 170: + case 171: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1029 +//line sql.y:1033 { yyVAL.joinCondition = yyDollar[1].joinCondition } - case 171: + case 172: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1032 +//line sql.y:1036 { yyVAL.empty = struct{}{} } - case 172: + case 173: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1034 +//line sql.y:1038 { yyVAL.empty = struct{}{} } - case 173: + case 174: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1037 +//line sql.y:1041 { yyVAL.tableIdent = NewTableIdent("") } - case 174: + case 175: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1041 +//line sql.y:1045 { yyVAL.tableIdent = yyDollar[1].tableIdent } - case 175: + case 176: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1045 +//line sql.y:1049 { yyVAL.tableIdent = yyDollar[2].tableIdent } - case 177: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1052 - { - yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) - } case 178: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1058 +//line sql.y:1056 { - yyVAL.str = JoinStr + yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } case 179: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1062 { - yyVAL.str = InnerJoinStr + yyVAL.str = JoinStr } case 180: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1066 { - yyVAL.str = CrossJoinStr + yyVAL.str = InnerJoinStr } case 181: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1072 +//line sql.y:1070 { - yyVAL.str = LeftJoinStr + yyVAL.str = CrossJoinStr } case 182: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1076 { yyVAL.str = LeftJoinStr } case 183: - yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1082 + yyDollar = yyS[yypt-3 : yypt+1] +//line sql.y:1080 { - yyVAL.str = NaturalJoinStr + yyVAL.str = LeftJoinStr } case 184: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1086 { - yyVAL.str = NaturalLeftJoinStr + yyVAL.str = NaturalJoinStr } case 185: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1092 +//line sql.y:1090 { - yyVAL.tableName = yyDollar[2].tableName + yyVAL.str = NaturalLeftJoinStr } case 186: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1096 { - yyVAL.tableName = yyDollar[1].tableName + yyVAL.tableName = yyDollar[2].tableName } case 187: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1102 +//line sql.y:1100 { - yyVAL.tableName = TableName{Name: yyDollar[1].tableIdent} + yyVAL.tableName = yyDollar[1].tableName } case 188: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1106 { - yyVAL.tableName = TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent} + yyVAL.tableName = TableName{Name: yyDollar[1].tableIdent} } case 189: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1111 + yyDollar = yyS[yypt-3 : yypt+1] +//line sql.y:1110 { - yyVAL.expr = nil + yyVAL.tableName = TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent} } case 190: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:1115 { - yyVAL.expr = yyDollar[2].expr + yyVAL.expr = nil } case 191: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1121 + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:1119 { - yyVAL.expr = yyDollar[1].expr + yyVAL.expr = yyDollar[2].expr } case 192: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1125 { - yyVAL.expr = &AndExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} + yyVAL.expr = yyDollar[1].expr } case 193: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1129 { - yyVAL.expr = &OrExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} + yyVAL.expr = &AndExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} } case 194: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1133 { - yyVAL.expr = &NotExpr{Expr: yyDollar[2].expr} + yyVAL.expr = &OrExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} } case 195: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1137 { - yyVAL.expr = &IsExpr{Operator: yyDollar[3].str, Expr: yyDollar[1].expr} + yyVAL.expr = &NotExpr{Expr: yyDollar[2].expr} } case 196: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1141 { - yyVAL.expr = yyDollar[1].expr + yyVAL.expr = &IsExpr{Operator: yyDollar[3].str, Expr: yyDollar[1].expr} } case 197: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1147 +//line sql.y:1145 { - yyVAL.boolVal = BoolVal(true) + yyVAL.expr = yyDollar[1].expr } case 198: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1151 { - yyVAL.boolVal = BoolVal(false) + yyVAL.boolVal = BoolVal(true) } case 199: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1157 + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1155 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr} + yyVAL.boolVal = BoolVal(false) } case 200: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1161 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: InStr, Right: yyDollar[3].colTuple} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr} } case 201: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1165 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotInStr, Right: yyDollar[4].colTuple} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: InStr, Right: yyDollar[3].colTuple} } case 202: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1169 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: LikeStr, Right: yyDollar[3].expr, Escape: yyDollar[4].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotInStr, Right: yyDollar[4].colTuple} } case 203: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1173 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotLikeStr, Right: yyDollar[4].expr, Escape: yyDollar[5].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: LikeStr, Right: yyDollar[3].expr, Escape: yyDollar[4].expr} } case 204: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:1177 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: RegexpStr, Right: yyDollar[3].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotLikeStr, Right: yyDollar[4].expr, Escape: yyDollar[5].expr} } case 205: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1181 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotRegexpStr, Right: yyDollar[4].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: RegexpStr, Right: yyDollar[3].expr} } case 206: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1185 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: MatchStr, Right: yyDollar[3].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotRegexpStr, Right: yyDollar[4].expr} } case 207: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1189 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotMatchStr, Right: yyDollar[4].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: MatchStr, Right: yyDollar[3].expr} } case 208: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1193 { - yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: BetweenStr, From: yyDollar[3].expr, To: yyDollar[5].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotMatchStr, Right: yyDollar[4].expr} } case 209: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:1197 { - yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: NotBetweenStr, From: yyDollar[4].expr, To: yyDollar[6].expr} + yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: BetweenStr, From: yyDollar[3].expr, To: yyDollar[5].expr} } case 210: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:1201 { - yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery} + yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: NotBetweenStr, From: yyDollar[4].expr, To: yyDollar[6].expr} } case 211: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1207 + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:1205 { - yyVAL.str = IsNullStr + yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery} } case 212: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1211 { - yyVAL.str = IsNotNullStr + yyVAL.str = IsNullStr } case 213: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1215 { - yyVAL.str = IsTrueStr + yyVAL.str = IsNotNullStr } case 214: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1219 { - yyVAL.str = IsNotTrueStr + yyVAL.str = IsTrueStr } case 215: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1223 { - yyVAL.str = IsFalseStr + yyVAL.str = IsNotTrueStr } case 216: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1227 { - yyVAL.str = IsNotFalseStr + yyVAL.str = IsFalseStr } case 217: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1233 + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:1231 { - yyVAL.str = EqualStr + yyVAL.str = IsNotFalseStr } case 218: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1237 { - yyVAL.str = LessThanStr + yyVAL.str = EqualStr } case 219: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1241 { - yyVAL.str = GreaterThanStr + yyVAL.str = LessThanStr } case 220: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1245 { - yyVAL.str = LessEqualStr + yyVAL.str = GreaterThanStr } case 221: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1249 { - yyVAL.str = GreaterEqualStr + yyVAL.str = LessEqualStr } case 222: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1253 { - yyVAL.str = NotEqualStr + yyVAL.str = GreaterEqualStr } case 223: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1257 { - yyVAL.str = NullSafeNotEqualStr + yyVAL.str = NotEqualStr } case 224: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1262 + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1261 { - yyVAL.expr = nil + yyVAL.str = NullSafeNotEqualStr } case 225: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:1266 { - yyVAL.expr = yyDollar[2].expr + yyVAL.expr = nil } case 226: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1272 + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:1270 { - yyVAL.colTuple = yyDollar[1].valTuple + yyVAL.expr = yyDollar[2].expr } case 227: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1276 { - yyVAL.colTuple = yyDollar[1].subquery + yyVAL.colTuple = yyDollar[1].valTuple } case 228: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1280 { - yyVAL.colTuple = ListArg(yyDollar[1].bytes) + yyVAL.colTuple = yyDollar[1].subquery } case 229: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1286 + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1284 { - yyVAL.subquery = &Subquery{yyDollar[2].selStmt} + yyVAL.colTuple = ListArg(yyDollar[1].bytes) } case 230: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1292 + yyDollar = yyS[yypt-3 : yypt+1] +//line sql.y:1290 { - yyVAL.exprs = Exprs{yyDollar[1].expr} + yyVAL.subquery = &Subquery{yyDollar[2].selStmt} } case 231: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1296 { - yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr) + yyVAL.exprs = Exprs{yyDollar[1].expr} } case 232: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1302 + yyDollar = yyS[yypt-3 : yypt+1] +//line sql.y:1300 { - yyVAL.expr = yyDollar[1].expr + yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr) } case 233: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1306 { - yyVAL.expr = yyDollar[1].boolVal + yyVAL.expr = yyDollar[1].expr } case 234: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1310 { - yyVAL.expr = yyDollar[1].colName + yyVAL.expr = yyDollar[1].boolVal } case 235: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1314 { - yyVAL.expr = yyDollar[1].expr + yyVAL.expr = yyDollar[1].colName } case 236: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1318 { - yyVAL.expr = yyDollar[1].subquery + yyVAL.expr = yyDollar[1].expr } case 237: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1322 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr} + yyVAL.expr = yyDollar[1].subquery } case 238: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1326 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitOrStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr} } case 239: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1330 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitXorStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitOrStr, Right: yyDollar[3].expr} } case 240: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1334 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: PlusStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitXorStr, Right: yyDollar[3].expr} } case 241: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1338 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MinusStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: PlusStr, Right: yyDollar[3].expr} } case 242: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1342 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MultStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MinusStr, Right: yyDollar[3].expr} } case 243: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1346 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: DivStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MultStr, Right: yyDollar[3].expr} } case 244: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1350 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: IntDivStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: DivStr, Right: yyDollar[3].expr} } case 245: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1354 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: IntDivStr, Right: yyDollar[3].expr} } case 246: yyDollar = yyS[yypt-3 : yypt+1] @@ -3059,17 +3068,23 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1362 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftLeftStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr} } case 248: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1366 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftRightStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftLeftStr, Right: yyDollar[3].expr} } case 249: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1370 + { + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftRightStr, Right: yyDollar[3].expr} + } + case 250: + yyDollar = yyS[yypt-2 : yypt+1] +//line sql.y:1374 { if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal { yyVAL.expr = num @@ -3077,9 +3092,9 @@ yydefault: yyVAL.expr = &UnaryExpr{Operator: UPlusStr, Expr: yyDollar[2].expr} } } - case 250: + case 251: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1378 +//line sql.y:1382 { if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal { // Handle double negative @@ -3093,21 +3108,21 @@ yydefault: yyVAL.expr = &UnaryExpr{Operator: UMinusStr, Expr: yyDollar[2].expr} } } - case 251: + case 252: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1392 +//line sql.y:1396 { yyVAL.expr = &UnaryExpr{Operator: TildaStr, Expr: yyDollar[2].expr} } - case 252: + case 253: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1396 +//line sql.y:1400 { yyVAL.expr = &UnaryExpr{Operator: BangStr, Expr: yyDollar[2].expr} } - case 253: + case 254: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1400 +//line sql.y:1404 { // This rule prevents the usage of INTERVAL // as a function. If support is needed for that, @@ -3115,124 +3130,118 @@ yydefault: // will be non-trivial because of grammar conflicts. yyVAL.expr = &IntervalExpr{Expr: yyDollar[2].expr, Unit: yyDollar[3].colIdent.String()} } - case 258: + case 259: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1418 +//line sql.y:1422 { yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Exprs: yyDollar[3].selectExprs} } - case 259: + case 260: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1422 +//line sql.y:1426 { yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Distinct: true, Exprs: yyDollar[4].selectExprs} } - case 260: + case 261: yyDollar = yyS[yypt-6 : yypt+1] -//line sql.y:1426 +//line sql.y:1430 { yyVAL.expr = &FuncExpr{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].colIdent, Exprs: yyDollar[5].selectExprs} } - case 261: + case 262: yyDollar = yyS[yypt-6 : yypt+1] -//line sql.y:1436 +//line sql.y:1440 { yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType} } - case 262: + case 263: yyDollar = yyS[yypt-7 : yypt+1] -//line sql.y:1440 +//line sql.y:1444 { yyVAL.expr = &GroupConcatExpr{Distinct: yyDollar[3].str, Exprs: yyDollar[4].selectExprs, OrderBy: yyDollar[5].orderBy, Separator: yyDollar[6].str} } - case 263: + case 264: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1444 +//line sql.y:1448 { yyVAL.expr = &CaseExpr{Expr: yyDollar[2].expr, Whens: yyDollar[3].whens, Else: yyDollar[4].expr} } - case 264: + case 265: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1448 +//line sql.y:1452 { yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colName} } - case 265: + case 266: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1458 +//line sql.y:1462 { yyVAL.expr = &TimeExpr{Expr: NewColIdent("current_timestamp")} } - case 266: + case 267: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1463 +//line sql.y:1467 { yyVAL.expr = &TimeExpr{Expr: NewColIdent("current_date")} } - case 267: + case 268: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1468 +//line sql.y:1472 { yyVAL.expr = &TimeExpr{Expr: NewColIdent("current_time")} } - case 268: - yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1478 - { - yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs} - } case 269: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1482 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs} } case 270: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1486 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs} } case 271: - yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1492 + yyDollar = yyS[yypt-4 : yypt+1] +//line sql.y:1490 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs} } case 272: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1496 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 273: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1500 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 274: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1504 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} - yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length - yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 275: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1510 +//line sql.y:1508 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length + yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale } case 276: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1514 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 277: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1518 { yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} @@ -3241,16 +3250,16 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1522 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 279: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1526 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 280: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1530 { yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} @@ -3259,7 +3268,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1534 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 282: yyDollar = yyS[yypt-2 : yypt+1] @@ -3292,340 +3301,346 @@ yydefault: yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 287: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1558 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 288: + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1562 + { + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + } + case 289: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1563 +//line sql.y:1567 { yyVAL.expr = nil } - case 289: + case 290: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1567 +//line sql.y:1571 { yyVAL.expr = yyDollar[1].expr } - case 290: + case 291: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1572 +//line sql.y:1576 { yyVAL.str = string("") } - case 291: + case 292: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1576 +//line sql.y:1580 { yyVAL.str = " separator '" + string(yyDollar[2].bytes) + "'" } - case 292: + case 293: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1582 +//line sql.y:1586 { yyVAL.whens = []*When{yyDollar[1].when} } - case 293: + case 294: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1586 +//line sql.y:1590 { yyVAL.whens = append(yyDollar[1].whens, yyDollar[2].when) } - case 294: + case 295: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1592 +//line sql.y:1596 { yyVAL.when = &When{Cond: yyDollar[2].expr, Val: yyDollar[4].expr} } - case 295: + case 296: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1597 +//line sql.y:1601 { yyVAL.expr = nil } - case 296: + case 297: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1601 +//line sql.y:1605 { yyVAL.expr = yyDollar[2].expr } - case 297: + case 298: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1607 +//line sql.y:1611 { yyVAL.colName = &ColName{Name: yyDollar[1].colIdent} } - case 298: + case 299: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1611 +//line sql.y:1615 { yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent} } - case 299: + case 300: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1615 +//line sql.y:1619 { yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent} } - case 300: + case 301: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1621 +//line sql.y:1625 { yyVAL.colName = &ColName{Name: yyDollar[1].colIdent} } - case 301: + case 302: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1625 +//line sql.y:1629 { yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent} } - case 302: + case 303: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1629 +//line sql.y:1633 { yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent} } - case 303: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1635 - { - yyVAL.expr = NewStrVal(yyDollar[1].bytes) - } case 304: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1639 { - yyVAL.expr = NewHexVal(yyDollar[1].bytes) + yyVAL.expr = NewStrVal(yyDollar[1].bytes) } case 305: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1643 { - yyVAL.expr = NewIntVal(yyDollar[1].bytes) + yyVAL.expr = NewHexVal(yyDollar[1].bytes) } case 306: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1647 { - yyVAL.expr = NewFloatVal(yyDollar[1].bytes) + yyVAL.expr = NewIntVal(yyDollar[1].bytes) } case 307: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1651 { - yyVAL.expr = NewHexNum(yyDollar[1].bytes) + yyVAL.expr = NewFloatVal(yyDollar[1].bytes) } case 308: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1655 { - yyVAL.expr = NewValArg(yyDollar[1].bytes) + yyVAL.expr = NewHexNum(yyDollar[1].bytes) } case 309: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1659 { - yyVAL.expr = NewPosArg(yyDollar[1].bytes) + yyVAL.expr = NewValArg(yyDollar[1].bytes) } case 310: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1663 { - yyVAL.expr = &NullVal{} + yyVAL.expr = NewPosArg(yyDollar[1].bytes) } case 311: + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1667 + { + yyVAL.expr = &NullVal{} + } + case 312: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1668 +//line sql.y:1672 { yyVAL.exprs = nil } - case 312: + case 313: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1672 +//line sql.y:1676 { yyVAL.exprs = yyDollar[3].exprs } - case 313: + case 314: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1677 +//line sql.y:1681 { yyVAL.expr = nil } - case 314: + case 315: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1681 +//line sql.y:1685 { yyVAL.expr = yyDollar[2].expr } - case 315: + case 316: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1686 +//line sql.y:1690 { yyVAL.orderBy = nil } - case 316: + case 317: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1690 +//line sql.y:1694 { yyVAL.orderBy = yyDollar[3].orderBy } - case 317: + case 318: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1696 +//line sql.y:1700 { yyVAL.orderBy = OrderBy{yyDollar[1].order} } - case 318: + case 319: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1700 +//line sql.y:1704 { yyVAL.orderBy = append(yyDollar[1].orderBy, yyDollar[3].order) } - case 319: + case 320: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1706 +//line sql.y:1710 { yyVAL.order = &Order{Expr: yyDollar[1].expr, Direction: yyDollar[2].str} } - case 320: + case 321: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1711 +//line sql.y:1715 { yyVAL.str = AscScr } - case 321: + case 322: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1715 +//line sql.y:1719 { yyVAL.str = AscScr } - case 322: + case 323: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1719 +//line sql.y:1723 { yyVAL.str = DescScr } - case 323: + case 324: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1724 +//line sql.y:1728 { yyVAL.limit = nil } - case 324: + case 325: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1728 +//line sql.y:1732 { yyVAL.limit = &Limit{Rowcount: yyDollar[2].expr} } - case 325: + case 326: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1732 +//line sql.y:1736 { yyVAL.limit = &Limit{Offset: yyDollar[2].expr, Rowcount: yyDollar[4].expr} } - case 326: + case 327: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1736 +//line sql.y:1740 { yyVAL.limit = &Limit{Offset: yyDollar[4].expr, Rowcount: yyDollar[2].expr} } - case 327: + case 328: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1749 +//line sql.y:1753 { yyVAL.ins = &Insert{Rows: yyDollar[2].values} } - case 328: + case 329: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1753 +//line sql.y:1757 { yyVAL.ins = &Insert{Rows: yyDollar[1].selStmt} } - case 329: + case 330: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1757 +//line sql.y:1761 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Rows: yyDollar[2].selStmt} } - case 330: + case 331: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1762 +//line sql.y:1766 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].values} } - case 331: + case 332: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:1766 +//line sql.y:1770 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[4].selStmt} } - case 332: + case 333: yyDollar = yyS[yypt-6 : yypt+1] -//line sql.y:1770 +//line sql.y:1774 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].selStmt} } - case 333: + case 334: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1777 +//line sql.y:1781 { yyVAL.columns = Columns{yyDollar[1].colIdent} } - case 334: + case 335: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1781 +//line sql.y:1785 { yyVAL.columns = Columns{yyDollar[3].colIdent} } - case 335: + case 336: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1785 +//line sql.y:1789 { yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent) } - case 336: + case 337: yyDollar = yyS[yypt-5 : yypt+1] -//line sql.y:1789 +//line sql.y:1793 { yyVAL.columns = append(yyVAL.columns, yyDollar[5].colIdent) } - case 337: + case 338: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1795 +//line sql.y:1799 { yyVAL.values = Values{yyDollar[1].valTuple} } - case 338: + case 339: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1799 +//line sql.y:1803 { yyVAL.values = append(yyDollar[1].values, yyDollar[3].valTuple) } - case 339: + case 340: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1805 +//line sql.y:1809 { yyVAL.valTuple = yyDollar[1].valTuple } - case 340: + case 341: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1809 +//line sql.y:1813 { yyVAL.valTuple = ValTuple{} } - case 341: + case 342: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1815 +//line sql.y:1819 { yyVAL.valTuple = ValTuple(yyDollar[2].exprs) } - case 342: + case 343: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1821 +//line sql.y:1825 { if len(yyDollar[1].valTuple) == 1 { yyVAL.expr = &ParenExpr{yyDollar[1].valTuple[0]} @@ -3633,75 +3648,69 @@ yydefault: yyVAL.expr = yyDollar[1].valTuple } } - case 343: + case 344: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1831 +//line sql.y:1835 { yyVAL.updateExprs = UpdateExprs{yyDollar[1].updateExpr} } - case 344: + case 345: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1835 +//line sql.y:1839 { yyVAL.updateExprs = append(yyDollar[1].updateExprs, yyDollar[3].updateExpr) } - case 345: + case 346: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1841 +//line sql.y:1845 { yyVAL.updateExpr = &UpdateExpr{Name: yyDollar[1].colName, Expr: yyDollar[3].expr} } - case 346: + case 347: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1846 +//line sql.y:1850 { yyVAL.byt = 0 } - case 347: + case 348: yyDollar = yyS[yypt-2 : yypt+1] -//line sql.y:1848 +//line sql.y:1852 { yyVAL.byt = 1 } - case 348: + case 349: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1851 +//line sql.y:1855 { yyVAL.empty = struct{}{} } - case 349: + case 350: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:1853 +//line sql.y:1857 { yyVAL.empty = struct{}{} } - case 350: + case 351: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1856 +//line sql.y:1860 { yyVAL.str = "" } - case 351: + case 352: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1858 +//line sql.y:1862 { yyVAL.str = IgnoreStr } - case 352: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:1861 - { - yyVAL.empty = struct{}{} - } case 353: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1863 + yyDollar = yyS[yypt-0 : yypt+1] +//line sql.y:1865 { yyVAL.empty = struct{}{} } case 354: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1865 +//line sql.y:1867 { yyVAL.empty = struct{}{} } @@ -3709,7 +3718,7 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1869 { - yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) + yyVAL.empty = struct{}{} } case 356: yyDollar = yyS[yypt-1 : yypt+1] @@ -3717,17 +3726,17 @@ yydefault: { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 358: + case 357: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1880 +//line sql.y:1877 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } case 359: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1886 +//line sql.y:1884 { - yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) + yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } case 360: yyDollar = yyS[yypt-1 : yypt+1] @@ -3735,41 +3744,41 @@ yydefault: { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 362: + case 361: + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:1894 + { + yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) + } + case 363: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:1897 +//line sql.y:1901 { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 472: + case 473: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:2032 +//line sql.y:2036 { if incNesting(yylex) { yylex.Error("max nesting level reached") return 1 } } - case 473: + case 474: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:2041 +//line sql.y:2045 { decNesting(yylex) } - case 474: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:2046 - { - forceEOF(yylex) - } case 475: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:2051 +//line sql.y:2050 { forceEOF(yylex) } case 476: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:2055 { forceEOF(yylex) @@ -3780,6 +3789,12 @@ yydefault: { forceEOF(yylex) } + case 478: + yyDollar = yyS[yypt-1 : yypt+1] +//line sql.y:2063 + { + forceEOF(yylex) + } } goto yystack /* stack new state and value */ } diff --git a/sql.y b/sql.y index 9e07285..6451d32 100644 --- a/sql.y +++ b/sql.y @@ -565,6 +565,10 @@ float_length_opt: { $$ = LengthScaleOption{} } +| '(' INTEGRAL ')' + { + $$ = LengthScaleOption{Length: NewIntVal($2)} + } | '(' INTEGRAL ',' INTEGRAL ')' { $$ = LengthScaleOption{ From ada4f15b6d84aa21a6fe834adbd7aca42cf25343 Mon Sep 17 00:00:00 2001 From: Jin Xu Date: Fri, 6 Nov 2026 20:06:27 +0800 Subject: [PATCH 2/2] Cover acceptance of floating defaults containing semicolons Complete parsing of a single-precision column declaration also keeps semicolons inside default strings within the statement. Cover FLOAT, DOUBLE, and REAL through ParseMultiple, preserving the original query and string value. This acceptance expansion accompanies the stricter stateful-default checks documented for the grammar change. --- parse_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/parse_test.go b/parse_test.go index 9700ef1..a4656f3 100644 --- a/parse_test.go +++ b/parse_test.go @@ -722,6 +722,30 @@ func TestFloatColumnPrecision(t *testing.T) { } } +func TestFloatColumnPrecisionSemicolonDefault(t *testing.T) { + for _, typ := range []string{"float", "double", "real"} { + input := "create table t (a " + typ + "(24) default 'a;b')" + queries, statements, err := ParseMultiple(NewStringTokenizer(input)) + if err != nil { + t.Errorf("ParseMultiple(%q): %v", input, err) + continue + } + if len(queries) != 1 || queries[0] != input || len(statements) != 1 { + t.Errorf("ParseMultiple(%q): unexpected result %v, %v", input, queries, statements) + continue + } + ddl := statements[0].(*DDL) + if ddl.TableSpec == nil || len(ddl.TableSpec.Columns) != 1 { + t.Errorf("ParseMultiple(%q): missing column specification", input) + continue + } + value := ddl.TableSpec.Columns[0].Type.Default + if value == nil || value.Type != StrVal || string(value.Val) != "a;b" { + t.Errorf("ParseMultiple(%q): unexpected default %v", input, value) + } + } +} + func TestCaseSensitivity(t *testing.T) { validSQL := []struct { input string