ruby_protobuf 0.3.3 → 0.4.1

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..id521073ac1f', 'racc/parser.rb', 1
+self.class.module_eval <<'..end racc/parser.rb modeval..idd168e4f443', '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..id521073ac1f
+..end racc/parser.rb modeval..idd168e4f443
 end
 ###### racc/parser.rb end
 
@@ -462,7 +462,7 @@ module Protobuf
 
   class ProtoParser < Racc::Parser
 
-module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/protobuf/compiler/proto.y', 163
+module_eval <<'..end lib/protobuf/compiler/proto.y modeval..ida0eea88ba4', 'lib/protobuf/compiler/proto.y', 158
 
   require 'strscan'
 
@@ -500,10 +500,8 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/
         yield [:BOOLEAN_LITERAL, @token == 'true']
       when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
         yield [:STRING_LITERAL, eval(@token)]
-      when match(/[a-zA-Z_][\w_]*/)
+      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
@@ -522,111 +520,80 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..id7865f341f1', 'lib/
     end
     false
   end
-..end lib/protobuf/compiler/proto.y modeval..id7865f341f1
+..end lib/protobuf/compiler/proto.y modeval..ida0eea88ba4
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 53, :_reduce_1,
- 2, 53, :_reduce_2,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 3, 58, :_reduce_11,
- 4, 59, :_reduce_12,
- 0, 62, :_reduce_13,
- 3, 62, :_reduce_14,
- 3, 60, :_reduce_15,
- 4, 63, :_reduce_16,
- 3, 55, :_reduce_17,
- 5, 56, :_reduce_18,
- 0, 67, :_reduce_19,
- 2, 67, :_reduce_20,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 5, 57, :_reduce_24,
- 0, 71, :_reduce_25,
- 2, 71, :_reduce_26,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 1, 72, :_reduce_none,
- 4, 73, :_reduce_30,
- 5, 61, :_reduce_31,
- 0, 75, :_reduce_32,
- 2, 75, :_reduce_33,
- 1, 76, :_reduce_none,
- 1, 76, :_reduce_none,
- 1, 76, :_reduce_none,
- 10, 77, :_reduce_37,
- 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_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,
+ 1, 52, :_reduce_1,
+ 2, 52, :_reduce_2,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_none,
+ 1, 53, :_reduce_10,
+ 3, 57, :_reduce_11,
+ 4, 58, :_reduce_12,
+ 0, 61, :_reduce_13,
+ 3, 61, :_reduce_14,
+ 3, 59, :_reduce_15,
+ 4, 62, :_reduce_16,
+ 3, 54, :_reduce_17,
+ 5, 55, :_reduce_18,
+ 0, 66, :_reduce_19,
+ 2, 66, :_reduce_20,
+ 1, 67, :_reduce_none,
+ 1, 67, :_reduce_none,
+ 1, 67, :_reduce_23,
+ 5, 56, :_reduce_24,
+ 0, 70, :_reduce_25,
+ 2, 70, :_reduce_26,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_none,
+ 1, 71, :_reduce_29,
+ 4, 72, :_reduce_30,
+ 5, 60, :_reduce_31,
+ 0, 74, :_reduce_32,
+ 2, 74, :_reduce_33,
+ 1, 75, :_reduce_none,
+ 1, 75, :_reduce_none,
+ 1, 75, :_reduce_36,
+ 10, 76, :_reduce_37,
+ 0, 77, :_reduce_none,
+ 1, 77, :_reduce_none,
+ 3, 64, :_reduce_40,
+ 0, 78, :_reduce_41,
+ 2, 78, :_reduce_42,
+ 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_50,
+ 6, 69, :_reduce_51,
+ 6, 68, :_reduce_52,
+ 9, 68, :_reduce_53,
+ 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,
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
@@ -643,111 +610,142 @@ racc_reduce_table = [
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
- 2, 66, :_reduce_116,
- 3, 66, :_reduce_117,
- 1, 64, :_reduce_none,
- 1, 64, :_reduce_none,
- 1, 64, :_reduce_none,
- 1, 64, :_reduce_none,
- 1, 64, :_reduce_none,
- 1, 74, :_reduce_none,
- 1, 74, :_reduce_none,
- 1, 74, :_reduce_none ]
+ 1, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 84, :_reduce_87,
+ 3, 84, :_reduce_88,
+ 1, 85, :_reduce_none,
+ 3, 85, :_reduce_90,
+ 4, 80, :_reduce_91,
+ 0, 87, :_reduce_92,
+ 2, 87, :_reduce_93,
+ 1, 86, :_reduce_94,
+ 3, 86, :_reduce_95,
+ 3, 86, :_reduce_96,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_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,
+ 1, 82, :_reduce_none,
+ 2, 65, :_reduce_116,
+ 3, 65, :_reduce_117,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none,
+ 1, 73, :_reduce_none ]
 
 racc_reduce_n = 126
 
 racc_shift_n = 184
 
 racc_action_table = [
-    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 ]
+    75,   176,    78,    18,    19,    75,    25,    78,    27,    47,
+     4,     7,    32,    11,    42,    39,    13,   106,    16,     1,
+    18,    19,     6,     9,   177,    38,   170,   103,   105,   109,
+    93,    94,    95,    96,    97,    98,   100,   101,   102,   104,
+   108,    92,    72,    73,    74,    76,    77,    72,    73,    74,
+    76,    77,   123,   110,   131,   134,    66,   141,   111,   147,
+   116,    35,    13,   122,   127,   130,    34,    67,   140,   144,
+    69,   148,   118,   120,   124,   126,   129,   133,   137,   139,
+   143,   146,   115,   117,   119,   121,   125,   128,   132,   136,
+   138,   142,   145,   114,    83,   166,    18,    19,    25,    54,
+    13,    33,    16,     1,   159,    86,     6,    74,    76,    77,
+    56,    74,    76,    77,   167,    51,    53,    57,   170,    90,
+    51,    53,    57,    74,    76,    77,     4,     7,    42,    11,
+    48,   150,    13,   151,    16,     1,    60,   152,     6,     9,
+    64,   154,    13,    74,    76,    77,   155,    61,    74,    76,
+    77,    74,    76,    77,    18,    19,   156,    42,    40,    31,
+   162,    29,    25,   165,    24,    40,   169,    23,   174,   175,
+    22,    42,    21,   180,    50,   182,   183 ]
 
 racc_action_check = [
-    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 ]
+    48,   172,    48,    59,    59,   175,   177,   175,    14,    36,
+    14,    14,    20,    14,    36,    27,    14,    59,    14,    14,
+   150,   150,    14,    14,   172,    26,   177,    59,    59,    59,
+    59,    59,    59,    59,    59,    59,    59,    59,    59,    59,
+    59,    59,    48,    48,    48,    48,    48,   175,   175,   175,
+   175,   175,    99,    64,    99,    99,    46,    99,    69,    99,
+    99,    23,    46,    99,    99,    99,    22,    46,    99,    99,
+    46,   106,    99,    99,    99,    99,    99,    99,    99,    99,
+    99,    99,    99,    99,    99,    99,    99,    99,    99,    99,
+    99,    99,    99,    99,    49,   163,     1,     1,   167,    44,
+    49,    21,    49,    49,   151,    49,    49,   154,   154,   154,
+    44,   152,   152,   152,   163,    49,    49,    49,   167,    49,
+    44,    44,    44,   151,   151,   151,     0,     0,    37,     0,
+    37,   111,     0,   112,     0,     0,    45,   113,     0,     0,
+    45,   135,    45,    90,    90,    90,   148,    45,   110,   110,
+   110,   155,   155,   155,   174,   174,   149,    43,    29,    19,
+   153,    16,    13,   157,    11,   164,   165,     9,   169,   170,
+     7,    30,     6,   176,    42,   178,   182 ]
 
 racc_action_pointer = [
-   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,
+   124,    90,   nil,   nil,   nil,   nil,   166,   166,   nil,   161,
+   nil,   158,   nil,   156,     8,   nil,   155,   nil,   nil,   153,
+     0,    89,    64,    49,   nil,   nil,    23,    15,   nil,   146,
+   164,   nil,   nil,   nil,   nil,   nil,     7,   121,   nil,   nil,
+   nil,   nil,   168,   150,    97,   134,    54,   nil,    -4,    92,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,
+   nil,   nil,   nil,   nil,    44,   nil,   nil,   nil,   nil,    52,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   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,
+    95,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    49,
+   nil,   nil,   nil,   nil,   nil,   nil,    65,   nil,   nil,   nil,
+   100,   114,   105,    92,   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,   nil,   nil,   nil,   132,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   137,   154,
+    14,    75,    63,   158,    59,   103,   nil,   145,   nil,   nil,
+   nil,   nil,   nil,    93,   153,   147,   nil,    92,   nil,   151,
+   160,   nil,   -21,   nil,   148,     1,   171,     0,   157,   nil,
    nil,   nil,   174,   nil ]
 
 racc_action_default = [
-  -126,  -126,    -3,    -4,   -10,    -5,  -126,  -126,    -6,  -126,
-    -7,  -126,    -8,    -9,  -126,  -126,  -126,    -1,  -126,   -13,
+  -126,  -126,    -4,    -5,   -10,    -6,  -126,  -126,    -7,  -126,
+    -8,  -126,    -9,  -126,  -126,    -1,  -126,    -3,   -13,  -126,
   -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,
+  -116,   -13,   -19,   -25,   -11,   -32,  -126,  -126,   -15,   184,
+   -41,   -17,  -126,  -117,  -126,  -126,  -126,   -12,  -126,  -126,
+   -14,   -97,   -20,   -98,   -23,   -21,   -18,   -99,   -22,  -126,
+   -29,   -24,   -27,   -26,  -126,   -28,   -36,   -31,   -34,  -126,
+   -33,   -35,  -120,  -122,  -123,  -121,  -124,  -125,  -118,  -119,
+   -16,   -46,   -44,   -50,   -43,   -42,   -40,   -48,   -47,   -49,
+  -126,   -45,  -114,  -103,  -104,  -105,  -106,  -107,  -108,  -126,
+  -109,  -110,  -111,  -100,  -112,  -101,  -126,  -115,  -113,  -102,
+  -126,  -126,   -94,   -92,   -86,   -75,   -62,   -76,   -55,   -77,
+   -56,   -78,   -63,   -58,   -57,   -79,   -68,   -64,   -80,   -69,
+   -65,   -59,   -81,   -70,   -54,  -126,   -82,   -71,   -83,   -72,
+   -66,   -60,   -84,   -73,   -67,   -85,   -74,   -61,  -126,  -126,
+   -38,  -126,  -126,  -126,  -126,  -126,   -30,  -126,   -39,   -96,
+   -95,   -93,   -91,  -126,  -126,  -126,   -52,  -126,   -51,  -126,
   -126,   -89,  -126,   -87,   -38,  -126,  -126,  -126,  -126,   -90,
    -53,   -88,  -126,   -37 ]
 
 racc_goto_table = [
-    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,
+    41,    80,   112,   113,    20,   157,    15,   173,    30,    63,
+    44,    58,    26,    55,    36,    37,    87,   181,    84,    45,
+    28,    43,   149,    62,    68,    52,    65,    89,    82,   178,
+    46,    70,    71,    81,    49,    85,    88,    99,   135,   172,
+    91,    14,   153,   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,   107,   160,   112,   161,   163,   164,   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,
@@ -757,13 +755,13 @@ racc_goto_table = [
    nil,   nil,   nil,   nil,   nil,   168 ]
 
 racc_goto_check = [
-    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,
+    13,    12,    22,    35,    14,    26,     2,    34,    10,    20,
+    15,    18,    11,    17,    10,    10,    18,    34,    17,    19,
+     2,    10,    22,     8,     8,    16,    21,     8,     5,    26,
     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,    14,    22,    22,    35,    22,    22,   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,
@@ -773,16 +771,16 @@ racc_goto_check = [
    nil,   nil,   nil,   nil,   nil,    13 ]
 
 racc_goto_pointer = [
-   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 ]
+   nil,    41,     6,    -9,   -16,   -21,   nil,   nil,   -22,   nil,
+   -10,    -1,   -47,   -29,     3,   -22,   -19,   -31,   -33,   -14,
+   -36,   -19,   -88,    -5,   -15,   -14,  -145,    -6,   -14,   -13,
+   nil,   -22,   -61,  -128,  -160,   -87,   -71 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     2,     3,     5,     8,    10,    12,    13,
-   nil,   171,   nil,   nil,   157,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    17,     2,     3,     5,     8,    10,    12,
+   nil,   171,   nil,   nil,   158,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    58,   nil,   nil,   nil,   nil,   nil,   nil ]
+    59,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -806,41 +804,40 @@ racc_token_table = {
  ")" => 18,
  "returns" => 19,
  "group" => 20,
- :CAMEL_IDENT => 21,
- "[" => 22,
- "]" => 23,
- "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,
- :HEX_INTEGER => 50,
- :OCT_INTEGER => 51 }
+ "[" => 21,
+ "]" => 22,
+ "required" => 23,
+ "optional" => 24,
+ "repeated" => 25,
+ "default" => 26,
+ "extensions" => 27,
+ "to" => 28,
+ "max" => 29,
+ "double" => 30,
+ "float" => 31,
+ "int32" => 32,
+ "int64" => 33,
+ "uint32" => 34,
+ "uint64" => 35,
+ "sint32" => 36,
+ "sint64" => 37,
+ "fixed32" => 38,
+ "fixed64" => 39,
+ "sfixed32" => 40,
+ "sfixed64" => 41,
+ "bool" => 42,
+ "string" => 43,
+ "bytes" => 44,
+ "," => 45,
+ :FLOAT_LITERAL => 46,
+ :BOOLEAN_LITERAL => 47,
+ :DEC_INTEGER => 48,
+ :HEX_INTEGER => 49,
+ :OCT_INTEGER => 50 }
 
 racc_use_result_var = true
 
