ruby_protobuf 0.4.5 → 0.4.6

data/History.txt

@@ -1,7 +1,14 @@
-=== 0.4.5 / 2010-07-17
+=== 0.4.6 / 2010-09-12
 
+* 0.4.6
+  * Implement Message#to_hash method.
+  * Accept String value for enum fields.
+  * Optimizations.
+  * Bug fixes.
+    * Ignore "syntax = ...." in .proto.
+    * Empty packed field.
 * 0.4.5
-  * Bug fix. (enum value)
+  * Bug fixes. (enum value, frozen string)
 * 0.4.4
   * Bug fix. (rprotoc)
 * 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/protobuf/common/wire_type.rb

@@ -6,5 +6,7 @@ module Protobuf
     START_GROUP      = 3
     END_GROUP        = 4
     FIXED32          = 5
+
+    PACKABLE_TYPES = [VARINT, FIXED64, FIXED32]
   end
 end

data/lib/protobuf/compiler/nodes.rb

@@ -317,5 +317,11 @@ require 'protobuf/message/extend'
         end
       end
     end
+
+    class SyntaxNode < Base
+      def initialize(syntax)
+        # do nothing
+      end
+    end
   end
 end

data/lib/protobuf/compiler/proto.y

@@ -12,6 +12,7 @@ rule
              | package
              | option
              | service
+             | syntax
              | ';'      { result = nil }
 
   import : 'import' STRING_LITERAL ';'
@@ -73,6 +74,8 @@ rule
                | rpc
                | ';'     { result = nil}
 
+  syntax : 'syntax' '=' STRING_LITERAL ';'  { result = Protobuf::Node::SyntaxNode.new(val[2]) }
+
   rpc : 'rpc' IDENT '(' rpc_arg ')' 'returns' '(' rpc_arg ')' ';'
         { result = Protobuf::Node::RpcNode.new(val[1], val[3], val[7]) }
 
@@ -104,7 +107,7 @@ rule
         | label type field_name '=' integer_literal '[' field_option_list ']' ';'
           { result = Protobuf::Node::FieldNode.new(val[0], val[1], val[2], val[4], val[6]) }
 
-  field_name : IDENT | "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"
+  field_name : IDENT | "required" | "optional" | "repeated" | "import" | "package" | "option" | "message" | "extend" | "enum" | "service" | "syntax" | "rpc" | "returns" | "group" | "default" | "extensions" | "to" | "max" | "double" | "float" | "int32" | "int64" | "uint32" | "uint64" | "sint32" | "sint64" | "fixed32" | "fixed64" | "sfixed32" | "sfixed64" | "bool" | "string" | "bytes"
 
   field_option_list : field_option
                       { result = val }
@@ -178,7 +181,7 @@ end
       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/)
+      when match(/(?:required|optional|repeated|import|package|option|message|extend|enum|service|syntax|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]