ruby_protobuf 0.3.3 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. data/History.txt +10 -2
  2. data/Manifest.txt +26 -12
  3. data/README.txt +6 -1
  4. data/Rakefile +51 -14
  5. data/TODO +15 -0
  6. data/VERSION +1 -0
  7. data/bin/rprotoc +11 -6
  8. data/lib/protobuf/common/exceptions.rb +11 -0
  9. data/lib/protobuf/common/util.rb +9 -0
  10. data/lib/protobuf/common/wire_type.rb +6 -6
  11. data/lib/protobuf/compiler/compiler.rb +16 -16
  12. data/lib/protobuf/compiler/nodes.rb +67 -65
  13. data/lib/protobuf/compiler/proto.y +31 -38
  14. data/lib/protobuf/compiler/proto_parser.rb +315 -294
  15. data/lib/protobuf/compiler/template/rpc_bin.erb +1 -1
  16. data/lib/protobuf/compiler/template/rpc_client.erb +1 -1
  17. data/lib/protobuf/compiler/template/rpc_service.erb +2 -2
  18. data/lib/protobuf/compiler/visitors.rb +45 -39
  19. data/lib/protobuf/descriptor/descriptor.proto +0 -0
  20. data/lib/protobuf/descriptor/descriptor.rb +11 -10
  21. data/lib/protobuf/descriptor/descriptor_builder.rb +6 -7
  22. data/lib/protobuf/descriptor/descriptor_proto.rb +51 -31
  23. data/lib/protobuf/descriptor/enum_descriptor.rb +5 -5
  24. data/lib/protobuf/descriptor/field_descriptor.rb +8 -9
  25. data/lib/protobuf/descriptor/file_descriptor.rb +0 -1
  26. data/lib/protobuf/message/decoder.rb +33 -35
  27. data/lib/protobuf/message/encoder.rb +23 -19
  28. data/lib/protobuf/message/enum.rb +43 -9
  29. data/lib/protobuf/message/field.rb +281 -193
  30. data/lib/protobuf/message/message.rb +166 -110
  31. data/lib/protobuf/message/protoable.rb +4 -3
  32. data/lib/protobuf/message/service.rb +1 -1
  33. data/lib/protobuf/rpc/client.rb +3 -3
  34. data/lib/protobuf/rpc/handler.rb +1 -1
  35. data/lib/protobuf/rpc/server.rb +8 -8
  36. data/lib/ruby_protobuf.rb +1 -1
  37. data/test/check_unbuild.rb +7 -7
  38. data/test/proto/addressbook.pb.rb +67 -0
  39. data/test/proto/addressbook.proto +2 -0
  40. data/test/proto/addressbook_base.pb.rb +59 -0
  41. data/test/proto/addressbook_base.proto +1 -1
  42. data/test/proto/addressbook_ext.pb.rb +21 -0
  43. data/test/proto/addressbook_ext.proto +2 -2
  44. data/test/{collision.rb → proto/collision.pb.rb} +0 -0
  45. data/test/{ext_collision.rb → proto/ext_collision.pb.rb} +1 -1
  46. data/test/{ext_range.rb → proto/ext_range.pb.rb} +4 -4
  47. data/test/proto/ext_range.proto +2 -2
  48. data/test/proto/float_default.proto +10 -0
  49. data/test/proto/lowercase.pb.rb +31 -0
  50. data/test/proto/lowercase.proto +9 -0
  51. data/test/{merge.rb → proto/merge.pb.rb} +2 -2
  52. data/test/proto/nested.pb.rb +31 -0
  53. data/test/proto/nested.proto +2 -0
  54. data/test/proto/optional_field.pb.rb +36 -0
  55. data/test/proto/optional_field.proto +12 -0
  56. data/test/proto/packed.pb.rb +23 -0
  57. data/test/proto/packed.proto +6 -0
  58. data/test/{types.rb → proto/types.pb.rb} +43 -1
  59. data/test/test_addressbook.rb +30 -17
  60. data/test/test_compiler.rb +79 -78
  61. data/test/test_descriptor.rb +12 -12
  62. data/test/test_enum_value.rb +41 -0
  63. data/test/test_extension.rb +10 -14
  64. data/test/test_lowercase.rb +11 -0
  65. data/test/test_message.rb +44 -41
  66. data/test/test_optional_field.rb +61 -38
  67. data/test/test_packed_field.rb +40 -0
  68. data/test/test_parse.rb +8 -8
  69. data/test/test_repeated_types.rb +29 -3
  70. data/test/test_serialize.rb +12 -12
  71. data/test/test_standard_message.rb +30 -30
  72. data/test/test_types.rb +95 -95
  73. metadata +69 -39
  74. data/test/addressbook.rb +0 -98
  75. data/test/addressbook_base.rb +0 -62
  76. data/test/addressbook_ext.rb +0 -12
  77. data/test/nested.rb +0 -25
  78. data/test/test_ruby_protobuf.rb +0 -1
@@ -10,7 +10,7 @@
10
10
  unless $".index 'racc/parser.rb'
11
11
  $".push 'racc/parser.rb'
12
12
 
13
- self.class.module_eval <<'..end racc/parser.rb modeval..id521073ac1f', 'racc/parser.rb', 1
13
+ self.class.module_eval <<'..end racc/parser.rb modeval..idd168e4f443', 'racc/parser.rb', 1
14
14
  #
15
15
  # $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
16
16
  #
@@ -453,7 +453,7 @@ module Racc
453
453
  end
454
454
 
455
455
  end
456
- ..end racc/parser.rb modeval..id521073ac1f
456
+ ..end racc/parser.rb modeval..idd168e4f443
457
457
  end
458
458
  ###### racc/parser.rb end
459
459
 
@@ -462,7 +462,7 @@ module Protobuf
462
462
 
463
463
  class ProtoParser < Racc::Parser
464
464
 
465
- module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/protobuf/compiler/proto.y', 163
465
+ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..ida0eea88ba4', 'lib/protobuf/compiler/proto.y', 158
466
466
 
467
467
  require 'strscan'
468
468
 
@@ -500,10 +500,8 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/
500
500
  yield [:BOOLEAN_LITERAL, @token == 'true']
501
501
  when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
502
502
  yield [:STRING_LITERAL, eval(@token)]
503
- when match(/[a-zA-Z_][\w_]*/)
503
+ when match(/[a-zA-Z_]\w*/)
504
504
  yield [:IDENT, @token.to_sym]
505
- when match(/[A-Z][\w_]*/)
506
- yield [:CAMEL_IDENT, @token.to_sym]
507
505
  when match(/./)
508
506
  yield [@token, @token]
509
507
  else
@@ -522,111 +520,80 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/
522
520
  end
523
521
  false
524
522
  end
525
- ..end lib/protobuf/compiler/proto.y modeval..id7865f341f1
523
+ ..end lib/protobuf/compiler/proto.y modeval..ida0eea88ba4
526
524
 
527
525
  ##### racc 1.4.5 generates ###
528
526
 
529
527
  racc_reduce_table = [
530
528
  0, 0, :racc_error,
531
- 1, 53, :_reduce_1,
532
- 2, 53, :_reduce_2,
533
- 1, 54, :_reduce_none,
534
- 1, 54, :_reduce_none,
535
- 1, 54, :_reduce_none,
536
- 1, 54, :_reduce_none,
537
- 1, 54, :_reduce_none,
538
- 1, 54, :_reduce_none,
539
- 1, 54, :_reduce_none,
540
- 1, 54, :_reduce_none,
541
- 3, 58, :_reduce_11,
542
- 4, 59, :_reduce_12,
543
- 0, 62, :_reduce_13,
544
- 3, 62, :_reduce_14,
545
- 3, 60, :_reduce_15,
546
- 4, 63, :_reduce_16,
547
- 3, 55, :_reduce_17,
548
- 5, 56, :_reduce_18,
549
- 0, 67, :_reduce_19,
550
- 2, 67, :_reduce_20,
551
- 1, 68, :_reduce_none,
552
- 1, 68, :_reduce_none,
553
- 1, 68, :_reduce_none,
554
- 5, 57, :_reduce_24,
555
- 0, 71, :_reduce_25,
556
- 2, 71, :_reduce_26,
557
- 1, 72, :_reduce_none,
558
- 1, 72, :_reduce_none,
559
- 1, 72, :_reduce_none,
560
- 4, 73, :_reduce_30,
561
- 5, 61, :_reduce_31,
562
- 0, 75, :_reduce_32,
563
- 2, 75, :_reduce_33,
564
- 1, 76, :_reduce_none,
565
- 1, 76, :_reduce_none,
566
- 1, 76, :_reduce_none,
567
- 10, 77, :_reduce_37,
568
- 0, 78, :_reduce_none,
569
- 1, 78, :_reduce_none,
570
- 3, 65, :_reduce_40,
571
- 0, 79, :_reduce_41,
572
- 2, 79, :_reduce_42,
573
- 1, 80, :_reduce_none,
574
- 1, 80, :_reduce_none,
575
- 1, 80, :_reduce_none,
576
- 1, 80, :_reduce_none,
577
- 1, 80, :_reduce_none,
578
- 1, 80, :_reduce_none,
579
- 1, 80, :_reduce_none,
580
- 1, 80, :_reduce_none,
581
- 6, 70, :_reduce_51,
582
- 6, 69, :_reduce_52,
583
- 9, 69, :_reduce_53,
584
- 1, 84, :_reduce_none,
585
- 1, 84, :_reduce_none,
586
- 1, 84, :_reduce_none,
587
- 1, 84, :_reduce_none,
588
- 1, 84, :_reduce_none,
589
- 1, 84, :_reduce_none,
590
- 1, 84, :_reduce_none,
591
- 1, 84, :_reduce_none,
592
- 1, 84, :_reduce_none,
593
- 1, 84, :_reduce_none,
594
- 1, 84, :_reduce_none,
595
- 1, 84, :_reduce_none,
596
- 1, 84, :_reduce_none,
597
- 1, 84, :_reduce_none,
598
- 1, 84, :_reduce_none,
599
- 1, 84, :_reduce_none,
600
- 1, 84, :_reduce_none,
601
- 1, 84, :_reduce_none,
602
- 1, 84, :_reduce_none,
603
- 1, 84, :_reduce_none,
604
- 1, 84, :_reduce_none,
605
- 1, 84, :_reduce_none,
606
- 1, 84, :_reduce_none,
607
- 1, 84, :_reduce_none,
608
- 1, 84, :_reduce_none,
609
- 1, 84, :_reduce_none,
610
- 1, 84, :_reduce_none,
611
- 1, 84, :_reduce_none,
612
- 1, 84, :_reduce_none,
613
- 1, 84, :_reduce_none,
614
- 1, 84, :_reduce_none,
615
- 1, 84, :_reduce_none,
616
- 1, 84, :_reduce_none,
617
- 1, 85, :_reduce_87,
618
- 3, 85, :_reduce_88,
619
- 1, 86, :_reduce_none,
620
- 3, 86, :_reduce_90,
621
- 4, 81, :_reduce_91,
622
- 0, 88, :_reduce_92,
623
- 2, 88, :_reduce_93,
624
- 1, 87, :_reduce_94,
625
- 3, 87, :_reduce_95,
626
- 3, 87, :_reduce_96,
627
- 1, 82, :_reduce_none,
628
- 1, 82, :_reduce_none,
629
- 1, 82, :_reduce_none,
529
+ 1, 52, :_reduce_1,
530
+ 2, 52, :_reduce_2,
531
+ 1, 53, :_reduce_none,
532
+ 1, 53, :_reduce_none,
533
+ 1, 53, :_reduce_none,
534
+ 1, 53, :_reduce_none,
535
+ 1, 53, :_reduce_none,
536
+ 1, 53, :_reduce_none,
537
+ 1, 53, :_reduce_none,
538
+ 1, 53, :_reduce_10,
539
+ 3, 57, :_reduce_11,
540
+ 4, 58, :_reduce_12,
541
+ 0, 61, :_reduce_13,
542
+ 3, 61, :_reduce_14,
543
+ 3, 59, :_reduce_15,
544
+ 4, 62, :_reduce_16,
545
+ 3, 54, :_reduce_17,
546
+ 5, 55, :_reduce_18,
547
+ 0, 66, :_reduce_19,
548
+ 2, 66, :_reduce_20,
549
+ 1, 67, :_reduce_none,
550
+ 1, 67, :_reduce_none,
551
+ 1, 67, :_reduce_23,
552
+ 5, 56, :_reduce_24,
553
+ 0, 70, :_reduce_25,
554
+ 2, 70, :_reduce_26,
555
+ 1, 71, :_reduce_none,
556
+ 1, 71, :_reduce_none,
557
+ 1, 71, :_reduce_29,
558
+ 4, 72, :_reduce_30,
559
+ 5, 60, :_reduce_31,
560
+ 0, 74, :_reduce_32,
561
+ 2, 74, :_reduce_33,
562
+ 1, 75, :_reduce_none,
563
+ 1, 75, :_reduce_none,
564
+ 1, 75, :_reduce_36,
565
+ 10, 76, :_reduce_37,
566
+ 0, 77, :_reduce_none,
567
+ 1, 77, :_reduce_none,
568
+ 3, 64, :_reduce_40,
569
+ 0, 78, :_reduce_41,
570
+ 2, 78, :_reduce_42,
571
+ 1, 79, :_reduce_none,
572
+ 1, 79, :_reduce_none,
573
+ 1, 79, :_reduce_none,
574
+ 1, 79, :_reduce_none,
575
+ 1, 79, :_reduce_none,
576
+ 1, 79, :_reduce_none,
577
+ 1, 79, :_reduce_none,
578
+ 1, 79, :_reduce_50,
579
+ 6, 69, :_reduce_51,
580
+ 6, 68, :_reduce_52,
581
+ 9, 68, :_reduce_53,
582
+ 1, 83, :_reduce_none,
583
+ 1, 83, :_reduce_none,
584
+ 1, 83, :_reduce_none,
585
+ 1, 83, :_reduce_none,
586
+ 1, 83, :_reduce_none,
587
+ 1, 83, :_reduce_none,
588
+ 1, 83, :_reduce_none,
589
+ 1, 83, :_reduce_none,
590
+ 1, 83, :_reduce_none,
591
+ 1, 83, :_reduce_none,
592
+ 1, 83, :_reduce_none,
593
+ 1, 83, :_reduce_none,
594
+ 1, 83, :_reduce_none,
595
+ 1, 83, :_reduce_none,
596
+ 1, 83, :_reduce_none,
630
597
  1, 83, :_reduce_none,
631
598
  1, 83, :_reduce_none,
632
599
  1, 83, :_reduce_none,
@@ -643,111 +610,142 @@ racc_reduce_table = [
643
610
  1, 83, :_reduce_none,
644
611
  1, 83, :_reduce_none,
645
612
  1, 83, :_reduce_none,
646
- 2, 66, :_reduce_116,
647
- 3, 66, :_reduce_117,
648
- 1, 64, :_reduce_none,
649
- 1, 64, :_reduce_none,
650
- 1, 64, :_reduce_none,
651
- 1, 64, :_reduce_none,
652
- 1, 64, :_reduce_none,
653
- 1, 74, :_reduce_none,
654
- 1, 74, :_reduce_none,
655
- 1, 74, :_reduce_none ]
613
+ 1, 83, :_reduce_none,
614
+ 1, 83, :_reduce_none,
615
+ 1, 84, :_reduce_87,
616
+ 3, 84, :_reduce_88,
617
+ 1, 85, :_reduce_none,
618
+ 3, 85, :_reduce_90,
619
+ 4, 80, :_reduce_91,
620
+ 0, 87, :_reduce_92,
621
+ 2, 87, :_reduce_93,
622
+ 1, 86, :_reduce_94,
623
+ 3, 86, :_reduce_95,
624
+ 3, 86, :_reduce_96,
625
+ 1, 81, :_reduce_none,
626
+ 1, 81, :_reduce_none,
627
+ 1, 81, :_reduce_none,
628
+ 1, 82, :_reduce_none,
629
+ 1, 82, :_reduce_none,
630
+ 1, 82, :_reduce_none,
631
+ 1, 82, :_reduce_none,
632
+ 1, 82, :_reduce_none,
633
+ 1, 82, :_reduce_none,
634
+ 1, 82, :_reduce_none,
635
+ 1, 82, :_reduce_none,
636
+ 1, 82, :_reduce_none,
637
+ 1, 82, :_reduce_none,
638
+ 1, 82, :_reduce_none,
639
+ 1, 82, :_reduce_none,
640
+ 1, 82, :_reduce_none,
641
+ 1, 82, :_reduce_none,
642
+ 1, 82, :_reduce_none,
643
+ 1, 82, :_reduce_none,
644
+ 2, 65, :_reduce_116,
645
+ 3, 65, :_reduce_117,
646
+ 1, 63, :_reduce_none,
647
+ 1, 63, :_reduce_none,
648
+ 1, 63, :_reduce_none,
649
+ 1, 63, :_reduce_none,
650
+ 1, 63, :_reduce_none,
651
+ 1, 73, :_reduce_none,
652
+ 1, 73, :_reduce_none,
653
+ 1, 73, :_reduce_none ]
656
654
 
657
655
  racc_reduce_n = 126
658
656
 
659
657
  racc_shift_n = 184
660
658
 
661
659
  racc_action_table = [
662
- 74, 51, 77, 19, 20, 74, 25, 77, 67, 60,
663
- 32, 47, 53, 63, 14, 14, 43, 107, 39, 68,
664
- 61, 38, 69, 50, 54, 56, 110, 170, 106, 109,
665
- 94, 96, 97, 98, 99, 100, 101, 103, 104, 105,
666
- 108, 93, 95, 72, 73, 75, 76, 78, 72, 73,
667
- 75, 76, 78, 123, 111, 131, 134, 43, 141, 48,
668
- 147, 116, 19, 20, 122, 126, 130, 19, 20, 140,
669
- 144, 75, 76, 78, 120, 124, 127, 129, 133, 136,
670
- 139, 143, 146, 115, 118, 119, 121, 125, 128, 132,
671
- 135, 138, 142, 145, 114, 117, 83, 167, 176, 75,
672
- 76, 78, 14, 25, 16, 1, 159, 85, 6, 75,
673
- 76, 78, 75, 76, 78, 19, 20, 166, 50, 54,
674
- 56, 177, 91, 35, 170, 75, 76, 78, 27, 34,
675
- 4, 7, 148, 11, 33, 150, 14, 151, 16, 1,
676
- 153, 154, 6, 9, 4, 7, 155, 11, 156, 43,
677
- 14, 40, 16, 1, 161, 30, 6, 9, 75, 76,
678
- 78, 29, 25, 165, 24, 40, 169, 23, 174, 175,
679
- 22, 43, 21, 180, 59, 182, 183 ]
660
+ 75, 176, 78, 18, 19, 75, 25, 78, 27, 47,
661
+ 4, 7, 32, 11, 42, 39, 13, 106, 16, 1,
662
+ 18, 19, 6, 9, 177, 38, 170, 103, 105, 109,
663
+ 93, 94, 95, 96, 97, 98, 100, 101, 102, 104,
664
+ 108, 92, 72, 73, 74, 76, 77, 72, 73, 74,
665
+ 76, 77, 123, 110, 131, 134, 66, 141, 111, 147,
666
+ 116, 35, 13, 122, 127, 130, 34, 67, 140, 144,
667
+ 69, 148, 118, 120, 124, 126, 129, 133, 137, 139,
668
+ 143, 146, 115, 117, 119, 121, 125, 128, 132, 136,
669
+ 138, 142, 145, 114, 83, 166, 18, 19, 25, 54,
670
+ 13, 33, 16, 1, 159, 86, 6, 74, 76, 77,
671
+ 56, 74, 76, 77, 167, 51, 53, 57, 170, 90,
672
+ 51, 53, 57, 74, 76, 77, 4, 7, 42, 11,
673
+ 48, 150, 13, 151, 16, 1, 60, 152, 6, 9,
674
+ 64, 154, 13, 74, 76, 77, 155, 61, 74, 76,
675
+ 77, 74, 76, 77, 18, 19, 156, 42, 40, 31,
676
+ 162, 29, 25, 165, 24, 40, 169, 23, 174, 175,
677
+ 22, 42, 21, 180, 50, 182, 183 ]
680
678
 
681
679
  racc_action_check = [
682
- 48, 42, 48, 58, 58, 175, 177, 175, 46, 45,
683
- 20, 36, 42, 45, 46, 45, 36, 58, 27, 46,
684
- 45, 26, 46, 42, 42, 42, 63, 177, 58, 58,
685
- 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
686
- 58, 58, 58, 48, 48, 48, 48, 48, 175, 175,
687
- 175, 175, 175, 102, 69, 102, 102, 37, 102, 37,
688
- 102, 102, 150, 150, 102, 102, 102, 1, 1, 102,
689
- 102, 91, 91, 91, 102, 102, 102, 102, 102, 102,
690
- 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
691
- 102, 102, 102, 102, 102, 102, 49, 163, 172, 110,
692
- 110, 110, 49, 166, 49, 49, 151, 49, 49, 154,
693
- 154, 154, 153, 153, 153, 174, 174, 163, 49, 49,
694
- 49, 172, 49, 23, 166, 151, 151, 151, 15, 22,
695
- 15, 15, 107, 15, 21, 111, 15, 112, 15, 15,
696
- 113, 137, 15, 15, 0, 0, 148, 0, 149, 44,
697
- 0, 29, 0, 0, 152, 18, 0, 0, 155, 155,
698
- 155, 16, 14, 158, 11, 164, 165, 9, 169, 170,
699
- 7, 31, 6, 176, 43, 178, 182 ]
680
+ 48, 172, 48, 59, 59, 175, 177, 175, 14, 36,
681
+ 14, 14, 20, 14, 36, 27, 14, 59, 14, 14,
682
+ 150, 150, 14, 14, 172, 26, 177, 59, 59, 59,
683
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
684
+ 59, 59, 48, 48, 48, 48, 48, 175, 175, 175,
685
+ 175, 175, 99, 64, 99, 99, 46, 99, 69, 99,
686
+ 99, 23, 46, 99, 99, 99, 22, 46, 99, 99,
687
+ 46, 106, 99, 99, 99, 99, 99, 99, 99, 99,
688
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
689
+ 99, 99, 99, 99, 49, 163, 1, 1, 167, 44,
690
+ 49, 21, 49, 49, 151, 49, 49, 154, 154, 154,
691
+ 44, 152, 152, 152, 163, 49, 49, 49, 167, 49,
692
+ 44, 44, 44, 151, 151, 151, 0, 0, 37, 0,
693
+ 37, 111, 0, 112, 0, 0, 45, 113, 0, 0,
694
+ 45, 135, 45, 90, 90, 90, 148, 45, 110, 110,
695
+ 110, 155, 155, 155, 174, 174, 149, 43, 29, 19,
696
+ 153, 16, 13, 157, 11, 164, 165, 9, 169, 170,
697
+ 7, 30, 6, 176, 42, 178, 182 ]
700
698
 
