carray 1.3.5 → 1.5.2

data/lib/carray/{base/serialize.rb → serialize.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/serialize.rb
+#  carray/serialize.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -33,7 +33,7 @@
 # offset 20 bytes
 #   data_type        : int32  : data type specifier
 #   bytes            : int32  : byte size of each data
-#   rank             : int32  : rank of array
+#   ndim             : int32  : ndim of array
 #   elements         : int32  : number of all elements
 #   has_mask         : int32  : 0 (not masked) or 1 (masked)
 # offset 40 bytes
@@ -54,13 +54,26 @@ class CArray::Serializer   # :nodoc:
     char_p    :endian,         :bytes=>4
     int32     :data_type
     int64     :bytes
-    int32     :rank
+    int32     :ndim
     int64     :elements
     int32     :has_mask
     array     :dim,            :type => CArray.int64(CA_RANK_MAX)
     int32     :has_attr
   }
 
+  Header_Legacy = CA.struct(:pack=>1, :size=>256) {
+    char_p    :magic_string,   :bytes=>8
+    char_p    :data_type_name, :bytes=>8
+    char_p    :endian,         :bytes=>4
+    int32     :data_type
+    int32     :bytes
+    int32     :ndim
+    int32     :elements
+    int32     :has_mask
+    array     :dim,            :type => CArray.int32(CA_RANK_MAX)
+    int32     :has_attr
+  }
+
   def initialize (io)
     case io
     when String
@@ -79,10 +92,10 @@ class CArray::Serializer   # :nodoc:
     header[:endian]         = ( endian == CA_LITTLE_ENDIAN ) ? "_LE_" : "_BE_"
     header[:data_type]      = ca.data_type
     header[:bytes]          = ca.bytes
-    header[:rank]           = ca.rank
+    header[:ndim]           = ca.ndim
     header[:elements]       = ca.elements
     header[:has_mask]       = ca.has_mask? ? 1 : 0
-    header[:dim][[0,ca.rank]] = ca.dim
+    header[:dim][[0,ca.ndim]] = ca.dim
     attr = nil
     if ca.attribute
       attr = ca.attribute.clone
@@ -114,8 +127,12 @@ class CArray::Serializer   # :nodoc:
     return ca
   end
   
-  def load (opt = {})
-    header = Header.decode(@io.read(256))
+  def load (opt = {}, legacy: false)
+    if legacy
+      header = Header_Legacy.decode(@io.read(256))
+    else
+      header = Header.decode(@io.read(256))
+    end
     if header[:magic_string] != "_CARRAY_"
       raise "not a CArray binary data"      
     end
@@ -130,10 +147,10 @@ class CArray::Serializer   # :nodoc:
     end
     data_type = header[:data_type]
     bytes     = header[:bytes]
-    rank      = header[:rank]
+    ndim      = header[:ndim]
     elements  = header[:elements]
     has_mask  = header[:has_mask] != 0 ? true : false
-    dim       = header[:dim][[0, rank]].to_a
+    dim       = header[:dim][[0, ndim]].to_a
     has_attr  = header[:has_attr]
     if data_type == 255
       data_type = header[:data_type_name].strip.to_sym
@@ -202,7 +219,8 @@ class CArray
 
   def marshal_dump ()
     if self.class != CArray and self.class != CScalar
-      raise TypeError, "can't dump a virtual or wrapped array."
+      return CArray.dump(self.to_ca)
+#      raise TypeError, "can't dump a virtual or wrapped array."
     end
     return CArray.dump(self)
   end
@@ -213,48 +231,5 @@ class CArray
     initialize_copy(ca)
   end
 
-  ### obsolete methods
-
-  def save_binary (filename, opt={})    # :nodoc: 
-    warn "CArray#save_binary will be obsolete, use CArray.save"
-    open(filename, "w") { |io|
-      return Serializer.new(io).save(self, opt)
-    }
-  end
-
-  def self.load_binary (filename, opt={})     # :nodoc: 
-    warn "CArray.load_binary will be obsolete, use CArray.load"
-    open(filename) { |io|
-      return Serializer.new(io).load(opt)
-    }
-  end
-
-  def save_binary_io (io, opt={})        # :nodoc:
-    warn "CArray#save_binary_io will be obsolete, use CArray.save"
-    return Serializer.new(io).save(self, opt) 
-  end
-
-  def self.load_binary_io (io, opt={})   # :nodoc:
-    warn "CArray#load_binary_io will be obsolete, use CArray.load"
-    return Serializer.new(io).load(opt)   
-  end 
-
-  def to_binary (io="", opt={})          # :nodoc:
-    warn "CArray#to_binary will be obsolete, use CArray.dump"
-    Serializer.new(io).save(self, opt) 
-    return io
-  end
-
-  def self.from_binary (io, opt={})      # :nodoc:
-    warn "CArray.from_binary will be obsolete, use CArray.load"
-    return Serializer.new(io).load(opt)   
-  end 
-
-  # depleted methods
-
-  def self.load_from_file (filename, data_type, dim, opt={}) # :nodoc:
-    raise "Sorry, CArray.load_from_file is depleted"
-  end
-
 end
 

