multiarray 0.2.4 → 0.4.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.2.4'
+PKG_VERSION = '0.4.0'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]
@@ -20,7 +20,10 @@ HOMEPAGE = %q{http://wedesoft.github.com/multiarray/}
 
 $SITELIBDIR = Config::CONFIG[ 'sitelibdir' ]
 
-task :default do
+task :default => :all
+
+desc 'Do nothing (default)'
+task :all do
 end
 
 desc 'Install Ruby extension'

data/lib/multiarray.rb

@@ -1,24 +1,11 @@
-require 'malloc'
-require 'multiarray/storage'
-require 'multiarray/list'
-require 'multiarray/memory'
-require 'multiarray/type'
-require 'multiarray/type_operation'
-require 'multiarray/descriptortype'
-require 'multiarray/object'
-require 'multiarray/int_'
-require 'multiarray/int'
-require 'multiarray/composite_type'
-require 'multiarray/sequence_'
-require 'multiarray/sequence'
-require 'multiarray/sequence_operation'
-require 'multiarray/multiarray'
-
-# @private
+# Proc#bind is defined if it does not exist already
 class Proc
 
-  # @private
   unless method_defined? :bind
+
+    # Proc#bind is defined if it does not exist already
+    #
+    # @private
     def bind( object )
       block, time = self, Time.now
       ( class << object; self end ).class_eval do
@@ -29,18 +16,56 @@ class Proc
         method
       end.bind object
     end
+
   end
 
 end
 
-# @private
+# Object#instance_exec is defined if it does not exist already
 class Object
 
-  # @private
   unless method_defined? :instance_exec
+
+    # Object#instance_exec is defined if it does not exist already
+    #
+    # @private
     def instance_exec( *arguments, &block )
       block.bind( self )[ *arguments ]
     end
+
   end
 
 end
+
+# Module#alias_method_chain is defined.
+#
+# @private
+class Module
+
+  unless method_defined? :alias_method_chain
+
+    # Method for creating alias chains.
+    #
+    # @private
+    def alias_method_chain( target, feature, vocalize = target )
+      alias_method "#{vocalize}_without_#{feature}", target
+      alias_method target, "#{vocalize}_with_#{feature}"
+    end
+
+  end
+
+end
+
+require 'malloc'
+require 'multiarray/lazy'
+require 'multiarray/list'
+require 'multiarray/malloc'
+require 'multiarray/type'
+require 'multiarray/object'
+require 'multiarray/int_'
+require 'multiarray/int'
+require 'multiarray/pointer_'
+require 'multiarray/pointer'
+require 'multiarray/sequence_'
+require 'multiarray/sequence'
+require 'multiarray/multiarray'

data/lib/multiarray/int.rb

@@ -28,7 +28,7 @@ module Hornetseye
   # @see INT_.signed
   def INT( bits, signed )
     retval = Class.new INT_
-    retval.bits   = bits
+    retval.bits = bits
     retval.signed = signed
     retval
   end

data/lib/multiarray/int_.rb

@@ -5,10 +5,25 @@ module Hornetseye
   # @see #INT
   #
   # @abstract
-  class INT_ < DescriptorType
+  class INT_ < Type
 
     class << self
 
+      # Get memory type for storing objects of this type
+      #
+      # @return [Class] Returns +Malloc+.
+      #
+      # @see Malloc
+      #
+      # @private
+      def memory
+        Malloc
+      end
+
+      def import( str )
+        new str.unpack( descriptor ).first
+      end
+
       # The number of bits of native integers represented by this class
       #
       # @return [Integer] Number of bits of native integer.
@@ -28,73 +43,36 @@ module Hornetseye
       # @private
       attr_accessor :signed
 
-      # Returns the type of storage object for storing values
-      #
-      # @return [Class] Returns +Memory+.
-      #
-      # @private
-      def storage
-        Memory
-      end
-
-      # Number of bytes for storing an object of this type
-      #
-      # @return [Integer] Number of bytes to store a native integer of this
-      # type.
-      #
-      # @private
-      def bytesize
-        ( bits + 7 ).div 8
-      end
-
-      # Default value for integers
-      #
-      # @return [Object] Returns +0+.
-      #
-      # @private
-      def default
-        0
-      end
-
       # Get string with information about this type
       #
       # @return [String] Information about this integer type.
       def to_s
-        case [ bits, signed ]
-        when [  8, true  ]
-          'BYTE'
-        when [  8, false ]
-          'UBYTE'
-        when [ 16, true  ]
-          'SINT'
-        when [ 16, false ]
-          'USINT'
-        when [ 32, true  ]
-          'INT'
-        when [ 32, false ]
-          'UINT'
-        when [ 64, true  ]
-          'LONG'
-        when [ 64, false ]
-          'ULONG'
+        if bits and signed != nil
+          case [ bits, signed ]
+          when [  8, true  ]
+            'BYTE'
+          when [  8, false ]
+            'UBYTE'
+          when [ 16, true  ]
+            'SINT'
+          when [ 16, false ]
+            'USINT'
+          when [ 32, true  ]
+            'INT'
+          when [ 32, false ]
+            'UINT'
+          when [ 64, true  ]
+            'LONG'
+          when [ 64, false ]
+            'ULONG'
+          else
+            "INT(#{bits.inspect},#{ signed ? 'SIGNED' : 'UNSIGNED' })"
+          end
         else
-          "INT(#{bits.to_s},#{ signed ? "SIGNED" : "UNSIGNED" })"
+          super
         end
       end
 
-      # Get string with information about this type
-      #
-      # @return [String] Information about this integer type.
-      def inspect
-        to_s
-      end
-
-      # Get descriptor for packing/unpacking native values
-      #
-      # @see DescriptorType.pack
-      # @see DescriptorType.unpack
-      #
-      # @private
       def descriptor
         case [ bits, signed ]
         when [  8, true  ]
@@ -118,6 +96,55 @@ module Hornetseye
         end
       end
 
+      # Get string with information about this type
+      #
+      # @return [String] Information about this integer type.
+      def inspect
+        to_s
+      end
+
+      # Default value for Ruby objects
+      #
+      # @return [Integer] Returns +0+.
+      #
+      # @private
+      def default
+        0
+      end
+
+      #def fetch( ptr )
+      #  new ptr.read( storage_size ).unpack( descriptor ).first
+      #end
+
+      def storage_size
+        ( bits + 7 ).div 8
+      end
+
+      def ==( other )
+        if other.is_a? Class
+          if other < INT_ and bits == other.bits and signed == other.signed
+            true
+          else
+            false
+          end
+        else
+          false
+        end
+      end
+
+      def hash
+        [ :INT_, bits, signed ].hash
+      end
+
+      def eql?( other )
+        self == other
+      end
+      
+    end
+
+    def store( ptr )
+      ptr.write [ @value ].pack( self.class.descriptor )
+      self
     end
 
   end

data/lib/multiarray/lazy.rb

@@ -0,0 +1,76 @@
+module Hornetseye
+
+  class Lazy
+
+    def initialize( *values )
+      options = values.last.is_a?( Hash ) ? values.pop : {}
+      @values = values
+      if options[ :action ]
+        @action = options[ :action ]
+      else
+        unless @values.size == 1
+          raise "#{@values.size} value(s) where specified without defining " +
+            ":action"
+        end
+        @action = proc { |*x| x.first }
+      end
+    end
+
+    def inspect
+      '<delayed>'
+    end
+
+    def force
+      @action.call *@values.collect { |value| value.force }
+    end
+
+    def fetch( type )
+      type.new Lazy.new( self, :action => proc { |x| x.fetch } )
+    end
+
+    def element( index )
+      elements = @values.collect { |value| value.element index }
+      Lazy.new( *( elements + [ :action => @action ] ) )
+    end
+
+    def -@
+      Lazy.new self, :action => proc { |x| -x }
+    end
+
+    def +@
+      self
+    end
+
+    def +( other )
+      Lazy.new self, other, :action => proc { |x,y| x + y }
+    end
+
+  end
+
+  def lazy
+    previous = Thread.current[ :lazy ]
+    Thread.current[ :lazy ] = true
+    begin
+      retval = yield
+    ensure
+      Thread.current[ :lazy ] = previous
+    end
+    retval
+  end
+
+  module_function :lazy
+
+  def eager
+    previous = Thread.current[ :lazy ]
+    Thread.current[ :lazy ] = false
+    begin
+      retval = yield
+    ensure
+      Thread.current[ :lazy ] = previous
+    end
+    retval
+  end
+
+  module_function :eager
+
+end

data/lib/multiarray/list.rb

@@ -1,99 +1,60 @@
 module Hornetseye
-
+  
   # Class for creating views on Ruby arrays
   #
-  # @see Storage
-  # @see Memory
   # @private
-  class List < Storage
-
-    class << self
-
-      # Create a +List+ object viewing a new Ruby array
-      #
-      # @param [Integer] size Number of elements the new Ruby array should
-      # have.
-      # @return [List] The new +List+ object.
-      #
-      # @private
-      def alloc( size )
-        new Array.new( size )
-      end
-
-      # Create a +List+ object viewing an existing Ruby array
-      #
-      # @param [Array<Object>] arr Existing Ruby array.
-      # @return [List] The new +List+ object.
-      #
-      # @private
-      def import( arr )
-        new arr
-      end
-
-    end
+  class List
 
-    # Offset of this view
+    # Create view on a Ruby array
+    #
+    # @param [Integer] n Number of elements of the view.
+    # @option options [Array<Object>] :array ([nil] * n) The Ruby array.
+    # @option options [Integer] :offset (0) Offset of the view.
     #
     # @private
-    attr_accessor :offset
+    def initialize( n, options = {} )
+      @array = options[ :array ] || [ nil ] * n
+      @offset = options[ :offset ] || 0
+    end
 
-    # Create zero-offset view on a Ruby array
+    # Display information about this object
     #
-    # @param [Array<Object>] arr A Ruby array.
+    # @return [String] A string with information about the size of this view.
+    def inspect
+      "List(#{@array.size - @offset})"
+    end
+
+    # Retrieve and map element from the array
     #
-    # @private
-    def initialize( arr )
-      super arr
-      @offset = 0
+    # @param [Class] type Native data type to create
+    # @return [Type] The mapped element.
+    def fetch( type )
+      type.new read
     end
 
     # Retrieve an element from the array
     #
-    # @param [Type] typecode This parameter is ignored.
     # @return [Object] The element from the array.
     #
-    # @see #store
-    # @see Memory#load
+    # @see #write
+    # @see Malloc#read
+    #
     # @private
-    def load( typecode )
-      @data[ @offset ]
+    def read
+      @array[ @offset ]
     end
 
     # Store an element in the array
     #
-    # @param [Type] typecode This parameter is ignored.
     # @param [Object] value The Ruby object to store.
     # @return [Object] Returns the parameter +value+.
     #
-    # @see #load
-    # @see Memory#store
-    # @private
-    def store( typecode, value )
-      @data[ @offset ] = value
-    end
-
-    # Store multiple elements in the array
-    #
-    # @param [Array<Object>] data A Ruby array with the new data.
-    # @return [Array<Object>] The parameter +data+.
-    #
-    # @see #export
-    # @see Memory#import
-    # @private
-    def import( data )
-      @data[ @offset ... @offset + data.size ] = data
-    end
-
-    # Retrieve multiple elements from the array
-    #
-    # @param [Integer] size Number of elements to retrieve
-    # @return [Array<Object>] A Ruby array with the elements.
+    # @see #read
+    # @see Malloc#write
     #
-    # @see #import
-    # @see Memory#export
     # @private
-    def export( size )
-      @data[ @offset ... @offset + size ]
+    def write( value )
+      @array[ @offset ] = value
     end
 
     # Create a new view with the specified offset
@@ -101,12 +62,10 @@ module Hornetseye
     # @param [Integer] offset A non-negative offset.
     # @return [List] A new view for the specified part of the array.
     #
-    # @see Memory#+
+    # @see Malloc#+
     # @private
     def +( offset )
-      retval = List.new @data
-      retval.offset = @offset + offset
-      retval
+      List.new 0, :array => @array, :offset => @offset + offset
     end
 
   end