gogyou 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be64eff572c8de86fa028cf2b0a3f43ced61f7fc
-  data.tar.gz: 60ba38f8395e03b59c06053f915e255e151009ac
+  metadata.gz: c1f4c10b0e249b1b9897b5b1c317e0ef5e535830
+  data.tar.gz: c8ccad916b49f45e18d91bff8538cf1b7e5b6377
 SHA512:
-  metadata.gz: 1b23fd8023dc3210c51228f0849a92aa541d4621a11e5ee4d57086e30458ede76d4b733cbbed1183667f5a2874964632c902e12017a8121aa17a91370124e4e8
-  data.tar.gz: 08f775733ffe50d57ebbac3dc48c6bc2420dd112e8e6e5c8eb3bb3ae7dbaa7d91bb6fe607c2c1f38abbad56962bc9883f717fe132c1fafed942324a1220dd844
+  metadata.gz: b73dba83766abfce2f63ba2daad894fdf3b7560ed20bfa613d9d388aa707f053dac67f8133f6fe76002eb0958824d8b6cec23fc1a05b58228244d1ab0cfdb503
+  data.tar.gz: 93b5fb1d45270650ff47c10746ec94ddf0b44c59751b8f035af841902a0fc807f02e2c39820447ca9d055aeafa1abc4ee1ab78a9e2f72383e5d7db0a7e325fd1

data/lib/gogyou.rb

@@ -141,7 +141,7 @@
 #
 module Gogyou
   Gogyou = self
-  VERSION = Gem::Version.new("0.2")
+  VERSION = Gem::Version.new("0.2.1")
 
   require_relative "gogyou/typespec"
   require_relative "gogyou/mixin"

data/lib/gogyou/accessor.rb

@@ -148,6 +148,9 @@ module Gogyou
     def self.define_accessors(accessorclass, model)
       accessorclass.class_eval do
         namecheck = {}
+        fieldsize = model.fields.size
+        define_method(:size__GOGYOU__, -> { fieldsize })
+        alias_method(:size, :size__GOGYOU__)
         model.fields.each do |field|
           name = field.name
           #raise NameError, "wrong field name - #{name}" unless name =~ /\A[A-Za-z_][A-Za-z_0-9]*\Z/
@@ -267,13 +270,13 @@ module Gogyou
           bytesize = type.bytesize
 
           if model.bytesize == 0
-            check_index = ->(index) do
+            define_method(:check_index, ->(index) {
               index = index.to_i
               unless index >= 0 && index < self.size
                 raise IndexError, "out of element size (index #{index} for 0 ... #{self.size})", caller(2)
               end
               index
-            end
+            })
 
             define_method(:<<, ->(value) {
               raise TypeError, "immutable object (#<%s:0x%08X>)" % [self.class, __id__], caller(2) if frozen?
@@ -292,27 +295,31 @@ module Gogyou
               (buffer__GOGYOU__.bytesize - offset__GOGYOU__).align_floor(type.bytesize)
             })
           else
-            check_index = ->(index) do
-              index = index.to_i
-              unless index >= 0 && (elements.nil? || index < elements)
-                raise IndexError, "out of element size (index #{index} for 0 ... #{elements})", caller(2)
+            eval <<-EOS
+              def check_index(index)
+                index = index.to_i
+                unless index >= 0 && (#{elements.nil?} || index < #{elements})
+                  raise IndexError, "out of element size (index \#{index} for 0 ... #{elements})", caller
+                end
+                index
               end
-              index
-            end
 
-            eval <<-EOS
-              def bytesize
+              def size
                 #{elements}
               end
+
+              def bytesize
+                #{type.bytesize * elements}
+              end
             EOS
           end
 
           define_method(:to_s, -> {
-            buffer__GOGYOU__.byteslice(offset__GOGYOU__, bytesize)
+            buffer__GOGYOU__.byteslice(offset__GOGYOU__, self.bytesize)
           })
 
           define_method(:[], ->(index) {
-            v = type.aref(buffer__GOGYOU__, offset__GOGYOU__ + check_index.(index) * bytesize)
+            v = type.aref(buffer__GOGYOU__, offset__GOGYOU__ + check_index(index) * bytesize)
             v.infect_from(self, buffer) unless v.frozen?
             v.freeze if frozen? || buffer.frozen? || field.const?
             v
@@ -320,7 +327,7 @@ module Gogyou
 
           define_method(:[]=, ->(index, value) {
             raise TypeError, "immutable object (#<%s:0x%08X>)" % [self.class, __id__, index], caller(2) if frozen? or field.const?
-            type.aset(buffer__GOGYOU__, offset__GOGYOU__ + check_index.(index) * bytesize, value)
+            type.aset(buffer__GOGYOU__, offset__GOGYOU__ + check_index(index) * bytesize, value)
           })
         end
         klass

data/lib/gogyou/mixin.rb

@@ -7,7 +7,7 @@ module Gogyou
     module Object
       module Mixin
         def infect_from(*obj)
-          obj.each { |o| taint if o.tainted?; untrust if o.untrusted? }
+          obj.each { |o| taint if o.tainted? }
           self
         end
       end
@@ -136,7 +136,6 @@ module Gogyou
 
         def swapbyte(bytesize)
           num = 0
-          mask = 0xff
           bytesize.times do |i|
             num <<= 8
             num |= (self >> (i * 8)) & 0xff

data/spec/gogyou_spec.rb

@@ -117,15 +117,21 @@ end
 describe Gogyou::Accessor do
   it "fixed bytesize struct" do
     type = Gogyou.struct {
-      int32_t :a, :b, 2, 2
+      char :a, 16
+      int32_t :b
+      int8_t :c
     }
 
-    expect(type.bytesize).to eq 20
+    expect(type.bytesize).to eq 24
     expect(type.bytealign).to eq 4
     expect(type.extensible?).to eq false
 
-    obj = type.new
-    expect(obj.bytesize).to eq 20
+    obj = type.bind((?a .. ?z).to_a.join)
+    expect(obj.bytesize).to eq 24
+    expect(obj.size).to eq 3
+    expect(obj.a.bytesize).to eq 16
+    expect(obj.a[1]).to eq ?b.ord
+    expect(obj.a.to_s).to eq "abcdefghijklmnop"
   end
 
   it "extensibity struct" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogyou
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - dearblue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -57,8 +57,8 @@ extra_rdoc_files:
 - lib/gogyou/accessor.rb
 - lib/gogyou/mixin.rb
 - lib/gogyou/model.rb
-- lib/gogyou/typespec.rb
 - lib/gogyou/primitives.rb
+- lib/gogyou/typespec.rb
 files:
 - LICENSE.markdown
 - README.markdown