diff --git a/parse_test.go b/parse_test.go index c11362f..f909d0f 100644 --- a/parse_test.go +++ b/parse_test.go @@ -726,8 +726,9 @@ func TestInsertComments(t *testing.T) { } } -func TestEmptySpecialComments(t *testing.T) { - for _, input := range []string{"select /*!*/ 1", "select /*!1234*/ 1"} { +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) @@ -737,8 +738,48 @@ func TestEmptySpecialComments(t *testing.T) { t.Errorf("ParseMultiple(%q): unexpected result %v, %v", input, queries, statements) continue } - if got := String(statements[0]); got != "select 1" { - t.Errorf("ParseMultiple(%q) = %q, want select 1", input, got) + 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 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) } } } @@ -846,6 +887,23 @@ func TestKeywords(t *testing.T) { } } +func TestEmptySpecialComments(t *testing.T) { + for _, input := range []string{"select /*!*/ 1", "select /*!1234*/ 1"} { + 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 + } + if got := String(statements[0]); got != "select 1" { + t.Errorf("ParseMultiple(%q) = %q, want select 1", input, got) + } + } +} + func TestConvert(t *testing.T) { validSQL := []struct { input string diff --git a/sql.go b/sql.go index a93de1f..3654589 100644 --- a/sql.go +++ b/sql.go @@ -402,440 +402,405 @@ var yyExca = [...]int{ 5, 17, -2, 4, -1, 121, - 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, 193, - 94, 359, - -2, 355, - -1, 194, 94, 360, -2, 356, + -1, 194, + 94, 361, + -2, 357, -1, 203, 5, 17, - -2, 328, + -2, 329, -1, 418, - 94, 177, - -2, 151, + 94, 178, + -2, 152, -1, 538, - 94, 362, - -2, 358, + 94, 363, + -2, 359, -1, 556, 5, 18, - -2, 329, + -2, 330, -1, 567, 5, 18, - -2, 229, + -2, 230, -1, 629, 5, 17, - -2, 331, - -1, 733, - 5, 18, -2, 332, + -1, 734, + 5, 18, + -2, 333, } const yyPrivate = 57344 -const yyLast = 4225 +const yyLast = 4350 var yyAct = [...]int{ - 194, 396, 641, 704, 477, 447, 419, 147, 533, 416, - 415, 605, 352, 452, 420, 446, 106, 544, 32, 49, - 414, 507, 443, 99, 99, 350, 273, 123, 562, 218, - 179, 127, 159, 458, 483, 196, 181, 99, 145, 99, - 209, 118, 31, 49, 473, 730, 448, 95, 38, 47, - 94, 100, 128, 354, 413, 143, 117, 582, 646, 647, - 648, 465, 219, 3, 115, 40, 649, 535, 116, 645, - 133, 121, 722, 129, 102, 720, 104, 105, 700, 25, - 27, 15, 16, 485, 484, 93, 134, 99, 484, 103, - 137, 37, 99, 657, 132, 87, 22, 88, 271, 370, - 460, 266, 265, 466, 139, 131, 86, 691, 136, 688, - 660, 611, 29, 559, 135, 99, 553, 576, 495, 141, - 150, 197, 395, 99, 99, 89, 99, 144, 198, 355, - 91, 357, 90, 552, 99, 515, 685, 99, 264, 99, - 99, 545, 205, 617, 357, 99, 545, 142, 512, 513, - 514, 511, 149, 226, 580, 121, 356, 355, 275, 701, - 699, 263, 29, 650, 267, 360, 269, 270, 18, 19, - 20, 222, 357, 510, 199, 225, 203, 459, 373, 374, - 375, 376, 377, 370, 21, 23, 703, 387, 24, 500, - 502, 503, 462, 613, 702, 397, 501, 138, 402, 463, - 585, 584, 261, 262, 583, 49, 745, 412, 99, 99, - 99, 99, 643, 349, 425, 411, 577, 99, 597, 598, - 599, 99, 735, 736, 99, 28, 439, 440, 49, 49, - 356, 355, 129, 409, 410, 426, 148, 129, 128, 421, - 121, 121, 121, 121, 696, 695, 357, 490, 148, 417, - 429, 741, 431, 121, 417, 740, 437, 651, 451, 129, - 453, 427, 99, 99, 428, 479, 430, 423, 356, 355, - 539, 442, 99, 99, 554, 371, 372, 373, 374, 375, - 376, 377, 370, 441, 357, 654, 653, 558, 148, 480, - 481, 539, 148, 207, 148, 228, 227, 444, 207, 487, - 488, 486, 475, 476, 245, 683, 491, 250, 251, 252, - 253, 254, 255, 25, 256, 257, 258, 259, 260, 246, - 247, 248, 249, 235, 236, 359, 551, 237, 238, 239, - 240, 241, 242, 243, 244, 33, 490, 25, 652, 468, - 469, 206, 356, 355, 490, 570, 29, 586, 358, 687, - 470, 471, 472, 49, 207, 551, 407, 467, 357, 628, - 587, 490, 493, 478, 25, 356, 355, 29, 497, 498, - 29, 504, 505, 636, 670, 573, 474, 679, 680, 681, - 678, 357, 682, 129, 42, 201, 202, 672, 12, 675, - 677, 671, 566, 669, 49, 509, 673, 29, 434, 508, - 563, 564, 435, 496, 540, 433, 674, 676, 432, 538, - 579, 397, 541, 739, 546, 436, 214, 738, 574, 482, - 197, 268, 537, 110, 532, 217, 451, 146, 112, 107, - 555, 556, 557, 153, 129, 397, 711, 108, 33, 542, - 710, 659, 536, 550, 35, 444, 272, 49, 140, 567, - 560, 417, 571, 125, 39, 101, 30, 569, 1, 565, - 92, 441, 568, 211, 214, 640, 212, 455, 213, 215, - 563, 564, 547, 548, 549, 211, 214, 451, 212, 445, - 213, 215, 126, 41, 49, 454, 99, 698, 644, 461, - 581, 575, 99, 128, 464, 49, 578, 590, 231, 232, - 230, 234, 233, 229, 594, 668, 216, 221, 492, 538, - 44, 36, 591, 589, 129, 588, 592, 129, 693, 424, - 408, 593, 596, 195, 121, 129, 451, 709, 658, 615, - 401, 543, 157, 600, 417, 158, 499, 168, 165, 167, - 166, 608, 536, 155, 509, 14, 200, 361, 508, 156, - 151, 120, 612, 113, 619, 620, 621, 622, 618, 49, - 49, 616, 210, 208, 561, 624, 119, 538, 631, 627, - 489, 49, 623, 49, 49, 729, 635, 34, 639, 634, - 626, 124, 129, 11, 451, 637, 638, 99, 99, 632, - 633, 421, 10, 17, 389, 390, 391, 392, 393, 417, - 625, 451, 609, 451, 642, 9, 8, 7, 6, 5, - 614, 4, 49, 661, 655, 656, 109, 665, 13, 666, - 629, 2, 0, 0, 0, 180, 0, 0, 0, 0, - 686, 0, 0, 684, 0, 689, 0, 49, 0, 49, - 0, 0, 451, 0, 571, 0, 694, 0, 96, 96, - 0, 692, 0, 0, 0, 0, 49, 49, 667, 0, - 707, 49, 96, 0, 96, 421, 0, 129, 708, 451, - 0, 0, 0, 0, 714, 0, 715, 718, 0, 0, - 0, 0, 0, 0, 0, 0, 451, 451, 129, 49, - 0, 451, 49, 690, 0, 0, 0, 49, 733, 737, - 731, 0, 706, 706, 0, 417, 0, 667, 0, 0, - 0, 0, 96, 743, 0, 0, 0, 96, 0, 451, - 0, 0, 734, 742, 397, 0, 0, 642, 0, 0, - 0, 0, 0, 0, 0, 732, 49, 744, 0, 0, - 96, 0, 0, 0, 0, 746, 697, 0, 96, 224, - 0, 96, 0, 0, 0, 70, 0, 0, 0, 96, - 0, 0, 96, 0, 96, 96, 129, 62, 0, 0, - 274, 353, 0, 716, 0, 717, 0, 719, 0, 721, - 48, 723, 724, 725, 726, 727, 728, 182, 26, 0, + 194, 396, 641, 106, 477, 447, 705, 147, 533, 416, + 446, 415, 352, 605, 419, 420, 443, 414, 32, 49, + 544, 123, 350, 99, 99, 507, 273, 218, 562, 458, + 179, 452, 535, 196, 38, 145, 159, 99, 483, 99, + 127, 473, 117, 49, 94, 100, 31, 95, 209, 47, + 181, 40, 128, 731, 413, 219, 3, 118, 115, 354, + 102, 143, 104, 105, 582, 465, 116, 645, 646, 647, + 648, 133, 723, 129, 721, 121, 649, 484, 485, 134, + 460, 701, 103, 484, 137, 93, 37, 99, 658, 87, + 132, 88, 99, 271, 139, 448, 131, 576, 266, 265, + 466, 86, 373, 374, 375, 376, 377, 370, 135, 692, + 689, 370, 661, 141, 611, 99, 559, 553, 355, 495, + 150, 197, 395, 99, 99, 89, 99, 144, 198, 136, + 91, 357, 90, 357, 99, 515, 205, 99, 552, 99, + 99, 686, 545, 545, 617, 99, 264, 226, 512, 513, + 514, 511, 149, 142, 580, 263, 225, 459, 267, 121, + 269, 270, 702, 700, 704, 360, 29, 199, 462, 203, + 703, 222, 746, 650, 585, 463, 275, 510, 349, 369, + 368, 378, 379, 371, 372, 373, 374, 375, 376, 377, + 370, 387, 597, 598, 599, 397, 356, 355, 402, 359, + 584, 583, 411, 261, 262, 49, 643, 412, 99, 99, + 99, 99, 357, 577, 425, 736, 737, 99, 138, 697, + 696, 99, 358, 539, 99, 148, 439, 440, 49, 49, + 742, 554, 129, 490, 148, 426, 741, 129, 128, 356, + 355, 33, 613, 206, 121, 121, 121, 121, 651, 417, + 428, 207, 430, 421, 417, 357, 207, 121, 451, 129, + 423, 427, 99, 99, 437, 479, 429, 490, 431, 453, + 490, 442, 99, 99, 655, 654, 441, 653, 652, 356, + 355, 558, 148, 480, 481, 371, 372, 373, 374, 375, + 376, 377, 370, 487, 488, 357, 539, 148, 570, 475, + 476, 207, 148, 245, 551, 486, 250, 251, 252, 253, + 254, 255, 407, 256, 257, 258, 259, 260, 246, 247, + 248, 249, 235, 236, 228, 227, 237, 238, 239, 240, + 241, 242, 243, 244, 356, 355, 468, 469, 444, 467, + 491, 688, 478, 29, 409, 410, 636, 470, 471, 472, + 357, 25, 25, 49, 500, 502, 503, 573, 563, 564, + 25, 501, 493, 474, 42, 566, 586, 551, 497, 498, + 490, 504, 505, 628, 25, 27, 15, 16, 587, 356, + 355, 201, 202, 129, 29, 29, 434, 433, 12, 496, + 435, 22, 432, 29, 49, 357, 579, 211, 214, 509, + 212, 740, 213, 215, 540, 436, 214, 29, 739, 574, + 482, 397, 541, 508, 268, 546, 217, 146, 112, 107, + 197, 712, 537, 110, 532, 108, 451, 538, 33, 711, + 555, 556, 557, 153, 129, 397, 542, 547, 548, 549, + 660, 550, 444, 272, 560, 140, 125, 49, 35, 567, + 39, 417, 571, 101, 441, 30, 1, 569, 92, 565, + 640, 455, 568, 18, 19, 20, 368, 378, 379, 371, + 372, 373, 374, 375, 376, 377, 370, 451, 445, 21, + 23, 126, 41, 24, 49, 454, 99, 575, 699, 644, + 461, 536, 99, 128, 581, 49, 464, 578, 590, 231, + 232, 230, 234, 233, 594, 229, 591, 589, 669, 216, + 221, 492, 44, 592, 129, 36, 694, 129, 424, 593, + 28, 408, 596, 195, 588, 129, 451, 538, 121, 710, + 659, 615, 401, 543, 417, 157, 158, 600, 499, 211, + 214, 608, 212, 168, 213, 215, 563, 564, 509, 165, + 167, 166, 612, 155, 619, 620, 621, 622, 618, 49, + 49, 14, 508, 200, 616, 624, 361, 609, 631, 623, + 627, 49, 637, 49, 49, 614, 635, 156, 639, 634, + 626, 638, 129, 151, 451, 538, 120, 99, 99, 632, + 633, 536, 113, 210, 389, 390, 391, 392, 393, 417, + 208, 451, 561, 451, 642, 421, 119, 489, 656, 657, + 730, 34, 49, 629, 124, 662, 11, 666, 10, 667, + 17, 9, 8, 7, 180, 6, 5, 4, 109, 13, + 687, 2, 0, 685, 0, 0, 0, 49, 693, 49, + 0, 0, 451, 690, 571, 0, 695, 96, 96, 625, + 0, 0, 0, 0, 0, 0, 0, 49, 49, 0, + 0, 96, 49, 96, 708, 0, 0, 129, 0, 451, + 709, 0, 0, 0, 0, 715, 0, 716, 719, 421, + 0, 0, 0, 0, 0, 0, 691, 451, 451, 129, + 49, 0, 451, 49, 0, 0, 0, 0, 49, 734, + 738, 732, 0, 0, 0, 0, 417, 668, 0, 0, + 0, 96, 0, 0, 744, 0, 96, 0, 0, 0, + 451, 0, 0, 735, 743, 397, 0, 0, 642, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 745, 96, + 0, 0, 0, 698, 0, 0, 747, 96, 224, 0, + 96, 0, 707, 707, 0, 0, 0, 668, 96, 0, + 0, 96, 0, 96, 96, 0, 0, 129, 0, 274, + 353, 717, 0, 718, 0, 720, 0, 722, 684, 724, + 725, 726, 727, 728, 729, 733, 0, 0, 182, 26, 0, 0, 0, 0, 0, 506, 0, 0, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, - 528, 529, 530, 531, 26, 0, 0, 0, 0, 0, - 0, 0, 111, 0, 0, 0, 122, 224, 0, 0, - 0, 0, 224, 96, 96, 96, 96, 0, 45, 43, - 0, 0, 438, 0, 46, 71, 96, 0, 59, 224, - 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, - 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, - 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, - 65, 63, 0, 73, 81, 85, 0, 96, 96, 0, - 0, 0, 0, 0, 82, 0, 0, 96, 96, 26, - 0, 204, 0, 0, 0, 0, 662, 0, 0, 0, - 220, 0, 0, 0, 0, 369, 368, 378, 379, 371, + 528, 529, 530, 531, 0, 26, 0, 0, 0, 0, + 0, 0, 0, 111, 0, 0, 224, 122, 0, 0, + 0, 224, 96, 96, 96, 96, 0, 0, 0, 0, + 0, 438, 0, 0, 0, 96, 0, 671, 224, 0, + 680, 681, 682, 679, 0, 683, 0, 0, 0, 0, + 673, 0, 676, 678, 672, 0, 670, 0, 0, 674, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 675, + 677, 0, 0, 0, 0, 0, 96, 96, 0, 0, + 0, 0, 0, 0, 0, 0, 96, 96, 0, 0, + 26, 0, 204, 0, 0, 0, 663, 0, 0, 0, + 0, 220, 0, 0, 0, 369, 368, 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, 369, 368, 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, 0, - 0, 0, 388, 0, 0, 0, 601, 602, 603, 604, + 0, 0, 0, 388, 0, 0, 601, 602, 603, 604, 606, 378, 379, 371, 372, 373, 374, 375, 376, 377, - 370, 70, 0, 0, 494, 0, 0, 394, 0, 0, - 398, 399, 400, 62, 403, 0, 0, 0, 404, 405, - 406, 0, 0, 0, 0, 0, 48, 0, 130, 0, - 422, 0, 26, 0, 0, 122, 122, 122, 122, 0, - 0, 356, 355, 0, 0, 0, 0, 0, 220, 0, - 0, 0, 0, 0, 0, 0, 0, 357, 0, 0, - 353, 274, 0, 0, 0, 0, 0, 0, 0, 224, - 353, 353, 353, 70, 0, 0, 0, 0, 0, 0, - 663, 664, 0, 0, 0, 62, 0, 0, 0, 0, - 0, 71, 0, 0, 59, 0, 0, 54, 48, 0, + 370, 0, 70, 0, 0, 494, 0, 0, 394, 0, + 0, 398, 399, 400, 62, 403, 0, 0, 0, 404, + 405, 406, 0, 0, 0, 0, 0, 48, 0, 130, + 0, 422, 0, 26, 0, 0, 122, 122, 122, 122, + 0, 0, 356, 355, 0, 0, 0, 0, 0, 220, + 0, 0, 0, 0, 0, 0, 0, 0, 357, 353, + 274, 25, 0, 0, 0, 0, 0, 0, 224, 353, + 353, 353, 70, 0, 0, 0, 0, 0, 0, 0, + 664, 665, 0, 0, 62, 0, 0, 0, 0, 0, + 0, 0, 71, 0, 29, 59, 0, 98, 54, 97, + 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, + 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, + 68, 75, 80, 67, 64, 51, 78, 65, 63, 0, + 73, 81, 85, 0, 0, 0, 0, 714, 0, 0, + 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, + 96, 224, 0, 0, 0, 353, 96, 0, 0, 0, + 274, 0, 71, 0, 0, 59, 0, 0, 54, 0, + 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, + 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, + 68, 75, 80, 67, 64, 51, 78, 65, 63, 353, + 73, 81, 85, 0, 0, 0, 0, 353, 0, 0, + 0, 82, 0, 0, 0, 0, 224, 26, 274, 0, + 0, 0, 0, 0, 0, 0, 0, 398, 0, 0, + 0, 0, 0, 0, 70, 0, 534, 0, 154, 0, + 0, 0, 0, 0, 0, 186, 62, 0, 0, 0, + 0, 96, 96, 0, 0, 0, 29, 0, 0, 193, + 170, 169, 171, 172, 173, 174, 175, 607, 0, 176, + 177, 178, 0, 0, 0, 353, 152, 163, 0, 185, + 0, 0, 0, 0, 0, 0, 0, 0, 369, 368, + 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, + 160, 161, 351, 0, 0, 0, 191, 0, 162, 0, + 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 122, 0, 190, 224, 71, 0, 0, 59, 0, 0, + 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, + 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, + 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, + 63, 0, 73, 81, 85, 610, 187, 188, 189, 192, + 183, 184, 0, 82, 0, 0, 0, 0, 0, 363, + 0, 367, 0, 422, 0, 0, 630, 380, 381, 382, + 383, 384, 385, 0, 364, 365, 366, 362, 386, 369, + 368, 378, 379, 371, 372, 373, 374, 375, 376, 377, + 370, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 340, 331, 309, 342, 290, 301, 347, 302, 303, + 325, 282, 317, 70, 0, 293, 278, 299, 279, 291, + 311, 314, 289, 333, 344, 62, 313, 315, 330, 308, + 326, 285, 320, 323, 343, 0, 0, 422, 48, 26, + 449, 450, 0, 0, 0, 0, 0, 0, 322, 339, + 300, 0, 0, 324, 277, 321, 0, 281, 283, 346, + 337, 296, 297, 572, 0, 706, 706, 0, 0, 312, + 316, 327, 318, 306, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 294, 0, 319, 0, 0, 0, 310, + 0, 284, 0, 295, 328, 276, 335, 345, 307, 338, + 305, 304, 341, 71, 0, 0, 59, 334, 292, 54, + 298, 348, 79, 74, 66, 60, 61, 50, 0, 72, + 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, + 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, + 280, 73, 81, 85, 336, 288, 286, 287, 329, 0, + 0, 332, 82, 340, 331, 309, 342, 290, 301, 347, + 302, 303, 325, 282, 317, 70, 0, 293, 278, 299, + 279, 291, 311, 314, 289, 333, 344, 62, 313, 315, + 330, 308, 326, 285, 320, 323, 343, 0, 0, 0, + 48, 0, 449, 450, 0, 0, 0, 0, 0, 0, + 322, 339, 300, 0, 0, 324, 277, 321, 0, 281, + 283, 346, 337, 296, 297, 0, 0, 0, 0, 0, + 0, 312, 316, 327, 318, 306, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 294, 0, 319, 0, 0, + 0, 310, 0, 284, 0, 295, 328, 276, 335, 345, + 307, 338, 305, 304, 341, 71, 0, 0, 59, 334, + 292, 54, 298, 348, 79, 74, 66, 60, 61, 50, + 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, + 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, + 65, 63, 280, 73, 81, 85, 336, 288, 286, 287, + 329, 0, 0, 332, 82, 340, 331, 309, 342, 290, + 301, 347, 302, 303, 325, 282, 317, 70, 0, 293, + 278, 299, 279, 291, 311, 314, 289, 333, 344, 62, + 313, 315, 330, 308, 326, 285, 320, 323, 343, 0, + 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 322, 339, 300, 0, 0, 324, 277, 321, + 0, 281, 283, 346, 337, 296, 297, 0, 0, 0, + 0, 0, 0, 312, 316, 327, 318, 306, 0, 0, + 0, 0, 0, 0, 0, 713, 0, 294, 0, 319, + 0, 0, 0, 310, 0, 284, 0, 295, 328, 276, + 335, 345, 307, 338, 305, 304, 341, 71, 0, 0, + 59, 334, 292, 54, 298, 348, 79, 74, 66, 60, + 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, + 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, + 51, 78, 65, 63, 280, 73, 81, 85, 336, 288, + 286, 287, 329, 0, 0, 332, 82, 340, 331, 309, + 342, 290, 301, 347, 302, 303, 325, 282, 317, 70, + 0, 293, 278, 299, 279, 291, 311, 314, 289, 333, + 344, 62, 313, 315, 330, 308, 326, 285, 320, 323, + 343, 29, 0, 0, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 322, 339, 300, 0, 0, 324, + 277, 321, 0, 281, 283, 346, 337, 296, 297, 0, + 0, 0, 0, 0, 0, 312, 316, 327, 318, 306, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 294, + 0, 319, 0, 0, 0, 310, 0, 284, 0, 295, + 328, 276, 335, 345, 307, 338, 305, 304, 341, 71, + 0, 0, 59, 334, 292, 54, 298, 348, 79, 74, + 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, + 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, + 67, 64, 51, 78, 65, 63, 280, 73, 81, 85, + 336, 288, 286, 287, 329, 0, 0, 332, 82, 340, + 331, 309, 342, 290, 301, 347, 302, 303, 325, 282, + 317, 70, 0, 293, 278, 299, 279, 291, 311, 314, + 289, 333, 344, 62, 313, 315, 330, 308, 326, 285, + 320, 323, 343, 0, 0, 0, 193, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 322, 339, 300, 0, + 0, 324, 277, 321, 0, 281, 283, 346, 337, 296, + 297, 0, 0, 0, 0, 0, 0, 312, 316, 327, + 318, 306, 0, 0, 0, 0, 0, 0, 0, 595, + 0, 294, 0, 319, 0, 0, 0, 310, 0, 284, + 0, 295, 328, 276, 335, 345, 307, 338, 305, 304, + 341, 71, 0, 0, 59, 334, 292, 54, 298, 348, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, - 75, 80, 67, 64, 51, 78, 65, 63, 0, 73, - 81, 85, 0, 0, 0, 0, 713, 0, 0, 0, - 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 96, 224, 0, 0, 0, 353, 96, 0, 0, - 0, 274, 0, 71, 0, 0, 59, 0, 0, 54, - 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, + 75, 80, 67, 64, 51, 78, 65, 63, 280, 73, + 81, 85, 336, 288, 286, 287, 329, 0, 0, 332, + 82, 340, 331, 309, 342, 290, 301, 347, 302, 303, + 325, 282, 317, 70, 0, 293, 278, 299, 279, 291, + 311, 314, 289, 333, 344, 62, 313, 315, 330, 308, + 326, 285, 320, 323, 343, 0, 0, 0, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 322, 339, + 300, 0, 0, 324, 277, 321, 0, 281, 283, 346, + 337, 296, 297, 0, 0, 0, 0, 0, 0, 312, + 316, 327, 318, 306, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 294, 0, 319, 0, 0, 0, 310, + 0, 284, 0, 295, 328, 276, 335, 345, 307, 338, + 305, 304, 341, 71, 0, 0, 59, 334, 292, 54, + 298, 348, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, - 353, 73, 81, 85, 0, 0, 0, 0, 353, 0, - 0, 0, 82, 0, 0, 0, 26, 224, 0, 274, - 0, 0, 0, 0, 0, 0, 398, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 70, 0, 534, - 0, 154, 0, 0, 0, 0, 0, 0, 186, 62, - 0, 0, 96, 96, 0, 0, 0, 0, 0, 29, - 0, 0, 193, 170, 169, 171, 172, 173, 174, 175, - 607, 0, 176, 177, 178, 0, 353, 0, 0, 152, - 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, - 0, 369, 368, 378, 379, 371, 372, 373, 374, 375, - 376, 377, 370, 160, 161, 351, 0, 0, 0, 191, - 0, 162, 0, 164, 0, 0, 0, 0, 0, 122, - 0, 0, 0, 224, 0, 190, 0, 71, 0, 0, - 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, + 280, 73, 81, 85, 336, 288, 286, 287, 329, 0, + 0, 332, 82, 340, 331, 309, 342, 290, 301, 347, + 302, 303, 325, 282, 317, 70, 0, 293, 278, 299, + 279, 291, 311, 314, 289, 333, 344, 62, 313, 315, + 330, 308, 326, 285, 320, 323, 343, 0, 0, 0, + 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 322, 339, 300, 0, 0, 324, 277, 321, 0, 281, + 283, 346, 337, 296, 297, 0, 0, 0, 0, 0, + 0, 312, 316, 327, 318, 306, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 294, 0, 319, 0, 0, + 0, 310, 0, 284, 0, 295, 328, 276, 335, 345, + 307, 338, 305, 304, 341, 71, 0, 0, 59, 334, + 292, 54, 298, 348, 79, 74, 66, 60, 61, 50, + 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, + 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, + 65, 63, 280, 73, 81, 85, 336, 288, 286, 287, + 329, 0, 0, 332, 82, 340, 331, 309, 342, 290, + 301, 347, 302, 303, 325, 282, 317, 70, 0, 293, + 278, 299, 279, 291, 311, 314, 289, 333, 344, 62, + 313, 315, 330, 308, 326, 285, 320, 323, 343, 0, + 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 322, 339, 300, 0, 0, 324, 277, 321, + 0, 281, 283, 346, 337, 296, 297, 0, 0, 0, + 0, 0, 0, 312, 316, 327, 318, 306, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 294, 0, 319, + 0, 0, 0, 310, 0, 284, 0, 295, 328, 276, + 335, 345, 307, 338, 305, 304, 341, 71, 0, 0, + 59, 334, 292, 54, 298, 348, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, - 51, 78, 65, 63, 610, 73, 81, 85, 0, 187, - 188, 189, 192, 183, 184, 0, 82, 0, 363, 0, - 367, 0, 422, 0, 0, 630, 380, 381, 382, 383, - 384, 385, 0, 364, 365, 366, 362, 386, 369, 368, - 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, + 51, 78, 65, 63, 280, 73, 81, 85, 336, 288, + 286, 287, 329, 70, 0, 332, 82, 154, 0, 0, + 0, 0, 0, 0, 186, 62, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 193, 170, + 169, 171, 172, 173, 174, 175, 0, 0, 176, 177, + 178, 0, 0, 0, 0, 152, 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 340, 331, 309, 342, 290, 301, 347, 302, 303, 325, - 282, 317, 70, 0, 293, 278, 299, 279, 291, 311, - 314, 289, 333, 344, 62, 313, 315, 330, 308, 326, - 285, 320, 323, 343, 0, 0, 422, 48, 26, 449, - 450, 0, 0, 0, 0, 0, 0, 322, 339, 300, - 0, 0, 324, 277, 321, 0, 281, 283, 346, 337, - 296, 297, 572, 705, 705, 0, 0, 0, 312, 316, - 327, 318, 306, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 294, 0, 319, 0, 0, 0, 310, 0, - 284, 0, 295, 328, 276, 335, 345, 307, 338, 305, - 304, 341, 71, 0, 0, 59, 334, 292, 54, 298, - 348, 79, 74, 66, 60, 61, 50, 0, 72, 57, - 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, - 68, 75, 80, 67, 64, 51, 78, 65, 63, 280, - 73, 81, 85, 336, 288, 286, 287, 329, 0, 0, - 332, 82, 340, 331, 309, 342, 290, 301, 347, 302, - 303, 325, 282, 317, 70, 0, 293, 278, 299, 279, - 291, 311, 314, 289, 333, 344, 62, 313, 315, 330, - 308, 326, 285, 320, 323, 343, 0, 0, 0, 48, - 0, 449, 450, 0, 0, 0, 0, 0, 0, 322, - 339, 300, 0, 0, 324, 277, 321, 0, 281, 283, - 346, 337, 296, 297, 0, 0, 0, 0, 0, 0, - 312, 316, 327, 318, 306, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 294, 0, 319, 0, 0, 0, - 310, 0, 284, 0, 295, 328, 276, 335, 345, 307, - 338, 305, 304, 341, 71, 0, 0, 59, 334, 292, - 54, 298, 348, 79, 74, 66, 60, 61, 50, 0, - 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, - 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, - 63, 280, 73, 81, 85, 336, 288, 286, 287, 329, - 0, 0, 332, 82, 340, 331, 309, 342, 290, 301, - 347, 302, 303, 325, 282, 317, 70, 0, 293, 278, - 299, 279, 291, 311, 314, 289, 333, 344, 62, 313, - 315, 330, 308, 326, 285, 320, 323, 343, 0, 0, - 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 322, 339, 300, 0, 0, 324, 277, 321, 0, - 281, 283, 346, 337, 296, 297, 0, 0, 0, 0, - 0, 0, 312, 316, 327, 318, 306, 0, 0, 0, - 0, 0, 0, 0, 712, 0, 294, 0, 319, 0, - 0, 0, 310, 0, 284, 0, 295, 328, 276, 335, - 345, 307, 338, 305, 304, 341, 71, 0, 0, 59, - 334, 292, 54, 298, 348, 79, 74, 66, 60, 61, - 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, - 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, - 78, 65, 63, 280, 73, 81, 85, 336, 288, 286, - 287, 329, 0, 0, 332, 82, 340, 331, 309, 342, - 290, 301, 347, 302, 303, 325, 282, 317, 70, 0, - 293, 278, 299, 279, 291, 311, 314, 289, 333, 344, - 62, 313, 315, 330, 308, 326, 285, 320, 323, 343, - 29, 0, 0, 48, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 322, 339, 300, 0, 0, 324, 277, - 321, 0, 281, 283, 346, 337, 296, 297, 0, 0, - 0, 0, 0, 0, 312, 316, 327, 318, 306, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 294, 0, - 319, 0, 0, 0, 310, 0, 284, 0, 295, 328, - 276, 335, 345, 307, 338, 305, 304, 341, 71, 0, - 0, 59, 334, 292, 54, 298, 348, 79, 74, 66, - 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, - 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, - 64, 51, 78, 65, 63, 280, 73, 81, 85, 336, - 288, 286, 287, 329, 0, 0, 332, 82, 340, 331, - 309, 342, 290, 301, 347, 302, 303, 325, 282, 317, - 70, 0, 293, 278, 299, 279, 291, 311, 314, 289, - 333, 344, 62, 313, 315, 330, 308, 326, 285, 320, - 323, 343, 0, 0, 0, 193, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 322, 339, 300, 0, 0, - 324, 277, 321, 0, 281, 283, 346, 337, 296, 297, - 0, 0, 0, 0, 0, 0, 312, 316, 327, 318, - 306, 0, 0, 0, 0, 0, 0, 0, 595, 0, - 294, 0, 319, 0, 0, 0, 310, 0, 284, 0, - 295, 328, 276, 335, 345, 307, 338, 305, 304, 341, - 71, 0, 0, 59, 334, 292, 54, 298, 348, 79, - 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, - 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, - 80, 67, 64, 51, 78, 65, 63, 280, 73, 81, - 85, 336, 288, 286, 287, 329, 0, 0, 332, 82, - 340, 331, 309, 342, 290, 301, 347, 302, 303, 325, - 282, 317, 70, 0, 293, 278, 299, 279, 291, 311, - 314, 289, 333, 344, 62, 313, 315, 330, 308, 326, - 285, 320, 323, 343, 0, 0, 0, 48, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 322, 339, 300, - 0, 0, 324, 277, 321, 0, 281, 283, 346, 337, - 296, 297, 0, 0, 0, 0, 0, 0, 312, 316, - 327, 318, 306, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 294, 0, 319, 0, 0, 0, 310, 0, - 284, 0, 295, 328, 276, 335, 345, 307, 338, 305, - 304, 341, 71, 0, 0, 59, 334, 292, 54, 298, - 348, 79, 74, 66, 60, 61, 50, 0, 72, 57, - 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, - 68, 75, 80, 67, 64, 51, 78, 65, 63, 280, - 73, 81, 85, 336, 288, 286, 287, 329, 0, 0, - 332, 82, 340, 331, 309, 342, 290, 301, 347, 302, - 303, 325, 282, 317, 70, 0, 293, 278, 299, 279, - 291, 311, 314, 289, 333, 344, 62, 313, 315, 330, - 308, 326, 285, 320, 323, 343, 0, 0, 0, 193, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 322, - 339, 300, 0, 0, 324, 277, 321, 0, 281, 283, - 346, 337, 296, 297, 0, 0, 0, 0, 0, 0, - 312, 316, 327, 318, 306, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 294, 0, 319, 0, 0, 0, - 310, 0, 284, 0, 295, 328, 276, 335, 345, 307, - 338, 305, 304, 341, 71, 0, 0, 59, 334, 292, - 54, 298, 348, 79, 74, 66, 60, 61, 50, 0, - 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, - 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, - 63, 280, 73, 81, 85, 336, 288, 286, 287, 329, - 0, 0, 332, 82, 340, 331, 309, 342, 290, 301, - 347, 302, 303, 325, 282, 317, 70, 0, 293, 278, - 299, 279, 291, 311, 314, 289, 333, 344, 62, 313, - 315, 330, 308, 326, 285, 320, 323, 343, 0, 0, - 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 322, 339, 300, 0, 0, 324, 277, 321, 0, - 281, 283, 346, 337, 296, 297, 0, 0, 0, 0, - 0, 0, 312, 316, 327, 318, 306, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 294, 0, 319, 0, - 0, 0, 310, 0, 284, 0, 295, 328, 276, 335, - 345, 307, 338, 305, 304, 341, 71, 0, 0, 59, - 334, 292, 54, 298, 348, 79, 74, 66, 60, 61, - 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, - 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, - 78, 65, 63, 280, 73, 81, 85, 336, 288, 286, - 287, 329, 70, 0, 332, 82, 154, 0, 0, 0, - 0, 0, 0, 186, 62, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 0, 0, 193, 170, 169, - 171, 172, 173, 174, 175, 0, 0, 176, 177, 178, - 0, 0, 0, 0, 152, 163, 0, 185, 369, 368, - 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, - 0, 0, 0, 0, 0, 0, 0, 0, 160, 161, - 351, 0, 0, 0, 191, 0, 162, 0, 164, 368, - 378, 379, 371, 372, 373, 374, 375, 376, 377, 370, - 190, 0, 71, 0, 0, 59, 0, 0, 54, 0, - 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, - 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, - 68, 75, 80, 67, 64, 51, 78, 65, 63, 0, - 73, 81, 85, 0, 187, 188, 189, 192, 183, 184, - 70, 82, 0, 0, 154, 0, 0, 0, 0, 0, - 0, 186, 62, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 29, 0, 148, 193, 170, 169, 171, 172, - 173, 174, 175, 0, 0, 176, 177, 178, 0, 0, - 0, 0, 152, 163, 0, 185, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, + 161, 351, 0, 0, 0, 191, 0, 162, 0, 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 160, 161, 0, 0, - 0, 0, 191, 0, 162, 0, 164, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 190, 0, - 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, - 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, - 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, - 80, 67, 64, 51, 78, 65, 63, 25, 73, 81, - 85, 0, 187, 188, 189, 192, 183, 184, 70, 82, - 0, 0, 154, 0, 0, 0, 0, 0, 0, 186, - 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 193, 170, 169, 171, 172, 173, 174, - 175, 0, 0, 176, 177, 178, 0, 0, 0, 0, - 152, 163, 0, 185, 0, 0, 0, 0, 0, 0, + 0, 190, 0, 71, 0, 0, 59, 0, 0, 54, + 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, + 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, + 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, + 0, 73, 81, 85, 0, 187, 188, 189, 192, 183, + 184, 70, 82, 0, 0, 154, 0, 0, 0, 0, + 0, 0, 186, 62, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 29, 0, 148, 193, 170, 169, 171, + 172, 173, 174, 175, 0, 0, 176, 177, 178, 0, + 0, 0, 0, 152, 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 160, 161, 0, 0, 0, 0, - 191, 0, 162, 0, 164, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 190, 0, 71, 0, - 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, - 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, - 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, - 64, 51, 78, 65, 63, 0, 73, 81, 85, 0, - 187, 188, 189, 192, 183, 184, 70, 82, 0, 0, - 154, 0, 0, 0, 0, 0, 0, 186, 62, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, - 0, 193, 170, 169, 171, 172, 173, 174, 175, 0, - 0, 176, 177, 178, 0, 0, 0, 0, 152, 163, - 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 160, 161, 0, + 0, 0, 0, 191, 0, 162, 0, 164, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 190, + 0, 71, 0, 0, 59, 0, 0, 54, 0, 0, + 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, + 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, + 75, 80, 67, 64, 51, 78, 65, 63, 25, 73, + 81, 85, 0, 187, 188, 189, 192, 183, 184, 70, + 82, 0, 0, 154, 0, 0, 0, 0, 0, 0, + 186, 62, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 29, 0, 0, 193, 170, 169, 171, 172, 173, + 174, 175, 0, 0, 176, 177, 178, 0, 0, 0, + 0, 152, 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 160, 161, 0, 0, 0, 0, 191, 0, - 162, 0, 164, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 190, 0, 71, 0, 0, 59, - 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, - 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, - 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, - 78, 65, 63, 0, 73, 81, 85, 70, 187, 188, - 189, 192, 183, 184, 0, 82, 0, 0, 186, 62, + 0, 0, 0, 0, 0, 160, 161, 0, 0, 0, + 0, 191, 0, 162, 0, 164, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 190, 0, 71, + 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, + 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, + 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, + 67, 64, 51, 78, 65, 63, 0, 73, 81, 85, + 0, 187, 188, 189, 192, 183, 184, 70, 82, 0, + 0, 154, 0, 0, 0, 0, 0, 0, 186, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 193, 170, 169, 171, 172, 173, 174, 175, - 0, 0, 176, 177, 178, 0, 0, 0, 0, 0, + 0, 0, 176, 177, 178, 0, 0, 0, 0, 152, 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 161, 0, 0, 0, 0, 191, - 0, 162, 0, 164, 0, 0, 0, 70, 0, 0, - 0, 0, 0, 0, 0, 190, 0, 71, 0, 62, - 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, - 61, 50, 48, 72, 57, 58, 56, 69, 76, 77, - 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, - 51, 78, 65, 63, 0, 73, 81, 85, 0, 187, - 188, 189, 192, 183, 184, 0, 82, 0, 0, 369, - 368, 378, 379, 371, 372, 373, 374, 375, 376, 377, - 370, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, + 0, 162, 0, 164, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 190, 0, 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, - 51, 78, 65, 63, 0, 73, 81, 85, 0, 70, - 0, 0, 0, 0, 0, 0, 82, 460, 0, 0, - 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 48, 0, 130, 0, 0, 25, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 29, 0, 0, 98, 0, 97, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 459, 0, 0, 0, 457, 456, - 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, - 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, - 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, - 67, 64, 51, 78, 65, 63, 0, 73, 81, 85, - 71, 0, 0, 59, 0, 0, 54, 0, 82, 79, - 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, - 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, - 80, 67, 64, 51, 78, 65, 63, 25, 73, 81, - 85, 0, 0, 0, 0, 0, 0, 0, 70, 82, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 51, 78, 65, 63, 0, 73, 81, 85, 70, 187, + 188, 189, 192, 183, 184, 0, 82, 0, 0, 186, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 48, 0, 130, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 29, 0, 0, 98, 0, 97, 0, 0, 0, + 29, 0, 0, 193, 170, 169, 171, 172, 173, 174, + 175, 0, 0, 176, 177, 178, 0, 0, 0, 0, + 0, 163, 0, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 160, 161, 0, 0, 0, 0, + 191, 0, 162, 0, 164, 0, 0, 0, 70, 0, + 0, 0, 0, 0, 0, 0, 190, 0, 71, 0, + 62, 59, 0, 0, 54, 0, 0, 79, 74, 66, + 60, 61, 50, 48, 72, 57, 58, 56, 69, 76, + 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, + 64, 51, 78, 65, 63, 0, 73, 81, 85, 0, + 187, 188, 189, 192, 183, 184, 0, 82, 0, 0, + 369, 368, 378, 379, 371, 372, 373, 374, 375, 376, + 377, 370, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, - 64, 51, 78, 65, 63, 0, 73, 81, 85, 71, - 0, 0, 59, 0, 0, 54, 0, 82, 79, 74, - 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, - 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, - 67, 64, 51, 78, 65, 63, 0, 73, 81, 85, - 70, 0, 0, 223, 0, 0, 0, 0, 82, 0, + 64, 51, 78, 65, 63, 0, 73, 81, 85, 0, + 70, 0, 0, 0, 0, 0, 0, 82, 460, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 98, 0, 97, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 114, 0, + 0, 0, 0, 0, 0, 48, 0, 130, 0, 0, + 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 98, 0, 97, 0, + 0, 0, 0, 29, 0, 0, 48, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, + 0, 0, 0, 0, 0, 459, 0, 0, 0, 457, + 456, 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, 0, 73, 81, @@ -845,14 +810,14 @@ var yyAct = [...]int{ 75, 80, 67, 64, 51, 78, 65, 63, 0, 73, 81, 85, 70, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 62, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 48, 0, 130, + 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 193, 0, - 418, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 71, 0, 0, 59, 0, 0, 54, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 98, 0, + 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 45, 43, 0, 0, 0, + 0, 46, 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, 0, @@ -860,14 +825,14 @@ var yyAct = [...]int{ 0, 82, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, 65, 63, - 0, 73, 81, 85, 70, 0, 0, 0, 0, 0, + 0, 73, 81, 85, 70, 0, 0, 223, 0, 0, 0, 0, 82, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, + 0, 0, 114, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 98, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, 50, 0, @@ -877,102 +842,149 @@ var yyAct = [...]int{ 0, 54, 0, 82, 79, 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, 78, - 65, 63, 0, 73, 81, 85, 0, 0, 0, 0, - 0, 0, 0, 0, 82, + 65, 63, 0, 73, 81, 85, 70, 0, 0, 0, + 0, 0, 0, 0, 82, 0, 0, 0, 62, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 48, 0, 130, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 193, 0, 418, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 71, 0, 0, 59, + 0, 0, 54, 0, 0, 79, 74, 66, 60, 61, + 50, 0, 72, 57, 58, 56, 69, 76, 77, 55, + 84, 53, 83, 52, 68, 75, 80, 67, 64, 51, + 78, 65, 63, 0, 73, 81, 85, 71, 0, 0, + 59, 0, 0, 54, 0, 82, 79, 74, 66, 60, + 61, 50, 0, 72, 57, 58, 56, 69, 76, 77, + 55, 84, 53, 83, 52, 68, 75, 80, 67, 64, + 51, 78, 65, 63, 0, 73, 81, 85, 70, 0, + 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, + 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 98, 0, 97, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, + 0, 59, 0, 0, 54, 0, 0, 79, 74, 66, + 60, 61, 50, 0, 72, 57, 58, 56, 69, 76, + 77, 55, 84, 53, 83, 52, 68, 75, 80, 67, + 64, 51, 78, 65, 63, 0, 73, 81, 85, 71, + 0, 0, 59, 0, 0, 54, 0, 82, 79, 74, + 66, 60, 61, 50, 0, 72, 57, 58, 56, 69, + 76, 77, 55, 84, 53, 83, 52, 68, 75, 80, + 67, 64, 51, 78, 65, 63, 0, 73, 81, 85, + 70, 0, 0, 0, 0, 0, 0, 0, 82, 0, + 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 98, 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, 0, 0, 0, + 71, 0, 0, 59, 0, 0, 54, 0, 0, 79, + 74, 66, 60, 61, 50, 0, 72, 57, 58, 56, + 69, 76, 77, 55, 84, 53, 83, 52, 68, 75, + 80, 67, 64, 51, 78, 65, 63, 0, 73, 81, + 85, 0, 0, 0, 0, 0, 0, 0, 0, 82, } var yyPact = [...]int{ - 73, -1000, -115, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 424, 439, -13, -1000, -1000, 345, 738, 6, - -5, 30, 4027, 4027, -1000, -1000, 307, -1000, -1000, -1000, - -1000, -1000, 413, 422, 307, 410, 3724, -1000, 3552, -1000, - 443, -1000, 3855, 5, -8, -19, -1000, -1000, -1000, -1000, + 368, -1000, -111, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 414, 443, -18, -1000, -1000, 325, 3505, 1, + -11, 30, 4021, 4021, -1000, -1000, 346, -1000, -1000, -1000, + -1000, -1000, 403, 410, 346, 400, 3718, -1000, 3546, -1000, + 436, -1000, 3849, -4, -12, -26, -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, 4027, -15, -15, 4, - 438, 4027, -1, -1000, -1000, -1000, 33, -1000, -1000, -1000, - -1000, -1000, 408, 195, 95, -1000, -1000, 2989, 2989, 424, - -1000, 307, -1000, 358, 4027, -1000, 314, 445, -1000, -1000, - -1000, 405, 3373, 3683, 124, 4027, 255, -1000, 191, -1000, - -1000, -19, -19, 4027, 79, 3, 4027, 400, 4027, 4027, - -2, -1000, -1000, 436, 2439, 2575, -1000, -1000, -1000, -99, - 308, -1000, 2989, 1279, 328, -1000, -1000, -1000, -1000, -1000, - 3120, 3120, 3120, 3120, 3120, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 328, - 28, -1000, 2851, 328, 328, 2989, 328, -1000, -1000, -1000, - 328, 328, 328, -1000, -1000, 316, -1000, 211, 413, 195, - -1000, 3896, 328, -1000, 3511, -1000, 3896, 3552, 3552, 3552, - 3552, -1000, 378, 375, 368, 385, 4068, -1000, 253, 195, - 3373, -1000, -1000, 4027, -1000, -1000, 434, 1527, 3332, 140, - -85, -1000, -1000, 318, -1000, 318, 318, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, 318, 318, 318, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, 337, 337, 337, 324, - 324, 4027, 4027, -1000, 398, -24, -20, -1000, -1000, -1000, - -1000, 4027, 4027, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 4021, -21, -21, -6, + 435, 4021, 5, -1000, -1000, -1000, 33, -1000, -1000, -1000, + -1000, -1000, 398, 184, 95, -1000, -1000, 2990, 2990, 414, + -1000, 346, -1000, 354, 4021, -1000, 216, 367, -1000, -1000, + -1000, 396, 1015, 3677, 105, 4021, 284, -1000, 190, -1000, + -1000, -26, -26, 4021, 87, 0, 4021, 393, 4021, 4021, + -7, -1000, -1000, 433, 2440, 2576, -1000, -1000, -1000, -93, + 182, -1000, 2990, 1280, 304, -1000, -1000, -1000, -1000, -1000, + 3121, 3121, 3121, 3121, 3121, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 304, + 28, -1000, 2852, 304, 304, 2990, 304, -1000, -1000, -1000, + 304, 304, 304, -1000, -1000, 272, -1000, 322, 403, 184, + -1000, 3890, 304, -1000, 3374, -1000, 3890, 3546, 3546, 3546, + 3546, -1000, 362, 357, 356, 375, 4193, -1000, 261, 184, + 1015, -1000, -1000, 4021, -1000, -1000, 431, 1528, 3333, 116, + -81, -1000, -1000, 300, -1000, 300, 300, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 300, 300, 300, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 324, 324, 324, 303, + 303, 4021, 4021, -1000, 389, -31, -25, -1000, -1000, -1000, + -1000, 4021, 4021, -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, -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, 296, - -1000, -1000, 944, 24, -1000, 2989, 2989, 137, 2989, 2989, - 58, 3120, 123, 74, 3120, 3120, 3120, 3120, 3120, 3120, - 3120, 3120, 3120, 3120, 3120, 3120, 3120, 3120, 3120, 3120, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 307, -1000, - -1000, -1000, -1000, 3200, 1180, 2287, 251, 99, 2851, 2989, - 408, 83, 99, 3896, 2575, 2575, 2575, 2989, -1000, -1000, - -1000, -1000, -1000, 315, -1000, 66, -1000, 22, -1000, 234, - -1000, -1000, 2713, 195, 247, -1000, 19, 286, 445, 363, - 433, -1000, -1000, -1000, -1000, 362, -1000, -1000, -1000, -1000, - -1000, 195, -1000, 424, 2989, 305, 1375, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 336, 393, 75, 174, -1000, - -1000, 384, -1000, 102, -90, -1000, -1000, 159, -1000, -1000, - -1000, -1000, -1000, -1000, 156, -1000, -1000, -1000, 155, -1000, - 309, 323, -1000, 3855, -1000, 4027, 3896, -1000, -1000, 434, - 2575, 3552, -1000, -1000, 3855, 1983, -1000, 58, 71, -1000, - -1000, 166, -1000, -1000, 99, 99, 2559, -1000, -1000, -1000, - -1000, 123, 3120, 3120, 3120, 3120, 836, 2559, 2559, 1172, - 870, 2589, -1000, 93, 93, 9, 9, 9, 9, 9, - 192, 192, -1000, 195, 2575, 304, 328, 17, -1000, 2989, - -1000, 173, 2575, 78, -1000, 2989, 195, 207, 207, 207, - -1000, 3896, 2989, 2287, 328, -1000, -1000, 331, 3855, 1016, - 424, -1000, -1000, 2989, 334, -1000, -1000, -1000, 413, 99, - 1527, -1000, 1527, 1016, -1000, 170, -1000, -1000, -75, 14, - -1000, -1000, -1000, 216, 298, 245, 4027, 4027, -1000, -1000, - -10, 429, -1000, 258, -1000, -1000, 16, -1000, -1000, -1000, - -1000, 836, 2559, 2559, 848, -1000, 3120, 3120, -1000, 207, - 2575, 2135, 99, 261, 321, 70, -1000, 2989, 285, -1000, - -1000, -1000, -1000, -1000, 99, -1000, 15, -1000, 328, -1000, - 307, -1000, 13, -1000, 413, 99, 3855, -1000, 1375, -1000, - 204, -1000, 318, -1000, 53, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 149, -1000, 141, 1831, 1831, 3896, 427, 421, - 1679, -1000, 3120, 2559, 2559, -1000, 195, -1000, 195, 318, - -1000, 318, 324, 318, -45, 318, -48, 318, 318, 318, - 318, 318, 318, -1000, -110, -1000, 99, 2989, 2135, 234, - 195, 1016, -1000, 182, -1000, -1000, 1016, -1000, -1000, 392, - -1000, 388, 214, 210, -1000, -1000, -1000, -1000, -1000, -1000, - 2989, 2989, -1000, 2559, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 195, - 162, 99, -1000, -1000, -1000, 3855, -1000, -1000, -1000, -1000, - -1000, -1000, 99, 230, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 330, + -1000, -1000, 945, 25, -1000, 2990, 2990, 302, 2990, 2990, + 58, 3121, 127, 74, 3121, 3121, 3121, 3121, 3121, 3121, + 3121, 3121, 3121, 3121, 3121, 3121, 3121, 3121, 3121, 3121, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 346, -1000, + -1000, -1000, -1000, 3201, 1177, 2288, 256, 139, 2852, 2990, + 398, 80, 139, 3890, 2576, 2576, 2576, 2990, -1000, -1000, + -1000, -1000, -1000, 264, -1000, 71, -1000, 23, -1000, 191, + -1000, -1000, 2714, 184, 241, -1000, 22, 327, 367, 321, + 509, -1000, -1000, -1000, -1000, 335, -1000, -1000, -1000, -1000, + -1000, 184, -1000, 414, 2990, 258, 1376, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 318, 384, 55, 171, -1000, + -1000, 370, -1000, 102, -83, -1000, -1000, 156, -1000, -1000, + -1000, -1000, -1000, -1000, 155, -1000, -1000, -1000, 129, -1000, + 328, 341, -1000, 3849, -1000, 4021, 3890, -1000, -1000, 431, + 2576, 3546, -1000, -1000, 3849, 1984, -1000, 58, 60, -1000, + -1000, 140, -1000, -1000, 139, 139, 100, -1000, -1000, -1000, + -1000, 127, 3121, 3121, 3121, 3121, 836, 100, 100, 1169, + 870, 386, -1000, 17, 17, 21, 21, 21, 21, 21, + 202, 202, -1000, 184, 2576, 230, 304, 20, -1000, 2990, + -1000, 222, 2576, 79, -1000, 2990, 184, 193, 193, 193, + -1000, 3890, 2990, 2288, 304, -1000, -1000, 345, 3849, 4062, + 414, -1000, -1000, 2990, 307, -1000, -1000, -1000, 403, 139, + 1528, -1000, 1528, 4062, -1000, 164, -1000, -1000, -77, 24, + -1000, -1000, -1000, 207, 237, 234, 4021, 4021, -1000, -1000, + -15, 428, -1000, 211, -1000, -1000, 18, -1000, -1000, -1000, + -1000, 836, 100, 100, 848, -1000, 3121, 3121, -1000, 193, + 2576, 2136, 139, 734, 227, 75, -1000, 2990, 277, -1000, + -1000, -1000, -1000, -1000, 139, -1000, 16, -1000, 304, -1000, + 346, -1000, 15, -1000, 403, 139, 3849, -1000, 1376, -1000, + 179, -1000, 300, -1000, 56, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, 125, -1000, 119, 1832, 1832, 3890, 416, + 406, 1680, -1000, 3121, 100, 100, -1000, 184, -1000, 184, + 300, -1000, 300, 303, 300, -46, 300, -48, 300, 300, + 300, 300, 300, 300, -1000, -102, -1000, 139, 2990, 2136, + 191, 184, 4062, -1000, 175, -1000, -1000, 4062, -1000, -1000, + 383, -1000, 376, 195, 189, -1000, -1000, -1000, -1000, -1000, + -1000, 2990, 2990, -1000, 100, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 184, 128, 139, -1000, -1000, -1000, 3849, -1000, -1000, -1000, + -1000, -1000, -1000, 139, 183, -1000, -1000, -1000, } var yyPgo = [...]int{ - 0, 621, 62, 388, 618, 616, 611, 609, 608, 607, - 606, 605, 593, 592, 583, 48, 581, 577, 38, 575, - 11, 67, 8, 25, 12, 570, 29, 56, 41, 566, - 28, 564, 563, 40, 562, 27, 553, 551, 22, 550, - 549, 547, 546, 545, 543, 433, 540, 539, 538, 537, - 536, 21, 1, 6, 36, 14, 535, 32, 10, 532, - 531, 17, 530, 529, 528, 527, 18, 523, 35, 520, - 16, 519, 518, 54, 20, 511, 108, 70, 510, 13, - 0, 30, 46, 9, 508, 625, 26, 47, 507, 506, - 3, 505, 503, 502, 501, 500, 499, 498, 103, 496, - 494, 490, 44, 4, 489, 488, 487, 31, 485, 33, - 483, 482, 479, 15, 5, 467, 2, 465, 34, 460, - 458, 456, 787, 7, 455, 454, + 0, 631, 55, 388, 629, 628, 627, 626, 625, 623, + 622, 621, 620, 618, 616, 34, 614, 611, 35, 610, + 13, 32, 8, 22, 12, 607, 27, 42, 57, 606, + 28, 602, 600, 48, 593, 21, 592, 586, 16, 583, + 577, 566, 563, 561, 553, 433, 551, 550, 549, 543, + 538, 25, 1, 14, 50, 15, 536, 36, 11, 535, + 533, 20, 532, 531, 530, 529, 18, 523, 33, 521, + 3, 518, 516, 54, 17, 515, 129, 71, 512, 31, + 0, 30, 95, 9, 511, 624, 26, 47, 510, 509, + 6, 508, 505, 503, 502, 501, 500, 499, 100, 497, + 496, 494, 41, 4, 490, 489, 488, 40, 485, 29, + 482, 481, 478, 10, 5, 461, 2, 460, 38, 458, + 456, 455, 788, 7, 453, 450, } var yyR1 = [...]int{ @@ -983,47 +995,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, 18, 18, 22, - 22, 21, 21, 23, 23, 23, 23, 84, 84, 84, - 83, 83, 25, 26, 26, 27, 27, 28, 28, 28, - 28, 37, 72, 72, 29, 29, 29, 30, 30, 31, - 31, 89, 89, 88, 88, 88, 87, 87, 32, 32, - 32, 33, 33, 34, 34, 36, 36, 35, 35, 38, - 38, 24, 24, 24, 24, 24, 24, 40, 40, 39, + 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, 18, 18, + 22, 22, 21, 21, 23, 23, 23, 23, 84, 84, + 84, 83, 83, 25, 26, 26, 27, 27, 28, 28, + 28, 28, 37, 72, 72, 29, 29, 29, 30, 30, + 31, 31, 89, 89, 88, 88, 88, 87, 87, 32, + 32, 32, 33, 33, 34, 34, 36, 36, 35, 35, + 38, 38, 24, 24, 24, 24, 24, 24, 40, 40, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 50, 50, 50, 50, 50, 50, 41, 41, 41, - 41, 41, 41, 41, 20, 20, 51, 51, 51, 57, - 52, 52, 45, 45, 45, 45, 45, 45, 45, 45, + 39, 39, 50, 50, 50, 50, 50, 50, 41, 41, + 41, 41, 41, 41, 41, 20, 20, 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, - 19, 19, 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, 42, 42, 42, - 42, 42, 42, 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, 19, 19, 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, 42, 42, + 42, 42, 42, 42, 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{ @@ -1034,35 +1046,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, @@ -1074,7 +1086,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{ @@ -1143,94 +1155,94 @@ var yyChk = [...]int{ -123, -123, -123, -74, -24, -82, -86, -55, 28, -2, -122, -83, -81, -81, -66, -24, 39, -70, -113, -114, -117, -116, -81, 42, -105, 144, 44, 45, 46, 52, - 149, 41, 40, 41, 40, -35, -35, 103, -64, 12, - 94, -20, 58, -45, -45, -123, -22, -82, -91, 132, - 113, 130, 126, 135, 145, 128, 146, 129, 119, 116, - 117, 118, 121, 44, -66, 66, -24, 64, 94, -53, - -2, 94, -70, -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, -19, - 155, -24, -82, -123, -81, 40, 41, -116, 25, 25, - 41, 41, -24, -52, -123, 44, -83, + 149, 41, 41, 40, 41, 40, -35, -35, 103, -64, + 12, 94, -20, 58, -45, -45, -123, -22, -82, -91, + 132, 113, 130, 126, 135, 145, 128, 146, 129, 119, + 116, 117, 118, 121, 44, -66, 66, -24, 64, 94, + -53, -2, 94, -70, -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, + -19, 155, -24, -82, -123, -81, 40, 41, -116, 25, + 25, 41, 41, -24, -52, -123, 44, -83, } var yyDef = [...]int{ 0, -2, 2, -2, 5, 6, 7, 8, 9, 10, - 11, 12, 315, 0, 350, 131, 131, 0, 352, 0, - 0, 126, 0, 0, 474, 131, 0, 131, 131, 472, - 1, 3, 323, 0, 0, 135, 0, 351, 0, 133, - 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, 23, 24, 13, 0, 0, 315, - 19, 0, 136, 0, 0, 186, 0, 153, 155, 156, - 157, -2, 0, 173, 132, 0, 0, 33, 0, 150, - 151, 348, 348, 0, 0, 0, 0, 0, 0, 0, - 0, 123, 124, 0, 0, 0, 138, 18, 473, 0, - 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, - 21, 0, 0, -2, 0, 185, 0, 0, 0, 0, - 0, 178, 0, 0, 0, 0, 0, 172, 0, 17, - 0, 161, 174, 0, 176, 134, 189, 105, 0, 79, - 75, 38, 39, 68, 41, 68, 68, 60, 61, 62, + 11, 12, 316, 0, 351, 132, 132, 0, 353, 0, + 0, 127, 0, 0, 475, 132, 0, 132, 132, 473, + 1, 3, 324, 0, 0, 136, 0, 352, 0, 134, + 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, 23, 24, 13, 0, 0, 316, + 19, 0, 137, 0, 0, 187, 0, 154, 156, 157, + 158, -2, 0, 174, 133, 0, 0, 33, 0, 151, + 152, 349, 349, 0, 0, 0, 0, 0, 0, 0, + 0, 124, 125, 0, 0, 0, 139, 18, 474, 0, + 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, + 21, 0, 0, -2, 0, 186, 0, 0, 0, 0, + 0, 179, 0, 0, 0, 0, 0, 173, 0, 17, + 0, 162, 175, 0, 177, 135, 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, 131, 0, 0, 0, 0, 0, - 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 42, 43, 44, 45, 46, 47, 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, 132, 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, 22, 343, 0, 297, 0, -2, 327, - 337, 339, 0, 17, 0, 333, 150, 189, 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, + 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, 22, 344, 0, 298, 0, -2, 328, + 338, 340, 0, 17, 0, 334, 151, 190, 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, 25, 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, 0, 0, 0, 0, 340, -2, 0, 0, 0, - 315, 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, 344, 345, 298, 0, 338, 0, -2, - 0, 335, 150, 334, 323, 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, 0, 330, - 17, 0, 26, 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, 299, -2, 336, 0, 168, 103, 91, 93, - 71, 74, 314, 312, 262, 291, 163, + 0, 0, 350, 0, 119, 0, 0, 123, 126, 190, + 0, 0, 145, 149, 0, 0, 25, 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, 0, 0, 0, 0, 341, -2, 0, 0, 0, + 316, 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, 345, 346, 299, 0, 339, 0, -2, + 0, 336, 151, 335, 324, 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, 0, + 331, 17, 0, 26, 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, 300, -2, 337, 0, 169, 104, 92, + 94, 72, 75, 315, 313, 263, 292, 164, } var yyTok1 = [...]int{ @@ -2002,108 +2014,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] @@ -2112,189 +2124,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 { @@ -2302,9 +2320,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 { @@ -2312,53 +2330,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] @@ -2370,674 +2382,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] @@ -3049,17 +3061,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 @@ -3067,9 +3085,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 @@ -3083,21 +3101,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, @@ -3105,124 +3123,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)} @@ -3231,16 +3243,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)} @@ -3249,7 +3261,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] @@ -3282,340 +3294,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]} @@ -3623,75 +3641,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{}{} } @@ -3699,7 +3711,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] @@ -3707,17 +3719,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] @@ -3725,41 +3737,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) @@ -3770,6 +3782,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 e85044f..3b99380 100644 --- a/sql.y +++ b/sql.y @@ -565,6 +565,10 @@ float_length_opt: { $$ = LengthScaleOption{} } +| '(' INTEGRAL ')' + { + $$ = LengthScaleOption{Length: NewIntVal($2)} + } | '(' INTEGRAL ',' INTEGRAL ')' { $$ = LengthScaleOption{