-racc_nt_base = 52
+racc_nt_base = 51
 
 Racc_arg = [
  racc_action_table,
@@ -880,7 +877,6 @@ Racc_token_to_s_table = [
 '")"',
 '"returns"',
 '"group"',
-'CAMEL_IDENT',
 '"["',
 '"]"',
 '"required"',
@@ -957,14 +953,14 @@ Racc_debug_parser = false
 
 module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 3
   def _reduce_1( val, _values, result )
- result = Protobuf::Node::ProtoNode.new val
+ result = Protobuf::Node::ProtoNode.new(val)
    result
   end
 .,.,
 
 module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 5
   def _reduce_2( val, _values, result )
- result.children << val[1]
+ result.children << val[1] if val[1]
    result
   end
 .,.,
@@ -983,74 +979,79 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 5
 
  # reduce 9 omitted
 
- # reduce 10 omitted
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 14
+  def _reduce_10( val, _values, result )
+ result = nil
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 18
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 17
   def _reduce_11( val, _values, result )
- result = Protobuf::Node::ImportNode.new val[1]
+ result = Protobuf::Node::ImportNode.new(val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 21
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 20
   def _reduce_12( val, _values, result )
- result = Protobuf::Node::PackageNode.new val[2].unshift(val[1])
+ result = Protobuf::Node::PackageNode.new(val[2].unshift(val[1]))
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 24
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 23
   def _reduce_13( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 26
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 25
   def _reduce_14( val, _values, result )
  result << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 29
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 28
   def _reduce_15( val, _values, result )
  result = Protobuf::Node::OptionNode.new(*val[1])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 32
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 31
   def _reduce_16( val, _values, result )
  result = [val[1].unshift(val[0]), val[3]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 35
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 34
   def _reduce_17( val, _values, result )
- result = Protobuf::Node::MessageNode.new val[1], val[2]
+ result = Protobuf::Node::MessageNode.new(val[1], val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 38
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 37
   def _reduce_18( val, _values, result )
- result = Protobuf::Node::ExtendNode.new val[1], val[3]
+ result = Protobuf::Node::ExtendNode.new(val[1], val[3])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 41
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 40
   def _reduce_19( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 43
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 42
   def _reduce_20( val, _values, result )
- result << val[1]
+ result << val[1] if val[1]
    result
   end
 .,.,
@@ -1059,25 +1060,30 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 43
 
  # reduce 22 omitted
 
- # reduce 23 omitted
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 46
+  def _reduce_23( val, _values, result )
+ result = nil
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 51
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 49
   def _reduce_24( val, _values, result )
- result = Protobuf::Node::EnumNode.new val[1], val[3]
+ result = Protobuf::Node::EnumNode.new(val[1], val[3])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 54
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 52
   def _reduce_25( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 56
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 54
   def _reduce_26( val, _values, result )
- result << val[1]
+ result << val[1] if val[1]
    result
   end
 .,.,
@@ -1086,32 +1092,37 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 56
 
  # reduce 28 omitted
 
- # reduce 29 omitted
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 58
+  def _reduce_29( val, _values, result )
+ result = nil
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 64
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 61
   def _reduce_30( val, _values, result )
- result = Protobuf::Node::EnumFieldNode.new val[0], val[2]
+ result = Protobuf::Node::EnumFieldNode.new(val[0], val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 67
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 64
   def _reduce_31( val, _values, result )
- result = Protobuf::Node::ServiceNode.new val[1], val[3]
+ result = Protobuf::Node::ServiceNode.new(val[1], val[3])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 70
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 67
   def _reduce_32( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 72
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 69
   def _reduce_33( val, _values, result )
- result << val[1]
+ result << val[1] if val[1]
    result
   end
 .,.,
@@ -1120,11 +1131,16 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 72
 
  # reduce 35 omitted
 
- # reduce 36 omitted
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 73
+  def _reduce_36( val, _values, result )
+ result = nil
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 80
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 76
   def _reduce_37( val, _values, result )
- result = Protobuf::Node::RpcNode.new val[1], val[3], val[7]
+ result = Protobuf::Node::RpcNode.new(val[1], val[3], val[7])
    result
   end
 .,.,
@@ -1133,23 +1149,23 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 80
 
  # reduce 39 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 86
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 82
   def _reduce_40( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 89
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 85
   def _reduce_41( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 91
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 87
   def _reduce_42( val, _values, result )
- result << val[1]
+ result << val[1] if val[1]
    result
   end
 .,.,
@@ -1168,25 +1184,30 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 91
 
  # reduce 49 omitted
 
- # reduce 50 omitted
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 96
+  def _reduce_50( val, _values, result )
+ result = nil
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 104
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 99
   def _reduce_51( val, _values, result )
- result = Protobuf::Node::GroupNode.new val[0], val[2], val[4], val[5]
+ result = Protobuf::Node::GroupNode.new(val[0], val[2], val[4], val[5])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 107
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 102
   def _reduce_52( val, _values, result )
- result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4]
+ result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 104
   def _reduce_53( val, _values, result )
- result = Protobuf::Node::FieldNode.new val[0], val[1], val[2], val[4], val[6]
+ result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4], val[6])
    result
   end
 .,.,
@@ -1257,14 +1278,14 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
 
  # reduce 86 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 114
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 109
   def _reduce_87( val, _values, result )
  result = val
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 111
   def _reduce_88( val, _values, result )
  result << val[2]
    result
@@ -1273,51 +1294,51 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 116
 
  # reduce 89 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 120
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 115
   def _reduce_90( val, _values, result )
  result = [:default, val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 123
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 118
   def _reduce_91( val, _values, result )
- result = Protobuf::Node::ExtensionsNode.new val[2].unshift(val[1])
+ result = Protobuf::Node::ExtensionsNode.new(val[2].unshift(val[1]))
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 126
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 121
   def _reduce_92( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 128
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 123
   def _reduce_93( val, _values, result )
  result << val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 131
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 126
   def _reduce_94( val, _values, result )
- result = Protobuf::Node::ExtensionRangeNode.new val[0]
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 133
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 128
   def _reduce_95( val, _values, result )
- result = Protobuf::Node::ExtensionRangeNode.new val[0], val[2]
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0], val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 135
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 130
   def _reduce_96( val, _values, result )
- result = Protobuf::Node::ExtensionRangeNode.new val[0], :max
+ result = Protobuf::Node::ExtensionRangeNode.new(val[0], :max)
    result
   end
 .,.,
@@ -1360,14 +1381,14 @@ module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 135
 
  # reduce 115 omitted
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 146
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 141
   def _reduce_116( val, _values, result )
  result = val[1].unshift(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 148
+module_eval <<'.,.,', 'lib/protobuf/compiler/proto.y', 143
   def _reduce_117( val, _values, result )
  result = val[1].unshift(val[0])
    result