701
699
  racc_action_pointer = [
702
- 142, 61, nil, nil, nil, nil, 166, 166, nil, 161,
703
- nil, 158, nil, nil, 156, 128, 155, nil, 143, nil,
704
- 4, 122, 127, 111, nil, nil, 19, 18, nil, 139,
705
- nil, 164, nil, nil, nil, nil, 9, 50, nil, nil,
706
- nil, nil, -1, 168, 142, 7, 6, nil, -4, 94,
707
- nil, nil, nil, nil, nil, nil, nil, nil, -3, nil,
708
- nil, nil, nil, 17, nil, nil, nil, nil, nil, 48,
700
+ 124, 90, nil, nil, nil, nil, 166, 166, nil, 161,
701
+ nil, 158, nil, 156, 8, nil, 155, nil, nil, 153,
702
+ 0, 89, 64, 49, nil, nil, 23, 15, nil, 146,
703
+ 164, nil, nil, nil, nil, nil, 7, 121, nil, nil,
704
+ nil, nil, 168, 150, 97, 134, 54, nil, -4, 92,
705
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, -3,
706
+ nil, nil, nil, nil, 44, nil, nil, nil, nil, 52,
709
707
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
710
708
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
711
- nil, 22, nil, nil, nil, nil, nil, nil, nil, nil,
712
- nil, nil, 50, nil, nil, nil, nil, 111, nil, nil,
713
- 50, 118, 108, 94, nil, nil, nil, nil, nil, nil,
709
+ 95, nil, nil, nil, nil, nil, nil, nil, nil, 49,
710
+ nil, nil, nil, nil, nil, nil, 65, nil, nil, nil,
711
+ 100, 114, 105, 92, nil, nil, nil, nil, nil, nil,
714
712
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
715
- nil, nil, nil, nil, nil, nil, nil, 132, nil, nil,
716
- nil, nil, nil, nil, nil, nil, nil, nil, 137, 146,
717
- 56, 76, 152, 63, 60, 109, nil, nil, 145, nil,
718
- nil, nil, nil, 95, 153, 147, 97, nil, nil, 151,
719
- 160, nil, 75, nil, 109, 1, 171, 0, 157, nil,
713
+ nil, nil, nil, nil, nil, 132, nil, nil, nil, nil,
714
+ nil, nil, nil, nil, nil, nil, nil, nil, 137, 154,
715
+ 14, 75, 63, 158, 59, 103, nil, 145, nil, nil,
716
+ nil, nil, nil, 93, 153, 147, nil, 92, nil, 151,
717
+ 160, nil, -21, nil, 148, 1, 171, 0, 157, nil,
720
718
  nil, nil, 174, nil ]
721
719
 
722
720
  racc_action_default = [
723
- -126, -126, -3, -4, -10, -5, -126, -126, -6, -126,
724
- -7, -126, -8, -9, -126, -126, -126, -1, -126, -13,
721
+ -126, -126, -4, -5, -10, -6, -126, -126, -7, -126,
722
+ -8, -126, -9, -126, -126, -1, -126, -3, -13, -126,
725
723
  -126, -126, -126, -126, -13, -13, -126, -126, -2, -126,
726
- -19, -116, -13, -25, -11, -32, -126, -126, -15, 184,
727
- -41, -17, -126, -126, -117, -126, -126, -12, -126, -126,
728
- -97, -23, -20, -18, -98, -21, -99, -22, -126, -14,
729
- -29, -24, -27, -126, -26, -28, -35, -36, -31, -126,
730
- -34, -33, -120, -122, -121, -123, -124, -118, -125, -119,
731
- -16, -45, -46, -50, -44, -40, -43, -42, -48, -47,
732
- -49, -126, -115, -113, -102, -114, -103, -104, -105, -106,
733
- -107, -108, -126, -109, -110, -111, -100, -126, -112, -101,
734
- -126, -126, -94, -92, -85, -74, -62, -86, -75, -76,
735
- -55, -77, -63, -58, -56, -78, -64, -57, -79, -68,
736
- -65, -59, -80, -69, -54, -81, -70, -126, -82, -71,
737
- -66, -60, -83, -72, -67, -84, -73, -61, -126, -126,
738
- -38, -126, -126, -126, -126, -126, -30, -39, -126, -96,
739
- -95, -91, -93, -126, -126, -126, -126, -52, -51, -126,
724
+ -116, -13, -19, -25, -11, -32, -126, -126, -15, 184,
725
+ -41, -17, -126, -117, -126, -126, -126, -12, -126, -126,
726
+ -14, -97, -20, -98, -23, -21, -18, -99, -22, -126,
727
+ -29, -24, -27, -26, -126, -28, -36, -31, -34, -126,
728
+ -33, -35, -120, -122, -123, -121, -124, -125, -118, -119,
729
+ -16, -46, -44, -50, -43, -42, -40, -48, -47, -49,
730
+ -126, -45, -114, -103, -104, -105, -106, -107, -108, -126,
731
+ -109, -110, -111, -100, -112, -101, -126, -115, -113, -102,
732
+ -126, -126, -94, -92, -86, -75, -62, -76, -55, -77,
733
+ -56, -78, -63, -58, -57, -79, -68, -64, -80, -69,
734
+ -65, -59, -81, -70, -54, -126, -82, -71, -83, -72,
735
+ -66, -60, -84, -73, -67, -85, -74, -61, -126, -126,
736
+ -38, -126, -126, -126, -126, -126, -30, -126, -39, -96,
737
+ -95, -93, -91, -126, -126, -126, -52, -126, -51, -126,
740
738
  -126, -89, -126, -87, -38, -126, -126, -126, -126, -90,
741
739
  -53, -88, -126, -37 ]
742
740
 