data/lib/carray/string.rb

@@ -0,0 +1,190 @@
+# ----------------------------------------------------------------------------
+#
+#  carray/string.rb
+#
+#  This file is part of Ruby/CArray extension library.
+#  You can redistribute it and/or modify it under the terms of
+#  the Ruby Licence.
+#
+#  Copyright (C) 2005 Hiroki Motoyoshi
+#
+# ----------------------------------------------------------------------------
+
+require "date"
+
+class CArray
+
+  def str_len ()
+    return convert(:int, &:length)
+  end
+
+  def str_size ()
+    return convert(:int, &:size)
+  end
+
+  def str_bytesize ()
+    return convert(:int, &:bytesize)
+  end
+
+  def str_gsub (*args, &block)
+    return convert() {|s| s.gsub(*args, &block) }
+  end
+
+  def str_sub (*args, &block)
+    return convert() {|s| s.sub(*args, &block) }
+  end
+
+  def str_encode (*args)
+    return convert() {|s| s.encode(*args) }
+  end
+
+  def str_force_encoding (encoding)
+    return convert() {|s| s.force_encoding(encoding) }
+  end
+
+  def str_encoding ()
+    return convert(&:encoding)
+  end
+
+  def str_is_end_with (*args)
+    return test {|s| s.end_with?(*args) }
+  end
+
+  def str_is_start_with (*args)
+    return test {|s| s.start_with?(*args) }
+  end
+
+  def str_includes (substr)
+    return test {|s| s.include?(substr) }
+  end
+
+  alias str_contains str_includes
+
+  def str_index (*args)
+    return convert(:int) {|s| s.index(*args) }
+  end
+
+  def str_rindex (*args)
+    return convert(:int) {|s| s.rindex(*args) }
+  end
+
+  def str_intern ()
+    return convert(&:intern)
+  end
+
+  def str_scrub ()
+    return convert(&:scrub)
+  end
+
+  def str_downcase ()
+    return convert(&:downcase)
+  end
+
+  def str_upcase ()
+    return convert(&:upcase)
+  end
+
+  def str_capitalize ()
+    return convert(&:capitalize)
+  end
+
+  def str_swapcase ()
+    return convert(&:swapcase)
+  end
+
+  def str_chomp (*args)
+    return convert() {|s| s.chomp(*args) }
+  end
+
+  def str_chop ()
+    return convert(&:chop)
+  end
+
+  def str_chr ()
+    return convert(&:chr)
+  end
+
+  def str_clear ()
+    return convert(&:clear)
+  end
+
+  def str_count (*args)
+    return convert(:int) {|s| s.count(*args) }
+  end
+
+  def str_delete (*args)
+    return convert() {|s| s.delete(*args) }
+  end
+
+  def str_delete_prefix (prefix)
+    return convert() {|s| s.delete_prefix(prefix) }
+  end
+
+  def str_delete_suffix (suffix)
+    return convert() {|s| s.delete_suffix(suffix) }
+  end
+
+  def str_dump ()
+    return convert(&:dump)
+  end
+
+  def str_center (*args)
+    return convert() {|s| s.center(*args) }
+  end
+
+  def str_ljust (*args)
+    return convert() {|s| s.ljust(*args) }
+  end
+
+  def str_rjust (*args)
+    return convert() {|s| s.rjust(*args) }
+  end
+
+  def str_to_i ()
+    return convert(&:to_i)
+  end
+
+  def str_to_f ()
+    return convert(&:to_f)
+  end
+
+  def str_to_r ()
+    return convert(&:to_r)
+  end
+
+  def str_strip ()
+    return convert(&:strip)
+  end
+
+  def str_rstrip ()
+    return convert(&:rstrip)
+  end
+
+  def str_lstrip ()
+    return convert(&:lstrip)
+  end
+
+  def str_is_empty ()
+    return test(&:empty?)
+  end
+
+  def str_matches (*args)
+    if args.size == 1 && args.first.is_a?(Regexp)
+      regexp = args.first
+      return test {|v| v =~ regexp }
+    else
+      mask = template(:boolean) { false }
+      args.each do |str|
+        addr = search(str)
+        mask[addr] = true if addr
+      end
+      return mask
+    end
+  end
+  
+  def str_extract (regexp, replace = '\0')
+    return convert {|s| regexp.match(s) {|m| m[0].sub(regexp, replace) } || "" }
+  end
+    
+end
+

