cauterize 0.0.1.pre10 → 0.0.1.pre11

data/lib/cauterize/version.rb

@@ -1,3 +1,3 @@
 module Cauterize
-  VERSION = "0.0.1.pre10"
+  VERSION = "0.0.1.pre11"
 end

data/support/ruby/src/cauterize_ruby_baseclasses.rb

@@ -1,11 +1,5 @@
 require 'stringio'
 
-def takeBytes!(num_bytes, str)
-  byte = str.slice!(0, num_bytes)
-  raise "Unexpected end of string" if byte == ""
-  byte
-end
-
 class CauterizeData
   def self.construct(x)
     if x.is_a? CauterizeData
@@ -27,21 +21,44 @@ class CauterizeBuiltin < CauterizeData
     raise "Out of range value" if not in_range(val)
     @val = val
   end
+end
+
+class CauterizeBuiltinInteger < CauterizeBuiltin
+  def initialize(val)
+    super(val.to_i)
+  end
+
   def to_i
-    return @val.to_i
+    val
+  end
+end
+
+class CauterizeBuiltinFloat < CauterizeBuiltin
+  def initialize(val)
+    super(val.to_f)
   end
+
   def to_f
-    return @val.to_f
+    val
+  end
+end
+
+class CauterizeBuiltinBool < CauterizeBuiltin
+  def initialize(val)
+    super((val)? true : false)
   end
 end
 
-class CauterizeScalar < CauterizeData
-  attr_reader :val
 
+class CauterizeScalar < CauterizeData
   def initialize(val)
     @val = self.class.builtin.construct val
   end
 
+  def val
+    @val.val
+  end
+
   def pack
     @val.pack
   end
@@ -51,8 +68,17 @@ class CauterizeScalar < CauterizeData
   end
 end
 
+class CauterizeArray < CauterizeData
+  def val
+    @elems.map{|e| e.val}
+  end
+
+  def to_s
+    val.to_a.pack("C*")
+  end
+end
 
-class CauterizeFixedArray < CauterizeData
+class CauterizeFixedArray < CauterizeArray
   attr_reader :elems
 
   def initialize(elems)
@@ -70,7 +96,7 @@ class CauterizeFixedArray < CauterizeData
 end
 
 
-class CauterizeVariableArray < CauterizeData
+class CauterizeVariableArray < CauterizeArray
   attr_reader :length
   attr_reader :elems
 
@@ -80,6 +106,10 @@ class CauterizeVariableArray < CauterizeData
     raise "Invalid length" if @elems.length > self.class.max_length
   end
 
+  def val
+    @elems.map{|e| e.val}
+  end
+
   def pack
     @length.pack + @elems.inject("") { |sum, n| sum + n.pack }
   end
@@ -104,6 +134,10 @@ class CauterizeComposite < CauterizeData
     end]
   end
 
+  def val
+    Hash[@fields.map{|name, value| [name, value.val]}]
+  end
+
   def pack
     @fields.values.inject("")  { |sum, v| sum + v.pack }
   end
@@ -134,6 +168,10 @@ class CauterizeEnumeration < CauterizeData
     @field_name = field_name
   end
 
+  def val
+    @field_name
+  end
+
   def val() self.class.fields[@field_name] end
 
   def pack
@@ -146,7 +184,7 @@ class CauterizeEnumeration < CauterizeData
   end
 
   def self.unpackio(str)
-    self.from_int(self.repr_type.unpackio(str))
+    self.from_int(self.repr_type.unpackio(str).to_i)
   end
 end
 
@@ -155,23 +193,37 @@ class CauterizeGroup < CauterizeData
   attr_reader :tag
   attr_reader :data
 
-  def to_tag_name(field_name)
-    (self.class.tag_prefix + field_name.to_s).to_sym
+  def val
+    if data.nil?
+      { tag: tag_field_name }
+    else
+      { tag: tag_field_name,
+        data: data.val }
+    end
+  end
+
+  def tag_field_name
+    self.class.from_tag_field_name(@tag.field_name)
+  end
+
+  def self.tag_from_field_name(field_name)
+    self.tag_type.construct((self.tag_prefix + field_name.to_s).to_sym)
   end
 
-  def self.from_field_name(tag_name)
+  def self.from_tag_field_name(tag_name)
     t = tag_name.to_s
     t.slice!(self.tag_prefix)
     t.to_sym
   end
   
-  def initialize(tag, data = nil)
-    @tag = self.class.tag_type.construct(to_tag_name(tag))
-    field_class = self.class.fields[self.class.from_field_name(@tag.field_name)]
+  def initialize(h)
+    @tag = self.class.tag_from_field_name(h[:tag])
+
+    field_class = self.class.fields[tag_field_name]
     if field_class.nil?