743
741
  racc_goto_table = [
744
- 41, 80, 112, 18, 158, 113, 31, 17, 57, 173,
745
- 55, 36, 37, 64, 42, 88, 26, 86, 45, 44,
746
- 181, 149, 28, 62, 70, 52, 65, 90, 178, 84,
747
- 46, 71, 66, 82, 49, 87, 89, 102, 137, 172,
748
- 81, 15, 152, nil, nil, nil, nil, nil, nil, nil,
742
+ 41, 80, 112, 113, 20, 157, 15, 173, 30, 63,
743
+ 44, 58, 26, 55, 36, 37, 87, 181, 84, 45,
744
+ 28, 43, 149, 62, 68, 52, 65, 89, 82, 178,
745
+ 46, 70, 71, 81, 49, 85, 88, 99, 135, 172,
746
+ 91, 14, 153, nil, nil, nil, nil, nil, nil, nil,
749
747
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
750
- 92, nil, 160, nil, 112, 163, 164, 162, nil, nil,
748
+ nil, nil, 107, 160, 112, 161, 163, 164, nil, nil,
751
749
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
752
750
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
753
751
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
@@ -757,13 +755,13 @@ racc_goto_table = [
757
755
  nil, nil, nil, nil, nil, 168 ]
758
756
 
759
757
  racc_goto_check = [
760
- 13, 12, 22, 14, 26, 35, 10, 2, 18, 34,
761
- 17, 10, 10, 20, 15, 18, 11, 17, 19, 10,
762
- 34, 22, 2, 8, 8, 16, 21, 8, 26, 5,
758
+ 13, 12, 22, 35, 14, 26, 2, 34, 10, 20,
759
+ 15, 18, 11, 17, 10, 10, 18, 34, 17, 19,
760
+ 2, 10, 22, 8, 8, 16, 21, 8, 5, 26,
763
761
  23, 24, 25, 4, 27, 28, 29, 31, 32, 33,
764
762
  3, 1, 36, nil, nil, nil, nil, nil, nil, nil,
765
763
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
766
- 14, nil, 22, nil, 22, 22, 22, 35, nil, nil,
764
+ nil, nil, 14, 22, 22, 35, 22, 22, nil, nil,
767
765
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
768
766
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
769
767
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
@@ -773,16 +771,16 @@ racc_goto_check = [
773
771
  nil, nil, nil, nil, nil, 13 ]
774
772
 
775
773
  racc_goto_pointer = [
776
- nil, 41, 7, -9, -16, -20, nil, nil, -22, nil,
777
- -13, 2, -47, -29, 2, -16, -17, -32, -34, -15,
778
- -32, -19, -89, -5, -15, -14, -146, -6, -14, -13,
779
- nil, -21, -64, -127, -157, -86, -71 ]
774
+ nil, 41, 6, -9, -16, -21, nil, nil, -22, nil,
775
+ -10, -1, -47, -29, 3, -22, -19, -31, -33, -14,
776
+ -36, -19, -88, -5, -15, -14, -145, -6, -14, -13,
777
+ nil, -22, -61, -128, -160, -87, -71 ]
780
778
 
781
779
  racc_goto_default = [
782
- nil, nil, nil, 2, 3, 5, 8, 10, 12, 13,
783
- nil, 171, nil, nil, 157, nil, nil, nil, nil, nil,
780
+ nil, nil, nil, 17, 2, 3, 5, 8, 10, 12,
781
+ nil, 171, nil, nil, 158, nil, nil, nil, nil, nil,
784
782
  nil, nil, 79, nil, nil, nil, nil, nil, nil, nil,
785
- 58, nil, nil, nil, nil, nil, nil ]
783
+ 59, nil, nil, nil, nil, nil, nil ]
786
784
 
787
785
  racc_token_table = {
788
786
  false => 0,
@@ -806,41 +804,40 @@ racc_token_table = {
806
804
  ")" => 18,
807
805
  "returns" => 19,
808
806
  "group" => 20,
809
- :CAMEL_IDENT => 21,
810
- "[" => 22,
811
- "]" => 23,
812
- "required" => 24,
813
- "optional" => 25,
814
- "repeated" => 26,
815
- "default" => 27,
816
- "extensions" => 28,
817
- "to" => 29,
818
- "max" => 30,
819
- "double" => 31,
820
- "float" => 32,
821
- "int32" => 33,
822
- "int64" => 34,
823
- "uint32" => 35,
824
- "uint64" => 36,
825
- "sint32" => 37,
826
- "sint64" => 38,
827
- "fixed32" => 39,
828
- "fixed64" => 40,
829
- "sfixed32" => 41,
830
- "sfixed64" => 42,
831
- "bool" => 43,
832
- "string" => 44,
833
- "bytes" => 45,
834
- "," => 46,
835
- :FLOAT_LITERAL => 47,
836
- :BOOLEAN_LITERAL => 48,
837
- :DEC_INTEGER => 49,
838
- :HEX_INTEGER => 50,
839
- :OCT_INTEGER => 51 }
807
+ "[" => 21,
808
+ "]" => 22,
809
+ "required" => 23,
810
+ "optional" => 24,
811
+ "repeated" => 25,
812
+ "default" => 26,
813
+ "extensions" => 27,
814
+ "to" => 28,
815
+ "max" => 29,
816
+ "double" => 30,
817
+ "float" => 31,
818
+ "int32" => 32,
819
+ "int64" => 33,
820
+ "uint32" => 34,
821
+ "uint64" => 35,
822
+ "sint32" => 36,
823
+ "sint64" => 37,
824
+ "fixed32" => 38,
825
+ "fixed64" => 39,
826
+ "sfixed32" => 40,
827
+ "sfixed64" => 41,
828
+ "bool" => 42,
829
+ "string" => 43,
830
+ "bytes" => 44,
831
+ "," => 45,
832
+ :FLOAT_LITERAL => 46,
833
+ :BOOLEAN_LITERAL => 47,
834
+ :DEC_INTEGER => 48,
835
+ :HEX_INTEGER => 49,
836
+ :OCT_INTEGER => 50 }
840
837
 
841
838
  racc_use_result_var = true
842
839
 
843
- racc_nt_base = 52
840
+ racc_nt_base = 51
844
841
 