data/lib/carray/{base/struct.rb → struct.rb}

@@ -1,6 +1,6 @@
 # ----------------------------------------------------------------------------
 #
-#  carray/base/struct.rb
+#  carray/struct.rb
 #
 #  This file is part of Ruby/CArray extension library.
 #  You can redistribute it and/or modify it under the terms of
@@ -22,7 +22,7 @@
 # The implementation of other properties (cf. initialization, instance,
 # methods ...) are left free.
 #
-# CA::Struct and CA::Union are examples of such data class.
+# CAStruct and CAUnion are examples of such data class.
 #
 # option = {
 #   :pack => 1,   # nil for alignment, int for pack(n)
@@ -90,14 +90,14 @@ class CArray
 
 end
 
-class CA::Struct
+class CAStruct
 
   include Enumerable
 
   class << self
     
     def inspect
-      return name.empty? ? "AnonStruct" : name
+      return name.nil? ? "AnonStruct" : name
     end
     
     def [] (*argv)
@@ -264,10 +264,10 @@ class CA::Struct
 
 end
 
-class CA::Union < CA::Struct
+class CAUnion < CAStruct
   class << self
     def inspect
-      return name.empty? ? "AnonUnion" : name
+      return name.nil? ? "AnonUnion" : name
     end
   end
 end
@@ -275,11 +275,11 @@ end
 module CA
 
   def self.struct (opt={}, &block)
-    return Struct::Builder.new(:struct, opt).define(&block)
+    return CAStruct::Builder.new(:struct, opt).define(&block)
   end
 
   def self.union (opt={}, &block)
-    return Struct::Builder.new(:union, opt).define(&block)
+    return CAStruct::Builder.new(:union, opt).define(&block)
   end
 
 end
@@ -290,7 +290,7 @@ end
 #
 # ---------------------------------------------------------------------
 
-class CA::Struct::Builder  # :nodoc:
+class CAStruct::Builder  # :nodoc:
 
   class Member # :nodoc:
 
@@ -358,9 +358,9 @@ class CA::Struct::Builder  # :nodoc:
     # ---
     case @type
     when :struct
-      klass = Class.new(CA::Struct)
+      klass = Class.new(CAStruct)
     when :union
-      klass = Class.new(CA::Union)
+      klass = Class.new(CAUnion)
     end
     # ---
     if @align.nil?
@@ -477,7 +477,7 @@ class CA::Struct::Builder  # :nodoc:
     if block
       opt = {:pack => @align}.update(opt)
       st = self.class.new(:struct, opt).define(&block)
-    elsif opt[:type] and opt[:type] <= CA::Struct
+    elsif opt[:type] and opt[:type] <= CAStruct
       st = opt[:type]
     else
       raise "type is not given for struct member of struct"
@@ -494,7 +494,7 @@ class CA::Struct::Builder  # :nodoc:
     if block
       opt = {:pack => @align}.update(opt)
       st = self.class.new(:union, opt).define(&block)
-    elsif opt[:type] and opt[:type] <= CA::Struct
+    elsif opt[:type] and opt[:type] <= CAStruct
       st = opt[:type]
     else
       raise "type is not given for union member of struct"
@@ -556,14 +556,14 @@ end
 
 
 
-class CA::Struct
+class CAStruct
 
   def self.spec
     output = ""
     table  = self::MEMBER_TABLE
     stlist = []
-    if self.name.empty?
-      if self <= CA::Union
+    if self.name.nil?
+      if self <= CAUnion
         prefix = "union"
       else
         prefix = "struct"
@@ -573,7 +573,7 @@ class CA::Struct
     else
       output << sprintf("%s = ", self.name)
     end
-    if self < CA::Union
+    if self < CAUnion
       output << sprintf("CA.union(:size=>%i) {\n", self::DATA_SIZE)
     else
       output << sprintf("CA.struct(:size=>%i) {\n", self::DATA_SIZE)
@@ -582,10 +582,10 @@ class CA::Struct
       offset, type, option = *table[member]
       case type
       when Class
-        if type < CA::Struct
+        if type < CAStruct
           stlist << type
-          if type.name.empty?
-            if type <= CA::Union
+          if type.name.nil?
+            if type <= CAUnion
               prefix = "union"
             else
               prefix = "struct"