From 74bd5aba869e526e1cb59911a5dfc48d10fc313b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 15 Jul 2023 10:51:50 +0200 Subject: [PATCH 1/3] IDL4 union extension (octet/wchar as discriminator type) * lib/ridl/parser.rb: * lib/ridl/parser.ry: --- lib/ridl/parser.rb | 1428 ++++++++++++++++++++++---------------------- lib/ridl/parser.ry | 2 + 2 files changed, 723 insertions(+), 707 deletions(-) diff --git a/lib/ridl/parser.rb b/lib/ridl/parser.rb index 7d1f3b6..1400ac7 100644 --- a/lib/ridl/parser.rb +++ b/lib/ridl/parser.rb @@ -672,7 +672,7 @@ module IDL class Parser < Racc::Parser -module_eval(<<'...end parser.ry/module_eval...', 'parser.ry', 847) +module_eval(<<'...end parser.ry/module_eval...', 'parser.ry', 849) def parse_type_declarator(type_spec, declarators) ret = Array.new @@ -771,28 +771,28 @@ def next_token ##### State transition tables begin ### racc_action_table = [ - -199, 441, 632, 122, 625, 122, 506, 549, 76, 92, - 550, 65, 69, 455, 71, 194, 77, 122, 688, 78, - 350, 330, 349, 331, 469, 688, 122, 122, 122, 302, - 303, 719, 294, 721, 295, 296, 330, 94, 331, 94, - 631, 302, 303, 94, 315, 316, 317, 318, 319, 302, - 303, 94, 302, 303, 449, 412, 687, 122, 318, 319, - 94, 94, 94, 691, 719, 65, 69, 73, 71, 718, - 55, 720, 136, 137, 138, 145, 146, 147, 148, 149, + -199, 441, 634, 122, 627, 122, 506, 551, 76, 92, + 552, 65, 69, 455, 71, 194, 77, 122, 690, 78, + 350, 330, 349, 331, 469, 690, 122, 122, 122, 302, + 303, 721, 294, 723, 295, 296, 330, 94, 331, 94, + 633, 302, 303, 94, 315, 316, 317, 318, 319, 302, + 303, 94, 302, 303, 449, 412, 689, 122, 318, 319, + 94, 94, 94, 693, 721, 65, 69, 73, 71, 720, + 55, 722, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, 160, 161, 162, 190, 191, 94, 191, 79, 195, 163, 164, 371, 372, 272, - 273, 53, 746, 54, 626, 627, 551, 80, 555, 196, - 197, 272, 273, 191, 191, 330, 555, 331, 81, 272, + 273, 53, 748, 54, 628, 629, 553, 80, 557, 196, + 197, 272, 273, 191, 191, 330, 557, 331, 81, 272, 273, 82, 272, 273, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 190, 191, 302, 303, 719, 83, 163, + 160, 161, 162, 190, 191, 302, 303, 721, 83, 163, 164, 318, 319, 272, 273, 277, 279, 430, 122, 122, - 84, 122, 122, 122, 197, 556, 557, 65, 69, 73, - 71, 85, 55, 556, 557, 122, 122, 302, 303, 122, - 315, 316, 317, 318, 319, 747, -84, 122, 122, 122, - 122, 122, 94, 94, 477, 94, 94, 94, 292, 588, - 634, 293, 638, 53, 86, 54, 496, 260, 87, 94, - 94, 88, 520, 94, 89, 272, 273, 521, 90, 122, + 84, 122, 122, 122, 197, 558, 559, 65, 69, 73, + 71, 85, 55, 558, 559, 122, 122, 302, 303, 122, + 315, 316, 317, 318, 319, 749, -84, 122, 122, 122, + 122, 122, 94, 94, 477, 94, 94, 94, 292, 590, + 636, 293, 640, 53, 86, 54, 496, 260, 87, 94, + 94, 88, 522, 94, 89, 272, 273, 523, 90, 122, 122, 94, 94, 94, 94, 94, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, 160, 161, 162, 190, 191, 272, 273, 118, @@ -801,7 +801,7 @@ def next_token 69, 73, 71, -86, 55, 122, 122, 122, 122, 249, 251, 252, 253, 254, 255, 257, 258, 122, 122, 122, 122, 122, 122, 122, 260, 94, 94, 94, 337, 338, - 292, 94, 94, 95, 639, 53, 638, 54, 96, 94, + 292, 94, 94, 95, 641, 53, 640, 54, 96, 94, 94, 94, 94, 347, 348, 122, 122, 122, 122, 371, 372, 94, 94, 94, 94, 94, 94, 94, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, @@ -813,12 +813,12 @@ def next_token 260, 403, 404, 405, 403, 404, 405, 94, 381, 382, 337, 338, 292, 403, 404, 405, 107, 53, 108, 54, 391, 361, 394, 395, 109, 503, 110, 122, 399, 400, - 401, 402, 561, 562, 111, 65, 69, 112, 71, 194, + 401, 402, 563, 564, 111, 65, 69, 112, 71, 194, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, 160, 161, 162, 190, - 191, 94, 585, 584, 113, 163, 164, 399, 400, 272, - 273, 277, 279, 401, 402, 401, 402, 697, 696, 522, - 197, 122, 752, 719, 114, 115, 116, 119, 120, 65, + 191, 94, 587, 586, 113, 163, 164, 399, 400, 272, + 273, 277, 279, 401, 402, 401, 402, 699, 698, 524, + 197, 122, 754, 721, 114, 115, 116, 119, 120, 65, 69, 199, 71, 194, 200, 201, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, 160, 161, 162, 190, 191, 94, 202, 203, 195, 163, @@ -844,31 +844,31 @@ def next_token 257, 258, 94, 434, 435, 443, 444, 445, 457, 458, 459, 460, 53, 461, 54, 462, 463, 471, 472, 473, 474, 331, 484, 485, 491, 492, 496, 499, 357, 512, - 524, 527, 528, 540, 541, 56, 62, 136, 137, 138, + 526, 529, 530, 542, 543, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 190, 191, 543, 558, 122, 559, - 163, 164, 560, 122, 272, 273, 277, 279, 541, 563, - 564, 65, 69, 73, 71, 197, 55, 565, 567, 568, - 541, 569, 570, 571, 572, 573, 575, 541, 357, 357, - 579, 580, 94, 357, 499, 586, 587, 94, 248, 589, - 357, 591, 292, 250, 348, 293, 592, 53, 376, 54, - 393, 244, 243, 397, 398, 543, 245, 249, 251, 252, - 253, 254, 255, 257, 258, 550, 629, 630, 646, 575, + 159, 160, 161, 162, 190, 191, 545, 560, 122, 561, + 163, 164, 562, 122, 272, 273, 277, 279, 543, 565, + 566, 65, 69, 73, 71, 197, 55, 567, 569, 570, + 543, 571, 572, 573, 574, 575, 577, 543, 357, 357, + 581, 582, 94, 357, 499, 588, 589, 94, 248, 591, + 357, 593, 292, 250, 348, 293, 594, 53, 376, 54, + 393, 244, 243, 397, 398, 545, 245, 249, 251, 252, + 253, 254, 255, 257, 258, 552, 631, 632, 648, 577, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, 159, 160, 161, 162, 190, - 191, 496, 496, 122, 649, 163, 164, 653, 122, 272, - 273, 277, 279, 656, 657, 658, 65, 69, 73, 71, - 197, 55, 659, 660, 661, 662, 663, 664, 665, 666, - 667, 668, 669, 670, 549, 673, 627, 94, 626, 543, - 678, 679, 94, 248, 683, 337, 338, 292, 250, 543, - 549, 549, 53, 692, 54, 693, 244, 243, 694, 695, - 698, 245, 249, 251, 252, 253, 254, 255, 257, 258, - 714, 543, 673, 549, 638, 56, 62, 136, 137, 138, + 191, 496, 496, 122, 651, 163, 164, 655, 122, 272, + 273, 277, 279, 658, 659, 660, 65, 69, 73, 71, + 197, 55, 661, 662, 663, 664, 665, 666, 667, 668, + 669, 670, 671, 672, 551, 675, 629, 94, 628, 545, + 680, 681, 94, 248, 685, 337, 338, 292, 250, 545, + 551, 551, 53, 694, 54, 695, 244, 243, 696, 697, + 700, 245, 249, 251, 252, 253, 254, 255, 257, 258, + 716, 545, 675, 551, 640, 56, 62, 136, 137, 138, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 190, 191, 543, 549, 732, 733, - 163, 164, 734, 122, 272, 273, 277, 279, 735, 736, - 737, 65, 69, 73, 71, 197, 55, 738, 739, 740, - 741, 742, 743, 744, 749, 750, 751, 754, nil, nil, + 159, 160, 161, 162, 190, 191, 545, 551, 734, 735, + 163, 164, 736, 122, 272, 273, 277, 279, 737, 738, + 739, 65, 69, 73, 71, 197, 55, 740, 741, 742, + 743, 744, 745, 746, 751, 752, 753, 756, nil, nil, nil, nil, nil, nil, nil, nil, nil, 94, nil, nil, 337, 338, 292, nil, nil, nil, nil, 53, nil, 54, nil, nil, nil, nil, nil, nil, nil, 122, nil, nil, @@ -964,132 +964,132 @@ def next_token nil, nil, 165, nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, 254, 255, 257, 258, nil, 513, 145, 146, 147, 148, 149, 154, 155, 156, 157, 158, - 159, 74, 161, nil, nil, nil, 19, nil, nil, nil, - nil, nil, 32, 51, 45, 65, 69, 73, 71, nil, - 55, nil, 28, 29, 31, nil, 34, nil, nil, nil, - 36, 39, 42, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 47, nil, nil, nil, nil, nil, nil, nil, - nil, 53, nil, 54, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, 122, nil, nil, nil, 378, - 19, nil, nil, nil, 56, 62, 32, 51, 45, 65, - 69, 73, 71, nil, 55, nil, 28, 29, 31, nil, - 34, nil, nil, nil, 36, 39, 42, nil, nil, 94, - nil, nil, nil, nil, nil, 248, 47, nil, nil, nil, - 250, nil, nil, nil, nil, 53, nil, 54, 244, 243, - nil, nil, nil, 245, 249, 251, 252, 253, 254, 255, - 257, 258, nil, 654, 594, nil, nil, nil, 56, 62, - 32, 51, 45, 65, 69, 73, 71, nil, 55, 612, - 28, 29, 31, nil, 34, nil, nil, nil, 36, 39, - 42, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 47, nil, nil, nil, nil, nil, nil, nil, nil, 53, - nil, 54, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, 730, 594, nil, - nil, nil, 56, 62, 32, 51, 45, 65, 69, 73, - 71, nil, 55, nil, 28, 29, 31, nil, 34, nil, - nil, nil, 36, 39, 42, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 47, nil, nil, nil, nil, nil, - nil, nil, nil, 53, 19, 54, nil, nil, nil, nil, - 32, 51, 45, 65, 69, 73, 71, nil, 55, nil, - 28, 29, 31, nil, 34, nil, 56, 62, 36, 39, - 42, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 47, nil, nil, nil, nil, nil, nil, nil, nil, 53, - 19, 54, nil, nil, nil, nil, 32, 51, 45, 65, - 69, 73, 71, nil, 55, nil, 28, 29, 31, nil, - 34, nil, 56, 62, 36, 39, 42, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 47, nil, nil, nil, - nil, nil, nil, nil, nil, 53, 594, 54, nil, nil, - nil, nil, 32, 51, 45, 65, 69, 73, 71, nil, - 55, 612, 28, 29, 31, nil, 34, nil, 56, 62, - 36, 39, 42, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 47, nil, nil, nil, nil, 122, nil, nil, - nil, 53, 594, 54, nil, nil, nil, nil, 32, 51, - 45, 65, 69, 73, 71, nil, 55, nil, 28, 29, - 31, nil, 34, nil, 56, 62, 36, 39, 42, nil, - nil, 94, 122, nil, nil, nil, nil, 248, 47, nil, - nil, nil, 250, nil, nil, nil, nil, 53, nil, 54, - 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, - 254, 255, 257, 258, nil, 122, 94, nil, nil, nil, - 56, 62, 248, nil, nil, nil, nil, 250, nil, nil, - nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, - 245, 249, 251, 252, 253, 254, 255, 257, 258, 94, - 122, nil, nil, nil, nil, 248, nil, nil, nil, nil, + 159, 160, 161, 162, 74, nil, nil, nil, nil, 19, + nil, nil, nil, nil, nil, 32, 51, 45, 65, 69, + 73, 71, nil, 55, nil, 28, 29, 31, nil, 34, + nil, nil, nil, 36, 39, 42, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 47, nil, nil, nil, nil, + nil, nil, nil, nil, 53, nil, 54, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, 122, nil, + nil, nil, 378, 19, nil, nil, nil, 56, 62, 32, + 51, 45, 65, 69, 73, 71, nil, 55, nil, 28, + 29, 31, nil, 34, nil, nil, nil, 36, 39, 42, + nil, nil, 94, nil, nil, nil, nil, nil, 248, 47, + nil, nil, nil, 250, nil, nil, nil, nil, 53, nil, + 54, 244, 243, nil, nil, nil, 245, 249, 251, 252, + 253, 254, 255, 257, 258, nil, 656, 596, nil, nil, + nil, 56, 62, 32, 51, 45, 65, 69, 73, 71, + nil, 55, 614, 28, 29, 31, nil, 34, nil, nil, + nil, 36, 39, 42, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 47, nil, nil, nil, nil, nil, nil, + nil, nil, 53, nil, 54, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 732, 596, nil, nil, nil, 56, 62, 32, 51, 45, + 65, 69, 73, 71, nil, 55, nil, 28, 29, 31, + nil, 34, nil, nil, nil, 36, 39, 42, nil, nil, + nil, nil, nil, nil, nil, nil, nil, 47, nil, nil, + nil, nil, nil, nil, nil, nil, 53, 19, 54, nil, + nil, nil, nil, 32, 51, 45, 65, 69, 73, 71, + nil, 55, nil, 28, 29, 31, nil, 34, nil, 56, + 62, 36, 39, 42, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 47, nil, nil, nil, nil, nil, nil, + nil, nil, 53, 19, 54, nil, nil, nil, nil, 32, + 51, 45, 65, 69, 73, 71, nil, 55, nil, 28, + 29, 31, nil, 34, nil, 56, 62, 36, 39, 42, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 47, + nil, nil, nil, nil, nil, nil, nil, nil, 53, 596, + 54, nil, nil, nil, nil, 32, 51, 45, 65, 69, + 73, 71, nil, 55, 614, 28, 29, 31, nil, 34, + nil, 56, 62, 36, 39, 42, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 47, nil, nil, nil, nil, + 122, nil, nil, nil, 53, 596, 54, nil, nil, nil, + nil, 32, 51, 45, 65, 69, 73, 71, nil, 55, + nil, 28, 29, 31, nil, 34, nil, 56, 62, 36, + 39, 42, nil, nil, 94, 122, nil, nil, nil, nil, + 248, 47, nil, nil, nil, 250, nil, nil, nil, nil, + 53, nil, 54, 244, 243, nil, nil, nil, 245, 249, + 251, 252, 253, 254, 255, 257, 258, nil, 122, 94, + nil, nil, nil, 56, 62, 248, nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, 254, 255, - 257, 258, nil, 122, 94, nil, nil, nil, nil, nil, - 248, nil, nil, nil, nil, 250, nil, nil, nil, nil, - nil, nil, nil, 244, 243, nil, nil, nil, 245, 249, - 251, 252, 253, 254, 255, 257, 258, 94, 122, nil, + 257, 258, 94, 122, nil, nil, nil, nil, 248, nil, + nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, + nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, + 253, 254, 255, 257, 258, nil, 122, 94, nil, nil, nil, nil, nil, 248, nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, 254, 255, 257, 258, - nil, 122, 94, nil, nil, nil, nil, nil, 248, nil, - nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, - nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, - 253, 254, 255, 257, 258, 94, 122, nil, nil, nil, - nil, 248, nil, nil, nil, nil, 250, nil, nil, nil, - nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, - 249, 251, 252, 253, 254, 255, 257, 258, nil, 122, - 94, nil, nil, nil, nil, nil, 248, nil, nil, nil, + 94, 122, nil, nil, nil, nil, 248, nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, 254, - 255, 257, 258, 94, 122, nil, nil, nil, nil, 248, - nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, - nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, - 252, 253, 254, 255, 257, 258, nil, nil, 94, nil, + 255, 257, 258, nil, 122, 94, nil, nil, nil, nil, + nil, 248, nil, nil, nil, nil, 250, nil, nil, nil, + nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, + 249, 251, 252, 253, 254, 255, 257, 258, 94, 122, nil, nil, nil, nil, 248, nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, 254, 255, 257, - 258 ] + 258, nil, 122, 94, nil, nil, nil, nil, nil, 248, + nil, nil, nil, nil, 250, nil, nil, nil, nil, nil, + nil, nil, 244, 243, nil, nil, nil, 245, 249, 251, + 252, 253, 254, 255, 257, 258, 94, 122, nil, nil, + nil, nil, 248, nil, nil, nil, nil, 250, nil, nil, + nil, nil, nil, nil, nil, 244, 243, nil, nil, nil, + 245, 249, 251, 252, 253, 254, 255, 257, 258, nil, + nil, 94, nil, nil, nil, nil, nil, 248, nil, nil, + nil, nil, 250, nil, nil, nil, nil, nil, nil, nil, + 244, 243, nil, nil, nil, 245, 249, 251, 252, 253, + 254, 255, 257, 258 ] racc_action_check = [ - 119, 297, 552, 119, 544, 302, 367, 423, 3, 19, - 423, 119, 119, 306, 119, 119, 4, 53, 635, 5, - 155, 119, 155, 119, 320, 640, 303, 449, 54, 297, - 297, 680, 108, 682, 108, 108, 339, 119, 339, 302, - 552, 306, 306, 19, 306, 306, 306, 306, 306, 109, - 109, 53, 320, 320, 303, 263, 635, 263, 320, 320, - 303, 449, 54, 640, 716, 263, 263, 263, 263, 680, - 263, 682, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 297, 554, 119, 546, 302, 367, 423, 3, 19, + 423, 119, 119, 306, 119, 119, 4, 53, 637, 5, + 155, 119, 155, 119, 320, 642, 303, 449, 54, 297, + 297, 682, 108, 684, 108, 108, 339, 119, 339, 302, + 554, 306, 306, 19, 306, 306, 306, 306, 306, 109, + 109, 53, 320, 320, 303, 263, 637, 263, 320, 320, + 303, 449, 54, 642, 718, 263, 263, 263, 263, 682, + 263, 684, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 263, 302, 6, 119, 119, 119, 367, 367, 297, - 297, 263, 716, 263, 544, 544, 425, 7, 425, 119, - 119, 306, 306, 303, 449, 340, 632, 340, 8, 109, + 297, 263, 718, 263, 546, 546, 425, 7, 425, 119, + 119, 306, 306, 303, 449, 340, 634, 340, 8, 109, 109, 9, 320, 320, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 263, 263, 263, 263, 113, 113, 717, 10, 263, + 263, 263, 263, 263, 263, 113, 113, 719, 10, 263, 263, 113, 113, 263, 263, 263, 263, 287, 330, 287, 11, 260, 294, 295, 263, 425, 425, 287, 287, 287, - 287, 12, 287, 632, 632, 296, 304, 112, 112, 305, - 112, 112, 112, 112, 112, 717, 96, 315, 316, 317, + 287, 12, 287, 634, 634, 296, 304, 112, 112, 305, + 112, 112, 112, 112, 112, 719, 96, 315, 316, 317, 318, 319, 330, 287, 330, 260, 294, 295, 287, 505, - 559, 287, 559, 287, 13, 287, 505, 96, 14, 296, + 561, 287, 561, 287, 13, 287, 505, 96, 14, 296, 304, 15, 374, 305, 16, 113, 113, 374, 17, 326, 241, 315, 316, 317, 318, 319, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, 112, 112, 47, 47, 287, 287, 326, 241, 287, 287, 287, 287, 332, - 241, 332, 331, 477, 18, 241, 287, 541, 561, 332, - 332, 332, 332, 97, 332, 562, 563, 564, 568, 241, - 241, 241, 241, 241, 241, 241, 241, 575, 612, 629, - 678, 679, 692, 693, 97, 332, 331, 477, 332, 332, - 332, 541, 561, 20, 560, 332, 560, 332, 23, 562, - 563, 564, 568, 138, 138, 694, 714, 719, 750, 203, - 203, 575, 612, 629, 678, 679, 692, 693, 332, 332, + 241, 332, 331, 477, 18, 241, 287, 543, 563, 332, + 332, 332, 332, 97, 332, 564, 565, 566, 570, 241, + 241, 241, 241, 241, 241, 241, 241, 577, 614, 631, + 680, 681, 694, 695, 97, 332, 331, 477, 332, 332, + 332, 543, 563, 20, 562, 332, 562, 332, 23, 564, + 565, 566, 570, 138, 138, 696, 716, 721, 752, 203, + 203, 577, 614, 631, 680, 681, 694, 695, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 694, - 714, 719, 750, 332, 332, 24, 111, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 332, 332, 332, 696, + 716, 721, 752, 332, 332, 24, 111, 332, 332, 332, 332, 343, 115, 343, 25, 285, 286, 26, 332, 98, 27, 343, 343, 343, 343, 28, 343, 111, 30, 111, 29, 29, 29, 115, 31, 115, 285, 286, 285, 286, - 98, 239, 239, 239, 535, 535, 535, 343, 217, 217, - 343, 343, 343, 536, 536, 536, 33, 343, 34, 343, + 98, 239, 239, 239, 537, 537, 537, 343, 217, 217, + 343, 343, 343, 538, 538, 538, 33, 343, 34, 343, 227, 227, 230, 230, 35, 364, 36, 364, 237, 237, 238, 238, 436, 436, 39, 364, 364, 40, 364, 364, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, 343, - 343, 364, 500, 500, 41, 343, 343, 532, 532, 343, - 343, 343, 343, 533, 533, 534, 534, 651, 651, 377, - 343, 377, 745, 745, 42, 45, 46, 51, 52, 377, + 343, 364, 500, 500, 41, 343, 343, 534, 534, 343, + 343, 343, 343, 535, 535, 536, 536, 653, 653, 377, + 343, 377, 747, 747, 42, 45, 46, 51, 52, 377, 377, 62, 377, 377, 63, 64, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 364, 377, 66, 67, 364, 364, @@ -1122,24 +1122,24 @@ def next_token 440, 107, 107, 107, 107, 99, 107, 446, 450, 451, 453, 464, 465, 466, 467, 468, 478, 481, 486, 487, 494, 495, 351, 496, 497, 501, 502, 107, 351, 508, - 510, 511, 107, 351, 513, 107, 514, 107, 521, 107, - 526, 351, 351, 530, 531, 542, 351, 351, 351, 351, - 351, 351, 351, 351, 351, 547, 549, 550, 566, 574, + 510, 511, 107, 351, 513, 107, 514, 107, 523, 107, + 528, 351, 351, 532, 533, 544, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 549, 551, 552, 568, 576, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 576, 577, 352, 583, 107, 107, 594, 116, 107, - 107, 107, 107, 597, 598, 599, 116, 116, 116, 116, - 107, 116, 600, 601, 602, 603, 604, 605, 606, 607, - 608, 609, 610, 611, 615, 616, 623, 352, 624, 625, - 626, 627, 116, 352, 630, 116, 116, 116, 352, 633, - 634, 639, 116, 641, 116, 642, 352, 352, 643, 650, - 652, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 671, 673, 676, 687, 688, 116, 116, 116, 116, 116, + 107, 578, 579, 352, 585, 107, 107, 596, 116, 107, + 107, 107, 107, 599, 600, 601, 116, 116, 116, 116, + 107, 116, 602, 603, 604, 605, 606, 607, 608, 609, + 610, 611, 612, 613, 617, 618, 625, 352, 626, 627, + 628, 629, 116, 352, 632, 116, 116, 116, 352, 635, + 636, 641, 116, 643, 116, 644, 352, 352, 645, 652, + 654, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 673, 675, 678, 689, 690, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 689, 691, 701, 702, - 116, 116, 703, 120, 116, 116, 116, 116, 704, 705, - 706, 120, 120, 120, 120, 116, 120, 707, 708, 709, - 710, 711, 712, 713, 721, 726, 729, 752, nil, nil, + 116, 116, 116, 116, 116, 116, 691, 693, 703, 704, + 116, 116, 705, 120, 116, 116, 116, 116, 706, 707, + 708, 120, 120, 120, 120, 116, 120, 709, 710, 711, + 712, 713, 714, 715, 723, 728, 731, 754, nil, nil, nil, nil, nil, nil, nil, nil, nil, 120, nil, nil, 120, 120, 120, nil, nil, nil, nil, 120, nil, 120, nil, nil, nil, nil, nil, nil, nil, 201, nil, nil, @@ -1200,28 +1200,28 @@ def next_token 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, nil, 421, nil, 396, 395, 395, nil, nil, nil, 396, nil, nil, nil, nil, 396, nil, nil, nil, 395, - 395, nil, 554, 396, 396, nil, nil, nil, 396, 396, + 395, nil, 556, 396, 396, nil, nil, nil, 396, 396, 396, 396, 396, 396, 396, 396, 396, 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, - 421, 421, 421, 421, 421, 421, 554, nil, nil, nil, + 421, 421, 421, 421, 421, 421, 556, nil, nil, nil, 421, 421, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, 421, 586, nil, 397, nil, - nil, nil, nil, nil, nil, nil, nil, nil, 586, nil, - nil, 554, 554, 554, 554, 554, 554, 554, 554, 554, - 554, 554, 554, 554, 554, 554, 554, 554, 554, 554, - 586, nil, 397, nil, 554, 554, nil, nil, 397, nil, - nil, nil, nil, 397, nil, nil, nil, nil, nil, 554, - 637, 397, 397, nil, nil, nil, 397, 397, 397, 397, - 397, 397, 397, 397, 397, 586, 586, 586, 586, 586, - 586, 586, 586, 586, 586, 586, 586, 586, 586, 586, - 586, 586, 586, 586, 637, nil, nil, nil, 586, 586, + nil, nil, nil, nil, nil, 421, 588, nil, 397, nil, + nil, nil, nil, nil, nil, nil, nil, nil, 588, nil, + nil, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 588, nil, 397, nil, 556, 556, nil, nil, 397, nil, + nil, nil, nil, 397, nil, nil, nil, nil, nil, 556, + 639, 397, 397, nil, nil, nil, 397, 397, 397, 397, + 397, 397, 397, 397, 397, 588, 588, 588, 588, 588, + 588, 588, 588, 588, 588, 588, 588, 588, 588, 588, + 588, 588, 588, 588, 639, nil, nil, nil, 588, 588, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 586, 586, 55, 398, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, 637, - 637, 637, 637, 637, 637, 637, 637, 637, 637, 637, - 637, 637, 637, 637, 637, 637, 637, 637, 55, 398, - nil, nil, 637, 637, nil, 398, nil, nil, nil, nil, - 398, nil, nil, nil, nil, nil, 228, 637, 398, 398, + nil, nil, 588, 588, 55, 398, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 639, 639, + 639, 639, 639, 639, 639, 639, 639, 639, 55, 398, + nil, nil, 639, 639, nil, 398, nil, nil, nil, nil, + 398, nil, nil, nil, nil, nil, 228, 639, 398, 398, nil, nil, nil, 398, 398, 398, 398, 398, 398, 398, 398, 398, nil, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, @@ -1235,85 +1235,85 @@ def next_token nil, nil, 228, nil, 399, 399, nil, nil, nil, 399, 399, 399, 399, 399, 399, 399, 399, 399, nil, 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, 373, - 373, 1, 373, nil, nil, nil, 1, nil, nil, nil, - nil, nil, 1, 1, 1, 1, 1, 1, 1, nil, - 1, nil, 1, 1, 1, nil, 1, nil, nil, nil, - 1, 1, 1, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 1, nil, nil, nil, nil, nil, nil, nil, - nil, 1, nil, 1, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, 400, nil, nil, nil, 213, - 213, nil, nil, nil, 1, 1, 213, 213, 213, 213, - 213, 213, 213, nil, 213, nil, 213, 213, 213, nil, - 213, nil, nil, nil, 213, 213, 213, nil, nil, 400, - nil, nil, nil, nil, nil, 400, 213, nil, nil, nil, - 400, nil, nil, nil, nil, 213, nil, 213, 400, 400, - nil, nil, nil, 400, 400, 400, 400, 400, 400, 400, - 400, 400, nil, 595, 595, nil, nil, nil, 213, 213, - 595, 595, 595, 595, 595, 595, 595, nil, 595, 595, - 595, 595, 595, nil, 595, nil, nil, nil, 595, 595, - 595, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 595, nil, nil, nil, nil, nil, nil, nil, nil, 595, - nil, 595, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, 699, 699, nil, - nil, nil, 595, 595, 699, 699, 699, 699, 699, 699, - 699, nil, 699, nil, 699, 699, 699, nil, 699, nil, - nil, nil, 699, 699, 699, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 699, nil, nil, nil, nil, nil, - nil, nil, nil, 699, 0, 699, nil, nil, nil, nil, - 0, 0, 0, 0, 0, 0, 0, nil, 0, nil, - 0, 0, 0, nil, 0, nil, 699, 699, 0, 0, - 0, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 0, nil, nil, nil, nil, nil, nil, nil, nil, 0, - 91, 0, nil, nil, nil, nil, 91, 91, 91, 91, - 91, 91, 91, nil, 91, nil, 91, 91, 91, nil, - 91, nil, 0, 0, 91, 91, 91, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 91, nil, nil, nil, - nil, nil, nil, nil, nil, 91, 524, 91, nil, nil, - nil, nil, 524, 524, 524, 524, 524, 524, 524, nil, - 524, 524, 524, 524, 524, nil, 524, nil, 91, 91, - 524, 524, 524, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 524, nil, nil, nil, nil, 401, nil, nil, - nil, 524, 670, 524, nil, nil, nil, nil, 670, 670, - 670, 670, 670, 670, 670, nil, 670, nil, 670, 670, - 670, nil, 670, nil, 524, 524, 670, 670, 670, nil, - nil, 401, 402, nil, nil, nil, nil, 401, 670, nil, - nil, nil, 401, nil, nil, nil, nil, 670, nil, 670, - 401, 401, nil, nil, nil, 401, 401, 401, 401, 401, - 401, 401, 401, 401, nil, 403, 402, nil, nil, nil, - 670, 670, 402, nil, nil, nil, nil, 402, nil, nil, - nil, nil, nil, nil, nil, 402, 402, nil, nil, nil, - 402, 402, 402, 402, 402, 402, 402, 402, 402, 403, - 404, nil, nil, nil, nil, 403, nil, nil, nil, nil, - 403, nil, nil, nil, nil, nil, nil, nil, 403, 403, - nil, nil, nil, 403, 403, 403, 403, 403, 403, 403, - 403, 403, nil, 405, 404, nil, nil, nil, nil, nil, - 404, nil, nil, nil, nil, 404, nil, nil, nil, nil, - nil, nil, nil, 404, 404, nil, nil, nil, 404, 404, - 404, 404, 404, 404, 404, 404, 404, 405, 491, nil, - nil, nil, nil, 405, nil, nil, nil, nil, 405, nil, - nil, nil, nil, nil, nil, nil, 405, 405, nil, nil, - nil, 405, 405, 405, 405, 405, 405, 405, 405, 405, - nil, 499, 491, nil, nil, nil, nil, nil, 491, nil, - nil, nil, nil, 491, nil, nil, nil, nil, nil, nil, - nil, 491, 491, nil, nil, nil, 491, 491, 491, 491, - 491, 491, 491, 491, 491, 499, 584, nil, nil, nil, - nil, 499, nil, nil, nil, nil, 499, nil, nil, nil, - nil, nil, nil, nil, 499, 499, nil, nil, nil, 499, - 499, 499, 499, 499, 499, 499, 499, 499, nil, 587, - 584, nil, nil, nil, nil, nil, 584, nil, nil, nil, - nil, 584, nil, nil, nil, nil, nil, nil, nil, 584, - 584, nil, nil, nil, 584, 584, 584, 584, 584, 584, - 584, 584, 584, 587, 696, nil, nil, nil, nil, 587, - nil, nil, nil, nil, 587, nil, nil, nil, nil, nil, - nil, nil, 587, 587, nil, nil, nil, 587, 587, 587, - 587, 587, 587, 587, 587, 587, nil, nil, 696, nil, - nil, nil, nil, nil, 696, nil, nil, nil, nil, 696, - nil, nil, nil, nil, nil, nil, nil, 696, 696, nil, - nil, nil, 696, 696, 696, 696, 696, 696, 696, 696, - 696 ] + 373, 373, 373, 373, 1, nil, nil, nil, nil, 1, + nil, nil, nil, nil, nil, 1, 1, 1, 1, 1, + 1, 1, nil, 1, nil, 1, 1, 1, nil, 1, + nil, nil, nil, 1, 1, 1, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 1, nil, nil, nil, nil, + nil, nil, nil, nil, 1, nil, 1, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, 400, nil, + nil, nil, 213, 213, nil, nil, nil, 1, 1, 213, + 213, 213, 213, 213, 213, 213, nil, 213, nil, 213, + 213, 213, nil, 213, nil, nil, nil, 213, 213, 213, + nil, nil, 400, nil, nil, nil, nil, nil, 400, 213, + nil, nil, nil, 400, nil, nil, nil, nil, 213, nil, + 213, 400, 400, nil, nil, nil, 400, 400, 400, 400, + 400, 400, 400, 400, 400, nil, 597, 597, nil, nil, + nil, 213, 213, 597, 597, 597, 597, 597, 597, 597, + nil, 597, 597, 597, 597, 597, nil, 597, nil, nil, + nil, 597, 597, 597, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 597, nil, nil, nil, nil, nil, nil, + nil, nil, 597, nil, 597, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 701, 701, nil, nil, nil, 597, 597, 701, 701, 701, + 701, 701, 701, 701, nil, 701, nil, 701, 701, 701, + nil, 701, nil, nil, nil, 701, 701, 701, nil, nil, + nil, nil, nil, nil, nil, nil, nil, 701, nil, nil, + nil, nil, nil, nil, nil, nil, 701, 0, 701, nil, + nil, nil, nil, 0, 0, 0, 0, 0, 0, 0, + nil, 0, nil, 0, 0, 0, nil, 0, nil, 701, + 701, 0, 0, 0, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 0, nil, nil, nil, nil, nil, nil, + nil, nil, 0, 91, 0, nil, nil, nil, nil, 91, + 91, 91, 91, 91, 91, 91, nil, 91, nil, 91, + 91, 91, nil, 91, nil, 0, 0, 91, 91, 91, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 91, + nil, nil, nil, nil, nil, nil, nil, nil, 91, 526, + 91, nil, nil, nil, nil, 526, 526, 526, 526, 526, + 526, 526, nil, 526, 526, 526, 526, 526, nil, 526, + nil, 91, 91, 526, 526, 526, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 526, nil, nil, nil, nil, + 401, nil, nil, nil, 526, 672, 526, nil, nil, nil, + nil, 672, 672, 672, 672, 672, 672, 672, nil, 672, + nil, 672, 672, 672, nil, 672, nil, 526, 526, 672, + 672, 672, nil, nil, 401, 402, nil, nil, nil, nil, + 401, 672, nil, nil, nil, 401, nil, nil, nil, nil, + 672, nil, 672, 401, 401, nil, nil, nil, 401, 401, + 401, 401, 401, 401, 401, 401, 401, nil, 403, 402, + nil, nil, nil, 672, 672, 402, nil, nil, nil, nil, + 402, nil, nil, nil, nil, nil, nil, nil, 402, 402, + nil, nil, nil, 402, 402, 402, 402, 402, 402, 402, + 402, 402, 403, 404, nil, nil, nil, nil, 403, nil, + nil, nil, nil, 403, nil, nil, nil, nil, nil, nil, + nil, 403, 403, nil, nil, nil, 403, 403, 403, 403, + 403, 403, 403, 403, 403, nil, 405, 404, nil, nil, + nil, nil, nil, 404, nil, nil, nil, nil, 404, nil, + nil, nil, nil, nil, nil, nil, 404, 404, nil, nil, + nil, 404, 404, 404, 404, 404, 404, 404, 404, 404, + 405, 491, nil, nil, nil, nil, 405, nil, nil, nil, + nil, 405, nil, nil, nil, nil, nil, nil, nil, 405, + 405, nil, nil, nil, 405, 405, 405, 405, 405, 405, + 405, 405, 405, nil, 499, 491, nil, nil, nil, nil, + nil, 491, nil, nil, nil, nil, 491, nil, nil, nil, + nil, nil, nil, nil, 491, 491, nil, nil, nil, 491, + 491, 491, 491, 491, 491, 491, 491, 491, 499, 586, + nil, nil, nil, nil, 499, nil, nil, nil, nil, 499, + nil, nil, nil, nil, nil, nil, nil, 499, 499, nil, + nil, nil, 499, 499, 499, 499, 499, 499, 499, 499, + 499, nil, 589, 586, nil, nil, nil, nil, nil, 586, + nil, nil, nil, nil, 586, nil, nil, nil, nil, nil, + nil, nil, 586, 586, nil, nil, nil, 586, 586, 586, + 586, 586, 586, 586, 586, 586, 589, 698, nil, nil, + nil, nil, 589, nil, nil, nil, nil, 589, nil, nil, + nil, nil, nil, nil, nil, 589, 589, nil, nil, nil, + 589, 589, 589, 589, 589, 589, 589, 589, 589, nil, + nil, 698, nil, nil, nil, nil, nil, 698, nil, nil, + nil, nil, 698, nil, nil, nil, nil, nil, nil, nil, + 698, 698, nil, nil, nil, 698, 698, 698, 698, 698, + 698, 698, 698, 698 ] racc_action_pointer = [ - 2169, 1931, nil, 6, 14, 17, 91, 105, 116, 119, + 2172, 1934, nil, 6, 14, 17, 91, 105, 116, 119, 146, 158, 169, 202, 206, 209, 212, 216, 261, 3, 296, nil, nil, 302, 349, 358, 364, 367, 364, 369, 372, 373, nil, 403, 402, 411, 410, nil, nil, 418, @@ -1322,7 +1322,7 @@ def next_token nil, nil, 475, 478, 482, nil, 500, 504, 427, nil, 519, 520, 524, 522, 529, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, 2215, 527, 491, 526, 574, 183, 270, 366, 662, + nil, 2218, 527, 491, 526, 574, 183, 270, 366, 662, 531, nil, nil, 532, 533, nil, nil, 757, 8, 17, nil, 353, 145, 113, 536, 359, 852, 555, 559, -3, 947, 526, nil, 516, 517, 563, nil, nil, nil, nil, @@ -1334,7 +1334,7 @@ def next_token nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 567, 568, 568, 569, 572, nil, nil, nil, 578, 1001, 488, 224, nil, 537, nil, 607, nil, nil, - nil, nil, nil, 1995, nil, 609, nil, 390, nil, 613, + nil, nil, nil, 1998, nil, 609, nil, 390, nil, 613, 615, 616, 617, 618, 620, 621, 622, 404, 1790, 623, 404, nil, nil, nil, 576, 581, 581, 361, 361, 330, nil, 214, nil, nil, nil, nil, nil, nil, 629, nil, @@ -1353,7 +1353,7 @@ def next_token nil, 1380, 705, 1842, 208, nil, nil, 465, nil, nil, nil, 727, 501, nil, nil, nil, nil, nil, nil, nil, nil, nil, 725, nil, 726, 1467, 1524, 1632, 1739, 1845, - 1989, 2301, 2336, 2369, 2404, 2437, nil, nil, 686, 725, + 1992, 2304, 2339, 2372, 2407, 2440, nil, nil, 686, 725, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 1522, 750, -101, nil, 59, 751, nil, nil, nil, nil, nil, nil, nil, 713, 716, 396, nil, 759, 742, @@ -1362,294 +1362,294 @@ def next_token nil, nil, nil, nil, 775, 776, 777, 778, 779, nil, nil, nil, nil, nil, nil, nil, nil, 257, 777, nil, nil, 778, nil, nil, nil, nil, 782, 783, nil, nil, - nil, 2472, nil, nil, 782, 783, 787, 694, nil, 2505, + nil, 2475, nil, nil, 782, 783, 787, 694, nil, 2508, 444, 786, 787, nil, nil, 197, nil, nil, 797, nil, 794, 777, nil, 727, 759, nil, nil, nil, nil, nil, - nil, 802, nil, nil, 2261, nil, 804, nil, nil, nil, - 758, 758, 400, 404, 406, 333, 342, nil, nil, nil, - nil, 261, 809, nil, -5, nil, nil, 714, nil, 780, - 781, nil, -7, nil, 1576, nil, nil, nil, nil, 153, - 257, 262, 269, 270, 271, nil, 822, nil, 272, nil, - nil, nil, nil, nil, 820, 281, 842, 843, nil, nil, - nil, nil, nil, 753, 2540, nil, 1630, 2573, nil, nil, - nil, nil, nil, nil, 851, 2059, nil, 861, 862, 863, - 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, - 880, 880, 282, nil, nil, 776, 876, nil, nil, nil, - nil, nil, nil, 776, 779, 883, 844, 845, nil, 283, - 843, nil, 67, 893, 792, 9, nil, 1684, nil, 793, - 16, 876, 877, 880, nil, nil, nil, nil, nil, nil, - 901, 459, 902, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 2307, 913, nil, 915, nil, nil, 913, nil, 284, 285, - 22, nil, 24, nil, nil, nil, nil, 815, 875, 940, - nil, 839, 286, 287, 309, nil, 2608, nil, nil, 2123, - nil, 946, 947, 950, 956, 957, 958, 965, 966, 967, - 968, 969, 970, 971, 310, nil, 55, 138, nil, 311, - nil, 923, nil, nil, nil, nil, 947, nil, nil, 968, + nil, nil, nil, 802, nil, nil, 2264, nil, 804, nil, + nil, nil, 758, 758, 400, 404, 406, 333, 342, nil, + nil, nil, nil, 261, 809, nil, -5, nil, nil, 714, + nil, 780, 781, nil, -7, nil, 1576, nil, nil, nil, + nil, 153, 257, 262, 269, 270, 271, nil, 822, nil, + 272, nil, nil, nil, nil, nil, 820, 281, 842, 843, + nil, nil, nil, nil, nil, 753, 2543, nil, 1630, 2576, + nil, nil, nil, nil, nil, nil, 851, 2062, nil, 861, + 862, 863, 870, 871, 872, 873, 874, 875, 876, 877, + 878, 879, 880, 880, 282, nil, nil, 776, 876, nil, + nil, nil, nil, nil, nil, 776, 779, 883, 844, 845, + nil, 283, 843, nil, 67, 893, 792, 9, nil, 1684, + nil, 793, 16, 876, 877, 880, nil, nil, nil, nil, + nil, nil, 901, 459, 902, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, 464, nil, nil, nil, nil, - 312, nil, 971, nil, nil ] + nil, nil, 2310, 913, nil, 915, nil, nil, 913, nil, + 284, 285, 22, nil, 24, nil, nil, nil, nil, 815, + 875, 940, nil, 839, 286, 287, 309, nil, 2611, nil, + nil, 2126, nil, 946, 947, 950, 956, 957, 958, 965, + 966, 967, 968, 969, 970, 971, 310, nil, 55, 138, + nil, 311, nil, 923, nil, nil, nil, nil, 947, nil, + nil, 968, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, 464, nil, nil, + nil, nil, 312, nil, 971, nil, nil ] racc_action_default = [ - -18, -448, -1, -448, -448, -448, -448, -448, -448, -448, - -448, -448, -448, -448, -448, -448, -448, -448, -448, -448, - -448, -76, -77, -448, -448, -448, -448, -448, -448, -448, - -448, -448, -93, -448, -448, -448, -448, -132, -133, -448, - -448, -448, -448, -176, -177, -448, -448, -448, -187, -188, - -189, -448, -448, -448, -448, -448, -448, -278, -279, -280, - -281, -282, -448, -448, -448, -350, -448, -448, -448, -358, - -448, -448, -448, -448, -448, -2, -3, -4, -5, -6, + -18, -450, -1, -450, -450, -450, -450, -450, -450, -450, + -450, -450, -450, -450, -450, -450, -450, -450, -450, -450, + -450, -76, -77, -450, -450, -450, -450, -450, -450, -450, + -450, -450, -93, -450, -450, -450, -450, -132, -133, -450, + -450, -450, -450, -176, -177, -450, -450, -450, -187, -188, + -189, -450, -450, -450, -450, -450, -450, -278, -279, -280, + -281, -282, -450, -450, -450, -350, -450, -450, -450, -358, + -450, -450, -450, -450, -450, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16, - -17, -18, -173, -24, -448, -448, -78, -79, -80, -103, - -448, -89, -90, -448, -448, -91, -92, -103, -448, -448, - -126, -134, -151, -161, -154, -179, -103, -448, -448, -191, - -103, -172, -173, -448, -448, -448, -231, -232, -233, -234, + -17, -18, -173, -24, -450, -450, -78, -79, -80, -103, + -450, -89, -90, -450, -450, -91, -92, -103, -450, -450, + -126, -134, -151, -161, -154, -179, -103, -450, -450, -191, + -103, -172, -173, -450, -450, -450, -231, -232, -233, -234, -235, -236, -237, -238, -239, -240, -314, -315, -326, -317, -318, -319, -320, -321, -322, -323, -324, -325, -327, -329, - -330, -331, -332, -333, -334, -448, -336, -338, -340, -341, - -342, -343, -344, -384, -386, -446, -277, -448, -285, -286, + -330, -331, -332, -333, -334, -450, -336, -338, -340, -341, + -342, -343, -344, -386, -388, -448, -277, -450, -285, -286, -287, -288, -289, -290, -291, -292, -293, -294, -295, -296, -297, -298, -299, -300, -301, -302, -303, -304, -305, -306, - -345, -346, -448, -448, -448, -448, -448, -447, -283, -311, - -347, -448, -354, -448, -356, -448, -373, -448, -374, -409, - -412, -410, 755, -448, -21, -448, -174, -448, -25, -448, - -448, -448, -448, -448, -448, -448, -448, -448, -448, -299, - -448, -71, -73, -74, -241, -242, -244, -246, -248, -251, - -254, -448, -259, -260, -261, -262, -263, -264, -448, -266, + -345, -346, -450, -450, -450, -450, -450, -449, -283, -311, + -347, -450, -354, -450, -356, -450, -375, -450, -376, -411, + -414, -412, 757, -450, -21, -450, -174, -450, -25, -450, + -450, -450, -450, -450, -450, -450, -450, -450, -450, -299, + -450, -71, -73, -74, -241, -242, -244, -246, -248, -251, + -254, -450, -259, -260, -261, -262, -263, -264, -450, -266, -267, -268, -269, -270, -271, -272, -273, -274, -275, -83, - -448, -85, -87, -448, -94, -448, -448, -448, -448, -448, - -448, -448, -448, -448, -448, -448, -448, -422, -423, -424, - -441, -442, -443, -444, -82, -178, -190, -448, -120, -122, - -448, -448, -448, -448, -448, -448, -448, -448, -127, -448, - -448, -448, -448, -448, -448, -448, -448, -142, -448, -448, - -448, -448, -448, -448, -448, -448, -448, -448, -448, -448, - -448, -155, -448, -448, -448, -448, -448, -185, -203, -204, - -448, -448, -448, -200, -211, -448, -448, -448, -448, -184, - -197, -192, -198, -448, -228, -229, -448, -316, -328, -335, - -337, -448, -448, -284, -307, -309, -310, -312, -313, -349, - -357, -448, -448, -448, -448, -351, -448, -448, -365, -448, - -368, -448, -448, -448, -448, -376, -378, -448, -19, -22, - -175, -448, -448, -27, -28, -29, -30, -31, -32, -33, - -34, -35, -448, -37, -448, -448, -448, -448, -448, -448, - -448, -448, -448, -448, -448, -448, -258, -263, -448, -104, + -450, -85, -87, -450, -94, -450, -450, -450, -450, -450, + -450, -450, -450, -450, -450, -450, -450, -424, -425, -426, + -443, -444, -445, -446, -82, -178, -190, -450, -120, -122, + -450, -450, -450, -450, -450, -450, -450, -450, -127, -450, + -450, -450, -450, -450, -450, -450, -450, -142, -450, -450, + -450, -450, -450, -450, -450, -450, -450, -450, -450, -450, + -450, -155, -450, -450, -450, -450, -450, -185, -203, -204, + -450, -450, -450, -200, -211, -450, -450, -450, -450, -184, + -197, -192, -198, -450, -228, -229, -450, -316, -328, -335, + -337, -450, -450, -284, -307, -309, -310, -312, -313, -349, + -357, -450, -450, -450, -450, -351, -450, -450, -367, -450, + -370, -450, -450, -450, -450, -378, -380, -450, -19, -22, + -175, -450, -450, -27, -28, -29, -30, -31, -32, -33, + -34, -35, -450, -37, -450, -450, -450, -450, -450, -450, + -450, -450, -450, -450, -450, -450, -258, -263, -450, -104, -105, -107, -81, -95, -96, -97, -98, -99, -100, -101, - -102, -448, -448, -421, -417, -448, -448, -416, -181, -194, - -108, -121, -123, -124, -448, -448, -448, -117, -118, -448, - -116, -125, -128, -129, -130, -131, -448, -170, -171, -448, - -448, -137, -140, -141, -138, -135, -143, -144, -145, -146, - -147, -148, -149, -150, -448, -448, -448, -448, -448, -152, - -156, -157, -158, -159, -160, -153, -202, -448, -206, -208, - -210, -207, -180, -201, -212, -213, -448, -448, -183, -196, - -193, -448, -339, -276, -448, -448, -448, -387, -388, -448, - -448, -448, -448, -348, -352, -448, -355, -366, -448, -369, - -448, -448, -371, -326, -448, -360, -361, -362, -363, -364, - -375, -448, -411, -413, -448, -26, -448, -36, -70, -72, - -243, -245, -247, -249, -250, -252, -253, -255, -256, -257, - -265, -448, -448, -312, -403, -393, -414, -419, -420, -448, - -448, -425, -448, -427, -448, -430, -431, -432, -415, -448, - -448, -448, -448, -448, -448, -162, -448, -164, -448, -165, - -166, -167, -168, -169, -205, -448, -214, -215, -230, -383, - -385, -308, -389, -448, -448, -380, -448, -448, -353, -367, - -372, -370, -359, -377, -448, -448, -38, -448, -448, -448, - -448, -448, -448, -448, -448, -448, -448, -448, -448, -448, - -448, -448, -448, -106, -391, -407, -406, -392, -394, -395, - -396, -397, -398, -401, -402, -448, -448, -448, -418, -448, - -448, -426, -448, -448, -216, -448, -224, -448, -227, -220, - -448, -448, -114, -113, -115, -119, -163, -136, -209, -390, - -448, -448, -448, -20, -23, -39, -40, -41, -42, -43, - -44, -45, -46, -47, -48, -49, -50, -51, -52, -53, - -448, -448, -405, -448, -399, -400, -404, -407, -448, -448, - -448, -436, -448, -439, -428, -429, -218, -217, -448, -448, - -222, -221, -448, -448, -448, -379, -448, -382, -445, -448, - -55, -448, -448, -448, -448, -448, -448, -448, -448, -448, - -448, -448, -448, -448, -448, -408, -448, -448, -433, -448, - -438, -448, -219, -225, -226, -223, -110, -111, -112, -448, - -54, -56, -57, -58, -59, -60, -61, -62, -63, -64, - -65, -66, -67, -68, -69, -448, -434, -435, -437, -440, - -448, -381, -448, -109, -75 ] + -102, -450, -450, -423, -419, -450, -450, -418, -181, -194, + -108, -121, -123, -124, -450, -450, -450, -117, -118, -450, + -116, -125, -128, -129, -130, -131, -450, -170, -171, -450, + -450, -137, -140, -141, -138, -135, -143, -144, -145, -146, + -147, -148, -149, -150, -450, -450, -450, -450, -450, -152, + -156, -157, -158, -159, -160, -153, -202, -450, -206, -208, + -210, -207, -180, -201, -212, -213, -450, -450, -183, -196, + -193, -450, -339, -276, -450, -450, -450, -389, -390, -450, + -450, -450, -450, -348, -352, -450, -355, -368, -450, -371, + -450, -450, -373, -326, -450, -360, -361, -362, -363, -364, + -365, -366, -377, -450, -413, -415, -450, -26, -450, -36, + -70, -72, -243, -245, -247, -249, -250, -252, -253, -255, + -256, -257, -265, -450, -450, -312, -405, -395, -416, -421, + -422, -450, -450, -427, -450, -429, -450, -432, -433, -434, + -417, -450, -450, -450, -450, -450, -450, -162, -450, -164, + -450, -165, -166, -167, -168, -169, -205, -450, -214, -215, + -230, -385, -387, -308, -391, -450, -450, -382, -450, -450, + -353, -369, -374, -372, -359, -379, -450, -450, -38, -450, + -450, -450, -450, -450, -450, -450, -450, -450, -450, -450, + -450, -450, -450, -450, -450, -106, -393, -409, -408, -394, + -396, -397, -398, -399, -400, -403, -404, -450, -450, -450, + -420, -450, -450, -428, -450, -450, -216, -450, -224, -450, + -227, -220, -450, -450, -114, -113, -115, -119, -163, -136, + -209, -392, -450, -450, -450, -20, -23, -39, -40, -41, + -42, -43, -44, -45, -46, -47, -48, -49, -50, -51, + -52, -53, -450, -450, -407, -450, -401, -402, -406, -409, + -450, -450, -450, -438, -450, -441, -430, -431, -218, -217, + -450, -450, -222, -221, -450, -450, -450, -381, -450, -384, + -447, -450, -55, -450, -450, -450, -450, -450, -450, -450, + -450, -450, -450, -450, -450, -450, -450, -410, -450, -450, + -435, -450, -440, -450, -219, -225, -226, -223, -110, -111, + -112, -450, -54, -56, -57, -58, -59, -60, -61, -62, + -63, -64, -65, -66, -67, -68, -69, -450, -436, -437, + -439, -442, -450, -383, -450, -109, -75 ] racc_goto_table = [ 3, 3, 4, 4, 5, 5, 16, 16, 17, 17, - 233, 232, 422, 231, 131, 280, 494, 495, 439, 454, - 375, 324, 544, 280, 126, 127, 547, 186, 502, 327, - 307, 353, 280, 342, 218, 298, 280, 132, 129, 229, - 644, 167, 368, 264, 321, 2, 75, 187, 446, 450, - 498, 289, 548, 553, 123, 124, 134, 172, 281, 301, - 288, 409, 314, 325, 188, 125, 281, 616, 600, 680, - 624, 192, 308, 322, 596, 281, 623, 309, 323, 281, - 709, 282, 290, 700, 259, 261, 262, 581, 478, 282, - 186, 3, 128, 4, 130, 5, 246, 16, 282, 17, - 283, 590, 282, 483, 341, 193, 453, 332, 283, 709, - 187, 343, 731, 1, 483, 213, 365, 283, 716, 717, - 172, 283, 537, 538, 539, 217, 135, 188, 448, 448, - 635, 640, 481, 595, 192, 93, 214, 601, 699, 600, - 533, 534, 615, 535, 536, 655, 230, 263, 613, 674, - 676, 287, 436, 297, 745, 306, 675, 451, 320, 476, - 542, 648, 723, 408, 583, 530, 531, 532, 193, 727, - 728, 406, 186, 166, 198, 364, 628, 367, 204, 280, - 514, 508, 509, 206, 374, 497, 614, 131, 617, 280, - 582, 280, 187, 545, 618, 566, 619, 126, 127, 428, - 429, 620, 172, 280, 621, 622, 507, 413, 601, 188, - 132, 129, 209, 3, 704, 4, 192, 5, 672, 16, - 377, 17, 281, 442, 456, 677, 753, 602, 324, 134, - 505, 289, 281, 685, 281, 574, 603, 686, 392, 423, - 431, 546, 690, 704, 604, 282, 281, 301, 280, 650, - 193, 470, 652, 488, 489, 282, 314, 282, 379, 280, - 684, 411, 290, 426, 283, 128, 308, 130, 424, 282, - 325, 309, 552, 715, 283, 448, 283, 500, 501, 504, - 322, 682, 647, 705, 641, 323, 511, 607, 283, 724, - 722, 281, 523, 633, 725, 437, 411, 440, 602, 135, - 608, nil, 281, 447, 447, 452, 411, 603, 186, 186, - 233, 232, 705, 529, 282, 604, 464, 465, 466, 467, - 468, 525, 486, 487, nil, 282, 526, 475, 187, 187, - 611, 480, 411, 283, 593, 186, nil, 280, 172, 172, - 186, nil, 515, 516, 283, 188, 188, nil, 186, nil, - 576, 577, 192, 192, 510, 187, 517, nil, 607, nil, - 187, 729, 172, 172, nil, 172, nil, nil, 187, 453, - 172, 608, 188, 706, 519, nil, 689, 188, 172, 192, - 281, 518, 707, nil, 192, 188, 193, 193, nil, nil, - 708, nil, 192, nil, nil, nil, 246, nil, nil, nil, - nil, 611, 706, 282, nil, nil, 578, nil, nil, nil, - nil, 707, nil, 193, nil, nil, nil, nil, 193, 708, - nil, nil, 283, nil, nil, nil, 193, nil, nil, nil, - nil, nil, nil, 710, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 711, nil, nil, nil, - 447, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 710, nil, nil, nil, nil, nil, nil, nil, - 280, nil, nil, nil, nil, 711, 611, nil, 480, nil, + 233, 232, 494, 495, 131, 280, 422, 439, 375, 454, + 218, 231, 555, 280, 502, 126, 229, 186, 324, 327, + 298, 353, 280, 342, 321, 498, 280, 132, 127, 128, + 301, 167, 307, 314, 325, 550, 478, 187, 602, 2, + 75, 129, 646, 135, 123, 124, 134, 172, 281, 618, + 288, 264, 308, 322, 188, 483, 281, 625, 603, 289, + 626, 192, 290, 409, 682, 281, 483, 711, 368, 281, + 598, 282, 702, 1, 332, 309, 323, 583, 343, 282, + 186, 3, 213, 4, 193, 5, 246, 16, 282, 17, + 283, 592, 282, 217, 341, 365, 711, 125, 283, 130, + 187, 733, 637, 642, 604, 535, 536, 283, 453, 602, + 172, 283, 597, 718, 719, 605, 606, 188, 446, 450, + 259, 261, 262, 93, 192, 701, 546, 609, 230, 603, + 214, 263, 678, 615, 481, 448, 448, 677, 549, 676, + 287, 657, 539, 540, 541, 537, 538, 193, 436, 747, + 585, 297, 306, 408, 544, 451, 320, 476, 650, 725, + 532, 630, 186, 533, 534, 584, 406, 166, 198, 280, + 364, 729, 730, 367, 204, 604, 514, 131, 508, 280, + 509, 280, 187, 576, 706, 206, 605, 606, 126, 428, + 429, 374, 172, 280, 497, 616, 619, 547, 609, 188, + 132, 127, 128, 3, 707, 4, 192, 5, 442, 16, + 620, 17, 281, 706, 129, 413, 135, 621, 301, 134, + 505, 686, 281, 622, 281, 324, 456, 314, 755, 193, + 431, 470, 507, 707, 610, 282, 281, 652, 280, 289, + 654, 325, 290, 488, 489, 282, 308, 282, 617, 280, + 708, 411, 379, 623, 283, 613, 624, 209, 504, 282, + 322, 709, 710, 377, 283, 568, 283, 500, 501, 309, + 392, 525, 130, 712, 649, 643, 511, 423, 283, 708, + 548, 281, 448, 323, 426, 437, 411, 440, 424, 635, + 709, 710, 281, 447, 447, 452, 411, 527, 186, 186, + 233, 232, 712, 528, 282, 610, 464, 465, 466, 467, + 468, 531, 486, 487, 554, 282, 684, 475, 187, 187, + nil, 480, 411, 283, 595, 186, 613, 280, 172, 172, + 186, 679, 674, 515, 283, 188, 188, nil, 186, 687, + 578, 579, 192, 192, 510, 187, 516, 521, nil, 731, + 187, 688, 172, 172, nil, 172, 692, nil, 187, 517, + 172, 520, 188, nil, 519, 193, 193, 188, 172, 192, + 281, 518, 691, 453, 192, 188, nil, nil, nil, 717, + 713, nil, 192, nil, nil, nil, 246, nil, nil, nil, + nil, nil, 193, 282, nil, 726, 580, 193, nil, nil, + nil, 613, nil, nil, 724, 193, nil, nil, 727, 713, + nil, nil, 283, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 613, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 447, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 651, nil, nil, 611, nil, nil, nil, nil, - nil, nil, nil, 281, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 597, nil, 598, nil, 599, nil, - 609, nil, 610, nil, nil, nil, 282, nil, nil, nil, - nil, nil, 411, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 280, nil, 283, nil, nil, nil, nil, - nil, nil, 411, 642, 643, 645, nil, nil, nil, 411, - nil, nil, nil, nil, nil, nil, 480, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, 172, nil, nil, - nil, nil, nil, nil, nil, 597, 281, 598, nil, 599, - nil, 609, nil, 610, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 671, nil, nil, nil, nil, nil, 282, + nil, nil, 280, nil, nil, nil, nil, nil, 480, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 681, nil, nil, nil, nil, nil, nil, nil, 283, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, 653, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 281, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, 599, nil, 600, nil, + 601, nil, 611, nil, 612, nil, nil, nil, 282, nil, + nil, nil, nil, nil, 411, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 280, nil, 283, nil, nil, + nil, nil, nil, nil, 411, 644, 645, 647, nil, nil, + nil, 411, nil, nil, nil, nil, nil, nil, 480, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 172, + nil, nil, nil, nil, nil, nil, nil, 599, 281, 600, + nil, 601, nil, 611, nil, 612, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 673, nil, nil, nil, nil, + nil, 282, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 683, nil, nil, nil, nil, nil, nil, nil, + 283, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 701, nil, 702, nil, 703, nil, 712, nil, 713, 681, - 681, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 726, 645, 645, nil, nil, nil, 701, - nil, 702, nil, 703, nil, 712, nil, 713, nil, nil, - nil, nil, nil, nil, nil, 681, nil, nil, nil, nil, - 748, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 703, nil, 704, nil, 705, nil, 714, nil, + 715, 683, 683, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 728, 647, 647, nil, nil, + nil, 703, nil, 704, nil, 705, nil, 714, nil, 715, + nil, nil, nil, nil, nil, nil, nil, 683, nil, nil, + nil, nil, 750, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, 645 ] + nil, nil, nil, 647 ] racc_goto_check = [ 3, 3, 4, 4, 5, 5, 16, 16, 17, 17, - 35, 34, 103, 33, 110, 134, 125, 125, 56, 71, - 170, 76, 104, 134, 105, 106, 100, 127, 125, 86, - 72, 98, 134, 86, 24, 63, 134, 111, 108, 26, - 57, 90, 163, 48, 79, 2, 2, 129, 80, 80, - 172, 48, 193, 195, 36, 36, 36, 36, 110, 49, - 58, 51, 49, 49, 131, 25, 110, 183, 6, 37, - 182, 153, 64, 64, 27, 110, 181, 65, 65, 110, - 28, 111, 59, 31, 46, 46, 46, 140, 95, 111, - 127, 3, 107, 4, 109, 5, 36, 16, 111, 17, - 36, 140, 111, 92, 90, 157, 51, 85, 36, 28, - 129, 85, 31, 1, 92, 19, 156, 36, 37, 37, - 36, 36, 120, 120, 120, 21, 113, 131, 81, 81, - 99, 99, 51, 22, 153, 23, 2, 7, 30, 6, - 118, 118, 104, 119, 119, 27, 32, 44, 52, 182, - 183, 54, 55, 62, 37, 69, 181, 70, 78, 94, - 103, 96, 101, 35, 125, 115, 116, 117, 157, 57, - 57, 122, 127, 126, 132, 155, 193, 159, 161, 134, - 162, 165, 166, 168, 169, 171, 173, 110, 174, 134, - 172, 134, 129, 175, 176, 80, 177, 105, 106, 86, - 86, 178, 36, 134, 179, 180, 163, 48, 7, 131, - 111, 108, 185, 3, 6, 4, 153, 5, 100, 16, - 186, 17, 110, 63, 72, 104, 57, 8, 76, 36, - 98, 48, 110, 104, 110, 95, 9, 100, 25, 188, - 58, 189, 100, 6, 10, 111, 110, 49, 134, 125, - 157, 79, 125, 86, 86, 111, 49, 111, 2, 134, - 195, 36, 59, 191, 36, 107, 64, 109, 192, 111, - 49, 65, 194, 104, 36, 81, 36, 34, 34, 156, - 64, 197, 71, 7, 56, 65, 35, 14, 36, 104, - 100, 110, 156, 103, 100, 36, 36, 36, 8, 113, - 15, nil, 110, 36, 36, 36, 36, 9, 127, 127, - 35, 34, 7, 33, 111, 10, 36, 36, 36, 36, - 36, 24, 90, 90, nil, 111, 26, 36, 129, 129, - 18, 36, 36, 36, 170, 127, nil, 134, 36, 36, - 127, nil, 105, 106, 36, 131, 131, nil, 127, nil, - 98, 98, 153, 153, 90, 129, 108, nil, 14, nil, - 129, 125, 36, 36, nil, 36, nil, nil, 129, 51, - 36, 15, 131, 8, 36, nil, 103, 131, 36, 153, - 110, 131, 9, nil, 153, 131, 157, 157, nil, nil, - 10, nil, 153, nil, nil, nil, 36, nil, nil, nil, - nil, 18, 8, 111, nil, nil, 35, nil, nil, nil, - nil, 9, nil, 157, nil, nil, nil, nil, 157, 10, - nil, nil, 36, nil, nil, nil, 157, nil, nil, nil, - nil, nil, nil, 14, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 15, nil, nil, nil, - 36, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 14, nil, nil, nil, nil, nil, nil, nil, - 134, nil, nil, nil, nil, 15, 18, nil, 36, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 34, nil, nil, 18, nil, nil, nil, nil, - nil, nil, nil, 110, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 3, nil, 4, nil, 5, nil, - 16, nil, 17, nil, nil, nil, 111, nil, nil, nil, + 35, 34, 125, 125, 110, 134, 103, 56, 170, 71, + 24, 33, 195, 134, 125, 105, 26, 127, 76, 86, + 63, 98, 134, 86, 79, 172, 134, 111, 106, 107, + 49, 90, 72, 49, 49, 193, 95, 129, 6, 2, + 2, 108, 57, 113, 36, 36, 36, 36, 110, 183, + 58, 48, 64, 64, 131, 92, 110, 181, 7, 48, + 182, 153, 59, 51, 37, 110, 92, 28, 163, 110, + 27, 111, 31, 1, 85, 65, 65, 140, 85, 111, + 127, 3, 19, 4, 157, 5, 36, 16, 111, 17, + 36, 140, 111, 21, 90, 156, 28, 25, 36, 109, + 129, 31, 99, 99, 8, 118, 118, 36, 51, 6, + 36, 36, 22, 37, 37, 9, 10, 131, 80, 80, + 46, 46, 46, 23, 153, 30, 104, 14, 32, 7, + 2, 44, 183, 52, 51, 81, 81, 181, 100, 182, + 54, 27, 120, 120, 120, 119, 119, 157, 55, 37, + 125, 62, 69, 35, 103, 70, 78, 94, 96, 101, + 115, 193, 127, 116, 117, 172, 122, 126, 132, 134, + 155, 57, 57, 159, 161, 8, 162, 110, 165, 134, + 166, 134, 129, 95, 6, 168, 9, 10, 105, 86, + 86, 169, 36, 134, 171, 173, 174, 175, 14, 131, + 111, 106, 107, 3, 7, 4, 153, 5, 63, 16, + 176, 17, 110, 6, 108, 48, 113, 177, 49, 36, + 98, 195, 110, 178, 110, 76, 72, 49, 57, 157, + 58, 79, 163, 7, 15, 111, 110, 125, 134, 48, + 125, 49, 59, 86, 86, 111, 64, 111, 104, 134, + 8, 36, 2, 179, 36, 18, 180, 185, 156, 111, + 64, 9, 10, 186, 36, 80, 36, 34, 34, 65, + 25, 156, 109, 14, 71, 56, 35, 188, 36, 8, + 189, 110, 81, 65, 191, 36, 36, 36, 192, 103, + 9, 10, 110, 36, 36, 36, 36, 24, 127, 127, + 35, 34, 14, 26, 111, 15, 36, 36, 36, 36, + 36, 33, 90, 90, 194, 111, 197, 36, 129, 129, + nil, 36, 36, 36, 170, 127, 18, 134, 36, 36, + 127, 104, 100, 105, 36, 131, 131, nil, 127, 104, + 98, 98, 153, 153, 90, 129, 106, 107, nil, 125, + 129, 100, 36, 36, nil, 36, 100, nil, 129, 108, + 36, 113, 131, nil, 36, 157, 157, 131, 36, 153, + 110, 131, 103, 51, 153, 131, nil, nil, nil, 104, + 15, nil, 153, nil, nil, nil, 36, nil, nil, nil, + nil, nil, 157, 111, nil, 104, 35, 157, nil, nil, + nil, 18, nil, nil, 100, 157, nil, nil, 100, 15, nil, nil, 36, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 134, nil, 36, nil, nil, nil, nil, - nil, nil, 36, 36, 36, 36, nil, nil, nil, 36, - nil, nil, nil, nil, nil, nil, 36, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, 36, nil, nil, - nil, nil, nil, nil, nil, 3, 110, 4, nil, 5, - nil, 16, nil, 17, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 36, nil, nil, nil, nil, nil, 111, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 36, nil, nil, nil, nil, nil, nil, nil, 36, nil, + 18, nil, nil, nil, nil, nil, nil, nil, nil, nil, + 36, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 134, nil, nil, nil, nil, nil, 36, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 3, nil, 4, nil, 5, nil, 16, nil, 17, 36, - 36, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 36, 36, 36, nil, nil, nil, 3, - nil, 4, nil, 5, nil, 16, nil, 17, nil, nil, + nil, nil, nil, nil, 34, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 110, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, 3, nil, 4, nil, + 5, nil, 16, nil, 17, nil, nil, nil, 111, nil, + nil, nil, nil, nil, 36, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 134, nil, 36, nil, nil, + nil, nil, nil, nil, 36, 36, 36, 36, nil, nil, + nil, 36, nil, nil, nil, nil, nil, nil, 36, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 36, + nil, nil, nil, nil, nil, nil, nil, 3, 110, 4, + nil, 5, nil, 16, nil, 17, nil, nil, nil, nil, nil, nil, nil, nil, nil, 36, nil, nil, nil, nil, + nil, 111, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 36, nil, nil, nil, nil, nil, nil, nil, 36, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, 36 ] + nil, nil, 3, nil, 4, nil, 5, nil, 16, nil, + 17, 36, 36, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 36, 36, 36, nil, nil, + nil, 3, nil, 4, nil, 5, nil, 16, nil, 17, + nil, nil, nil, nil, nil, nil, nil, 36, nil, nil, + nil, nil, 36, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, 36 ] racc_goto_pointer = [ - nil, 113, 45, 0, 2, 4, -456, -387, -297, -288, - -280, nil, nil, nil, -237, -224, 6, 8, -194, 24, - nil, 30, -391, 116, -61, 10, -56, -450, -590, nil, - -532, -587, 51, -82, -84, -85, 1, -560, nil, nil, - nil, nil, nil, nil, 48, nil, -12, nil, -56, -50, - nil, -199, -393, nil, 44, -142, -277, -524, -47, -25, - nil, nil, 44, -74, -40, -35, nil, nil, nil, 43, - -147, -286, -82, nil, nil, nil, -92, nil, 45, -69, - -254, -174, nil, nil, nil, -9, -86, nil, nil, nil, - -15, nil, -229, nil, -169, -242, -414, nil, -136, -429, - -397, -526, nil, -261, -400, -31, -30, 37, -17, 39, - -41, -18, nil, 71, nil, -231, -231, -231, -259, -258, - -281, nil, -70, nil, nil, -335, 117, -29, nil, -9, - nil, 8, 112, nil, -84, nil, nil, nil, nil, nil, + nil, 83, 49, 0, 2, 4, -478, -458, -412, -401, + -400, nil, nil, nil, -389, -282, 6, 8, -261, 1, + nil, 8, -404, 114, -75, 52, -69, -446, -595, nil, + -537, -590, 43, -74, -84, -85, 1, -557, nil, nil, + nil, nil, nil, nil, 42, nil, 34, nil, -38, -69, + nil, -187, -400, nil, 43, -136, -278, -514, -47, -35, + nil, nil, 52, -79, -50, -27, nil, nil, nil, 50, + -139, -286, -70, nil, nil, nil, -85, nil, 53, -79, + -174, -157, nil, nil, nil, -32, -86, nil, nil, nil, + -15, nil, -267, nil, -161, -284, -409, nil, -136, -449, + -275, -521, nil, -257, -286, -30, -17, -16, -4, 54, + -41, -18, nil, -2, nil, -226, -224, -224, -284, -246, + -251, nil, -65, nil, nil, -339, 121, -29, nil, -9, + nil, 8, 116, nil, -84, nil, nil, nil, nil, nil, -409, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, 15, nil, -26, -85, 49, nil, -26, - nil, 110, -193, -161, nil, -188, -187, nil, 113, -23, - -187, -172, -307, -356, -356, -229, -350, -348, -343, -340, - -339, -468, -474, -475, nil, 140, 10, nil, -35, -182, - nil, -12, -6, -371, -153, -372, nil, -349 ] + nil, nil, nil, 15, nil, -21, -96, 38, nil, -20, + nil, 116, -187, -125, nil, -181, -179, nil, 125, -6, + -189, -153, -322, -339, -340, -215, -326, -319, -313, -283, + -280, -479, -476, -485, nil, 195, 63, nil, 13, -133, + nil, 19, 24, -378, -101, -403, nil, -306 ] racc_goto_default = [ nil, nil, nil, 265, 266, 267, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 270, 271, 18, nil, - 20, nil, nil, 121, nil, nil, 182, nil, 605, 606, + 20, nil, nil, 121, nil, nil, 182, nil, 607, 608, nil, nil, nil, nil, 168, 493, 407, nil, 21, 22, 23, 24, 25, 26, nil, 27, nil, 30, 334, 268, 269, 438, 410, 33, nil, nil, nil, nil, nil, 336, @@ -1657,7 +1657,7 @@ def next_token nil, nil, nil, 310, 311, 312, 313, 41, nil, nil, nil, 180, 43, 44, 46, nil, nil, 48, 49, 50, 366, 52, 333, 328, 329, nil, 479, 335, nil, nil, - nil, 636, 637, 278, 355, 174, 175, 176, 177, 173, + nil, 638, 639, 278, 355, 174, 175, 176, 177, 173, 183, 184, 133, 178, 234, 235, 236, 237, 238, 239, 240, 241, 242, 247, 256, nil, nil, 57, 58, 59, 60, 61, nil, 169, 170, 171, 179, 181, 185, 189, @@ -1666,7 +1666,7 @@ def next_token 68, nil, nil, nil, 369, nil, 370, 70, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 72, nil, nil, 274, nil, nil, - 275, 276, nil, nil, nil, nil, 554, nil ] + 275, 276, nil, nil, nil, nil, 556, nil ] racc_reduce_table = [ 0, 0, :racc_error, @@ -2034,93 +2034,95 @@ def next_token 1, 276, :_reduce_none, 1, 276, :_reduce_none, 1, 276, :_reduce_none, + 1, 276, :_reduce_365, + 1, 276, :_reduce_366, 1, 273, :_reduce_none, 2, 273, :_reduce_none, - 3, 277, :_reduce_367, - 1, 278, :_reduce_368, - 2, 278, :_reduce_369, - 3, 280, :_reduce_370, - 2, 280, :_reduce_371, - 2, 279, :_reduce_372, - 2, 245, :_reduce_373, - 2, 281, :_reduce_374, + 3, 277, :_reduce_369, + 1, 278, :_reduce_370, + 2, 278, :_reduce_371, + 3, 280, :_reduce_372, + 2, 280, :_reduce_373, + 2, 279, :_reduce_374, + 2, 245, :_reduce_375, + 2, 281, :_reduce_376, 3, 282, :_reduce_none, 1, 283, :_reduce_none, 3, 283, :_reduce_none, - 1, 284, :_reduce_378, - 6, 140, :_reduce_379, - 4, 140, :_reduce_380, - 8, 253, :_reduce_381, - 6, 253, :_reduce_382, - 4, 224, :_reduce_383, - 1, 224, :_reduce_384, - 4, 225, :_reduce_385, - 1, 225, :_reduce_386, - 2, 256, :_reduce_387, - 1, 285, :_reduce_388, - 2, 285, :_reduce_389, - 3, 286, :_reduce_390, - 4, 163, :_reduce_391, - 4, 163, :_reduce_392, - 3, 163, :_reduce_393, + 1, 284, :_reduce_380, + 6, 140, :_reduce_381, + 4, 140, :_reduce_382, + 8, 253, :_reduce_383, + 6, 253, :_reduce_384, + 4, 224, :_reduce_385, + 1, 224, :_reduce_386, + 4, 225, :_reduce_387, + 1, 225, :_reduce_388, + 2, 256, :_reduce_389, + 1, 285, :_reduce_390, + 2, 285, :_reduce_391, + 3, 286, :_reduce_392, + 4, 163, :_reduce_393, + 4, 163, :_reduce_394, + 3, 163, :_reduce_395, 1, 288, :_reduce_none, 1, 288, :_reduce_none, 1, 288, :_reduce_none, 1, 288, :_reduce_none, 1, 288, :_reduce_none, - 2, 290, :_reduce_399, - 2, 291, :_reduce_400, - 1, 292, :_reduce_401, - 1, 293, :_reduce_402, - 0, 294, :_reduce_403, - 3, 289, :_reduce_404, - 2, 287, :_reduce_405, - 1, 287, :_reduce_406, - 1, 297, :_reduce_407, - 3, 297, :_reduce_408, - 2, 119, :_reduce_409, - 2, 298, :_reduce_410, + 2, 290, :_reduce_401, + 2, 291, :_reduce_402, + 1, 292, :_reduce_403, + 1, 293, :_reduce_404, + 0, 294, :_reduce_405, + 3, 289, :_reduce_406, + 2, 287, :_reduce_407, + 1, 287, :_reduce_408, + 1, 297, :_reduce_409, + 3, 297, :_reduce_410, + 2, 119, :_reduce_411, + 2, 298, :_reduce_412, 3, 299, :_reduce_none, 0, 300, :_reduce_none, 2, 300, :_reduce_none, 3, 164, :_reduce_none, - 3, 301, :_reduce_415, - 2, 301, :_reduce_416, + 3, 301, :_reduce_417, + 2, 301, :_reduce_418, 1, 302, :_reduce_none, - 2, 303, :_reduce_418, - 1, 303, :_reduce_419, - 1, 303, :_reduce_420, - 0, 303, :_reduce_421, - 1, 304, :_reduce_422, - 1, 305, :_reduce_423, - 1, 305, :_reduce_424, + 2, 303, :_reduce_420, + 1, 303, :_reduce_421, + 1, 303, :_reduce_422, + 0, 303, :_reduce_423, + 1, 304, :_reduce_424, + 1, 305, :_reduce_425, + 1, 305, :_reduce_426, 2, 306, :_reduce_none, 3, 306, :_reduce_none, 1, 308, :_reduce_none, 3, 308, :_reduce_none, - 3, 309, :_reduce_429, - 1, 310, :_reduce_430, - 1, 310, :_reduce_431, + 3, 309, :_reduce_431, 1, 310, :_reduce_432, - 4, 214, :_reduce_433, - 4, 295, :_reduce_434, - 4, 296, :_reduce_435, - 1, 151, :_reduce_436, - 3, 151, :_reduce_437, - 4, 307, :_reduce_438, - 1, 311, :_reduce_439, - 3, 311, :_reduce_440, - 1, 217, :_reduce_441, - 1, 217, :_reduce_442, + 1, 310, :_reduce_433, + 1, 310, :_reduce_434, + 4, 214, :_reduce_435, + 4, 295, :_reduce_436, + 4, 296, :_reduce_437, + 1, 151, :_reduce_438, + 3, 151, :_reduce_439, + 4, 307, :_reduce_440, + 1, 311, :_reduce_441, + 3, 311, :_reduce_442, 1, 217, :_reduce_443, 1, 217, :_reduce_444, - 6, 252, :_reduce_445, - 1, 226, :_reduce_446, - 1, 251, :_reduce_447 ] + 1, 217, :_reduce_445, + 1, 217, :_reduce_446, + 6, 252, :_reduce_447, + 1, 226, :_reduce_448, + 1, 251, :_reduce_449 ] -racc_reduce_n = 448 +racc_reduce_n = 450 -racc_shift_n = 755 +racc_shift_n = 757 racc_token_table = { false => 0, @@ -4040,12 +4042,24 @@ def _reduce_359(val, _values) # reduce 364 omitted -# reduce 365 omitted +module_eval(<<'.,.,', 'parser.ry', 665) + def _reduce_365(val, _values) + if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end + end +.,., + +module_eval(<<'.,.,', 'parser.ry', 666) + def _reduce_366(val, _values) + if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end + end +.,., + +# reduce 367 omitted -# reduce 366 omitted +# reduce 368 omitted -module_eval(<<'.,.,', 'parser.ry', 671) - def _reduce_367(val, _values) +module_eval(<<'.,.,', 'parser.ry', 673) + def _reduce_369(val, _values) dcls = parse_type_declarator(val[1][0], [val[1][1]]) dcls.each do |d| @d.define_case(val[0], d[0], d[1]) @@ -4054,135 +4068,135 @@ def _reduce_367(val, _values) end .,., -module_eval(<<'.,.,', 'parser.ry', 677) - def _reduce_368(val, _values) +module_eval(<<'.,.,', 'parser.ry', 679) + def _reduce_370(val, _values) [val[0]] end .,., -module_eval(<<'.,.,', 'parser.ry', 678) - def _reduce_369(val, _values) +module_eval(<<'.,.,', 'parser.ry', 680) + def _reduce_371(val, _values) val[0] << val[1] end .,., -module_eval(<<'.,.,', 'parser.ry', 680) - def _reduce_370(val, _values) +module_eval(<<'.,.,', 'parser.ry', 682) + def _reduce_372(val, _values) val[1] end .,., -module_eval(<<'.,.,', 'parser.ry', 681) - def _reduce_371(val, _values) +module_eval(<<'.,.,', 'parser.ry', 683) + def _reduce_373(val, _values) :default end .,., -module_eval(<<'.,.,', 'parser.ry', 684) - def _reduce_372(val, _values) +module_eval(<<'.,.,', 'parser.ry', 686) + def _reduce_374(val, _values) val end .,., -module_eval(<<'.,.,', 'parser.ry', 687) - def _reduce_373(val, _values) +module_eval(<<'.,.,', 'parser.ry', 689) + def _reduce_375(val, _values) @d.end_enum(val[0]) end .,., -module_eval(<<'.,.,', 'parser.ry', 689) - def _reduce_374(val, _values) +module_eval(<<'.,.,', 'parser.ry', 691) + def _reduce_376(val, _values) @d.define_enum(val[1]) end .,., -# reduce 375 omitted +# reduce 377 omitted -# reduce 376 omitted +# reduce 378 omitted -# reduce 377 omitted +# reduce 379 omitted -module_eval(<<'.,.,', 'parser.ry', 697) - def _reduce_378(val, _values) +module_eval(<<'.,.,', 'parser.ry', 699) + def _reduce_380(val, _values) @d.declare_enumerator(val[0]) end .,., -module_eval(<<'.,.,', 'parser.ry', 701) - def _reduce_379(val, _values) +module_eval(<<'.,.,', 'parser.ry', 703) + def _reduce_381(val, _values) ::IDL::Type::Sequence.new(val[2], val[4]) end .,., -module_eval(<<'.,.,', 'parser.ry', 703) - def _reduce_380(val, _values) +module_eval(<<'.,.,', 'parser.ry', 705) + def _reduce_382(val, _values) ::IDL::Type::Sequence.new(val[2], nil) end .,., -module_eval(<<'.,.,', 'parser.ry', 706) - def _reduce_381(val, _values) +module_eval(<<'.,.,', 'parser.ry', 708) + def _reduce_383(val, _values) if @idlversion < 4 then raise "int8 is only supported with IDL4 or newer" else ::IDL::Type::Map.new(val[2], val[4], val[6]) end end .,., -module_eval(<<'.,.,', 'parser.ry', 708) - def _reduce_382(val, _values) +module_eval(<<'.,.,', 'parser.ry', 710) + def _reduce_384(val, _values) if @idlversion < 4 then raise "int8 is only supported with IDL4 or newer" else ::IDL::Type::Map.new(val[2], val[4], nil) end end .,., -module_eval(<<'.,.,', 'parser.ry', 711) - def _reduce_383(val, _values) +module_eval(<<'.,.,', 'parser.ry', 713) + def _reduce_385(val, _values) ::IDL::Type::String.new(val[2]) end .,., -module_eval(<<'.,.,', 'parser.ry', 713) - def _reduce_384(val, _values) +module_eval(<<'.,.,', 'parser.ry', 715) + def _reduce_386(val, _values) ::IDL::Type::String.new() end .,., -module_eval(<<'.,.,', 'parser.ry', 716) - def _reduce_385(val, _values) +module_eval(<<'.,.,', 'parser.ry', 718) + def _reduce_387(val, _values) ::IDL::Type::WString.new(val[2]) end .,., -module_eval(<<'.,.,', 'parser.ry', 718) - def _reduce_386(val, _values) +module_eval(<<'.,.,', 'parser.ry', 720) + def _reduce_388(val, _values) ::IDL::Type::WString.new() end .,., -module_eval(<<'.,.,', 'parser.ry', 720) - def _reduce_387(val, _values) +module_eval(<<'.,.,', 'parser.ry', 722) + def _reduce_389(val, _values) val end .,., -module_eval(<<'.,.,', 'parser.ry', 722) - def _reduce_388(val, _values) +module_eval(<<'.,.,', 'parser.ry', 724) + def _reduce_390(val, _values) [val[0]] end .,., -module_eval(<<'.,.,', 'parser.ry', 723) - def _reduce_389(val, _values) +module_eval(<<'.,.,', 'parser.ry', 725) + def _reduce_391(val, _values) val[0] << val[1] end .,., -module_eval(<<'.,.,', 'parser.ry', 725) - def _reduce_390(val, _values) +module_eval(<<'.,.,', 'parser.ry', 727) + def _reduce_392(val, _values) val[1] end .,., -module_eval(<<'.,.,', 'parser.ry', 728) - def _reduce_391(val, _values) +module_eval(<<'.,.,', 'parser.ry', 730) + def _reduce_393(val, _values) dcls = parse_type_declarator(val[2], val[3][0]) dcls.each do |d| @d.declare_attribute(d[0], d[1], true).get_raises = val[3][1] @@ -4191,8 +4205,8 @@ def _reduce_391(val, _values) end .,., -module_eval(<<'.,.,', 'parser.ry', 734) - def _reduce_392(val, _values) +module_eval(<<'.,.,', 'parser.ry', 736) + def _reduce_394(val, _values) att = @d.declare_attribute(val[1], val[2]) att.get_raises = val[3][0] unless val[3][0].empty? att.set_raises = val[3][1] unless val[3][1].empty? @@ -4200,8 +4214,8 @@ def _reduce_392(val, _values) end .,., -module_eval(<<'.,.,', 'parser.ry', 739) - def _reduce_393(val, _values) +module_eval(<<'.,.,', 'parser.ry', 741) + def _reduce_395(val, _values) dcls = parse_type_declarator(val[1], val[2]) dcls.each do |d| att = @d.declare_attribute(d[0], d[1]) @@ -4210,241 +4224,229 @@ def _reduce_393(val, _values) end .,., -# reduce 394 omitted - -# reduce 395 omitted - # reduce 396 omitted # reduce 397 omitted # reduce 398 omitted -module_eval(<<'.,.,', 'parser.ry', 751) - def _reduce_399(val, _values) +# reduce 399 omitted + +# reduce 400 omitted + +module_eval(<<'.,.,', 'parser.ry', 753) + def _reduce_401(val, _values) [val[0], val[1]] end .,., -module_eval(<<'.,.,', 'parser.ry', 753) - def _reduce_400(val, _values) +module_eval(<<'.,.,', 'parser.ry', 755) + def _reduce_402(val, _values) [val[1], val[0]] end .,., -module_eval(<<'.,.,', 'parser.ry', 755) - def _reduce_401(val, _values) +module_eval(<<'.,.,', 'parser.ry', 757) + def _reduce_403(val, _values) [val[0], []] end .,., -module_eval(<<'.,.,', 'parser.ry', 757) - def _reduce_402(val, _values) +module_eval(<<'.,.,', 'parser.ry', 759) + def _reduce_404(val, _values) [[], val[0]] end .,., -module_eval(<<'.,.,', 'parser.ry', 759) - def _reduce_403(val, _values) +module_eval(<<'.,.,', 'parser.ry', 761) + def _reduce_405(val, _values) [[], []] end .,., -module_eval(<<'.,.,', 'parser.ry', 762) - def _reduce_404(val, _values) +module_eval(<<'.,.,', 'parser.ry', 764) + def _reduce_406(val, _values) [val[0]].concat(val[2]) end .,., -module_eval(<<'.,.,', 'parser.ry', 765) - def _reduce_405(val, _values) +module_eval(<<'.,.,', 'parser.ry', 767) + def _reduce_407(val, _values) [[val[0]], val[1]] end .,., -module_eval(<<'.,.,', 'parser.ry', 766) - def _reduce_406(val, _values) +module_eval(<<'.,.,', 'parser.ry', 768) + def _reduce_408(val, _values) [val[0], []] end .,., -module_eval(<<'.,.,', 'parser.ry', 768) - def _reduce_407(val, _values) +module_eval(<<'.,.,', 'parser.ry', 770) + def _reduce_409(val, _values) [val[0]] end .,., -module_eval(<<'.,.,', 'parser.ry', 769) - def _reduce_408(val, _values) +module_eval(<<'.,.,', 'parser.ry', 771) + def _reduce_410(val, _values) val[0] << val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 772) - def _reduce_409(val, _values) +module_eval(<<'.,.,', 'parser.ry', 774) + def _reduce_411(val, _values) @d.end_exception(val[0]) end .,., -module_eval(<<'.,.,', 'parser.ry', 774) - def _reduce_410(val, _values) +module_eval(<<'.,.,', 'parser.ry', 776) + def _reduce_412(val, _values) @d.define_exception(val[1]) end .,., -# reduce 411 omitted - -# reduce 412 omitted - # reduce 413 omitted # reduce 414 omitted -module_eval(<<'.,.,', 'parser.ry', 783) - def _reduce_415(val, _values) +# reduce 415 omitted + +# reduce 416 omitted + +module_eval(<<'.,.,', 'parser.ry', 785) + def _reduce_417(val, _values) @d.declare_op_header(val[0], val[1], val[2]) end .,., -module_eval(<<'.,.,', 'parser.ry', 785) - def _reduce_416(val, _values) +module_eval(<<'.,.,', 'parser.ry', 787) + def _reduce_418(val, _values) @d.declare_op_header(nil, val[0], val[1]) end .,., -# reduce 417 omitted +# reduce 419 omitted -module_eval(<<'.,.,', 'parser.ry', 790) - def _reduce_418(val, _values) +module_eval(<<'.,.,', 'parser.ry', 792) + def _reduce_420(val, _values) @d.declare_op_footer(val[0], val[1]) end .,., -module_eval(<<'.,.,', 'parser.ry', 792) - def _reduce_419(val, _values) +module_eval(<<'.,.,', 'parser.ry', 794) + def _reduce_421(val, _values) @d.declare_op_footer(val[0], nil) end .,., -module_eval(<<'.,.,', 'parser.ry', 794) - def _reduce_420(val, _values) +module_eval(<<'.,.,', 'parser.ry', 796) + def _reduce_422(val, _values) @d.declare_op_footer(nil, val[0]) end .,., -module_eval(<<'.,.,', 'parser.ry', 796) - def _reduce_421(val, _values) +module_eval(<<'.,.,', 'parser.ry', 798) + def _reduce_423(val, _values) @d.declare_op_footer(nil,nil) end .,., -module_eval(<<'.,.,', 'parser.ry', 798) - def _reduce_422(val, _values) +module_eval(<<'.,.,', 'parser.ry', 800) + def _reduce_424(val, _values) :oneway end .,., -module_eval(<<'.,.,', 'parser.ry', 800) - def _reduce_423(val, _values) +module_eval(<<'.,.,', 'parser.ry', 802) + def _reduce_425(val, _values) val[0] end .,., -module_eval(<<'.,.,', 'parser.ry', 801) - def _reduce_424(val, _values) +module_eval(<<'.,.,', 'parser.ry', 803) + def _reduce_426(val, _values) ::IDL::Type::Void.new end .,., -# reduce 425 omitted - -# reduce 426 omitted - # reduce 427 omitted # reduce 428 omitted -module_eval(<<'.,.,', 'parser.ry', 810) - def _reduce_429(val, _values) - @d.declare_op_parameter(val[0], val[1], val[2]) - end -.,., +# reduce 429 omitted -module_eval(<<'.,.,', 'parser.ry', 812) - def _reduce_430(val, _values) - :in - end -.,., +# reduce 430 omitted -module_eval(<<'.,.,', 'parser.ry', 813) +module_eval(<<'.,.,', 'parser.ry', 812) def _reduce_431(val, _values) - :out + @d.declare_op_parameter(val[0], val[1], val[2]) end .,., module_eval(<<'.,.,', 'parser.ry', 814) def _reduce_432(val, _values) - :inout + :in end .,., -module_eval(<<'.,.,', 'parser.ry', 816) +module_eval(<<'.,.,', 'parser.ry', 815) def _reduce_433(val, _values) - val[2] + :out end .,., -module_eval(<<'.,.,', 'parser.ry', 818) +module_eval(<<'.,.,', 'parser.ry', 816) def _reduce_434(val, _values) - val[2] + :inout end .,., -module_eval(<<'.,.,', 'parser.ry', 820) +module_eval(<<'.,.,', 'parser.ry', 818) def _reduce_435(val, _values) val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 822) +module_eval(<<'.,.,', 'parser.ry', 820) def _reduce_436(val, _values) - val + val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 823) +module_eval(<<'.,.,', 'parser.ry', 822) def _reduce_437(val, _values) - val[0] << val[2] + val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 825) +module_eval(<<'.,.,', 'parser.ry', 824) def _reduce_438(val, _values) - val[2] + val end .,., -module_eval(<<'.,.,', 'parser.ry', 827) +module_eval(<<'.,.,', 'parser.ry', 825) def _reduce_439(val, _values) - val + val[0] << val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 828) +module_eval(<<'.,.,', 'parser.ry', 827) def _reduce_440(val, _values) - val[0] << val[2] + val[2] end .,., -module_eval(<<'.,.,', 'parser.ry', 830) +module_eval(<<'.,.,', 'parser.ry', 829) def _reduce_441(val, _values) - val[0] + val end .,., -module_eval(<<'.,.,', 'parser.ry', 831) +module_eval(<<'.,.,', 'parser.ry', 830) def _reduce_442(val, _values) - val[0] + val[0] << val[2] end .,., @@ -4460,20 +4462,32 @@ def _reduce_444(val, _values) end .,., -module_eval(<<'.,.,', 'parser.ry', 837) +module_eval(<<'.,.,', 'parser.ry', 834) def _reduce_445(val, _values) - IDL::Type::Fixed.new(val[2], val[4]) + val[0] end .,., -module_eval(<<'.,.,', 'parser.ry', 839) +module_eval(<<'.,.,', 'parser.ry', 835) def _reduce_446(val, _values) - ::IDL::Type::Fixed.new + val[0] end .,., -module_eval(<<'.,.,', 'parser.ry', 841) +module_eval(<<'.,.,', 'parser.ry', 839) def _reduce_447(val, _values) + IDL::Type::Fixed.new(val[2], val[4]) + end +.,., + +module_eval(<<'.,.,', 'parser.ry', 841) + def _reduce_448(val, _values) + ::IDL::Type::Fixed.new + end +.,., + +module_eval(<<'.,.,', 'parser.ry', 843) + def _reduce_449(val, _values) ::IDL::Type::ValueBase.new end .,., diff --git a/lib/ridl/parser.ry b/lib/ridl/parser.ry index 9cab667..166f53c 100644 --- a/lib/ridl/parser.ry +++ b/lib/ridl/parser.ry @@ -663,6 +663,8 @@ rule | boolean_type | enum_type | scoped_name + | octet_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end } + | wide_char_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end } union_body : union_case | union_body union_case From 4a4e193de0326ea114eb75ad4f030ee34ba67110 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Jul 2023 09:28:01 +0200 Subject: [PATCH 2/3] Fixed grammar, no default label detection for wchar * lib/ridl/node.rb: * lib/ridl/parser.rb: * lib/ridl/parser.ry: --- lib/ridl/node.rb | 1 + lib/ridl/parser.rb | 4 ++-- lib/ridl/parser.ry | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ridl/node.rb b/lib/ridl/node.rb index 1e1f5c1..4f488a5 100644 --- a/lib/ridl/node.rb +++ b/lib/ridl/node.rb @@ -2722,6 +2722,7 @@ def has_default? def default_label swtype = @switchtype.resolved_type + return nil if IDL::Type::WChar === swtype lbls = members.collect { |m| m.labels.include?(:default) ? [] : m.labels.collect { |l| l.value } }.flatten lbls = lbls.sort unless IDL::Type::Boolean === swtype ## work around bug in Ruby 1.9.2 def_lbl = swtype.min diff --git a/lib/ridl/parser.rb b/lib/ridl/parser.rb index 1400ac7..65af372 100644 --- a/lib/ridl/parser.rb +++ b/lib/ridl/parser.rb @@ -4044,13 +4044,13 @@ def _reduce_359(val, _values) module_eval(<<'.,.,', 'parser.ry', 665) def _reduce_365(val, _values) - if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end + if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::Octet.new end end .,., module_eval(<<'.,.,', 'parser.ry', 666) def _reduce_366(val, _values) - if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end + if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::WChar.new end end .,., diff --git a/lib/ridl/parser.ry b/lib/ridl/parser.ry index 166f53c..602a207 100644 --- a/lib/ridl/parser.ry +++ b/lib/ridl/parser.ry @@ -663,8 +663,8 @@ rule | boolean_type | enum_type | scoped_name - | octet_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end } - | wide_char_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" end } + | octet_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::Octet.new end } + | wide_char_type { if @idlversion < 4 then raise "union with octect discriminator type is only supported with IDL4 or newer" else ::IDL::Type::WChar.new end } union_body : union_case | union_body union_case From c1b68433fe9b476e1652d3999ee38de0dc529f7e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 17 Jul 2023 09:37:29 +0200 Subject: [PATCH 3/3] Add comment * lib/ridl/node.rb: --- lib/ridl/node.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ridl/node.rb b/lib/ridl/node.rb index 4f488a5..2ecc147 100644 --- a/lib/ridl/node.rb +++ b/lib/ridl/node.rb @@ -2722,7 +2722,7 @@ def has_default? def default_label swtype = @switchtype.resolved_type - return nil if IDL::Type::WChar === swtype + return nil if IDL::Type::WChar === swtype # No default label detection for wchar lbls = members.collect { |m| m.labels.include?(:default) ? [] : m.labels.collect { |l| l.value } }.flatten lbls = lbls.sort unless IDL::Type::Boolean === swtype ## work around bug in Ruby 1.9.2 def_lbl = swtype.min