ruby_protobuf 0.3.0 → 0.3.2

data/History.txt

@@ -1,5 +1,7 @@
-=== 0.3.0 / 2008-08-19
+=== 0.3.2 / 2008-10-01
 
+* 0.3.2 fixed a lot of bugs. Thanks code.monkey.steve. (rev.177)
+* 0.3.1 fixed bugs concerning RPC (rev.146)
 * 0.3.0 RPC is available (rev.124)
   * RPC is available
   * New compiler using racc (ruby version of yacc)

data/bin/mk_parser

@@ -0,0 +1,2 @@
+#!/bin/sh
+racc -E lib/protobuf/compiler/proto.y -o lib/protobuf/compiler/proto_parser.rb

data/bin/rprotoc

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 $: << "#{File.dirname(__FILE__)}/../lib"
 require 'optparse'
 require 'ruby_protobuf'

data/lib/protobuf/compiler/compiler.rb

@@ -15,31 +15,31 @@ module Protobuf
     end
 
     def create_message(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      rb_file = "#{out_dir}/#{proto_file.sub(/\.proto$/, '.rb')}"
+      out_dir.sub! %r{/$}, ''
+      proto_dir.sub! %r{/$}, ''
+      rb_file = 
+        if proto_file =~ %r{^/} 
+        then "#{out_dir}/#{proto_file.split('/').last.sub(/\.proto$/, '.pb.rb')}"  
+        else "#{out_dir}/#{proto_file.sub(/\.proto$/, '.pb.rb')}" end
       proto_path = validate_existence proto_file, proto_dir
 
-      message_visitor = Protobuf::Visitor::CreateMessageVisitor.new proto_dir, out_dir
+      message_visitor = Protobuf::Visitor::CreateMessageVisitor.new proto_file, proto_dir, out_dir
       File.open proto_path, 'r' do |file|
         message_visitor.visit Protobuf::ProtoParser.new.parse(file)
       end
-      if file_create
-        puts "#{rb_file} writing..."
-        FileUtils.mkpath File.dirname(rb_file)
-        File.open(rb_file, 'w') {|f| f.write message_visitor.to_s}
-      else
-        message_visitor.to_s
-      end
+      message_visitor.create_files rb_file, out_dir, file_create
     end
 
     def create_rpc(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      rb_file = "#{out_dir}/#{proto_file.sub(/\.proto$/, '.rb')}"
+      message_file = "#{out_dir}/#{proto_file.sub(/\.proto$/, '.pb.rb')}"
+      out_dir = "#{out_dir}/#{File.dirname proto_file}"
       proto_path = validate_existence proto_file, proto_dir
 
-      rpc_visitor = Protobuf::Visitor::CreateRpcVisitor.new# proto_dir, out_dir
+      rpc_visitor = Protobuf::Visitor::CreateRpcVisitor.new
       File.open proto_path, 'r' do |file|
         rpc_visitor.visit Protobuf::ProtoParser.new.parse(file)
       end
-      rpc_visitor.create_files rb_file, out_dir, file_create
+      rpc_visitor.create_files message_file, out_dir, file_create
     end
 
     def validate_existence(path, base_dir)

data/lib/protobuf/compiler/nodes.rb

@@ -1,7 +1,19 @@
+require 'protobuf/descriptor/descriptor_proto'
+
 module Protobuf
   module Node
     class Base
-      def accept_rpc_creator(vistor)
+      def define_in_the_file(visitor)
+        visitor.write "defined_in __FILE__" if visitor.attach_proto?
+      end
+
+      def accept_message_visitor(visitor)
+      end
+
+      def accept_rpc_visitor(vistor)
+      end
+
+      def accept_descriptor_visitor(visitor)
       end
     end
   
@@ -12,19 +24,30 @@ module Protobuf
         @children = children
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
+        visitor.write '### Generated by rprotoc. DO NOT EDIT!'
+        visitor.write "### <proto file: #{visitor.proto_file}>" if visitor.attach_proto?
+        visitor.write visitor.commented_proto_contents if visitor.attach_proto?
         visitor.write <<-eos
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
 require 'protobuf/message/service'
 require 'protobuf/message/extend'
         eos
-        @children.map{|child| child.accept_message_creator visitor}
+        @children.map{|child| child.accept_message_visitor visitor}
         visitor.close_ruby
       end
 
-      def accept_rpc_creator(visitor)
-        @children.map{|child| child.accept_rpc_creator visitor}
+      def accept_rpc_visitor(visitor)
+        @children.map{|child| child.accept_rpc_visitor visitor}
+      end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::FileDescriptorProto.new :name => visitor.filename
+        visitor.file_descriptor = descriptor
+        visitor.in_context descriptor do
+          @children.map{|child| child.accept_descriptor_visitor visitor}
+        end
       end
     end
   
@@ -33,9 +56,13 @@ require 'protobuf/message/extend'
         @path = path
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "require '#{visitor.required_message_from_proto @path}'"
       end
+
+      def accept_descriptor_visitor(visitor)
+        visitor.current_descriptor.dependency << @path
+      end
     end
 
     class PackageNode < Base
@@ -43,16 +70,20 @@ require 'protobuf/message/extend'
         @path_list = path_list
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         @path_list.each do |path|
           visitor.write "module #{path.to_s.capitalize}"
           visitor.increment
         end
       end
 
-      def accept_rpc_creator(visitor)
+      def accept_rpc_visitor(visitor)
         visitor.package = @path_list.dup
       end
+
+      def accept_descriptor_visitor(visitor)
+        visitor.current_descriptor.package = @path_list.join '.'
+      end
     end
 
     class OptionNode < Base
@@ -60,9 +91,13 @@ require 'protobuf/message/extend'
         @name_list, @value = name_list, value
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "::Protobuf::OPTIONS[:#{@name_list.join('.').inspect}] = #{@value.inspect}"
       end
+
+      def accept_descriptor_visitor(visitor)
+        visitor.add_option @name_list.join('.'), @value
+      end
     end
 
     class MessageNode < Base
@@ -70,13 +105,22 @@ require 'protobuf/message/extend'
         @name, @children = name, children
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "class #{@name} < ::Protobuf::Message"
         visitor.in_context self.class do 
-          @children.each {|child| child.accept_message_creator visitor}
+          define_in_the_file visitor
+          @children.each {|child| child.accept_message_visitor visitor}
         end
         visitor.write "end"
       end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::DescriptorProto.new :name => @name.to_s
+        visitor.descriptor = descriptor
+        visitor.in_context descriptor do
+          @children.each {|child| child.accept_descriptor_visitor visitor}
+        end
+      end
     end
 
     class ExtendNode < Base
@@ -84,13 +128,18 @@ require 'protobuf/message/extend'
         @name, @children = name, children
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "class #{@name} < ::Protobuf::Message"
         visitor.in_context self.class do 
-          @children.each {|child| child.accept_message_creator visitor}
+          define_in_the_file visitor
+          @children.each {|child| child.accept_message_visitor visitor}
         end
         visitor.write "end"
       end
+
+      def accept_descriptor_visitor(visitor)
+        # TODO: how should i handle this?
+      end
     end
 
     class EnumNode < Base
@@ -98,13 +147,22 @@ require 'protobuf/message/extend'
         @name, @children = name, children
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "class #{@name} < ::Protobuf::Enum"
         visitor.in_context self.class do 
-          @children.each {|child| child.accept_message_creator visitor}
+          define_in_the_file visitor
+          @children.each {|child| child.accept_message_visitor visitor}
         end
         visitor.write "end"
       end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::EnumDescriptorProto.new :name => @name.to_s
+        visitor.enum_descriptor = descriptor
+        visitor.in_context descriptor do
+          @children.each {|child| child.accept_descriptor_visitor visitor}
+        end
+      end
     end
 
     class EnumFieldNode < Base
@@ -112,9 +170,14 @@ require 'protobuf/message/extend'
         @name, @value = name, value
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "#{@name} = #{@value}"
       end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::EnumValueDescriptorProto.new :name => @name.to_s, :number => @value
+        visitor.enum_value_descriptor = descriptor
+      end
     end
 
     class ServiceNode < Base
@@ -122,18 +185,21 @@ require 'protobuf/message/extend'
         @name, @children = name, children
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         # do nothing
-        #visitor.write "class #{@name} < ::Protobuf::Service"
-        #visitor.in_context self.class do 
-        #  @children.each {|child| child.accept_message_creator visitor}
-        #end
-        #visitor.write "end"
       end
 
-      def accept_rpc_creator(visitor)
+      def accept_rpc_visitor(visitor)
         visitor.current_service = @name
-        @children.each {|child| child.accept_rpc_creator visitor}
+        @children.each {|child| child.accept_rpc_visitor visitor}
+      end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::ServiceDescriptorProto.new :name => @name.to_s
+        visitor.service_descriptor = descriptor
+        visitor.in_context descriptor do 
+          @children.each {|child| child.accept_descriptor_visitor visitor}
+        end
       end
     end
 
@@ -142,14 +208,18 @@ require 'protobuf/message/extend'
         @name, @request, @response = name, request, response
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         # do nothing
-        #visitor.write "rpc :#{@name}, :request => :#{@request}, :response => :#{@response}"
       end
 
-      def accept_rpc_creator(visitor)
+      def accept_rpc_visitor(visitor)
         visitor.add_rpc @name, @request, @response
       end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::MethodDescriptorProto.new :name => @name.to_s, :input_type => @request.to_s, :output_type => @response.to_s
+        visitor.method_descriptor = descriptor
+      end
     end
 
     class GroupNode < Base
@@ -157,22 +227,45 @@ require 'protobuf/message/extend'
         @label, @name, @value, @children = label, name, value, children
       end
 
-      def accept_message_creator(visitor)
-        raise ArgumentError.new('have not implement')
+      def accept_message_visitor(visitor)
+        raise NotImplementedError.new
+      end
+
+      def accept_descriptor_visitor(visitor)
+        raise NotImplementedError.new
       end
     end
 
     class FieldNode < Base
-      def initialize(label, type, name, value, opts=[])
+      def initialize(label, type, name, value, opts={})
         @label, @type, @name, @value, @opts = label, type, name, value, opts
       end
 
-      def accept_message_creator(visitor)
-        opts = @opts.empty? ? '' : ", #{@opts.map{|k, v| ":#{k} => :#{v}"}.join(', ')}"
+      def accept_message_visitor(visitor)
+        opts = @opts.empty? ? '' : ", #{@opts.map{|k, v| ":#{k} => #{v.inspect}" }.join(', ')}"
         if visitor.context.first == Protobuf::Node::ExtendNode
           opts += ', :extension => true'
         end
-        visitor.write "#{@label} :#{@type}, :#{@name}, #{@value}#{opts}"
+        type = (Array === @type and 1 < @type.size) ?  "'#{@type.join '::'}'" : @type 
+        visitor.write "#{@label} :#{type}, :#{@name}, #{@value}#{opts}"
+      end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::FieldDescriptorProto.new :name => @name.to_s, :number => @value
+        descriptor.label = Google::Protobuf::FieldDescriptorProto::Label.const_get "LABEL_#{@label.to_s.upcase}"
+        descriptor.type = Google::Protobuf::FieldDescriptorProto::Type.const_get "TYPE_#{@type.to_s.upcase}" if predefined_type?
+        descriptor.type_name = @type.to_s
+        @opts.each do |key, val|
+          case key.to_sym
+          when :default
+            descriptor.default_value = val.to_s
+          end
+        end
+        visitor.field_descriptor = descriptor
+      end
+
+      def predefined_type?
+        %w{double float int64 uint64 int32 fixed64 fixed32 bool string group message bytes uint32 enum sfixed32 sfixed64 sint32 sint64}.include? @type.to_s
       end
     end
 
@@ -181,17 +274,29 @@ require 'protobuf/message/extend'
         @range = range
       end
 
-      def accept_message_creator(visitor)
+      def accept_message_visitor(visitor)
         visitor.write "extensions #{@range.to_s}"
       end
+
+      def accept_descriptor_visitor(visitor)
+        descriptor = Google::Protobuf::DescriptorProto::ExtensionRange.new :start => @range.first.low
+        case @range.first.high
+        when NilClass; # ignore
+        when :max;     descriptor.end = 1
+        else;          descriptor.end = @range.first.high
+        end
+        visitor.extension_range_descriptor = descriptor
+      end
     end
 
     class ExtensionRangeNode < Base
+      attr_reader :low, :high
+
       def initialize(low, high=nil)
         @low, @high = low, high
       end
 
-      #def accept_message_creator(visitor)
+      #def accept_message_visitor(visitor)
       #end
       
       def to_s

data/lib/protobuf/compiler/proto.y

@@ -28,7 +28,7 @@ rule
                    { result << val[2] }
 
   option : 'option' option_body ';'
-           { result = Protobuf::Node::OptionNode.new *val[1] }
+           { result = Protobuf::Node::OptionNode.new(*val[1]) }
 
   option_body : IDENT dot_ident_list '=' constant
                 { result = [val[1].unshift(val[0]), val[3]] }
@@ -78,9 +78,12 @@ rule
                | ';'
                  { }
 
-  rpc : 'rpc' IDENT '(' user_type ')' 'returns' '(' user_type ')' ';'
+  rpc : 'rpc' IDENT '(' rpc_arg ')' 'returns' '(' rpc_arg ')' ';'
         { result = Protobuf::Node::RpcNode.new val[1], val[3], val[7] }
 
+  rpc_arg :
+          | user_type
+
   message_body : '{' message_body_body_list '}'
                  { result = val[1] }
 
@@ -164,9 +167,9 @@ end
         case line
         when /\A\s+/, /\A\/\/.*/
           ;
-        when /\A(required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)/
+        when /\A(required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/
           @q.push [$&, $&.to_sym]
-        when /\A[1-9]\d*/, /\A0(?![.xX0-9])/
+        when /\A[1-9]\d*(?!\.)/, /\A0(?![.xX0-9])/
           @q.push [:DEC_INTEGER, $&.to_i]
         when /\A0[xX]([A-Fa-f0-9])+/
           @q.push [:HEX_INTEGER, $&.to_i(0)]

data/lib/protobuf/compiler/proto_parser.rb

@@ -10,7 +10,7 @@
 unless $".index 'racc/parser.rb'
 $".push 'racc/parser.rb'
 
-self.class.module_eval <<'..end racc/parser.rb modeval..id6f3c71ebec', 'racc/parser.rb', 1
+self.class.module_eval <<'..end racc/parser.rb modeval..id99e3ee3ee1', 'racc/parser.rb', 1
 #
 # $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
 #
@@ -453,7 +453,7 @@ module Racc
   end
 
 end
-..end racc/parser.rb modeval..id6f3c71ebec
+..end racc/parser.rb modeval..id99e3ee3ee1
 end
 ###### racc/parser.rb end
 
@@ -462,7 +462,7 @@ module Protobuf
 
   class ProtoParser < Racc::Parser
 
-module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idaefa6bf7e1', 'lib/protobuf/compiler/proto.y', 159
+module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id6c9ee64762', 'lib/protobuf/compiler/proto.y', 162
 
   def parse(f)
     @q = []
@@ -471,9 +471,9 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idaefa6bf7e1', 'lib/
         case line
         when /\A\s+/, /\A\/\/.*/
           ;
-        when /\A(required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)/
+        when /\A(required|optional|repeated|import|package|option|message|extend|enum|service|rpc|returns|group|default|extensions|to|max|double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\b/
           @q.push [$&, $&.to_sym]
-        when /\A[1-9]\d*/, /\A0(?![.xX0-9])/
+        when /\A[1-9]\d*(?!\.)/, /\A0(?![.xX0-9])/
           @q.push [:DEC_INTEGER, $&.to_i]
         when /\A0[xX]([A-Fa-f0-9])+/
           @q.push [:HEX_INTEGER, $&.to_i(0)]
@@ -503,7 +503,7 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idaefa6bf7e1', 'lib/
   def next_token
     @q.shift
   end
-..end lib/protobuf/compiler/proto.y modeval..idaefa6bf7e1
+..end lib/protobuf/compiler/proto.y modeval..id6c9ee64762
 
 ##### racc 1.4.5 generates ###
 
@@ -546,51 +546,53 @@ racc_reduce_table = [
  1, 76, :_reduce_none,
  1, 76, :_reduce_none,
  10, 77, :_reduce_37,
- 3, 65, :_reduce_38,
- 0, 78, :_reduce_39,
- 2, 78, :_reduce_40,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 1, 79, :_reduce_none,
- 6, 70, :_reduce_49,
- 6, 69, :_reduce_50,
- 9, 69, :_reduce_51,
- 1, 83, :_reduce_52,
- 3, 83, :_reduce_53,
- 1, 84, :_reduce_none,
+ 0, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 3, 65, :_reduce_40,
+ 0, 79, :_reduce_41,
+ 2, 79, :_reduce_42,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 1, 80, :_reduce_none,
+ 6, 70, :_reduce_51,
+ 6, 69, :_reduce_52,
+ 9, 69, :_reduce_53,
+ 1, 84, :_reduce_54,
  3, 84, :_reduce_55,
- 4, 80, :_reduce_56,
- 0, 86, :_reduce_57,
- 2, 86, :_reduce_58,
- 1, 85, :_reduce_59,
- 3, 85, :_reduce_60,
- 3, 85, :_reduce_61,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
- 1, 81, :_reduce_none,
+ 1, 85, :_reduce_none,
+ 3, 85, :_reduce_57,
+ 4, 81, :_reduce_58,
+ 0, 87, :_reduce_59,
+ 2, 87, :_reduce_60,
+ 1, 86, :_reduce_61,
+ 3, 86, :_reduce_62,
+ 3, 86, :_reduce_63,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 2, 66, :_reduce_81,
- 3, 66, :_reduce_82,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 2, 66, :_reduce_83,
+ 3, 66, :_reduce_84,
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
@@ -600,43 +602,43 @@ racc_reduce_table = [
  1, 74, :_reduce_none,
  1, 74, :_reduce_none ]
 
-racc_reduce_n = 91
+racc_reduce_n = 93
 
-racc_shift_n = 150
+racc_shift_n = 151
 
 racc_action_table = [
-    74,   125,    77,    47,    43,    74,    83,    77,    43,    50,
-    25,   133,    14,    25,    16,     1,    38,    86,     6,    43,
-    52,    48,    75,    76,    78,    19,    20,    19,    20,   136,
-    89,   132,   136,    56,    57,    58,    56,    57,    58,    19,
+    74,   126,    77,    47,    43,    74,    83,    77,    43,    50,
+    25,   134,    14,    25,    16,     1,    38,    85,     6,    43,
+    52,    48,    75,    76,    78,    19,    20,    19,    20,   137,
+    88,   133,   137,    56,    57,    58,    56,    57,    58,    19,
     20,   107,    35,    72,    73,    75,    76,    78,    72,    73,
     75,    76,    78,   109,    94,    96,    98,    99,   100,   101,
-   103,   104,   105,   106,   108,    93,    95,    97,    27,    34,
+   102,   104,   105,   106,   108,    93,    95,    97,    27,    34,
      4,     7,   110,    11,    67,   111,    14,    33,    16,     1,
     14,   114,     6,     9,   115,    68,     4,     7,    69,    11,
     19,    20,    14,    32,    16,     1,    60,   117,     6,     9,
     63,   118,    14,    75,    76,    78,   119,    61,    75,    76,
     78,    75,    76,    78,    75,    76,    78,    75,    76,    78,
-   142,   143,   121,   122,   123,    39,    30,    29,   128,    25,
-    24,   131,    23,    40,   135,    22,   140,   141,    40,    43,
-    21,   146,    59,   148,   149 ]
+   143,   144,   121,   122,   123,    39,    30,    29,   129,    25,
+    24,   132,    23,    40,   136,    22,   141,   142,    40,    43,
+    21,   147,    59,   149,   150 ]
 
 racc_action_check = [
-    48,   118,    48,    36,    31,   141,    49,   141,    36,    42,
-   132,   129,    49,   143,    49,    49,    26,    49,    49,    37,
-    42,    37,   118,   118,   118,   117,   117,    54,    54,   132,
-    49,   129,   143,    49,    49,    49,    42,    42,    42,     1,
-     1,    54,    23,    48,    48,    48,    48,    48,   141,   141,
-   141,   141,   141,    54,    54,    54,    54,    54,    54,    54,
-    54,    54,    54,    54,    54,    54,    54,    54,    15,    22,
+    48,   118,    48,    36,    31,   142,    49,   142,    36,    42,
+   133,   130,    49,   144,    49,    49,    26,    49,    49,    37,
+    42,    37,   118,   118,   118,   117,   117,    55,    55,   133,
+    49,   130,   144,    49,    49,    49,    42,    42,    42,     1,
+     1,    55,    23,    48,    48,    48,    48,    48,   142,   142,
+   142,   142,   142,    55,    55,    55,    55,    55,    55,    55,
+    55,    55,    55,    55,    55,    55,    55,    55,    15,    22,
     15,    15,    63,    15,    46,    69,    15,    21,    15,    15,
-    46,   102,    15,    15,   107,    46,     0,     0,    46,     0,
-   140,   140,     0,    20,     0,     0,    45,   111,     0,     0,
+    46,   103,    15,    15,   107,    46,     0,     0,    46,     0,
+   141,   141,     0,    20,     0,     0,    45,   111,     0,     0,
     45,   112,    45,   121,   121,   121,   113,    45,   119,   119,
-   119,    89,    89,    89,   110,   110,   110,   122,   122,   122,
-   137,   137,   114,   115,   116,    27,    18,    16,   120,    14,
-    11,   124,     9,   130,   131,     7,   135,   136,    29,    44,
-     6,   142,    43,   144,   148 ]
+   119,    88,    88,    88,   110,   110,   110,   122,   122,   122,
+   138,   138,   114,   115,   116,    27,    18,    16,   120,    14,
+    11,   125,     9,   131,   132,     7,   136,   137,    29,    44,
+     6,   143,    43,   145,   149 ]
 
 racc_action_pointer = [
     84,    33,   nil,   nil,   nil,   nil,   134,   131,   nil,   126,
@@ -644,77 +646,73 @@ racc_action_pointer = [
     87,    65,    67,    30,   nil,   nil,    14,   125,   nil,   126,
    nil,    -3,   nil,   nil,   nil,   nil,     1,    12,   nil,   nil,
    nil,   nil,     7,   136,   132,    94,    72,   nil,    -4,     4,
-   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,    63,   nil,   nil,   nil,   nil,   nil,    69,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    62,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    62,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    75,   nil,   nil,   nil,   nil,    63,   nil,   nil,
+   nil,   nil,   nil,    75,   nil,   nil,   nil,    63,   nil,   nil,
     65,    80,    74,    82,   113,   114,   122,    19,   -27,    59,
-   126,    54,    68,   nil,   113,   nil,   nil,   nil,   nil,     9,
-   121,   115,     4,   nil,   nil,   119,   128,    97,   nil,   nil,
-    84,     1,   139,     7,   125,   nil,   nil,   nil,   142,   nil ]
+   126,    54,    68,   nil,   nil,   113,   nil,   nil,   nil,   nil,
+     9,   121,   115,     4,   nil,   nil,   119,   128,    97,   nil,
+   nil,    84,     1,   139,     7,   125,   nil,   nil,   nil,   142,
+   nil ]
 
 racc_action_default = [
-   -91,   -91,    -3,    -4,   -10,    -5,   -91,   -91,    -6,   -91,
-    -7,   -91,    -8,    -9,   -91,   -91,   -91,    -1,   -91,   -13,
-   -91,   -91,   -91,   -91,   -13,   -13,   -91,   -91,    -2,   -91,
-   -19,   -81,   -13,   -25,   -11,   -32,   -91,   -91,   -15,   150,
-   -39,   -17,   -91,   -91,   -82,   -91,   -91,   -12,   -91,   -91,
-   -23,   -20,   -18,   -21,   -91,   -22,   -62,   -63,   -64,   -14,
-   -29,   -24,   -27,   -91,   -26,   -28,   -35,   -36,   -31,   -91,
-   -34,   -33,   -85,   -87,   -86,   -88,   -89,   -83,   -90,   -84,
-   -16,   -43,   -44,   -48,   -42,   -40,   -38,   -45,   -41,   -91,
-   -46,   -47,   -80,   -77,   -66,   -78,   -67,   -79,   -68,   -69,
-   -70,   -71,   -91,   -72,   -73,   -74,   -75,   -91,   -76,   -65,
-   -91,   -91,   -59,   -57,   -91,   -91,   -91,   -91,   -91,   -91,
-   -91,   -91,   -91,   -30,   -91,   -61,   -60,   -58,   -56,   -91,
-   -91,   -91,   -91,   -50,   -49,   -91,   -91,   -91,   -52,   -54,
-   -91,   -91,   -91,   -91,   -91,   -55,   -51,   -53,   -91,   -37 ]
+   -93,   -93,    -3,    -4,   -10,    -5,   -93,   -93,    -6,   -93,
+    -7,   -93,    -8,    -9,   -93,   -93,   -93,    -1,   -93,   -13,
+   -93,   -93,   -93,   -93,   -13,   -13,   -93,   -93,    -2,   -93,
+   -19,   -83,   -13,   -25,   -11,   -32,   -93,   -93,   -15,   151,
+   -41,   -17,   -93,   -93,   -84,   -93,   -93,   -12,   -93,   -93,
+   -23,   -20,   -18,   -21,   -22,   -93,   -64,   -65,   -66,   -14,
+   -29,   -24,   -27,   -93,   -26,   -28,   -35,   -36,   -31,   -93,
+   -34,   -33,   -87,   -89,   -88,   -90,   -91,   -85,   -92,   -86,
+   -16,   -45,   -46,   -50,   -44,   -40,   -43,   -42,   -93,   -48,
+   -47,   -49,   -82,   -79,   -68,   -80,   -69,   -81,   -70,   -71,
+   -72,   -73,   -74,   -93,   -75,   -76,   -77,   -93,   -78,   -67,
+   -93,   -93,   -61,   -59,   -93,   -93,   -93,   -38,   -93,   -93,
+   -93,   -93,   -93,   -30,   -39,   -93,   -63,   -62,   -60,   -58,
+   -93,   -93,   -93,   -93,   -52,   -51,   -93,   -93,   -93,   -56,
+   -54,   -38,   -93,   -93,   -93,   -93,   -57,   -53,   -55,   -93,
+   -37 ]
 
 racc_goto_table = [
-    18,    41,    80,   112,   113,    17,    31,   138,    53,    55,
-    45,    36,    37,    62,    70,    88,    90,    91,   147,    44,
-    28,    51,    26,    84,   116,    42,    64,    65,    82,    46,
-    71,    66,   126,   112,   127,   129,   130,    49,    85,    87,
-   102,   137,    81,    15,   120,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    92,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    41,    80,    18,   112,   113,   125,    17,    31,   140,    54,
+    53,    45,    36,    37,    62,    70,    89,    86,    91,   148,
+    44,    28,    42,    26,    51,   116,    64,    65,    84,   145,
+    46,    71,    66,   127,   112,   128,   130,   131,    82,    49,
+    87,    90,   103,   138,    81,    15,   120,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    92,   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,   145,   nil,   nil,   nil,   nil,
-   nil,   nil,   134,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   124,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   144 ]
+   nil,   nil,   nil,   nil,   nil,   146,   nil,   nil,   nil,   nil,
+   nil,   nil,   135 ]
 
 racc_goto_check = [
-    14,    13,    12,    22,    33,     2,    10,    32,    17,    18,
-    19,    10,    10,     8,     8,    17,    18,     8,    32,    10,
-     2,    16,    11,     5,    22,    15,    20,    21,     4,    23,
-    24,    25,    22,    22,    33,    22,    22,    26,    27,    28,
-    30,    31,     3,     1,    34,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+    13,    12,    14,    22,    34,    26,     2,    10,    33,    18,
+    17,    19,    10,    10,     8,     8,    18,    17,     8,    33,
+    10,     2,    15,    11,    16,    22,    20,    21,     5,    26,
+    23,    24,    25,    22,    22,    34,    22,    22,     4,    27,
+    28,    29,    31,    32,     3,     1,    35,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    14,   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,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,
-   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14 ]
+   nil,   nil,    13 ]
 
 racc_goto_pointer = [
-   nil,    43,     5,    -7,   -21,   -26,   nil,   nil,   -32,   nil,
-   -13,     8,   -46,   -28,    -1,    -5,   -21,   -34,   -33,   -23,
-   -19,   -18,   -86,    -6,   -16,   -15,    -3,   -11,   -10,   nil,
-   -14,   -91,  -125,   -85,   -69 ]
+   nil,    45,     6,    -5,   -11,   -21,   nil,   nil,   -31,   nil,
+   -12,     9,   -47,   -29,     1,    -8,   -18,   -32,   -33,   -22,
+   -19,   -18,   -85,    -5,   -15,   -14,  -112,    -1,    -9,    -8,
+   nil,   -13,   -90,  -125,   -84,   -67 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     2,     3,     5,     8,    10,    12,    13,
-   nil,   139,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    79,   nil,   nil,   nil,   nil,   nil,   nil,    54,
-   nil,   nil,   nil,   nil,   nil ]
+   nil,   139,   nil,   nil,   124,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    55,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -869,6 +867,7 @@ Racc_token_to_s_table = [
 'service_body_list',
 'service_body',
 'rpc',
+'rpc_arg',
 'message_body_body_list',
 'message_body_body',
 'extensions',
@@ -945,7 +944,7 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 27
 
 module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 30
   def _reduce_15( val, _values, result )
- result = Protobuf::Node::OptionNode.new *val[1]
+ result = Protobuf::Node::OptionNode.new(*val[1])
    result
   end
 .,.,
@@ -1059,31 +1058,31 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 81
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 84
-  def _reduce_38( val, _values, result )
+ # reduce 38 omitted
+
+ # reduce 39 omitted
+
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 87
+  def _reduce_40( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 87
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 90
+  def _reduce_41( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 89
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 92
+  def _reduce_42( val, _values, result )
  result << val[1]
    result
   end
 .,.,
 
- # reduce 41 omitted
-
- # reduce 42 omitted
-
  # reduce 43 omitted
 
  # reduce 44 omitted
@@ -1096,96 +1095,96 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 89
 
  # reduce 48 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 102
-  def _reduce_49( val, _values, result )
+ # reduce 49 omitted
+
+ # reduce 50 omitted
+
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 105
+  def _reduce_51( val, _values, result )
  result = Protobuf::Node::GroupNode.new val[0], val[2], val[4], val[5]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 105
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 108
+  def _reduce_52( val, _values, result )
  result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 107
-  def _reduce_51( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 110
+  def _reduce_53( val, _values, result )
  result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4], val[6]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 110
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 113
+  def _reduce_54( val, _values, result )
  result = val
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 112
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 115
+  def _reduce_55( val, _values, result )
  result << val[2]
    result
   end
 .,.,
 
- # reduce 54 omitted
+ # reduce 56 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 119
+  def _reduce_57( val, _values, result )
  result = [:default, val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 119
-  def _reduce_56( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 122
+  def _reduce_58( val, _values, result )
  result = Protobuf::Node::ExtensionsNode.new val[2].unshift(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 122
-  def _reduce_57( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 125
+  def _reduce_59( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 124
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 127
+  def _reduce_60( val, _values, result )
  result << val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 127
-  def _reduce_59( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 130
+  def _reduce_61( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 129
-  def _reduce_60( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 132
+  def _reduce_62( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 131
-  def _reduce_61( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 134
+  def _reduce_63( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0], :max
    result
   end
 .,.,
 
- # reduce 62 omitted
-
- # reduce 63 omitted
-
  # reduce 64 omitted
 
  # reduce 65 omitted
@@ -1220,24 +1219,24 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 131
 
  # reduce 80 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 142
-  def _reduce_81( val, _values, result )
+ # reduce 81 omitted
+
+ # reduce 82 omitted
+
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 145
+  def _reduce_83( val, _values, result )
  result = val[1].unshift(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 144
-  def _reduce_82( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 147
+  def _reduce_84( val, _values, result )
  result = val[1].unshift(val[0])
    result
   end
 .,.,
 
- # reduce 83 omitted
-
- # reduce 84 omitted
-
  # reduce 85 omitted
 
  # reduce 86 omitted
@@ -1250,6 +1249,10 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 144
 
  # reduce 90 omitted
 
+ # reduce 91 omitted
+
+ # reduce 92 omitted
+
  def _reduce_none( val, _values, result )
   result
  end