ruby_protobuf 0.3.2 → 0.3.3

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..id99e3ee3ee1', 'racc/parser.rb', 1
+self.class.module_eval <<'..end racc/parser.rb modeval..id521073ac1f', '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..id99e3ee3ee1
+..end racc/parser.rb modeval..id521073ac1f
 end
 ###### racc/parser.rb end
 
@@ -462,48 +462,67 @@ module Protobuf
 
   class ProtoParser < Racc::Parser
 
-module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id6c9ee64762', 'lib/protobuf/compiler/proto.y', 162
+module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/protobuf/compiler/proto.y', 163
+
+  require 'strscan'
 
   def parse(f)
-    @q = []
-    f.each do |line|
-      until line.empty? do
-        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)\b/
-          @q.push [$&, $&.to_sym]
-        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)]
-        when /\A0[0-7]+/
-          @q.push [:OCT_INTEGER, $&.to_i(0)]
-        when /\A\d+(\.\d+)?([Ee][\+-]?\d+)?/
-          @q.push [:FLOAT_LITERAL, $&.to_f]
-        when /\A(true|false)/
-          @q.push [:BOOLEAN_LITERAL, $& == 'true']
-        when /\A"(?:[^"\\]+|\\.)*"/, /\A'(?:[^'\\]+|\\.)*'/
-          @q.push [:STRING_LITERAL, eval($&)]
-        when /\A[a-zA-Z_][\w_]*/
-          @q.push [:IDENT, $&.to_sym]
-        when /\A[A-Z][\w_]*/
-          @q.push [:CAMEL_IDENT, $&.to_sym]
-        when /\A./
-          @q.push [$&, $&]
-        else
-          raise ArgumentError.new(line) 
-        end
-        line = $'
+    @scanner = StringScanner.new(f.read)
+    yyparse(self, :scan)
+  end
+
+  def scan_debug
+    scan do |token, value|
+      p [token, value]
+      yield [token, value]
+    end
+  end
+
+  def scan
+    until @scanner.eos?
+      case
+      when match(/\s+/, /\/\/.*/)
+        # skip
+      when match(/\/\*/)
+        # C-like comment
+        raise 'EOF inside block comment' until @scanner.scan_until(/\*\//)
+      when match(/(?: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/)
+        yield [@token, @token.to_sym]
+      when match(/[+-]?\d*\.\d+([Ee][\+-]?\d+)?/)
+        yield [:FLOAT_LITERAL, @token.to_f]
+      when match(/[+-]?[1-9]\d*(?!\.)/, /0(?![.xX0-9])/)
+        yield [:DEC_INTEGER, @token.to_i]
+      when match(/0[xX]([A-Fa-f0-9])+/)
+        yield [:HEX_INTEGER, @token.to_i(0)]
+      when match(/0[0-7]+/)
+        yield [:OCT_INTEGER, @token.to_i(0)]
+      when match(/(true|false)\b/)
+        yield [:BOOLEAN_LITERAL, @token == 'true']
+      when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
+        yield [:STRING_LITERAL, eval(@token)]
+      when match(/[a-zA-Z_][\w_]*/)
+        yield [:IDENT, @token.to_sym]
+      when match(/[A-Z][\w_]*/)
+        yield [:CAMEL_IDENT, @token.to_sym]
+      when match(/./)
+        yield [@token, @token]
+      else
+        raise "parse error around #{@scanner.string[@scanner.pos, 32].inspect}"
       end
     end
-    do_parse
+    yield [false, nil]
   end
 
-  def next_token
-    @q.shift
+  def match(*regular_expressions)
+    regular_expressions.each do |re|
+      if @scanner.scan(re)
+        @token = @scanner[0]
+        return true
+      end
+    end
+    false
   end
-..end lib/protobuf/compiler/proto.y modeval..id6c9ee64762
+..end lib/protobuf/compiler/proto.y modeval..id7865f341f1
 
 ##### racc 1.4.5 generates ###
 
@@ -562,16 +581,49 @@ racc_reduce_table = [
  6, 70, :_reduce_51,
  6, 69, :_reduce_52,
  9, 69, :_reduce_53,
- 1, 84, :_reduce_54,
- 3, 84, :_reduce_55,
- 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, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 84, :_reduce_none,
+ 1, 85, :_reduce_87,
+ 3, 85, :_reduce_88,
+ 1, 86, :_reduce_none,
+ 3, 86, :_reduce_90,
+ 4, 81, :_reduce_91,
+ 0, 88, :_reduce_92,
+ 2, 88, :_reduce_93,
+ 1, 87, :_reduce_94,
+ 3, 87, :_reduce_95,
+ 3, 87, :_reduce_96,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
@@ -591,8 +643,8 @@ racc_reduce_table = [
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
- 2, 66, :_reduce_83,
- 3, 66, :_reduce_84,
+ 2, 66, :_reduce_116,
+ 3, 66, :_reduce_117,
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
  1, 64, :_reduce_none,
@@ -602,117 +654,135 @@ racc_reduce_table = [
  1, 74, :_reduce_none,
  1, 74, :_reduce_none ]
 
-racc_reduce_n = 93
+racc_reduce_n = 126
 
-racc_shift_n = 151
+racc_shift_n = 184
 
 racc_action_table = [
-    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,
-   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,
-   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 ]
+    74,    51,    77,    19,    20,    74,    25,    77,    67,    60,
+    32,    47,    53,    63,    14,    14,    43,   107,    39,    68,
+    61,    38,    69,    50,    54,    56,   110,   170,   106,   109,
+    94,    96,    97,    98,    99,   100,   101,   103,   104,   105,
+   108,    93,    95,    72,    73,    75,    76,    78,    72,    73,
+    75,    76,    78,   123,   111,   131,   134,    43,   141,    48,
+   147,   116,    19,    20,   122,   126,   130,    19,    20,   140,
+   144,    75,    76,    78,   120,   124,   127,   129,   133,   136,
+   139,   143,   146,   115,   118,   119,   121,   125,   128,   132,
+   135,   138,   142,   145,   114,   117,    83,   167,   176,    75,
+    76,    78,    14,    25,    16,     1,   159,    85,     6,    75,
+    76,    78,    75,    76,    78,    19,    20,   166,    50,    54,
+    56,   177,    91,    35,   170,    75,    76,    78,    27,    34,
+     4,     7,   148,    11,    33,   150,    14,   151,    16,     1,
+   153,   154,     6,     9,     4,     7,   155,    11,   156,    43,
+    14,    40,    16,     1,   161,    30,     6,     9,    75,    76,
+    78,    29,    25,   165,    24,    40,   169,    23,   174,   175,
+    22,    43,    21,   180,    59,   182,   183 ]
 
 racc_action_check = [
-    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,   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,    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 ]
+    48,    42,    48,    58,    58,   175,   177,   175,    46,    45,
+    20,    36,    42,    45,    46,    45,    36,    58,    27,    46,
+    45,    26,    46,    42,    42,    42,    63,   177,    58,    58,
+    58,    58,    58,    58,    58,    58,    58,    58,    58,    58,
+    58,    58,    58,    48,    48,    48,    48,    48,   175,   175,
+   175,   175,   175,   102,    69,   102,   102,    37,   102,    37,
+   102,   102,   150,   150,   102,   102,   102,     1,     1,   102,
+   102,    91,    91,    91,   102,   102,   102,   102,   102,   102,
+   102,   102,   102,   102,   102,   102,   102,   102,   102,   102,
+   102,   102,   102,   102,   102,   102,    49,   163,   172,   110,
+   110,   110,    49,   166,    49,    49,   151,    49,    49,   154,
+   154,   154,   153,   153,   153,   174,   174,   163,    49,    49,
+    49,   172,    49,    23,   166,   151,   151,   151,    15,    22,
+    15,    15,   107,    15,    21,   111,    15,   112,    15,    15,
+   113,   137,    15,    15,     0,     0,   148,     0,   149,    44,
+     0,    29,     0,     0,   152,    18,     0,     0,   155,   155,
+   155,    16,    14,   158,    11,   164,   165,     9,   169,   170,
+     7,    31,     6,   176,    43,   178,   182 ]
 
 racc_action_pointer = [
-    84,    33,   nil,   nil,   nil,   nil,   134,   131,   nil,   126,
-   nil,   124,   nil,   nil,   123,    68,   121,   nil,   114,   nil,
-    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,   nil,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    63,   nil,   nil,   nil,   nil,   nil,    69,
+   142,    61,   nil,   nil,   nil,   nil,   166,   166,   nil,   161,
+   nil,   158,   nil,   nil,   156,   128,   155,   nil,   143,   nil,
+     4,   122,   127,   111,   nil,   nil,    19,    18,   nil,   139,
+   nil,   164,   nil,   nil,   nil,   nil,     9,    50,   nil,   nil,
+   nil,   nil,    -1,   168,   142,     7,     6,   nil,    -4,    94,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,   nil,
+   nil,   nil,   nil,    17,   nil,   nil,   nil,   nil,   nil,    48,
    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,   nil,   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,   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 ]
+   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    50,   nil,   nil,   nil,   nil,   111,   nil,   nil,
+    50,   118,   108,    94,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   132,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   137,   146,
+    56,    76,   152,    63,    60,   109,   nil,   nil,   145,   nil,
+   nil,   nil,   nil,    95,   153,   147,    97,   nil,   nil,   151,
+   160,   nil,    75,   nil,   109,     1,   171,     0,   157,   nil,
+   nil,   nil,   174,   nil ]
 
 racc_action_default = [
-   -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 ]
+  -126,  -126,    -3,    -4,   -10,    -5,  -126,  -126,    -6,  -126,
+    -7,  -126,    -8,    -9,  -126,  -126,  -126,    -1,  -126,   -13,
+  -126,  -126,  -126,  -126,   -13,   -13,  -126,  -126,    -2,  -126,
+   -19,  -116,   -13,   -25,   -11,   -32,  -126,  -126,   -15,   184,
+   -41,   -17,  -126,  -126,  -117,  -126,  -126,   -12,  -126,  -126,
+   -97,   -23,   -20,   -18,   -98,   -21,   -99,   -22,  -126,   -14,
+   -29,   -24,   -27,  -126,   -26,   -28,   -35,   -36,   -31,  -126,
+   -34,   -33,  -120,  -122,  -121,  -123,  -124,  -118,  -125,  -119,
+   -16,   -45,   -46,   -50,   -44,   -40,   -43,   -42,   -48,   -47,
+   -49,  -126,  -115,  -113,  -102,  -114,  -103,  -104,  -105,  -106,
+  -107,  -108,  -126,  -109,  -110,  -111,  -100,  -126,  -112,  -101,
+  -126,  -126,   -94,   -92,   -85,   -74,   -62,   -86,   -75,   -76,
+   -55,   -77,   -63,   -58,   -56,   -78,   -64,   -57,   -79,   -68,
+   -65,   -59,   -80,   -69,   -54,   -81,   -70,  -126,   -82,   -71,
+   -66,   -60,   -83,   -72,   -67,   -84,   -73,   -61,  -126,  -126,
+   -38,  -126,  -126,  -126,  -126,  -126,   -30,   -39,  -126,   -96,
+   -95,   -91,   -93,  -126,  -126,  -126,  -126,   -52,   -51,  -126,
+  -126,   -89,  -126,   -87,   -38,  -126,  -126,  -126,  -126,   -90,
+   -53,   -88,  -126,   -37 ]
 
 racc_goto_table = [
-    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,
+    41,    80,   112,    18,   158,   113,    31,    17,    57,   173,
+    55,    36,    37,    64,    42,    88,    26,    86,    45,    44,
+   181,   149,    28,    62,    70,    52,    65,    90,   178,    84,
+    46,    71,    66,    82,    49,    87,    89,   102,   137,   172,
+    81,    15,   152,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    92,   nil,   160,   nil,   112,   163,   164,   162,   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,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   146,   nil,   nil,   nil,   nil,
-   nil,   nil,   135 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   179,   nil,
+   nil,   nil,   nil,   nil,   nil,   168 ]
 
 racc_goto_check = [
-    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,
+    13,    12,    22,    14,    26,    35,    10,     2,    18,    34,
+    17,    10,    10,    20,    15,    18,    11,    17,    19,    10,
+    34,    22,     2,     8,     8,    16,    21,     8,    26,     5,
+    23,    24,    25,     4,    27,    28,    29,    31,    32,    33,
+     3,     1,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    14,   nil,    22,   nil,    22,    22,    22,    35,   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,   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,    12,   nil,
+   nil,   nil,   nil,   nil,   nil,    13 ]
 
 racc_goto_pointer = [
-   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 ]
+   nil,    41,     7,    -9,   -16,   -20,   nil,   nil,   -22,   nil,
+   -13,     2,   -47,   -29,     2,   -16,   -17,   -32,   -34,   -15,
+   -32,   -19,   -89,    -5,   -15,   -14,  -146,    -6,   -14,   -13,
+   nil,   -21,   -64,  -127,  -157,   -86,   -71 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     2,     3,     5,     8,    10,    12,    13,
-   nil,   139,   nil,   nil,   124,   nil,   nil,   nil,   nil,   nil,
+   nil,   171,   nil,   nil,   157,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    55,   nil,   nil,   nil,   nil,   nil ]
+    58,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -739,29 +809,29 @@ racc_token_table = {
  :CAMEL_IDENT => 21,
  "[" => 22,
  "]" => 23,
- "," => 24,
- "default" => 25,
- "extensions" => 26,
- "to" => 27,
- "max" => 28,
- "required" => 29,
- "optional" => 30,
- "repeated" => 31,
- "double" => 32,
- "float" => 33,
- "int32" => 34,
- "int64" => 35,
- "uint32" => 36,
- "uint64" => 37,
- "sint32" => 38,
- "sint64" => 39,
- "fixed32" => 40,
- "fixed64" => 41,
- "sfixed32" => 42,
- "sfixed64" => 43,
- "bool" => 44,
- "string" => 45,
- "bytes" => 46,
+ "required" => 24,
+ "optional" => 25,
+ "repeated" => 26,
+ "default" => 27,
+ "extensions" => 28,
+ "to" => 29,
+ "max" => 30,
+ "double" => 31,
+ "float" => 32,
+ "int32" => 33,
+ "int64" => 34,
+ "uint32" => 35,
+ "uint64" => 36,
+ "sint32" => 37,
+ "sint64" => 38,
+ "fixed32" => 39,
+ "fixed64" => 40,
+ "sfixed32" => 41,
+ "sfixed64" => 42,
+ "bool" => 43,
+ "string" => 44,
+ "bytes" => 45,
+ "," => 46,
  :FLOAT_LITERAL => 47,
  :BOOLEAN_LITERAL => 48,
  :DEC_INTEGER => 49,
@@ -813,14 +883,13 @@ Racc_token_to_s_table = [
 'CAMEL_IDENT',
 '"["',
 '"]"',
-'","',
+'"required"',
+'"optional"',
+'"repeated"',
 '"default"',
 '"extensions"',
 '"to"',
 '"max"',
-'"required"',
-'"optional"',
-'"repeated"',
 '"double"',
 '"float"',
 '"int32"',
@@ -836,6 +905,7 @@ Racc_token_to_s_table = [
 '"bool"',
 '"string"',
 '"bytes"',
+'","',
 'FLOAT_LITERAL',
 'BOOLEAN_LITERAL',
 'DEC_INTEGER',
@@ -873,6 +943,7 @@ Racc_token_to_s_table = [
 'extensions',
 'label',
 'type',
+'field_name',
 'field_option_list',
 'field_option',
 'extension',
@@ -884,14 +955,14 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 4
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 3
   def _reduce_1( val, _values, result )
  result = Protobuf::Node::ProtoNode.new val
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 6
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 5
   def _reduce_2( val, _values, result )
  result.children << val[1]
    result
@@ -914,70 +985,70 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 6
 
  # reduce 10 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 19
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 18
   def _reduce_11( val, _values, result )
  result = Protobuf::Node::ImportNode.new val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 22
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 21
   def _reduce_12( val, _values, result )
  result = Protobuf::Node::PackageNode.new val[2].unshift(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 25
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 24
   def _reduce_13( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 27
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 26
   def _reduce_14( val, _values, result )
  result << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 30
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 29
   def _reduce_15( val, _values, result )
  result = Protobuf::Node::OptionNode.new(*val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 33
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 32
   def _reduce_16( val, _values, result )
  result = [val[1].unshift(val[0]), val[3]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 36
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 35
   def _reduce_17( val, _values, result )
  result = Protobuf::Node::MessageNode.new val[1], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 39
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 38
   def _reduce_18( val, _values, result )
  result = Protobuf::Node::ExtendNode.new val[1], val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 42
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 41
   def _reduce_19( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 44
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 43
   def _reduce_20( val, _values, result )
  result << val[1]
    result
@@ -990,21 +1061,21 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 44
 
  # reduce 23 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 52
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 51
   def _reduce_24( val, _values, result )
  result = Protobuf::Node::EnumNode.new val[1], val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 55
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 54
   def _reduce_25( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 57
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 56
   def _reduce_26( val, _values, result )
  result << val[1]
    result
@@ -1017,28 +1088,28 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 57
 
  # reduce 29 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 65
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 64
   def _reduce_30( val, _values, result )
  result = Protobuf::Node::EnumFieldNode.new val[0], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 68
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 67
   def _reduce_31( val, _values, result )
  result = Protobuf::Node::ServiceNode.new val[1], val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 71
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 70
   def _reduce_32( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 73
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 72
   def _reduce_33( val, _values, result )
  result << val[1]
    result
@@ -1051,7 +1122,7 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 73
 
  # reduce 36 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 81
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 80
   def _reduce_37( val, _values, result )
  result = Protobuf::Node::RpcNode.new val[1], val[3], val[7]
    result
@@ -1062,21 +1133,21 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 81
 
  # reduce 39 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 87
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 86
   def _reduce_40( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 90
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 89
   def _reduce_41( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 92
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 91
   def _reduce_42( val, _values, result )
  result << val[1]
    result
@@ -1099,159 +1170,225 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 92
 
  # reduce 50 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 105
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 104
   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', 108
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 107
   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', 110
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
   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', 113
-  def _reduce_54( val, _values, result )
+ # reduce 54 omitted
+
+ # reduce 55 omitted
+
+ # reduce 56 omitted
+
+ # reduce 57 omitted
+
+ # reduce 58 omitted
+
+ # reduce 59 omitted
+
+ # reduce 60 omitted
+
+ # reduce 61 omitted
+
+ # reduce 62 omitted
+
+ # reduce 63 omitted
+
+ # reduce 64 omitted
+
+ # reduce 65 omitted
+
+ # reduce 66 omitted
+
+ # reduce 67 omitted
+
+ # reduce 68 omitted
+
+ # reduce 69 omitted
+
+ # reduce 70 omitted
+
+ # reduce 71 omitted
+
+ # reduce 72 omitted
+
+ # reduce 73 omitted
+
+ # reduce 74 omitted
+
+ # reduce 75 omitted
+
+ # reduce 76 omitted
+
+ # reduce 77 omitted
+
+ # reduce 78 omitted
+
+ # reduce 79 omitted
+
+ # reduce 80 omitted
+
+ # reduce 81 omitted
+
+ # reduce 82 omitted
+
+ # reduce 83 omitted
+
+ # reduce 84 omitted
+
+ # reduce 85 omitted
+
+ # reduce 86 omitted
+
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 114
+  def _reduce_87( val, _values, result )
  result = val
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 115
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
+  def _reduce_88( val, _values, result )
  result << val[2]
    result
   end
 .,.,
 
- # reduce 56 omitted
+ # reduce 89 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 119
-  def _reduce_57( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 120
+  def _reduce_90( val, _values, result )
  result = [:default, val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 122
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 123
+  def _reduce_91( val, _values, result )
  result = Protobuf::Node::ExtensionsNode.new val[2].unshift(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 125
-  def _reduce_59( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 126
+  def _reduce_92( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 127
-  def _reduce_60( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 128
+  def _reduce_93( val, _values, result )
  result << val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 130
-  def _reduce_61( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 131
+  def _reduce_94( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 132
-  def _reduce_62( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 133
+  def _reduce_95( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 134
-  def _reduce_63( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 135
+  def _reduce_96( val, _values, result )
  result = Protobuf::Node::ExtensionRangeNode.new val[0], :max
    result
   end
 .,.,
 
- # reduce 64 omitted
+ # reduce 97 omitted
 
- # reduce 65 omitted
+ # reduce 98 omitted
 
- # reduce 66 omitted
+ # reduce 99 omitted
 
- # reduce 67 omitted
+ # reduce 100 omitted
 
- # reduce 68 omitted
+ # reduce 101 omitted
 
- # reduce 69 omitted
+ # reduce 102 omitted
 
- # reduce 70 omitted
+ # reduce 103 omitted
 
- # reduce 71 omitted
+ # reduce 104 omitted
 
- # reduce 72 omitted
+ # reduce 105 omitted
 
- # reduce 73 omitted
+ # reduce 106 omitted
 
- # reduce 74 omitted
+ # reduce 107 omitted
 
- # reduce 75 omitted
+ # reduce 108 omitted
 
- # reduce 76 omitted
+ # reduce 109 omitted
 
- # reduce 77 omitted
+ # reduce 110 omitted
 
- # reduce 78 omitted
+ # reduce 111 omitted
 
- # reduce 79 omitted
+ # reduce 112 omitted
 
- # reduce 80 omitted
+ # reduce 113 omitted
 
- # reduce 81 omitted
+ # reduce 114 omitted
 
- # reduce 82 omitted
+ # reduce 115 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 145
-  def _reduce_83( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 146
+  def _reduce_116( val, _values, result )
  result = val[1].unshift(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 147
-  def _reduce_84( val, _values, result )
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 148
+  def _reduce_117( val, _values, result )
  result = val[1].unshift(val[0])
    result
   end
 .,.,
 
- # reduce 85 omitted
+ # reduce 118 omitted
 
- # reduce 86 omitted
+ # reduce 119 omitted
 
- # reduce 87 omitted
+ # reduce 120 omitted
 
- # reduce 88 omitted
+ # reduce 121 omitted
 
- # reduce 89 omitted
+ # reduce 122 omitted
 
- # reduce 90 omitted
+ # reduce 123 omitted
 
- # reduce 91 omitted
+ # reduce 124 omitted
 
- # reduce 92 omitted
+ # reduce 125 omitted
 
  def _reduce_none( val, _values, result )
   result