845
842
  Racc_arg = [
846
843
  racc_action_table,
@@ -880,7 +877,6 @@ Racc_token_to_s_table = [
880
877
  '")"',
881
878
  '"returns"',
882
879
  '"group"',
883
- 'CAMEL_IDENT',
884
880
  '"["',
885
881
  '"]"',
886
882
  '"required"',
@@ -957,14 +953,14 @@ Racc_debug_parser = false
957
953
 
958
954
  module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 3
959
955
  def _reduce_1( val, _values, result )
960
- result = Protobuf::Node::ProtoNode.new val
956
+ result = Protobuf::Node::ProtoNode.new(val)
961
957
  result
962
958
  end
963
959
  .,.,
964
960
 
965
961
  module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 5
966
962
  def _reduce_2( val, _values, result )
967
- result.children << val[1]
963
+ result.children << val[1] if val[1]
968
964
  result
969
965
  end
970
966
  .,.,
@@ -983,74 +979,79 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 5
983
979
 
984
980
  # reduce 9 omitted
985
981
 
986
- # reduce 10 omitted
982
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 14
983
+ def _reduce_10( val, _values, result )
984
+ result = nil
985
+ result
986
+ end
987
+ .,.,
987
988
 
988
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 18
989
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 17
989
990
  def _reduce_11( val, _values, result )
990
- result = Protobuf::Node::ImportNode.new val[1]
991
+ result = Protobuf::Node::ImportNode.new(val[1])
991
992
  result
992
993
  end
993
994
  .,.,
994
995
 
995
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 21
996
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 20
996
997
  def _reduce_12( val, _values, result )
997
- result = Protobuf::Node::PackageNode.new val[2].unshift(val[1])
998
+ result = Protobuf::Node::PackageNode.new(val[2].unshift(val[1]))
998
999
  result
999
1000
  end
1000
1001
  .,.,
1001
1002
 
1002
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 24
1003
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 23
1003
1004
  def _reduce_13( val, _values, result )
1004
1005
  result = []
1005
1006
  result
1006
1007
  end
1007
1008
  .,.,
1008
1009
 
1009
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 26
1010
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 25
1010
1011
  def _reduce_14( val, _values, result )
1011
1012
  result << val[2]
1012
1013
  result
1013
1014
  end
1014
1015
  .,.,
1015
1016
 
1016
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 29
1017
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 28
1017
1018
  def _reduce_15( val, _values, result )
1018
1019
  result = Protobuf::Node::OptionNode.new(*val[1])
1019
1020
  result
1020
1021
  end
1021
1022
  .,.,
1022
1023
 
1023
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 32
1024
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 31
1024
1025
  def _reduce_16( val, _values, result )
1025
1026
  result = [val[1].unshift(val[0]), val[3]]
1026
1027
  result
1027
1028
  end
1028
1029
  .,.,
1029
1030
 
1030
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 35
1031
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 34
1031
1032
  def _reduce_17( val, _values, result )
1032
- result = Protobuf::Node::MessageNode.new val[1], val[2]
1033
+ result = Protobuf::Node::MessageNode.new(val[1], val[2])
1033
1034
  result
1034
1035
  end
1035
1036
  .,.,
1036
1037
 
1037
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 38
1038
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 37
1038
1039
  def _reduce_18( val, _values, result )
1039
- result = Protobuf::Node::ExtendNode.new val[1], val[3]
1040
+ result = Protobuf::Node::ExtendNode.new(val[1], val[3])
1040
1041
  result
1041
1042
  end
1042
1043
  .,.,
1043
1044
 
1044
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 41
1045
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 40
1045
1046
  def _reduce_19( val, _values, result )
1046
1047
  result = []
1047
1048
  result
1048
1049
  end
1049
1050
  .,.,
1050
1051
 
1051
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 43
1052
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 42
1052
1053
  def _reduce_20( val, _values, result )
1053
- result << val[1]
1054
+ result << val[1] if val[1]
1054
1055
  result
1055
1056
  end
1056
1057
  .,.,
@@ -1059,25 +1060,30 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 43
1059
1060
 
1060
1061
  # reduce 22 omitted
1061
1062
 
1062
- # reduce 23 omitted
1063
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 46
1064
+ def _reduce_23( val, _values, result )
1065
+ result = nil
1066
+ result
1067
+ end
1068
+ .,.,
1063
1069
 
1064
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 51
1070
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 49
1065
1071
  def _reduce_24( val, _values, result )
1066
- result = Protobuf::Node::EnumNode.new val[1], val[3]
1072
+ result = Protobuf::Node::EnumNode.new(val[1], val[3])
1067
1073
  result
1068
1074
  end
1069
1075
  .,.,
1070
1076
 
1071
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 54
1077
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 52
1072
1078
  def _reduce_25( val, _values, result )
1073
1079
  result = []
1074
1080
  result
1075
1081
  end
1076
1082
  .,.,
1077
1083
 
1078
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 56
1084
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 54
1079
1085
  def _reduce_26( val, _values, result )
1080
- result << val[1]
1086
+ result << val[1] if val[1]
1081
1087
  result
1082
1088
  end
1083
1089
  .,.,
@@ -1086,32 +1092,37 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 56
1086
1092
 
1087
1093
  # reduce 28 omitted
1088
1094
 
1089
- # reduce 29 omitted
1095
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 58
1096
+ def _reduce_29( val, _values, result )
1097
+ result = nil
1098
+ result
1099
+ end
1100
+ .,.,
1090
1101
 
1091
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 64
1102
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 61
1092
1103
  def _reduce_30( val, _values, result )
1093
- result = Protobuf::Node::EnumFieldNode.new val[0], val[2]
1104
+ result = Protobuf::Node::EnumFieldNode.new(val[0], val[2])
1094
1105
  result
1095
1106
  end
1096
1107
  .,.,
1097
1108
 
1098
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 67
1109
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 64
1099
1110
  def _reduce_31( val, _values, result )
1100
- result = Protobuf::Node::ServiceNode.new val[1], val[3]
1111
+ result = Protobuf::Node::ServiceNode.new(val[1], val[3])
1101
1112
  result
1102
1113
  end
1103
1114
  .,.,
1104
1115
 
1105
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 70
1116
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 67
1106
1117
  def _reduce_32( val, _values, result )
1107
1118
  result = []
1108
1119
  result
1109
1120
  end
1110
1121
  .,.,
1111
1122
 
1112
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 72
1123
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 69
1113
1124
  def _reduce_33( val, _values, result )
1114
- result << val[1]
1125
+ result << val[1] if val[1]
1115
1126
  result
1116
1127
  end
1117
1128
  .,.,
@@ -1120,11 +1131,16 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 72
1120
1131
 
1121
1132
  # reduce 35 omitted
1122
1133
 
1123
- # reduce 36 omitted
1134
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 73
1135
+ def _reduce_36( val, _values, result )
1136
+ result = nil
1137
+ result
1138
+ end
1139
+ .,.,
1124
1140
 
1125
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 80
1141
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 76
1126
1142
  def _reduce_37( val, _values, result )
1127
- result = Protobuf::Node::RpcNode.new val[1], val[3], val[7]
1143
+ result = Protobuf::Node::RpcNode.new(val[1], val[3], val[7])
1128
1144
  result
1129
1145
  end
1130
1146
  .,.,
@@ -1133,23 +1149,23 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 80
1133
1149
 
1134
1150
  # reduce 39 omitted
1135
1151
 
1136
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 86
1152
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 82
1137
1153
  def _reduce_40( val, _values, result )
1138
1154
  result = val[1]
1139
1155
  result
1140
1156
  end
1141
1157
  .,.,
1142
1158
 
1143
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 89
1159
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 85
1144
1160
  def _reduce_41( val, _values, result )
1145
1161
  result = []
1146
1162
  result
1147
1163
  end
1148
1164
  .,.,
1149
1165
 
1150
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 91
1166
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 87
1151
1167
  def _reduce_42( val, _values, result )
1152
- result << val[1]
1168
+ result << val[1] if val[1]
1153
1169
  result
1154
1170
  end
1155
1171
  .,.,
@@ -1168,25 +1184,30 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 91
1168
1184
 
1169
1185
  # reduce 49 omitted
1170
1186
 
1171
- # reduce 50 omitted
1187
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 96
1188
+ def _reduce_50( val, _values, result )
1189
+ result = nil
1190
+ result
1191
+ end
1192
+ .,.,
1172
1193
 
1173
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 104
1194
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 99
1174
1195
  def _reduce_51( val, _values, result )
1175
- result = Protobuf::Node::GroupNode.new val[0], val[2], val[4], val[5]
1196
+ result = Protobuf::Node::GroupNode.new(val[0], val[2], val[4], val[5])
1176
1197
  result
1177
1198
  end
1178
1199
  .,.,
1179
1200
 
1180
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 107
1201
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 102
1181
1202
  def _reduce_52( val, _values, result )
1182
- result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4]
1203
+ result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4])
1183
1204
  result