-      @data = data
+      @data = nil
     else
-      @data = field_class.construct(data)
+      @data = field_class.construct(h[:data])
     end
   end
 
@@ -185,12 +237,12 @@ class CauterizeGroup < CauterizeData
 
   def self.unpackio(str)
     tag = self.tag_type.unpackio(str)
-    field_name = self.from_field_name(tag.field_name)
-    data = self.fields[field_name]
-    if data.nil?
-      self.new(field_name)
+    field_name = self.from_tag_field_name(tag.field_name)
+    data_type = self.fields[field_name]
+    if data_type.nil?
+      self.new({ tag: field_name })
     else
-      self.new(field_name, data.unpackio(str))
+      self.new({ tag: field_name, data: data_type.unpackio(str) })
     end
   end
 end

data/support/ruby/src/cauterize_ruby_builtins.rb

@@ -1,6 +1,6 @@
 require_relative './cauterize_ruby_baseclasses'
 
-class UInt8 < CauterizeBuiltin
+class UInt8 < CauterizeBuiltinInteger
   def in_range(v) v >= 0 && v < 2**8 end
   def pack
     [val.to_i].pack("C")
@@ -10,7 +10,7 @@ class UInt8 < CauterizeBuiltin
   end
 end
 
-class UInt16 < CauterizeBuiltin
+class UInt16 < CauterizeBuiltinInteger
   def in_range(v) v >= 0 && v < 2**16 end
   def pack
     [val.to_i].pack("S")
@@ -20,7 +20,7 @@ class UInt16 < CauterizeBuiltin
   end
 end
 
-class UInt32 < CauterizeBuiltin
+class UInt32 < CauterizeBuiltinInteger
   def in_range(v) v >= 0 && v < 2**32 end
   def pack
     [val.to_i].pack("L")
@@ -30,7 +30,7 @@ class UInt32 < CauterizeBuiltin
   end
 end
 
-class UInt64 < CauterizeBuiltin
+class UInt64 < CauterizeBuiltinInteger
   def in_range(v) v >= 0 && v < 2**64 end
   def pack
     [val.to_i].pack("Q")
@@ -40,7 +40,7 @@ class UInt64 < CauterizeBuiltin
   end
 end
 
-class Int8 < CauterizeBuiltin
+class Int8 < CauterizeBuiltinInteger
   def in_range(v) (v >= -2**7) && (v < 2**7) end
   def pack
     [val.to_i].pack("c")
@@ -50,7 +50,7 @@ class Int8 < CauterizeBuiltin
   end
 end
 
-class Int16 < CauterizeBuiltin
+class Int16 < CauterizeBuiltinInteger
   def in_range(v) (v >= -2**15) && (v < 2**15) end
   def pack
     [val.to_i].pack("s")
@@ -60,7 +60,7 @@ class Int16 < CauterizeBuiltin
   end
 end
 
-class Int32 < CauterizeBuiltin
+class Int32 < CauterizeBuiltinInteger
   def in_range(v) (v >= -2**31) && (v < 2**31) end
   def pack
     [val.to_i].pack("l")
@@ -70,7 +70,7 @@ class Int32 < CauterizeBuiltin
   end
 end
 
-class Int64 < CauterizeBuiltin
+class Int64 < CauterizeBuiltinInteger
   def in_range(v) (v >= -2**63) && (v < 2**63) end
   def pack
     [val.to_i].pack("q")
@@ -80,7 +80,7 @@ class Int64 < CauterizeBuiltin
   end
 end
 
-class Bool < CauterizeBuiltin
+class Bool < CauterizeBuiltinBool
   def in_range(v) true end
   def pack
     if @val
@@ -98,7 +98,7 @@ class Bool < CauterizeBuiltin
   end
 end
 
-class Float32 < CauterizeBuiltin
+class Float32 < CauterizeBuiltinFloat
   def in_range(v) v > (-3.402823466e38) && v < (3.402823466e38) end
   def pack
     [val.to_f].pack("f")
@@ -108,7 +108,7 @@ class Float32 < CauterizeBuiltin
   end
 end
 
-class Float64 < CauterizeBuiltin
+class Float64 < CauterizeBuiltinFloat
   def in_range(v) true end
   def pack
     [val.to_f].pack("d")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cauterize
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre10
+  version: 0.0.1.pre11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -263,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3445789086503525251
+      hash: -3567501395549835058
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: