From 86ea21a737fbff9afad59fd4895acaa29985003b Mon Sep 17 00:00:00 2001 From: Qi Xiao Date: Thu, 16 May 2019 21:54:52 +0800 Subject: [PATCH 1/2] Update vendor supporting double quoted table name and column name ident --- Gopkg.lock | 4 +- .../github.com/CovenantSQL/sqlparser/sql.go | 1589 +++++++++-------- vendor/github.com/CovenantSQL/sqlparser/sql.y | 32 +- 3 files changed, 850 insertions(+), 775 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 494f6d2b0..942e4c983 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -40,7 +40,7 @@ [[projects]] branch = "master" - digest = "1:747a4d23380a7186ac767b81dcba660e482ed9d82f02d12603147cf6e2b9f02f" + digest = "1:91b1ab48b79ab08ff3687a2f59150d9911ae9b3b486fe98256fc828f4b00abe2" name = "github.com/CovenantSQL/sqlparser" packages = [ ".", @@ -50,7 +50,7 @@ "dependency/sqltypes", ] pruneopts = "UT" - revision = "8673c64d83a0954a21eaf0158bb2e1eb574304da" + revision = "d1a5098e1ccc60f277938e9cdeb810c0a3db8880" [[projects]] digest = "1:3e98d7591efd49c324016c20fa4409e7498f791bc764a7c016258e34584d9514" diff --git a/vendor/github.com/CovenantSQL/sqlparser/sql.go b/vendor/github.com/CovenantSQL/sqlparser/sql.go index de19d4c40..1ac3660c6 100644 --- a/vendor/github.com/CovenantSQL/sqlparser/sql.go +++ b/vendor/github.com/CovenantSQL/sqlparser/sql.go @@ -394,7 +394,7 @@ var yyExca = [...]int{ -1, 3, 5, 17, -2, 4, - -1, 116, + -1, 118, 1, 157, 5, 157, 11, 157, @@ -414,559 +414,598 @@ var yyExca = [...]int{ 41, 157, 155, 157, -2, 170, - -1, 184, - 93, 353, - -2, 349, - -1, 185, - 93, 354, - -2, 350, - -1, 400, - 5, 17, - -2, 322, - -1, 516, + -1, 188, 93, 356, -2, 352, - -1, 547, + -1, 189, + 93, 357, + -2, 353, + -1, 403, + 5, 17, + -2, 325, + -1, 411, + 93, 176, + -2, 150, + -1, 518, + 93, 359, + -2, 355, + -1, 550, 5, 18, -2, 226, - -1, 603, + -1, 606, 5, 18, - -2, 323, - -1, 665, + -2, 326, + -1, 669, 5, 17, - -2, 325, - -1, 722, + -2, 328, + -1, 729, 5, 18, - -2, 326, + -2, 329, } const yyPrivate = 57344 -const yyLast = 4076 +const yyLast = 4424 var yyAct = [...]int{ - 185, 617, 530, 338, 380, 427, 172, 531, 511, 457, - 32, 170, 522, 487, 515, 583, 148, 208, 3, 47, - 404, 472, 207, 95, 95, 426, 101, 432, 438, 336, - 45, 423, 187, 136, 121, 542, 462, 428, 403, 95, - 453, 113, 211, 31, 99, 138, 706, 140, 173, 26, - 134, 198, 562, 513, 622, 623, 624, 445, 118, 621, - 124, 111, 625, 698, 696, 677, 112, 464, 463, 91, - 125, 128, 463, 109, 440, 26, 632, 85, 86, 123, - 259, 92, 96, 106, 130, 95, 84, 117, 254, 253, - 95, 122, 710, 353, 352, 362, 363, 355, 356, 357, - 358, 359, 360, 361, 354, 635, 141, 188, 87, 95, - 606, 589, 440, 89, 88, 189, 540, 476, 95, 95, - 95, 379, 135, 354, 190, 95, 446, 584, 95, 556, - 95, 95, 342, 127, 539, 660, 95, 340, 523, 523, - 133, 595, 252, 126, 678, 676, 494, 345, 132, 439, - 261, 100, 342, 437, 436, 26, 560, 626, 591, 492, - 493, 491, 344, 263, 194, 29, 209, 193, 355, 356, - 357, 358, 359, 360, 361, 354, 490, 381, 215, 680, - 386, 679, 565, 251, 250, 343, 255, 439, 257, 258, - 335, 564, 563, 95, 372, 341, 340, 95, 95, 95, - 95, 442, 341, 340, 721, 619, 95, 406, 443, 400, - 95, 342, 405, 95, 711, 712, 395, 47, 342, 378, - 129, 122, 382, 383, 384, 557, 387, 421, 431, 460, - 388, 389, 390, 341, 340, 139, 396, 673, 672, 409, - 401, 411, 658, 469, 139, 117, 117, 117, 117, 342, - 717, 402, 433, 419, 420, 422, 417, 716, 209, 459, - 95, 95, 150, 408, 627, 410, 517, 25, 27, 15, - 16, 353, 352, 362, 363, 355, 356, 357, 358, 359, - 360, 361, 354, 601, 22, 393, 394, 455, 456, 630, - 629, 465, 357, 358, 359, 360, 361, 354, 605, 139, - 29, 116, 25, 480, 482, 483, 576, 577, 578, 645, - 481, 196, 654, 655, 656, 653, 470, 657, 466, 467, - 341, 340, 647, 628, 650, 652, 646, 33, 644, 517, - 139, 648, 424, 341, 340, 29, 342, 196, 139, 47, - 662, 649, 651, 538, 477, 478, 469, 484, 485, 342, - 474, 448, 449, 469, 488, 18, 19, 20, 217, 216, - 195, 538, 450, 451, 452, 469, 550, 391, 25, 29, - 21, 23, 25, 196, 24, 447, 200, 203, 47, 201, - 116, 202, 204, 543, 544, 566, 381, 519, 458, 510, - 664, 431, 612, 398, 399, 188, 553, 543, 544, 406, - 421, 29, 47, 454, 524, 29, 532, 516, 371, 41, - 406, 28, 414, 536, 12, 405, 415, 514, 520, 534, - 546, 26, 416, 203, 528, 413, 518, 47, 549, 412, - 559, 382, 551, 715, 548, 537, 714, 529, 431, 144, - 554, 461, 525, 526, 527, 256, 545, 36, 533, 105, - 26, 200, 203, 206, 201, 137, 202, 204, 107, 116, - 116, 116, 116, 38, 39, 95, 555, 547, 102, 687, - 103, 95, 116, 98, 47, 33, 686, 406, 634, 424, - 260, 131, 569, 119, 35, 474, 37, 97, 431, 30, - 1, 575, 90, 572, 616, 573, 435, 567, 488, 571, - 570, 425, 120, 40, 516, 579, 434, 675, 620, 441, - 561, 444, 558, 220, 514, 221, 219, 223, 222, 117, - 218, 590, 643, 568, 681, 205, 210, 596, 471, 42, - 108, 670, 535, 392, 594, 186, 685, 381, 633, 593, - 385, 521, 149, 609, 479, 159, 156, 611, 607, 158, - 406, 47, 431, 47, 47, 405, 157, 586, 615, 608, - 146, 397, 431, 588, 431, 618, 587, 95, 516, 346, - 597, 598, 599, 600, 592, 613, 614, 147, 610, 602, - 603, 604, 142, 115, 191, 199, 197, 541, 114, 468, - 47, 373, 374, 375, 376, 377, 636, 641, 705, 661, - 14, 431, 34, 659, 110, 11, 47, 47, 532, 663, - 489, 10, 17, 47, 9, 47, 171, 667, 668, 8, - 551, 7, 665, 6, 671, 631, 431, 642, 5, 4, - 104, 13, 47, 640, 669, 2, 47, 0, 0, 93, - 93, 0, 0, 431, 406, 0, 0, 431, 0, 684, - 533, 0, 0, 666, 0, 93, 0, 694, 0, 0, - 0, 0, 0, 0, 0, 0, 707, 708, 0, 683, - 0, 532, 0, 642, 47, 713, 0, 0, 0, 0, - 682, 0, 0, 0, 709, 618, 0, 690, 0, 691, - 718, 381, 719, 0, 0, 0, 0, 0, 0, 0, - 0, 93, 0, 0, 0, 0, 93, 0, 0, 0, - 0, 47, 47, 533, 0, 26, 0, 0, 0, 0, - 0, 0, 723, 724, 0, 93, 0, 0, 0, 0, - 0, 0, 0, 116, 93, 213, 93, 637, 0, 0, - 0, 93, 0, 0, 93, 674, 93, 93, 0, 0, - 0, 720, 262, 339, 489, 722, 0, 353, 352, 362, - 363, 355, 356, 357, 358, 359, 360, 361, 354, 0, - 0, 692, 0, 693, 0, 695, 0, 697, 0, 699, - 700, 701, 702, 703, 704, 0, 486, 0, 0, 495, - 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, - 506, 507, 508, 509, 0, 0, 0, 0, 0, 93, - 585, 0, 407, 93, 93, 93, 93, 0, 0, 0, - 0, 0, 418, 0, 0, 0, 93, 0, 0, 213, - 353, 352, 362, 363, 355, 356, 357, 358, 359, 360, - 361, 354, 352, 362, 363, 355, 356, 357, 358, 359, - 360, 361, 354, 68, 0, 512, 0, 145, 0, 0, - 0, 0, 0, 0, 177, 60, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 29, 93, 93, 184, 161, - 160, 162, 163, 164, 165, 166, 0, 0, 167, 168, - 169, 0, 0, 0, 0, 143, 154, 0, 176, 362, - 363, 355, 356, 357, 358, 359, 360, 361, 354, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 151, 152, - 337, 0, 0, 0, 182, 0, 153, 0, 155, 0, - 0, 0, 580, 581, 582, 0, 0, 0, 0, 181, - 0, 69, 0, 0, 57, 0, 0, 52, 0, 0, - 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, - 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, - 73, 78, 65, 62, 49, 76, 63, 61, 0, 71, - 79, 83, 0, 178, 179, 180, 183, 174, 175, 0, - 80, 0, 0, 0, 0, 339, 262, 68, 0, 0, - 0, 0, 0, 0, 407, 339, 339, 339, 0, 60, - 0, 0, 0, 0, 0, 407, 0, 0, 0, 0, - 0, 0, 46, 234, 638, 639, 239, 240, 241, 242, - 243, 244, 0, 245, 246, 247, 248, 249, 235, 236, - 237, 238, 224, 225, 0, 0, 226, 227, 228, 229, - 230, 231, 232, 233, 0, 0, 0, 0, 353, 352, - 362, 363, 355, 356, 357, 358, 359, 360, 361, 354, - 0, 0, 0, 0, 0, 0, 0, 689, 0, 0, - 0, 93, 407, 0, 0, 69, 339, 93, 57, 0, - 0, 52, 0, 262, 77, 72, 64, 58, 59, 48, - 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, - 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 0, 0, 0, 339, - 0, 0, 0, 0, 80, 0, 0, 339, 0, 0, + 189, 383, 532, 461, 621, 431, 174, 408, 533, 264, + 513, 32, 409, 586, 430, 524, 407, 442, 406, 47, + 489, 339, 176, 97, 97, 45, 545, 427, 140, 191, + 211, 123, 466, 212, 3, 457, 103, 142, 93, 97, + 436, 114, 47, 31, 202, 712, 144, 138, 125, 626, + 627, 628, 432, 565, 124, 115, 449, 629, 625, 128, + 101, 704, 702, 468, 120, 341, 683, 467, 467, 113, + 129, 132, 444, 111, 25, 27, 15, 16, 636, 127, + 91, 85, 86, 262, 134, 97, 84, 92, 98, 559, + 97, 22, 257, 256, 716, 675, 639, 609, 357, 515, + 360, 361, 362, 363, 364, 357, 592, 29, 543, 345, + 478, 97, 382, 139, 344, 343, 343, 154, 193, 87, + 97, 97, 97, 594, 89, 88, 542, 664, 131, 97, + 345, 345, 97, 525, 97, 97, 255, 137, 396, 397, + 97, 102, 194, 450, 198, 684, 682, 443, 525, 130, + 598, 446, 630, 496, 136, 686, 118, 563, 447, 215, + 344, 343, 18, 19, 20, 685, 494, 495, 493, 568, + 145, 192, 29, 344, 343, 197, 345, 21, 23, 567, + 266, 24, 566, 492, 344, 343, 218, 253, 728, 345, + 623, 666, 560, 254, 718, 719, 258, 97, 260, 261, + 345, 97, 97, 97, 97, 464, 125, 679, 678, 662, + 97, 473, 143, 348, 97, 133, 143, 97, 28, 724, + 47, 47, 579, 580, 581, 723, 435, 125, 33, 403, + 398, 631, 399, 124, 482, 484, 485, 118, 410, 519, + 338, 483, 412, 384, 414, 199, 389, 425, 604, 423, + 424, 200, 437, 421, 473, 426, 463, 413, 200, 415, + 347, 405, 632, 97, 97, 634, 633, 374, 358, 359, + 360, 361, 362, 363, 364, 357, 649, 608, 143, 658, + 659, 660, 657, 346, 661, 459, 460, 519, 143, 651, + 469, 654, 656, 650, 541, 648, 200, 143, 652, 474, + 344, 343, 220, 219, 473, 553, 394, 29, 653, 655, + 451, 462, 616, 556, 25, 458, 345, 428, 118, 118, + 118, 118, 25, 25, 177, 26, 41, 470, 471, 473, + 569, 118, 365, 366, 358, 359, 360, 361, 362, 363, + 364, 357, 47, 401, 402, 668, 541, 29, 125, 546, + 547, 26, 549, 418, 476, 29, 29, 419, 12, 108, + 417, 204, 207, 119, 205, 416, 206, 208, 546, 547, + 722, 452, 453, 490, 204, 207, 562, 205, 36, 206, + 208, 47, 454, 455, 456, 420, 207, 512, 721, 435, + 557, 465, 517, 107, 38, 39, 259, 125, 526, 210, + 141, 109, 104, 693, 100, 47, 105, 33, 125, 479, + 480, 539, 486, 487, 692, 638, 522, 538, 428, 425, + 531, 520, 263, 518, 530, 534, 135, 121, 35, 410, + 37, 47, 99, 26, 540, 516, 554, 435, 536, 551, + 410, 548, 30, 1, 213, 90, 620, 439, 429, 122, + 40, 384, 521, 438, 681, 624, 445, 564, 448, 558, + 192, 561, 223, 550, 224, 222, 226, 47, 491, 97, + 225, 221, 647, 125, 375, 97, 125, 572, 47, 124, + 687, 209, 214, 475, 125, 435, 42, 110, 578, 676, + 576, 527, 528, 529, 552, 574, 537, 395, 570, 381, + 573, 190, 385, 386, 387, 575, 390, 691, 410, 637, + 391, 392, 393, 596, 582, 388, 490, 523, 152, 518, + 404, 153, 481, 163, 160, 119, 119, 119, 119, 162, + 161, 516, 150, 571, 400, 349, 151, 146, 213, 597, + 117, 195, 203, 201, 544, 116, 472, 711, 125, 14, + 435, 589, 610, 614, 47, 34, 47, 47, 611, 112, + 435, 619, 435, 622, 600, 601, 602, 603, 618, 11, + 97, 10, 17, 605, 606, 607, 9, 8, 7, 6, + 410, 5, 4, 106, 518, 593, 148, 13, 617, 2, + 0, 599, 118, 47, 0, 0, 613, 640, 0, 435, + 0, 384, 645, 0, 0, 0, 0, 663, 612, 47, + 47, 491, 615, 667, 590, 672, 673, 47, 0, 47, + 0, 671, 595, 125, 554, 435, 0, 534, 644, 677, + 0, 0, 0, 0, 635, 0, 47, 0, 0, 0, + 47, 669, 435, 125, 690, 646, 435, 674, 0, 0, + 175, 0, 0, 0, 0, 700, 0, 0, 0, 0, + 0, 0, 0, 0, 665, 0, 0, 0, 0, 0, + 0, 714, 0, 94, 94, 410, 47, 0, 0, 0, + 47, 0, 435, 696, 720, 697, 622, 0, 689, 94, + 0, 534, 646, 0, 0, 726, 0, 0, 0, 0, + 26, 0, 0, 0, 715, 0, 0, 0, 0, 0, + 385, 0, 0, 0, 0, 0, 0, 47, 0, 47, + 0, 0, 0, 730, 0, 125, 0, 535, 717, 26, + 0, 731, 713, 0, 0, 94, 0, 0, 0, 0, + 94, 0, 376, 377, 378, 379, 380, 0, 0, 727, + 0, 0, 0, 729, 0, 0, 0, 0, 725, 384, + 0, 94, 0, 0, 0, 0, 680, 0, 0, 0, + 94, 217, 94, 0, 0, 0, 0, 0, 0, 94, + 0, 0, 94, 0, 94, 94, 0, 0, 0, 0, + 265, 342, 698, 0, 699, 0, 701, 0, 703, 119, + 705, 706, 707, 708, 709, 710, 237, 0, 0, 242, + 243, 244, 245, 246, 247, 0, 248, 249, 250, 251, + 252, 238, 239, 240, 241, 227, 228, 0, 0, 229, + 230, 231, 232, 233, 234, 235, 236, 0, 0, 0, + 0, 591, 0, 0, 0, 0, 0, 94, 0, 0, + 217, 94, 94, 94, 94, 0, 0, 0, 0, 0, + 422, 641, 0, 0, 94, 0, 0, 217, 356, 355, + 365, 366, 358, 359, 360, 361, 362, 363, 364, 357, + 0, 356, 355, 365, 366, 358, 359, 360, 361, 362, + 363, 364, 357, 0, 0, 0, 0, 0, 0, 0, + 68, 0, 587, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 60, 94, 94, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 46, 0, 0, 0, 535, + 0, 0, 670, 0, 0, 0, 488, 0, 0, 497, + 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, + 508, 509, 510, 511, 588, 0, 0, 0, 0, 0, + 688, 356, 355, 365, 366, 358, 359, 360, 361, 362, + 363, 364, 357, 0, 356, 355, 365, 366, 358, 359, + 360, 361, 362, 363, 364, 357, 0, 0, 69, 0, + 0, 57, 0, 535, 52, 26, 0, 77, 72, 64, + 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, + 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, + 62, 49, 76, 63, 61, 0, 71, 79, 83, 0, + 0, 0, 342, 265, 0, 0, 0, 80, 351, 0, + 354, 217, 342, 342, 342, 0, 367, 368, 369, 370, + 371, 372, 217, 352, 353, 350, 373, 356, 355, 365, + 366, 358, 359, 360, 361, 362, 363, 364, 357, 356, + 355, 365, 366, 358, 359, 360, 361, 362, 363, 364, + 357, 583, 584, 585, 355, 365, 366, 358, 359, 360, + 361, 362, 363, 364, 357, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 407, 0, 262, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 94, + 217, 0, 0, 0, 342, 94, 0, 0, 0, 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 93, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 339, 0, 46, 0, 429, - 430, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 552, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 407, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 46, 0, 429, - 430, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 46, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 688, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 29, 0, 0, 46, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 184, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 574, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 46, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 184, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 0, 0, 319, 80, - 327, 318, 297, 329, 278, 289, 333, 290, 291, 312, - 270, 305, 68, 0, 281, 266, 287, 267, 279, 299, - 302, 277, 320, 331, 60, 301, 303, 317, 296, 313, - 273, 307, 310, 330, 0, 0, 0, 94, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 309, 326, 288, - 0, 0, 311, 265, 308, 0, 269, 271, 332, 324, - 284, 285, 0, 0, 0, 0, 0, 0, 300, 304, - 314, 294, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 282, 0, 306, 0, 0, 0, 298, 0, 272, - 0, 283, 315, 264, 322, 295, 325, 293, 292, 328, - 69, 0, 0, 57, 321, 280, 52, 286, 334, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 268, 71, 79, - 83, 323, 276, 274, 275, 316, 68, 0, 319, 80, - 145, 0, 0, 0, 0, 0, 0, 177, 60, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, - 0, 184, 161, 160, 162, 163, 164, 165, 166, 0, - 0, 167, 168, 169, 0, 0, 0, 0, 143, 154, - 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 151, 152, 337, 0, 0, 0, 182, 0, 153, - 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 181, 0, 69, 0, 0, 57, 0, 0, - 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, - 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, - 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, - 61, 0, 71, 79, 83, 0, 178, 179, 180, 183, - 174, 175, 68, 80, 0, 0, 145, 0, 0, 0, - 0, 0, 0, 177, 60, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 0, 139, 184, 161, 160, - 162, 163, 164, 165, 166, 0, 0, 167, 168, 169, - 0, 0, 0, 0, 143, 154, 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 151, 152, 0, - 0, 0, 0, 182, 0, 153, 0, 155, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 181, 0, - 69, 0, 0, 57, 0, 0, 52, 0, 0, 77, - 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, - 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, - 78, 65, 62, 49, 76, 63, 61, 25, 71, 79, - 83, 0, 178, 179, 180, 183, 174, 175, 68, 80, - 0, 0, 145, 0, 0, 0, 0, 0, 0, 177, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 184, 161, 160, 162, 163, 164, 165, - 166, 0, 0, 167, 168, 169, 0, 0, 0, 0, - 143, 154, 0, 176, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 342, 0, 0, 0, 0, + 0, 0, 0, 342, 642, 643, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 151, 152, 0, 0, 0, 0, 182, - 0, 153, 0, 155, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 181, 0, 69, 0, 0, 57, - 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 0, 178, 179, - 180, 183, 174, 175, 68, 80, 0, 0, 145, 0, - 0, 0, 0, 0, 0, 177, 60, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 29, 0, 0, 184, - 161, 160, 162, 163, 164, 165, 166, 0, 0, 167, - 168, 169, 0, 0, 0, 0, 143, 154, 0, 176, + 0, 0, 217, 0, 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, - 152, 0, 0, 0, 0, 182, 0, 153, 0, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 0, 69, 0, 0, 57, 0, 0, 52, 0, - 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, - 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, - 66, 73, 78, 65, 62, 49, 76, 63, 61, 0, - 71, 79, 83, 68, 178, 179, 180, 183, 174, 175, - 0, 80, 0, 0, 177, 60, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 29, 0, 0, 184, 161, - 160, 162, 163, 164, 165, 166, 0, 0, 167, 168, - 169, 0, 0, 0, 0, 0, 154, 0, 176, 0, + 94, 0, 0, 0, 0, 0, 0, 0, 695, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 151, 152, - 0, 0, 0, 0, 182, 0, 153, 0, 155, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 181, + 0, 0, 342, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 46, 0, 433, 434, 0, 0, 0, 217, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 555, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 46, 0, 433, 434, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 694, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 29, 0, 0, + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 577, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 330, 321, 300, 332, 281, 292, 336, + 293, 294, 315, 273, 308, 68, 0, 284, 269, 290, + 270, 282, 302, 305, 280, 323, 334, 60, 304, 306, + 320, 299, 316, 276, 310, 313, 333, 0, 0, 0, + 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 312, 329, 291, 0, 0, 314, 268, 311, 0, 272, + 274, 335, 327, 287, 288, 0, 0, 0, 0, 0, + 0, 303, 307, 317, 297, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 285, 0, 309, 0, 0, 0, + 301, 0, 275, 0, 286, 318, 267, 325, 298, 328, + 296, 295, 331, 69, 0, 0, 57, 324, 283, 52, + 289, 337, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 271, 71, 79, 83, 326, 279, 277, 278, 319, 0, + 0, 322, 80, 68, 0, 514, 0, 149, 0, 0, + 0, 0, 0, 0, 181, 60, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 188, 165, + 164, 166, 167, 168, 169, 170, 0, 0, 171, 172, + 173, 0, 0, 0, 0, 147, 158, 0, 180, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 155, 156, + 340, 0, 0, 0, 186, 0, 157, 0, 159, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 185, 0, 69, 0, 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, 0, 71, - 79, 83, 0, 178, 179, 180, 183, 174, 175, 68, - 80, 0, 473, 0, 0, 0, 0, 0, 0, 0, - 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 46, 0, 475, 0, 0, 0, - 25, 0, 0, 0, 0, 0, 0, 0, 0, 341, - 340, 68, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 60, 0, 342, 0, 0, 0, 0, - 0, 0, 0, 29, 0, 0, 46, 0, 0, 0, + 79, 83, 0, 182, 183, 184, 187, 178, 179, 68, + 80, 0, 0, 149, 0, 0, 0, 0, 0, 0, + 181, 60, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 29, 0, 0, 188, 165, 164, 166, 167, 168, + 169, 170, 0, 0, 171, 172, 173, 0, 0, 0, + 0, 147, 158, 0, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 69, 0, 0, + 0, 0, 0, 0, 155, 156, 340, 0, 0, 0, + 186, 0, 157, 0, 159, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 185, 0, 69, 0, 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, - 49, 76, 63, 61, 0, 71, 79, 83, 0, 69, - 0, 0, 57, 0, 0, 52, 80, 0, 77, 72, + 49, 76, 63, 61, 0, 71, 79, 83, 0, 182, + 183, 184, 187, 178, 179, 68, 80, 0, 0, 149, + 0, 0, 0, 0, 0, 0, 181, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 29, 0, 143, + 188, 165, 164, 166, 167, 168, 169, 170, 0, 0, + 171, 172, 173, 0, 0, 0, 0, 147, 158, 0, + 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 155, 156, 0, 0, 0, 0, 186, 0, 157, 0, + 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 185, 0, 69, 0, 0, 57, 0, 0, 52, + 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, + 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, + 50, 66, 73, 78, 65, 62, 49, 76, 63, 61, + 25, 71, 79, 83, 0, 182, 183, 184, 187, 178, + 179, 68, 80, 0, 0, 149, 0, 0, 0, 0, + 0, 0, 181, 60, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 29, 0, 0, 188, 165, 164, 166, + 167, 168, 169, 170, 0, 0, 171, 172, 173, 0, + 0, 0, 0, 147, 158, 0, 180, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 155, 156, 0, 0, + 0, 0, 186, 0, 157, 0, 159, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 185, 0, 69, + 0, 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, - 65, 62, 49, 76, 63, 61, 25, 71, 79, 83, - 0, 0, 0, 0, 0, 0, 0, 68, 80, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, + 65, 62, 49, 76, 63, 61, 0, 71, 79, 83, + 0, 182, 183, 184, 187, 178, 179, 68, 80, 0, + 0, 149, 0, 0, 0, 0, 0, 0, 181, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, - 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, - 0, 212, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 94, 0, 214, 0, 0, 0, 0, + 0, 0, 188, 165, 164, 166, 167, 168, 169, 170, + 0, 0, 171, 172, 173, 0, 0, 0, 0, 147, + 158, 0, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 0, 0, 57, 0, + 0, 0, 155, 156, 0, 0, 0, 0, 186, 0, + 157, 0, 159, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 185, 0, 69, 0, 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 69, 0, 0, 57, - 0, 0, 52, 0, 80, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 68, 0, 0, - 0, 0, 0, 0, 0, 80, 0, 0, 0, 60, + 63, 61, 0, 71, 79, 83, 68, 182, 183, 184, + 187, 178, 179, 0, 80, 0, 0, 181, 60, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, + 0, 188, 165, 164, 166, 167, 168, 169, 170, 0, + 0, 171, 172, 173, 0, 0, 0, 0, 0, 158, + 0, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, + 0, 155, 156, 0, 0, 0, 0, 186, 0, 157, + 0, 159, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 185, 0, 69, 0, 0, 57, 0, 0, + 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, + 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, + 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, + 61, 0, 71, 79, 83, 0, 182, 183, 184, 187, + 178, 179, 68, 80, 0, 477, 0, 0, 0, 0, + 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 46, 0, 475, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, - 0, 0, 0, 0, 44, 69, 0, 0, 57, 0, - 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, - 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, - 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 69, 0, 0, 57, - 0, 0, 52, 0, 80, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 68, 0, 0, - 0, 0, 0, 0, 0, 80, 0, 0, 0, 60, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, - 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, + 0, 0, 344, 343, 68, 0, 0, 0, 0, 0, + 0, 0, 444, 0, 0, 0, 60, 0, 345, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, + 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 94, 0, 214, 0, 0, 0, 0, + 69, 0, 0, 57, 0, 0, 52, 0, 0, 77, + 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, + 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, + 78, 65, 62, 49, 76, 63, 61, 443, 71, 79, + 83, 441, 440, 0, 0, 57, 0, 0, 52, 80, + 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, + 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, + 66, 73, 78, 65, 62, 49, 76, 63, 61, 25, + 71, 79, 83, 0, 0, 0, 0, 0, 0, 0, + 68, 80, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 29, 0, 0, 46, 0, 126, 0, 0, + 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 29, 0, 0, 96, 0, 95, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, + 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, + 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, + 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, + 62, 49, 76, 63, 61, 0, 71, 79, 83, 69, + 0, 0, 57, 0, 0, 52, 0, 80, 77, 72, + 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, + 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, + 65, 62, 49, 76, 63, 61, 0, 71, 79, 83, + 68, 0, 0, 0, 0, 0, 0, 0, 80, 0, + 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 29, 0, 0, 96, 0, 95, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 0, 0, 216, 0, 0, 0, 0, 0, + 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 96, 0, 95, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, + 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, + 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, + 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, + 62, 49, 76, 63, 61, 0, 71, 79, 83, 69, + 0, 0, 57, 0, 0, 52, 0, 80, 77, 72, + 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, + 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, + 65, 62, 49, 76, 63, 61, 0, 71, 79, 83, + 68, 0, 0, 0, 0, 0, 0, 196, 80, 0, + 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 96, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 0, 0, 57, 0, + 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, + 0, 57, 0, 0, 52, 0, 0, 77, 72, 64, + 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, + 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, + 62, 49, 76, 63, 61, 0, 71, 79, 83, 43, + 0, 0, 0, 0, 44, 69, 0, 80, 57, 0, 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 69, 0, 0, 57, - 0, 0, 52, 0, 80, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 68, 0, 0, - 0, 0, 0, 0, 192, 80, 0, 0, 0, 60, + 63, 61, 0, 71, 79, 83, 68, 0, 0, 0, + 0, 0, 0, 0, 80, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 348, - 60, 351, 0, 0, 0, 0, 0, 364, 365, 366, - 367, 368, 369, 46, 349, 350, 347, 370, 353, 352, - 362, 363, 355, 356, 357, 358, 359, 360, 361, 354, - 0, 0, 0, 0, 0, 69, 0, 0, 57, 0, - 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, + 0, 46, 0, 126, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 188, 0, 411, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 69, 0, 0, 57, 0, 0, + 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, + 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, + 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, + 61, 0, 71, 79, 83, 69, 0, 0, 57, 0, + 0, 52, 0, 80, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 69, 0, 0, 57, - 0, 0, 52, 0, 80, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 68, 0, 0, - 0, 0, 0, 0, 0, 80, 0, 0, 0, 60, + 63, 61, 0, 71, 79, 83, 68, 0, 0, 0, + 0, 0, 0, 0, 80, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 184, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, + 0, 96, 0, 95, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, + 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 0, 0, 57, 0, - 0, 52, 0, 0, 77, 72, 64, 58, 59, 48, + 0, 0, 0, 0, 69, 0, 0, 57, 0, 0, + 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, + 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, + 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, + 61, 0, 71, 79, 83, 69, 0, 0, 57, 0, + 0, 52, 0, 80, 77, 72, 64, 58, 59, 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, 76, - 63, 61, 0, 71, 79, 83, 69, 0, 0, 57, - 0, 0, 52, 0, 80, 77, 72, 64, 58, 59, - 48, 0, 70, 55, 56, 54, 67, 74, 75, 53, - 82, 51, 81, 50, 66, 73, 78, 65, 62, 49, - 76, 63, 61, 0, 71, 79, 83, 0, 0, 0, - 0, 0, 0, 0, 0, 80, + 63, 61, 0, 71, 79, 83, 68, 0, 0, 0, + 0, 0, 0, 0, 80, 0, 0, 0, 60, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 96, 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, 69, 0, 0, 57, 0, 0, + 52, 0, 0, 77, 72, 64, 58, 59, 48, 0, + 70, 55, 56, 54, 67, 74, 75, 53, 82, 51, + 81, 50, 66, 73, 78, 65, 62, 49, 76, 63, + 61, 0, 71, 79, 83, 0, 0, 0, 0, 0, + 0, 0, 0, 80, } var yyPact = [...]int{ - 261, -1000, -112, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 461, 479, -1000, -1000, -1000, 370, 3370, -13, - -22, 14, 3921, 3921, -1000, -1000, 296, 94, -1000, -1000, - -1000, -1000, 452, 455, 296, 440, -29, -1000, 3540, 473, - -1000, 179, -21, -33, -1000, -1000, -1000, -1000, -1000, -1000, + 68, -1000, -112, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 393, 423, -1000, -1000, -1000, 287, 3800, -13, + -18, 25, 4099, 4099, -1000, -1000, 308, 84, -1000, -1000, + -1000, -1000, 386, 391, 308, 383, -29, -1000, 3583, 417, + -1000, 3929, -21, -33, -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, 3921, -32, -32, -15, 471, 3921, - -6, -1000, -1000, 29, -1000, -1000, -1000, -1000, 436, 194, - -103, -1000, 2757, 2757, 461, -1000, 296, -1000, 3710, -1000, - 113, 333, 421, -1000, -1000, -1000, 433, 3200, 3241, 3921, - 318, -1000, 912, -33, 3921, 83, -9, 3921, 424, 3921, - 3921, -19, -1000, -1000, 470, 2215, 2349, -1000, -1000, -1000, - -1000, 145, -1000, 2757, 3720, 330, -1000, -1000, -1000, -1000, - -1000, 2886, 2886, 2886, 2886, 2886, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 4099, -32, -32, -15, 416, 4099, + -9, -1000, -1000, -1000, 20, -1000, -1000, -1000, -1000, -1000, + 381, 175, -104, -1000, 2970, 2970, 393, -1000, 308, -1000, + 3753, -1000, 93, 218, 344, -1000, -1000, -1000, 379, 3454, + 3624, 4099, 262, -1000, 695, -1000, -1000, -33, 4099, 77, + -5, 4099, 375, 4099, 4099, -16, -1000, -1000, 412, 2288, + 2562, -1000, -1000, -1000, -1000, 243, -1000, 2970, 979, 268, + -1000, -1000, -1000, -1000, -1000, 3099, 3099, 3099, 3099, 3099, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - 330, 28, -1000, 2621, 330, 330, 2757, 330, -1000, -1000, - -1000, 330, 330, 330, -1000, -1000, 327, -1000, 263, 452, - 194, 366, 3921, -1000, -1000, 3880, 3540, 3540, 3540, 3540, - -1000, 399, 395, 382, 392, 3921, -1000, 297, 194, 3200, - -1000, -1000, 3581, -1000, -1000, 468, 1315, 49, 149, -87, - -1000, -1000, 336, -1000, 336, 336, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 336, 336, 336, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 364, 364, 364, 349, 349, - 187, -1000, 420, -38, -34, -1000, -1000, -1000, -1000, 3921, - 3921, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, 268, 19, -1000, 2834, 268, 268, + 2970, 268, -1000, -1000, -1000, 268, 268, 268, -1000, -1000, + 266, -1000, 116, 386, 175, 316, 4099, -1000, -1000, 3970, + 3583, 3583, 3583, 3583, -1000, 335, 330, 323, 355, 4269, + -1000, 256, 175, 3454, -1000, -1000, 4099, -1000, 407, 1388, + 3277, 99, -88, -1000, -1000, 271, -1000, 271, 271, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 271, 271, + 271, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 276, 276, + 276, 272, 272, 163, -1000, 370, -39, -38, -1000, -1000, + -1000, -1000, 4099, 4099, -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, 306, -1000, -1000, 3022, 24, - 2757, 2757, 251, 2757, 2757, 59, 2886, 126, 85, 2886, - 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, 2886, - 2886, 2886, 2886, 2886, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 296, -1000, -1000, -1000, -1000, 980, 836, 2065, - 289, 176, 2621, 2757, 436, 75, 176, 3880, 2349, 2349, - 2349, 2757, -1000, -1000, -1000, -1000, -1000, -1000, 3880, 330, - -1000, 3064, -1000, 321, -1000, 67, -1000, 23, 421, 360, - 346, -1000, -1000, -1000, -1000, 390, -1000, -1000, -1000, -1000, - -1000, 194, -1000, 461, 2757, 326, 1165, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 357, 415, 87, 183, -1000, - -1000, 404, -1000, 104, -93, -1000, -1000, 147, -1000, -1000, - -1000, -1000, -1000, -1000, 146, -1000, -1000, -1000, 137, -1000, - 348, -1000, 179, -1000, 3921, 3880, -1000, -1000, 468, 2349, - 3540, -1000, -1000, 3411, -1000, -1000, 1765, 59, 79, -1000, - -1000, 254, -1000, -1000, 176, 176, 193, -1000, -1000, -1000, - -1000, 126, 2886, 2886, 2886, 15, 193, 752, 819, 763, - -1000, 208, 208, 34, 34, 34, 34, 34, 86, 86, - -1000, 194, 2349, 325, 330, 18, -1000, 2757, -1000, 138, - 2349, 76, -1000, 2757, 194, 203, 203, 203, -1000, 303, - 243, -1000, -1000, 2485, 194, 258, 17, 461, 3880, 2757, - 2065, -1000, -1000, 2757, 353, -1000, -1000, -1000, 452, 176, - 1315, -1000, 1315, 3751, -1000, 163, -1000, -1000, -83, 10, - -1000, -1000, -1000, 223, 283, 249, 3921, -1000, -1000, -25, - 466, -1000, 271, -1000, -1000, 12, -1000, -1000, -1000, -1000, - 15, 193, 679, -1000, 2886, 2886, -1000, 203, 2349, 1915, - 176, 198, 313, 69, -1000, 2757, 276, -1000, -1000, -1000, - -1000, 330, -1000, -1000, 362, 3751, 3751, 452, -1000, 176, - -1000, 176, 3751, -1000, 1165, -1000, 197, -1000, 336, -1000, - 40, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 136, -1000, - 134, 1615, 3880, 463, 454, 1465, -1000, 2886, 193, 193, - -1000, 194, -1000, 194, 336, -1000, 336, 349, 336, -54, - 336, -55, 336, 336, 336, 336, 336, 336, -1000, -107, - -1000, 176, 2757, -1000, 330, -1000, 296, -1, -1000, -1000, - 174, -1000, -1000, 3751, -1000, -1000, 411, -1000, 408, 216, - 209, -1000, -1000, -1000, -1000, -1000, 2757, 2757, -1000, 193, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 289, -1000, + -1000, 3235, 17, 2970, 2970, 182, 2970, 2970, 36, 3099, + 133, 92, 3099, 3099, 3099, 3099, 3099, 3099, 3099, 3099, + 3099, 3099, 3099, 3099, 3099, 3099, 3099, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 308, -1000, -1000, -1000, -1000, + 883, 2426, 2138, 247, 57, 2834, 2970, 381, 70, 57, + 3970, 2562, 2562, 2562, 2970, -1000, -1000, -1000, -1000, -1000, + -1000, 3970, 268, -1000, 3413, -1000, 306, -1000, 59, -1000, + 15, -1000, 344, 312, 331, -1000, -1000, -1000, -1000, 322, + -1000, -1000, -1000, -1000, -1000, 175, -1000, 393, 2970, 265, + 1238, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 274, + 365, 47, 150, -1000, -1000, 350, -1000, 105, -92, -1000, + -1000, 137, -1000, -1000, -1000, -1000, -1000, -1000, 134, -1000, + -1000, -1000, 124, -1000, 293, -1000, 3929, -1000, 4099, 3970, + -1000, -1000, 407, 2562, 3583, -1000, -1000, 3929, 1838, 36, + 58, -1000, -1000, 170, -1000, -1000, 57, 57, 991, -1000, + -1000, -1000, -1000, 133, 3099, 3099, 3099, 790, 991, 896, + 252, 1005, -1000, 16, 16, 9, 9, 9, 9, 9, + 186, 186, -1000, 175, 2562, 264, 268, 13, -1000, 2970, + -1000, 103, 2562, 85, -1000, 2970, 175, 171, 171, 171, + -1000, 254, 208, -1000, -1000, 2698, 175, 237, -1000, 4, + 393, 3970, 2970, 2138, -1000, -1000, 2970, 273, -1000, -1000, + -1000, 386, 57, 1388, -1000, 1388, 4140, -1000, 148, -1000, + -1000, -84, 5, -1000, -1000, -1000, 190, 222, 225, 4099, + -1000, -1000, -23, 403, -1000, 211, -1000, -1000, 3, -1000, + -1000, -1000, -1000, 790, 991, 803, -1000, 3099, 3099, -1000, + 171, 2562, 1988, 57, 165, 214, 61, -1000, 2970, 127, + -1000, -1000, -1000, -1000, 268, -1000, -1000, 317, 3929, 4140, + 386, -1000, 57, -1000, 2, 57, 3929, -1000, 1238, -1000, + 167, -1000, 271, -1000, 41, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 120, -1000, 110, 1688, 3970, 401, 388, 1538, + -1000, 3099, 991, 991, -1000, 175, -1000, 175, 271, -1000, + 271, 272, 271, -56, 271, -57, 271, 271, 271, 271, + 271, 271, -1000, -108, -1000, 57, 2970, -1000, 268, -1000, + 308, -1000, 1, -1000, -1000, 1988, 154, -1000, -1000, 4140, + -1000, -1000, 363, -1000, 345, 184, 178, -1000, -1000, -1000, + -1000, -1000, 2970, 2970, -1000, 991, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 194, 160, 176, 243, 194, - 3751, 3751, -1000, -1000, -1000, -1000, -1000, -1000, 176, 226, - -1000, -1000, -1000, -1000, -1000, + -1000, 175, 144, 57, 208, 175, 4140, -1000, 3929, -1000, + -1000, -1000, -1000, -1000, -1000, 57, 199, -1000, -1000, -1000, + -1000, -1000, } var yyPgo = [...]int{ - 0, 635, 17, 414, 631, 630, 629, 628, 623, 621, - 619, 614, 612, 611, 605, 447, 604, 602, 600, 33, - 598, 15, 53, 8, 29, 3, 589, 22, 66, 41, - 588, 35, 587, 586, 51, 585, 58, 584, 583, 31, - 582, 577, 569, 561, 560, 439, 556, 549, 546, 545, - 544, 13, 4, 2, 6, 7, 542, 262, 16, 541, - 12, 540, 539, 538, 536, 10, 535, 32, 533, 26, - 532, 531, 38, 20, 530, 133, 60, 529, 27, 0, - 11, 37, 21, 528, 616, 14, 42, 526, 525, 524, - 522, 520, 518, 517, 516, 515, 513, 126, 512, 511, - 510, 40, 9, 509, 508, 507, 34, 506, 28, 503, - 502, 501, 25, 5, 496, 1, 494, 36, 492, 490, - 489, 48, 45, 487, 486, + 0, 589, 33, 358, 587, 583, 582, 581, 579, 578, + 577, 576, 572, 571, 569, 378, 559, 555, 549, 28, + 547, 13, 99, 10, 21, 65, 546, 30, 41, 55, + 545, 26, 544, 543, 44, 542, 64, 541, 540, 27, + 537, 536, 535, 534, 532, 586, 530, 529, 524, 523, + 522, 20, 1, 2, 22, 8, 521, 117, 7, 518, + 517, 15, 515, 513, 509, 507, 11, 501, 29, 497, + 36, 496, 489, 18, 16, 487, 128, 59, 486, 40, + 0, 6, 52, 12, 483, 650, 9, 38, 482, 481, + 480, 472, 471, 470, 466, 465, 464, 462, 143, 461, + 458, 457, 35, 3, 456, 455, 454, 31, 453, 17, + 450, 449, 448, 14, 5, 447, 4, 446, 32, 445, + 443, 442, 324, 37, 432, 430, } var yyR1 = [...]int{ - 0, 119, 120, 120, 1, 1, 1, 1, 1, 1, + 0, 120, 121, 121, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 18, 18, 18, 7, 8, 9, 9, - 12, 109, 110, 110, 110, 106, 91, 91, 91, 94, - 94, 92, 92, 92, 92, 92, 92, 93, 93, 93, - 93, 93, 95, 95, 95, 95, 95, 96, 96, 96, - 96, 96, 96, 96, 96, 96, 96, 97, 97, 101, - 101, 102, 102, 102, 99, 99, 100, 100, 103, 103, - 103, 98, 98, 98, 98, 98, 98, 104, 104, 105, - 105, 105, 105, 105, 107, 114, 114, 114, 114, 108, - 108, 116, 116, 115, 111, 111, 111, 112, 112, 112, - 113, 113, 113, 10, 10, 10, 117, 117, 11, 11, - 13, 13, 13, 13, 13, 118, 118, 14, 14, 14, - 124, 15, 16, 16, 17, 17, 19, 19, 23, 23, - 22, 22, 24, 24, 24, 24, 83, 83, 83, 82, - 82, 26, 27, 27, 28, 28, 29, 29, 29, 29, - 38, 71, 71, 30, 30, 30, 31, 31, 32, 32, - 88, 88, 87, 87, 87, 86, 86, 33, 33, 33, + 12, 110, 111, 111, 111, 107, 92, 92, 92, 95, + 95, 93, 93, 93, 93, 93, 93, 94, 94, 94, + 94, 94, 96, 96, 96, 96, 96, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 98, 98, 102, + 102, 103, 103, 103, 100, 100, 101, 101, 104, 104, + 104, 99, 99, 99, 99, 99, 99, 105, 105, 106, + 106, 106, 106, 106, 108, 115, 115, 115, 115, 109, + 109, 117, 117, 116, 112, 112, 112, 113, 113, 113, + 114, 114, 114, 10, 10, 10, 118, 118, 11, 11, + 13, 13, 13, 13, 13, 119, 119, 14, 14, 14, + 125, 15, 16, 16, 17, 17, 19, 19, 23, 23, + 22, 22, 24, 24, 24, 24, 84, 84, 84, 83, + 83, 26, 27, 27, 28, 28, 29, 29, 29, 29, + 38, 72, 72, 30, 30, 30, 31, 31, 32, 32, + 89, 89, 88, 88, 88, 87, 87, 33, 33, 33, 34, 34, 35, 35, 37, 37, 36, 36, 39, 39, 25, 25, 25, 25, 25, 25, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 50, 50, @@ -975,27 +1014,28 @@ var yyR1 = [...]int{ 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, 90, 90, - 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 90, 90, 90, 61, 61, 20, 20, 59, - 59, 60, 62, 62, 58, 58, 58, 44, 44, 44, - 44, 44, 44, 44, 44, 63, 63, 64, 64, 65, - 65, 66, 66, 67, 68, 68, 68, 69, 69, 69, - 69, 43, 43, 43, 43, 43, 43, 70, 70, 70, - 70, 53, 53, 55, 55, 54, 56, 72, 72, 73, - 75, 75, 76, 76, 74, 74, 77, 77, 77, 80, - 80, 81, 81, 84, 84, 85, 85, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 79, 79, + 46, 46, 47, 47, 47, 49, 49, 49, 91, 91, + 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, + 91, 91, 91, 91, 91, 62, 62, 20, 20, 60, + 60, 61, 63, 63, 58, 58, 58, 59, 59, 59, + 44, 44, 44, 44, 44, 44, 44, 44, 64, 64, + 65, 65, 66, 66, 67, 67, 68, 69, 69, 69, + 70, 70, 70, 70, 43, 43, 43, 43, 43, 43, + 71, 71, 71, 71, 53, 53, 55, 55, 54, 56, + 73, 73, 74, 76, 76, 77, 77, 75, 75, 78, + 78, 78, 81, 81, 82, 82, 85, 85, 86, 86, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 121, 122, 123, 89, 89, 89, + 79, 79, 79, 79, 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, 80, 122, 123, 124, + 90, 90, 90, } var yyR2 = [...]int{ @@ -1028,12 +1068,12 @@ var yyR2 = [...]int{ 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, 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, + 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, @@ -1045,159 +1085,162 @@ 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, 1, 1, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 1, 1, } var yyChk = [...]int{ - -1000, -119, -1, -2, -6, -7, -8, -9, -10, -11, + -1000, -120, -1, -2, -6, -7, -8, -9, -10, -11, -13, -14, -3, -4, -18, 8, 9, -12, 94, 95, - 96, 109, 23, 110, 113, 6, -121, 7, 150, 39, - -120, 155, -65, 14, -17, 5, -15, -124, -15, -15, - -109, 39, -77, 99, 104, -80, 42, -79, 119, 138, + 96, 109, 23, 110, 113, 6, -122, 7, 150, 39, + -121, 155, -66, 14, -17, 5, -15, -125, -15, -15, + -110, 39, -78, 99, 104, -81, 42, -80, 119, 138, 132, 130, 111, 128, 124, 122, 123, 108, 117, 118, 29, 141, 137, 140, 116, 136, 133, 125, 17, 105, 121, 143, 115, 134, 126, 127, 139, 114, 135, 144, 154, 131, 129, 145, 99, 99, 100, 94, 100, 99, - -118, 55, -36, -84, 42, -79, -36, -123, -15, -2, - 57, -69, 16, 15, -5, -3, -121, 18, -74, 102, - -16, -27, -28, -29, -30, -38, -57, -121, -36, 10, - -110, -106, 42, 100, -76, 103, -36, -75, 103, -75, - 99, 10, -36, 146, 56, 93, -19, 19, -122, 41, - 150, -25, -40, 59, -45, 21, -44, -41, -58, -56, - -57, 82, 83, 90, 60, 92, -48, -46, -47, -49, - 44, 43, 45, 46, 47, 48, 49, 52, 53, 54, - -80, -84, -54, -121, 151, 152, 62, 28, 147, 148, - 149, 103, 88, 150, 42, -79, -66, -67, -25, -65, - -2, -37, 24, -36, 51, 27, 40, -33, -34, -35, - 30, 33, 35, 31, 36, -88, 20, -27, -2, -121, - -87, -86, 20, -84, 44, -36, 41, 40, -91, -94, - -96, -95, -92, -93, 130, 131, 134, 135, 136, 137, - 138, 139, 140, 141, 111, 126, 127, 128, 129, 114, - 115, 116, 117, 118, 119, 121, 122, 123, 124, 125, - -76, -36, 59, 98, 97, -36, 21, -36, -36, 99, - 10, -85, -84, -78, 98, 58, 20, 22, 142, 61, - 15, 62, 94, 35, 148, 149, 147, 26, 9, 23, - 110, 19, 86, 96, 65, 66, 112, 21, 54, 10, - 12, 13, 103, 102, 76, 100, 33, 7, 92, 24, - 73, 30, 25, 31, 74, 16, 88, 36, 59, 52, - 37, 57, 14, 34, 75, 97, 150, 32, 6, 153, - 27, 109, 99, 146, 64, 101, 53, 5, 104, 8, - 38, 28, 63, 11, 113, -22, -24, 84, -25, -84, - 58, 57, 73, 40, 17, -25, -42, 76, 59, 74, - 75, 61, 79, 78, 89, 82, 83, 84, 85, 86, - 87, 88, 80, 81, 67, 68, 69, 70, 71, 72, - 77, -57, -121, -45, -45, -45, -45, -45, -121, 93, - -52, -25, -121, -121, -121, -61, -25, -121, -121, -121, - -121, 40, -68, 22, 23, -69, -122, -43, 27, 28, - -2, -121, -36, -72, -73, -58, -80, -84, -28, -29, - -28, -29, 30, 30, 30, 34, 30, -34, -84, -122, - -122, -2, -86, -39, 11, -111, -112, -113, -81, 44, - 45, -80, -78, -106, -107, -114, 105, 104, -108, 100, - 25, -103, 52, 59, -99, 144, -97, 39, -97, -97, - -97, -97, -97, -101, 39, -101, -101, -102, 39, -102, - 42, 21, -117, 106, 101, -117, -36, -36, -26, 40, - 10, -83, -82, 20, -80, 44, 93, -25, -25, -50, - 52, 59, 53, 54, -25, -25, -45, -51, -54, -57, - 50, 76, 74, 75, 61, -45, -45, -45, -45, -45, + -119, 55, -36, -87, -85, 44, 42, -80, -36, -124, + -15, -2, 57, -70, 16, 15, -5, -3, -122, 18, + -75, 102, -16, -27, -28, -29, -30, -38, -57, -122, + -36, 10, -111, -107, -83, -81, 44, 100, -77, 103, + -36, -76, 103, -76, 99, 10, -36, 146, 56, 93, + -19, 19, -123, 41, 150, -25, -40, 59, -45, 21, + -44, -41, -59, -56, -57, 82, 83, 90, 60, 92, + -48, -46, -47, -49, 44, 43, 45, 46, 47, 48, + 49, 52, 53, 54, -81, -85, -54, -122, 151, 152, + 62, 28, 147, 148, 149, 103, 88, 150, 42, -80, + -67, -68, -25, -66, -2, -37, 24, -36, 51, 27, + 40, -33, -34, -35, 30, 33, 35, 31, 36, -89, + 20, -27, -2, -122, -88, -87, 20, -85, -36, 41, + 40, -92, -95, -97, -96, -93, -94, 130, 131, 134, + 135, 136, 137, 138, 139, 140, 141, 111, 126, 127, + 128, 129, 114, 115, 116, 117, 118, 119, 121, 122, + 123, 124, 125, -77, -36, 59, 98, 97, -36, 21, + -36, -36, 99, 10, -86, -85, -79, 98, 58, 20, + 22, 142, 61, 15, 62, 94, 35, 148, 149, 147, + 26, 9, 23, 110, 19, 86, 96, 65, 66, 112, + 21, 54, 10, 12, 13, 103, 102, 76, 100, 33, + 7, 92, 24, 73, 30, 25, 31, 74, 16, 88, + 36, 59, 52, 37, 57, 14, 34, 75, 97, 150, + 32, 6, 153, 27, 109, 99, 146, 64, 101, 53, + 5, 104, 8, 38, 28, 63, 11, 113, -22, -24, + 84, -25, -85, 58, 57, 73, 40, 17, -25, -42, + 76, 59, 74, 75, 61, 79, 78, 89, 82, 83, + 84, 85, 86, 87, 88, 80, 81, 67, 68, 69, + 70, 71, 72, 77, -57, -122, -45, -45, -45, -45, + -45, -122, 93, -52, -25, -122, -122, -122, -62, -25, + -122, -122, -122, -122, 40, -69, 22, 23, -70, -123, + -43, 27, 28, -2, -122, -36, -73, -74, -58, -83, + -87, 44, -28, -29, -28, -29, 30, 30, 30, 34, + 30, -34, -85, -123, -123, -2, -87, -39, 11, -112, + -113, -114, -82, 44, 45, -81, -79, -107, -108, -115, + 105, 104, -109, 100, 25, -104, 52, 59, -100, 144, + -98, 39, -98, -98, -98, -98, -98, -102, 39, -102, + -102, -103, 39, -103, 42, 21, -118, 106, 101, -118, + -36, -36, -26, 40, 10, -84, -83, 20, 93, -25, + -25, -50, 52, 59, 53, 54, -25, -25, -45, -51, + -54, -57, 50, 76, 74, 75, 61, -45, -45, -45, -45, -45, -45, -45, -45, -45, -45, -45, -45, -45, - -80, -23, 19, -22, -81, -85, -78, 40, -122, -25, - -19, -59, -60, 63, -58, -22, -22, -22, -67, -72, - -53, -55, -54, -121, -2, -70, -80, -39, 40, 67, - 93, -32, -31, 37, 38, -31, 30, -122, -65, -25, - 40, -113, 67, 39, 25, -108, 42, 42, -98, 26, - 52, -100, 145, 45, 45, 45, 37, -106, -36, -58, - -39, -24, -27, -82, 84, -85, 52, 53, 54, -51, - -45, -45, -45, -21, 112, 58, -122, -22, -121, 93, - -25, 20, -22, -62, -60, 65, -25, -122, -122, -122, - -122, 40, -122, -122, -122, 40, 93, -65, -73, -25, - -81, -25, 39, -69, -112, -113, -116, -115, -80, 42, - -104, 142, 44, 45, 46, 52, 147, 41, 40, 41, - 40, -36, 101, -63, 12, 93, -21, 58, -45, -45, - -122, -23, -81, -90, 130, 111, 128, 124, 133, 143, - 126, 144, 127, 117, 114, 115, 116, 119, 44, -65, - 66, -25, 64, -55, 28, -2, -121, -80, -80, -69, - -71, -80, 41, 40, -97, -105, 105, 25, 104, 45, - 45, -89, -121, -81, -58, -64, 13, 15, 84, -45, - -122, -122, -97, -97, -102, -97, 118, -97, 118, -97, - -97, -97, -97, -97, -97, -20, 153, -25, -53, -2, - 93, 40, 41, -115, 25, 25, 41, 41, -25, -52, - -122, 44, -122, -80, -80, + -45, -45, -81, -23, 19, -22, -82, -86, -79, 40, + -123, -25, -19, -60, -61, 63, -58, -22, -22, -22, + -68, -73, -53, -55, -54, -122, -2, -71, -83, -81, + -39, 40, 67, 93, -32, -31, 37, 38, -31, 30, + -123, -66, -25, 40, -114, 67, 39, 25, -109, 42, + 42, -99, 26, 52, -101, 145, 45, 45, 45, 37, + -107, -36, -58, -39, -24, -27, -83, 84, -86, 52, + 53, 54, -51, -45, -45, -45, -21, 112, 58, -123, + -22, -122, 93, -25, 20, -22, -63, -61, 65, -25, + -123, -123, -123, -123, 40, -123, -123, -123, 40, 93, + -66, -74, -25, -82, -86, -25, 39, -70, -113, -114, + -117, -116, -81, 42, -105, 142, 44, 45, 46, 52, + 147, 41, 40, 41, 40, -36, 101, -64, 12, 93, + -21, 58, -45, -45, -123, -23, -82, -91, 130, 111, + 128, 124, 133, 143, 126, 144, 127, 117, 114, 115, + 116, 119, 44, -66, 66, -25, 64, -55, 28, -2, + -122, -83, -81, -81, -70, 93, -72, -83, 41, 40, + -98, -106, 105, 25, 104, 45, 45, -90, -122, -82, + -58, -65, 13, 15, 84, -45, -123, -123, -98, -98, + -103, -98, 118, -98, 118, -98, -98, -98, -98, -98, + -98, -20, 153, -25, -53, -2, 93, -82, 40, 41, + -116, 25, 25, 41, 41, -25, -52, -123, 44, -123, + -81, -83, } var yyDef = [...]int{ 0, -2, 2, -2, 5, 6, 7, 8, 9, 10, - 11, 12, 309, 0, 130, 130, 130, 0, 346, 0, - 0, 125, 0, 0, 466, 130, 0, 23, 24, 464, - 1, 3, 317, 0, 0, 134, 344, 132, 0, 0, - 28, 0, 0, 342, 347, 348, 349, 350, 428, 429, - 430, 431, 432, 433, 434, 435, 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, 0, 340, 340, 0, 0, 0, - 0, 126, 127, 186, 353, 354, 128, 129, 136, 17, - 0, 13, 0, 0, 309, 19, 0, 135, 0, 345, - 131, 0, 152, 154, 155, 156, -2, 0, 172, 0, - 0, 32, 0, 342, 0, 0, 0, 0, 0, 0, - 0, 0, 122, 123, 0, 0, 0, 137, 18, 465, - 25, 318, 190, 0, 195, 0, 229, 230, 231, 232, - 233, 0, 0, 0, 0, 0, 251, 252, 253, 254, - 297, 298, 299, 300, 301, 302, 303, 304, 196, 197, - 294, 0, 336, 0, 0, 0, 285, 0, 262, 263, - 264, 0, 0, 0, -2, -2, 310, 311, 314, 317, - 17, 0, 0, 185, 133, 0, 0, 0, 0, 0, - 177, 0, 0, 0, 0, 0, 171, 0, 17, 0, - 160, 173, 0, 175, 176, 188, 104, 0, 78, 74, - 37, 38, 67, 40, 67, 67, 59, 60, 61, 62, - 63, 64, 65, 66, 52, 67, 67, 67, 56, 41, - 42, 43, 44, 45, 46, 69, 69, 69, 71, 71, - 0, 30, 0, 116, 116, 118, 341, 119, 120, 0, - 0, 187, 355, 356, 357, 358, 359, 360, 361, 362, + 11, 12, 312, 0, 130, 130, 130, 0, 349, 0, + 0, 125, 0, 0, 469, 130, 0, 23, 24, 467, + 1, 3, 320, 0, 0, 134, 347, 132, 0, 0, + 28, 0, 0, 345, 350, 351, 352, 353, 431, 432, + 433, 434, 435, 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, 0, 343, 343, 0, 0, 0, + 0, 126, 127, 186, 175, 176, 356, 357, 128, 129, + 136, 17, 0, 13, 0, 0, 312, 19, 0, 135, + 0, 348, 131, 0, 152, 154, 155, 156, -2, 0, + 172, 0, 0, 32, 0, 149, 150, 345, 0, 0, + 0, 0, 0, 0, 0, 0, 122, 123, 0, 0, + 0, 137, 18, 468, 25, 321, 190, 0, 195, 0, + 229, 230, 231, 232, 233, 0, 0, 0, 0, 0, + 251, 252, 253, 254, 300, 301, 302, 303, 304, 305, + 306, 307, 196, 197, 297, 0, 339, 0, 0, 0, + 285, 0, 262, 263, 264, 0, 0, 0, -2, -2, + 313, 314, 317, 320, 17, 0, 0, 185, 133, 0, + 0, 0, 0, 0, 177, 0, 0, 0, 0, 0, + 171, 0, 17, 0, 160, 173, 0, 175, 188, 104, + 0, 78, 74, 37, 38, 67, 40, 67, 67, 59, + 60, 61, 62, 63, 64, 65, 66, 52, 67, 67, + 67, 56, 41, 42, 43, 44, 45, 46, 69, 69, + 69, 71, 71, 0, 30, 0, 116, 116, 118, 344, + 119, 120, 0, 0, 187, 358, 359, 360, 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, 16, 140, 142, 146, 0, - 0, 0, 0, 0, 0, 193, 0, 0, 0, 0, + 423, 424, 425, 426, 427, 428, 429, 430, 16, 140, + 142, 146, 0, 0, 0, 0, 0, 0, 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 214, 215, 216, 217, 218, 219, - 220, 207, 0, 246, 247, 248, 249, 0, 138, 0, - 0, 227, 0, 0, 136, 0, 286, 0, 0, 0, - 0, 0, 313, 315, 316, 14, 20, 21, 0, 0, - -2, 0, 184, 188, 337, 0, 294, 0, 153, 168, - 0, 165, 178, 179, 180, 0, 182, 183, 158, 159, - 226, 17, 174, 309, 0, 31, 105, 107, 110, 111, - 112, 351, 352, 33, 34, 0, 0, 0, 0, 99, - 100, 81, 79, 0, 76, 75, 39, 0, 57, 58, - 53, 54, 55, 47, 0, 48, 49, 50, 0, 51, - 0, 343, 0, 117, 0, 0, 121, 124, 188, 0, - 0, 143, 147, 0, 149, 150, 0, 191, 192, 194, - 208, 0, 210, 212, 319, 320, 198, 199, 223, 224, - 225, 0, 0, 0, 0, 221, 203, 0, 234, 235, - 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, - 250, 0, 0, 139, 295, 0, -2, 0, 335, 0, - 0, 292, 289, 0, 0, 0, 0, 0, 312, 22, - 321, 331, 333, 0, 17, 0, 327, 309, 0, 0, - 0, 163, 169, 0, 0, 164, 181, -2, 317, 189, - 0, 108, 0, 0, 95, 0, 97, 98, 87, 0, - 80, 36, 77, 0, 0, 0, 0, 113, 114, 0, - 305, 141, 151, 148, 144, 0, 209, 211, 213, 200, - 221, 204, 0, 201, 0, 0, 255, 0, 138, 0, - 228, 0, 309, 0, 290, 0, 0, 261, 265, 266, - 267, 0, 334, -2, 0, 0, 0, 317, 338, 339, - 295, 166, 0, 27, 106, 109, 0, 101, 67, 96, - 89, 88, 82, 83, 84, 85, 86, 68, 0, 72, - 0, 467, 0, 307, 0, 0, 202, 0, 222, 205, - 256, 0, 296, 0, 67, 269, 67, 71, 67, 273, - 67, 276, 67, 67, 67, 67, 67, 67, 284, 287, - 260, 293, 0, 332, 0, -2, 0, 329, 328, 26, - 0, 161, 94, 0, 103, 35, 0, 91, 93, 0, - 0, 29, 468, 469, 115, 15, 0, 0, 145, 206, - 257, 258, 268, 270, 271, 272, 274, 275, 277, 278, - 279, 280, 281, 282, 283, 0, 0, 291, 324, 17, - 0, 0, 167, 102, 90, 92, 70, 73, 308, 306, - 259, 288, -2, 330, 162, + 0, 0, 0, 0, 0, 0, 0, 214, 215, 216, + 217, 218, 219, 220, 207, 0, 246, 247, 248, 249, + 0, 138, 0, 0, 227, 0, 0, 136, 0, 286, + 0, 0, 0, 0, 0, 316, 318, 319, 14, 20, + 21, 0, 0, -2, 0, 184, 188, 340, 0, 294, + 0, -2, 153, 168, 0, 165, 178, 179, 180, 0, + 182, 183, 158, 159, 226, 17, 174, 312, 0, 31, + 105, 107, 110, 111, 112, 354, 355, 33, 34, 0, + 452, 0, 0, 99, 100, 81, 79, 0, 76, 75, + 39, 0, 57, 58, 53, 54, 55, 47, 0, 48, + 49, 50, 0, 51, 0, 346, 0, 117, 0, 0, + 121, 124, 188, 0, 0, 143, 147, 0, 0, 191, + 192, 194, 208, 0, 210, 212, 322, 323, 198, 199, + 223, 224, 225, 0, 0, 0, 0, 221, 203, 0, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 250, 0, 0, 139, 298, 0, -2, 0, + 338, 0, 0, 292, 289, 0, 0, 0, 0, 0, + 315, 22, 324, 334, 336, 0, 17, 0, 330, 149, + 312, 0, 0, 0, 163, 169, 0, 0, 164, 181, + -2, 320, 189, 0, 108, 0, 0, 95, 0, 97, + 98, 87, 0, 80, 36, 77, 0, 0, 0, 0, + 113, 114, 0, 308, 141, 151, 148, 144, 0, 209, + 211, 213, 200, 221, 204, 0, 201, 0, 0, 255, + 0, 138, 0, 228, 0, 312, 0, 290, 0, 0, + 261, 265, 266, 267, 0, 337, -2, 0, 0, 0, + 320, 341, 342, 295, 0, 166, 0, 27, 106, 109, + 0, 101, 67, 96, 89, 88, 82, 83, 84, 85, + 86, 68, 0, 72, 0, 470, 0, 310, 0, 0, + 202, 0, 222, 205, 256, 0, 299, 0, 67, 269, + 67, 71, 67, 273, 67, 276, 67, 67, 67, 67, + 67, 67, 284, 287, 260, 293, 0, 335, 0, -2, + 0, 332, 149, 331, 26, 0, 0, 161, 94, 0, + 103, 35, 0, 91, 93, 0, 0, 29, 471, 472, + 115, 15, 0, 0, 145, 206, 257, 258, 268, 270, + 271, 272, 274, 275, 277, 278, 279, 280, 281, 282, + 283, 0, 0, 291, 327, 17, 0, 296, 0, 167, + 102, 90, 92, 70, 73, 311, 309, 259, 288, -2, + 333, 162, } var yyTok1 = [...]int{ @@ -1755,7 +1798,7 @@ yydefault: yyDollar[2].columnType.Default = yyDollar[4].optVal yyDollar[2].columnType.Autoincrement = yyDollar[5].boolVal yyDollar[2].columnType.KeyOpt = yyDollar[6].colKeyOpt - yyVAL.columnDefinition = &ColumnDefinition{Name: NewColIdent(string(yyDollar[1].bytes)), Type: yyDollar[2].columnType} + yyVAL.columnDefinition = &ColumnDefinition{Name: yyDollar[1].colIdent, Type: yyDollar[2].columnType} } case 36: yyDollar = yyS[yypt-3 : yypt+1] @@ -3312,241 +3355,259 @@ yydefault: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1609 { - yyVAL.expr = NewStrVal(yyDollar[1].bytes) + yyVAL.colName = &ColName{Name: yyDollar[1].colIdent} } case 298: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1613 { - yyVAL.expr = NewHexVal(yyDollar[1].bytes) + yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent} } case 299: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:1617 { - yyVAL.expr = NewIntVal(yyDollar[1].bytes) + yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent} } case 300: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1621 + //line sql.y:1623 { - yyVAL.expr = NewFloatVal(yyDollar[1].bytes) + yyVAL.expr = NewStrVal(yyDollar[1].bytes) } case 301: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1625 + //line sql.y:1627 { - yyVAL.expr = NewHexNum(yyDollar[1].bytes) + yyVAL.expr = NewHexVal(yyDollar[1].bytes) } case 302: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1629 + //line sql.y:1631 { - yyVAL.expr = NewValArg(yyDollar[1].bytes) + yyVAL.expr = NewIntVal(yyDollar[1].bytes) } case 303: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1633 + //line sql.y:1635 { - yyVAL.expr = NewPosArg(yyDollar[1].bytes) + yyVAL.expr = NewFloatVal(yyDollar[1].bytes) } case 304: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1637 + //line sql.y:1639 { - yyVAL.expr = &NullVal{} + yyVAL.expr = NewHexNum(yyDollar[1].bytes) } case 305: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1643 + { + yyVAL.expr = NewValArg(yyDollar[1].bytes) + } + case 306: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1647 + { + yyVAL.expr = NewPosArg(yyDollar[1].bytes) + } + case 307: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1651 + { + yyVAL.expr = &NullVal{} + } + case 308: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1642 + //line sql.y:1656 { yyVAL.exprs = nil } - case 306: + case 309: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1646 + //line sql.y:1660 { yyVAL.exprs = yyDollar[3].exprs } - case 307: + case 310: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1651 + //line sql.y:1665 { yyVAL.expr = nil } - case 308: + case 311: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1655 + //line sql.y:1669 { yyVAL.expr = yyDollar[2].expr } - case 309: + case 312: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1660 + //line sql.y:1674 { yyVAL.orderBy = nil } - case 310: + case 313: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1664 + //line sql.y:1678 { yyVAL.orderBy = yyDollar[3].orderBy } - case 311: + case 314: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1670 + //line sql.y:1684 { yyVAL.orderBy = OrderBy{yyDollar[1].order} } - case 312: + case 315: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1674 + //line sql.y:1688 { yyVAL.orderBy = append(yyDollar[1].orderBy, yyDollar[3].order) } - case 313: + case 316: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1680 + //line sql.y:1694 { yyVAL.order = &Order{Expr: yyDollar[1].expr, Direction: yyDollar[2].str} } - case 314: + case 317: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1685 + //line sql.y:1699 { yyVAL.str = AscScr } - case 315: + case 318: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1689 + //line sql.y:1703 { yyVAL.str = AscScr } - case 316: + case 319: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1693 + //line sql.y:1707 { yyVAL.str = DescScr } - case 317: + case 320: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1698 + //line sql.y:1712 { yyVAL.limit = nil } - case 318: + case 321: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1702 + //line sql.y:1716 { yyVAL.limit = &Limit{Rowcount: yyDollar[2].expr} } - case 319: + case 322: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1706 + //line sql.y:1720 { yyVAL.limit = &Limit{Offset: yyDollar[2].expr, Rowcount: yyDollar[4].expr} } - case 320: + case 323: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1710 + //line sql.y:1724 { yyVAL.limit = &Limit{Offset: yyDollar[4].expr, Rowcount: yyDollar[2].expr} } - case 321: + case 324: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1723 + //line sql.y:1737 { yyVAL.ins = &Insert{Rows: yyDollar[2].values} } - case 322: + case 325: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1727 + //line sql.y:1741 { yyVAL.ins = &Insert{Rows: yyDollar[1].selStmt} } - case 323: + case 326: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1731 + //line sql.y:1745 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Rows: yyDollar[2].selStmt} } - case 324: + case 327: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1736 + //line sql.y:1750 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].values} } - case 325: + case 328: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1740 + //line sql.y:1754 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[4].selStmt} } - case 326: + case 329: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:1744 + //line sql.y:1758 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].selStmt} } - case 327: + case 330: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1751 + //line sql.y:1765 { yyVAL.columns = Columns{yyDollar[1].colIdent} } - case 328: + case 331: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1755 + //line sql.y:1769 { yyVAL.columns = Columns{yyDollar[3].colIdent} } - case 329: + case 332: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1759 + //line sql.y:1773 { yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent) } - case 330: + case 333: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1763 + //line sql.y:1777 { yyVAL.columns = append(yyVAL.columns, yyDollar[5].colIdent) } - case 331: + case 334: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1769 + //line sql.y:1783 { yyVAL.values = Values{yyDollar[1].valTuple} } - case 332: + case 335: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1773 + //line sql.y:1787 { yyVAL.values = append(yyDollar[1].values, yyDollar[3].valTuple) } - case 333: + case 336: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1779 + //line sql.y:1793 { yyVAL.valTuple = yyDollar[1].valTuple } - case 334: + case 337: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1783 + //line sql.y:1797 { yyVAL.valTuple = ValTuple{} } - case 335: + case 338: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1789 + //line sql.y:1803 { yyVAL.valTuple = ValTuple(yyDollar[2].exprs) } - case 336: + case 339: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1795 + //line sql.y:1809 { if len(yyDollar[1].valTuple) == 1 { yyVAL.expr = &ParenExpr{yyDollar[1].valTuple[0]} @@ -3554,150 +3615,150 @@ yydefault: yyVAL.expr = yyDollar[1].valTuple } } - case 337: + case 340: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1805 + //line sql.y:1819 { yyVAL.updateExprs = UpdateExprs{yyDollar[1].updateExpr} } - case 338: + case 341: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1809 + //line sql.y:1823 { yyVAL.updateExprs = append(yyDollar[1].updateExprs, yyDollar[3].updateExpr) } - case 339: + case 342: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1815 + //line sql.y:1829 { yyVAL.updateExpr = &UpdateExpr{Name: yyDollar[1].colName, Expr: yyDollar[3].expr} } - case 340: + case 343: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1820 + //line sql.y:1834 { yyVAL.byt = 0 } - case 341: + case 344: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1822 + //line sql.y:1836 { yyVAL.byt = 1 } - case 342: + case 345: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1825 + //line sql.y:1839 { yyVAL.empty = struct{}{} } - case 343: + case 346: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1827 + //line sql.y:1841 { yyVAL.empty = struct{}{} } - case 344: + case 347: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1830 + //line sql.y:1844 { yyVAL.str = "" } - case 345: + case 348: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1832 + //line sql.y:1846 { yyVAL.str = IgnoreStr } - case 346: + case 349: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1835 + //line sql.y:1849 { yyVAL.empty = struct{}{} } - case 347: + case 350: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1837 + //line sql.y:1851 { yyVAL.empty = struct{}{} } - case 348: + case 351: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1839 + //line sql.y:1853 { yyVAL.empty = struct{}{} } - case 349: + case 352: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1843 + //line sql.y:1857 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 350: + case 353: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1847 + //line sql.y:1861 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 352: + case 355: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1854 + //line sql.y:1868 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 353: + case 356: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1860 + //line sql.y:1874 { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 354: + case 357: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1864 + //line sql.y:1878 { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 356: + case 359: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1871 + //line sql.y:1885 { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 464: + case 467: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2004 + //line sql.y:2018 { if incNesting(yylex) { yylex.Error("max nesting level reached") return 1 } } - case 465: + case 468: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2013 + //line sql.y:2027 { decNesting(yylex) } - case 466: + case 469: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2018 + //line sql.y:2032 { forceEOF(yylex) } - case 467: + case 470: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2023 + //line sql.y:2037 { forceEOF(yylex) } - case 468: + case 471: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2027 + //line sql.y:2041 { forceEOF(yylex) } - case 469: + case 472: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2031 + //line sql.y:2045 { forceEOF(yylex) } diff --git a/vendor/github.com/CovenantSQL/sqlparser/sql.y b/vendor/github.com/CovenantSQL/sqlparser/sql.y index 37d4b0fe8..4e366e0c9 100644 --- a/vendor/github.com/CovenantSQL/sqlparser/sql.y +++ b/vendor/github.com/CovenantSQL/sqlparser/sql.y @@ -194,7 +194,7 @@ func forceEOF(yylex interface{}) { %type row_tuple tuple_or_empty %type tuple_expression %type subquery -%type column_name +%type column_name column_name_not_string %type when_expression_list %type when_expression %type expression_opt else_expression_opt @@ -397,13 +397,13 @@ table_column_list: } column_definition: - ID column_type null_opt column_default_opt auto_increment_opt column_key_opt + col_alias column_type null_opt column_default_opt auto_increment_opt column_key_opt { $2.NotNull = $3 $2.Default = $4 $2.Autoincrement = $5 $2.KeyOpt = $6 - $$ = &ColumnDefinition{Name: NewColIdent(string($1)), Type: $2} + $$ = &ColumnDefinition{Name: $1, Type: $2} } column_type: numeric_type unsigned_opt zero_fill_opt @@ -989,11 +989,11 @@ table_name as_opt_id } column_list: - sql_id + col_alias { $$ = Columns{$1} } -| column_list ',' sql_id +| column_list ',' col_alias { $$ = append($$, $3) } @@ -1094,7 +1094,7 @@ into_table_name: } table_name: - table_id + table_alias { $$ = TableName{Name: $1} } @@ -1294,7 +1294,7 @@ value_expression: { $$ = $1 } -| column_name +| column_name_not_string { $$ = $1 } @@ -1591,6 +1591,20 @@ else_expression_opt: } column_name: + col_alias + { + $$ = &ColName{Name: $1} + } +| table_alias '.' reserved_sql_id + { + $$ = &ColName{Qualifier: TableName{Name: $1}, Name: $3} + } +| table_alias '.' reserved_table_id '.' reserved_sql_id + { + $$ = &ColName{Qualifier: TableName{Qualifier: $1, Name: $3}, Name: $5} + } + +column_name_not_string: sql_id { $$ = &ColName{Name: $1} @@ -1747,7 +1761,7 @@ insert_data: } ins_column_list: - sql_id + col_alias { $$ = Columns{$1} } @@ -1755,7 +1769,7 @@ ins_column_list: { $$ = Columns{$3} } -| ins_column_list ',' sql_id +| ins_column_list ',' col_alias { $$ = append($$, $3) } From 94a4dbbe4b8bcd33ee46e034599ee26f8919eb49 Mon Sep 17 00:00:00 2001 From: Qi Xiao Date: Thu, 16 May 2019 22:01:25 +0800 Subject: [PATCH 2/2] Add test case for double quoted table/column name ident --- xenomint/state_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xenomint/state_test.go b/xenomint/state_test.go index de962e931..7af55b1a7 100644 --- a/xenomint/state_test.go +++ b/xenomint/state_test.go @@ -210,12 +210,12 @@ func TestState(t *testing.T) { }) Convey("The state should work properly with reading/writing queries", func() { _, resp, err = st1.Query(buildRequest(types.WriteQuery, []types.Query{ - buildQuery(`INSERT INTO t1 (k, v) VALUES (?, ?)`, values[0]...), + buildQuery(`INSERT INTO "t1" ("k", "v") VALUES (?, ?)`, values[0]...), }), true) So(err, ShouldBeNil) So(resp.Header.RowCount, ShouldEqual, 0) _, resp, err = st1.Query(buildRequest(types.ReadQuery, []types.Query{ - buildQuery(`SELECT v FROM t1 WHERE k=?`, values[0][0]), + buildQuery(`SELECT "v" FROM "t1" WHERE "k"=?`, values[0][0]), }), true) So(err, ShouldBeNil) So(resp.Header.RowCount, ShouldEqual, 1) @@ -227,7 +227,7 @@ func TestState(t *testing.T) { st1.Stat(id1) _, resp, err = st1.Query(buildRequest(types.WriteQuery, []types.Query{ - buildQuery(`INSERT INTO t1 (k, v) VALUES (?, ?)`, values[1]...), + buildQuery(`INSERT INTO t1 ("k", "v") VALUES (?, ?)`, values[1]...), buildQuery(`INSERT INTO t1 (k, v) VALUES (?, ?); INSERT INTO t1 (k, v) VALUES (?, ?)`, concat(values[2:4])...), }), true)