Merge pull request #8 from rtecco/master

Fix compilation error for field options in Ruby 1.9
macks · May 21, 2011 · 7268223 · 7268223
2 parents c12fe26 + 2eb6f7a
commit 7268223
Show file tree

Hide file tree

Showing 2 changed files with 703 additions and 705 deletions.
diff --git a/lib/protobuf/compiler/proto.y b/lib/protobuf/compiler/proto.y
@@ -122,9 +122,10 @@ rule
                     | field_option_list ',' field_option
                       { result << val[2] }
 
-  field_option : option_body
-               | 'default' '=' constant
-                 { result = [:default, val[2]] }
+  field_option : 'default' '=' constant
+				 { result = [:default, val[2]] }
+				| IDENT '=' constant
+				 { result = [val[0], val[2]] }
 
   extensions : 'extensions' extension comma_extension_list ';'
                { result = Protobuf::Node::ExtensionsNode.new(val[2].unshift(val[1])) }