1184
1205
  end
1185
1206
  .,.,
1186
1207
 
1187
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
1208
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 104
1188
1209
  def _reduce_53( val, _values, result )
1189
- result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4], val[6]
1210
+ result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4], val[6])
1190
1211
  result
1191
1212
  end
1192
1213
  .,.,
@@ -1257,14 +1278,14 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
1257
1278
 
1258
1279
  # reduce 86 omitted
1259
1280
 
1260
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 114
1281
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
1261
1282
  def _reduce_87( val, _values, result )
1262
1283
  result = val
1263
1284
  result
1264
1285
  end
1265
1286
  .,.,
1266
1287
 
1267
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
1288
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 111
1268
1289
  def _reduce_88( val, _values, result )
1269
1290
  result << val[2]
1270
1291
  result
@@ -1273,51 +1294,51 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
1273
1294
 
1274
1295
  # reduce 89 omitted
1275
1296
 
1276
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 120
1297
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 115
1277
1298
  def _reduce_90( val, _values, result )
1278
1299
  result = [:default, val[2]]
1279
1300
  result
1280
1301
  end
1281
1302
  .,.,
1282
1303
 
1283
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 123
1304
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 118
1284
1305
  def _reduce_91( val, _values, result )
1285
- result = Protobuf::Node::ExtensionsNode.new val[2].unshift(val[1])
1306
+ result = Protobuf::Node::ExtensionsNode.new(val[2].unshift(val[1]))
1286
1307
  result
1287
1308
  end
1288
1309
  .,.,
1289
1310
 
1290
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 126
1311
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 121
1291
1312
  def _reduce_92( val, _values, result )
1292
1313
  result = []
1293
1314
  result
1294
1315
  end
1295
1316
  .,.,
1296
1317
 
1297
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 128
1318
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 123
1298
1319
  def _reduce_93( val, _values, result )
1299
1320
  result << val[1]
1300
1321
  result
1301
1322
  end
1302
1323
  .,.,
1303
1324
 
1304
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 131
1325
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 126
1305
1326
  def _reduce_94( val, _values, result )
1306
- result = Protobuf::Node::ExtensionRangeNode.new val[0]
1327
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0])
1307
1328
  result
1308
1329
  end
1309
1330
  .,.,
1310
1331
 
1311
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 133
1332
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 128
1312
1333
  def _reduce_95( val, _values, result )
1313
- result = Protobuf::Node::ExtensionRangeNode.new val[0], val[2]
1334
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0], val[2])
1314
1335
  result
1315
1336
  end
1316
1337
  .,.,
1317
1338
 
1318
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 135
1339
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 130
1319
1340
  def _reduce_96( val, _values, result )
1320
- result = Protobuf::Node::ExtensionRangeNode.new val[0], :max
1341
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0], :max)
1321
1342
  result
1322
1343
  end
1323
1344
  .,.,
@@ -1360,14 +1381,14 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 135
1360
1381
 
1361
1382
  # reduce 115 omitted
1362
1383
 
1363
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 146
1384
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 141
1364
1385
  def _reduce_116( val, _values, result )
1365
1386
  result = val[1].unshift(val[0])
1366
1387
  result
1367
1388
  end
1368
1389
  .,.,
1369
1390
 
1370
- module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 148
1391
+ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 143
1371
1392
  def _reduce_117( val, _values, result )
1372
1393
  result = val[1].unshift(val[0])
1373
1394
  result