webruby 0.2.7 → 0.9.1

data/modules/mruby/mrblib/enum.rb

@@ -23,23 +23,20 @@ module Enumerable
   #
   # ISO 15.3.2.2.1
   def all?(&block)
-    st = true
     if block
-      self.each{|val|
-        unless block.call(val)
-          st = false
-          break
+      self.each{|*val|
+        unless block.call(*val)
+          return false
         end
       }
     else
-      self.each{|val|
-        unless val
-          st = false
-          break
+      self.each{|*val|
+        unless val.__svalue
+          return false
         end
       }
     end
-    st
+    true
   end
 
   ##
@@ -51,23 +48,20 @@ module Enumerable
   #
   # ISO 15.3.2.2.2
   def any?(&block)
-    st = false
     if block
-      self.each{|val|
-        if block.call(val)
-          st = true
-          break
+      self.each{|*val|
+        if block.call(*val)
+          return true
         end
       }
     else
-      self.each{|val|
-        if val
-          st = true
-          break
+      self.each{|*val|
+        if val.__svalue
+          return true
         end
       }
     end
-    st
+    false
   end
 
   ##
@@ -78,9 +72,11 @@ module Enumerable
   #
   # ISO 15.3.2.2.3
   def collect(&block)
+    return to_enum :collect unless block
+
     ary = []
-    self.each{|val|
-      ary.push(block.call(val))
+    self.each{|*val|
+      ary.push(block.call(*val))
     }
     ary
   end
@@ -95,9 +91,9 @@ module Enumerable
   # ISO 15.3.2.2.4
   def detect(ifnone=nil, &block)
     ret = ifnone
-    self.each{|val|
-      if block.call(val)
-        ret = val
+    self.each{|*val|
+      if block.call(*val)
+        ret = val.__svalue
         break
       end
     }
@@ -112,9 +108,11 @@ module Enumerable
   #
   # ISO 15.3.2.2.5
   def each_with_index(&block)
+    return to_enum :each_with_index unless block
+
     i = 0
-    self.each{|val|
-      block.call(val, i)
+    self.each{|*val|
+      block.call(val.__svalue, i)
       i += 1
     }
     self
@@ -127,8 +125,9 @@ module Enumerable
   # ISO 15.3.2.2.6
   def entries
     ary = []
-    self.each{|val|
-      ary.push val
+    self.each{|*val|
+      # __svalue is an internal method
+      ary.push val.__svalue
     }
     ary
   end
@@ -147,9 +146,11 @@ module Enumerable
   #
   # ISO 15.3.2.2.8
   def find_all(&block)
+    return to_enum :find_all unless block
+
     ary = []
-    self.each{|val|
-      ary.push(val) if block.call(val)
+    self.each{|*val|
+      ary.push(val.__svalue) if block.call(*val)
     }
     ary
   end
@@ -164,9 +165,10 @@ module Enumerable
   # ISO 15.3.2.2.9
   def grep(pattern, &block)
     ary = []
-    self.each{|val|
-      if pattern === val
-        ary.push((block)? block.call(val): val)
+    self.each{|*val|
+      sv = val.__svalue
+      if pattern === sv
+        ary.push((block)? block.call(*val): sv)
       end
     }
     ary
@@ -180,14 +182,12 @@ module Enumerable
   #
   # ISO 15.3.2.2.10
   def include?(obj)
-    st = false
-    self.each{|val|
-      if val == obj
-        st = true
-        break
+    self.each{|*val|
+      if val.__svalue == obj
+        return true
       end
     }
-    st
+    false
   end
 
   ##
@@ -202,7 +202,7 @@ module Enumerable
     raise ArgumentError, "too many arguments" if args.size > 2
     if Symbol === args[-1]
       sym = args[-1]
-      block = ->(x,y){x.send(sym,y)}
+      block = ->(x,y){x.__send__(sym,y)}
       args.pop
     end
     if args.empty?
@@ -212,7 +212,8 @@ module Enumerable
       flag = false
       result = args[0]
     end
-    self.each{|val|
+    self.each{|*val|
+      val = val.__svalue
       if flag
         # push first element as initial
         flag = false
@@ -241,7 +242,8 @@ module Enumerable
   def max(&block)
     flag = true  # 1st element?
     result = nil
-    self.each{|val|
+    self.each{|*val|
+      val = val.__svalue
       if flag
         # 1st element
         result = val
@@ -267,7 +269,8 @@ module Enumerable
   def min(&block)
     flag = true  # 1st element?
     result = nil
-    self.each{|val|
+    self.each{|*val|
+      val = val.__svalue
       if flag
         # 1st element
         result = val
@@ -302,11 +305,11 @@ module Enumerable
   def partition(&block)
     ary_T = []
     ary_F = []
-    self.each{|val|
-      if block.call(val)
-        ary_T.push(val)
+    self.each{|*val|
+      if block.call(*val)
+        ary_T.push(val.__svalue)
       else
-        ary_F.push(val)
+        ary_F.push(val.__svalue)
       end
     }
     [ary_T, ary_F]
@@ -321,8 +324,8 @@ module Enumerable
   # ISO 15.3.2.2.17
   def reject(&block)
     ary = []
-    self.each{|val|
-      ary.push(val) unless block.call(val)
+    self.each{|*val|
+      ary.push(val.__svalue) unless block.call(*val)
     }
     ary
   end
@@ -383,8 +386,8 @@ module Enumerable
   # ISO 15.3.2.2.19
   def sort(&block)
     ary = []
-    self.each{|val| ary.push(val)}
-    unless ary.empty?
+    self.each{|*val| ary.push(val.__svalue)}
+    if ary.size > 1
       __sort_sub__(ary, ::Array.new(ary.size), 0, 0, ary.size - 1, &block)
     end
     ary
@@ -395,4 +398,13 @@ module Enumerable
   #
   # ISO 15.3.2.2.20
   alias to_a entries
+
+  # redefine #hash 15.3.1.3.15
+  def hash
+    h = 12347
+    self.each do |e|
+      h ^= e.hash
+    end
+    h
+  end
 end

data/modules/mruby/mrblib/error.rb

@@ -40,10 +40,6 @@ end
 class NameError < StandardError
   attr_accessor :name
 
-  def new(message="NameError", name=nil)
-    initialize(message, name)
-  end
-
   def initialize(message=nil, name=nil)
     @name = name
     super(message)
@@ -52,6 +48,12 @@ end
 
 # ISO 15.2.32
 class NoMethodError < NameError
+  attr_reader :args
+
+  def initialize(message=nil, name=nil, args=nil)
+    @args = args
+    super message, name
+  end
 end
 
 # ISO 15.2.33
@@ -64,3 +66,6 @@ end
 class NotImplementedError < ScriptError
 end
 
+class StopIteration < IndexError
+  attr_accessor :result
+end

data/modules/mruby/mrblib/hash.rb

@@ -3,6 +3,47 @@
 #
 # ISO 15.2.13
 class Hash
+  ##
+  #  Equality---Two hashes are equal if they each contain the same number
+  #  of keys and if each key-value pair is equal to (according to
+  #  <code>Object#==</code>) the corresponding elements in the other
+  #  hash.
+  #
+  # ISO 15.2.13.4.1
+  def == (hash)
+    return true if self.equal?(hash)
+    begin
+      hash = hash.to_hash
+    rescue NoMethodError
+      return false
+    end
+    return false if self.size != hash.size
+    self.each do |k,v|
+      return false unless hash.key?(k)
+      return false unless self[k] == hash[k]
+    end
+    return true
+  end
+
+  ##
+  # Returns <code>true</code> if <i>hash</i> and <i>other</i> are
+  # both hashes with the same content compared by eql?.
+  #
+  # ISO 15.2.13.4.32 (x)
+  def eql?(hash)
+    return true if self.equal?(hash)
+    begin
+      hash = hash.to_hash
+    rescue NoMethodError
+      return false
+    end
+    return false if self.size != hash.size
+    self.each do |k,v|
+      return false unless hash.key?(k)
+      return false unless self[k].eql?(hash[k])
+    end
+    return true
+  end
 
   ##
   # Delete the element with the key +key+.
@@ -43,7 +84,16 @@ class Hash
   #
   # ISO 15.2.13.4.9
   def each(&block)
-    self.keys.each{|k| block.call([k, self[k]])}
+    return to_enum :each unless block_given?
+
+    keys = self.keys
+    vals = self.values
+    len = self.size
+    i = 0
+    while i < len
+      block.call [keys[i], vals[i]]
+      i += 1
+    end
     self
   end
 
@@ -67,6 +117,8 @@ class Hash
   #
   # ISO 15.2.13.4.10
   def each_key(&block)
+    return to_enum :each_key unless block_given?
+
     self.keys.each{|k| block.call(k)}
     self
   end
@@ -91,17 +143,31 @@ class Hash
   #
   # ISO 15.2.13.4.11
   def each_value(&block)
+    return to_enum :each_value unless block_given?
+
     self.keys.each{|k| block.call(self[k])}
     self
   end
 
   ##
-  # Create a direct instance of the class Hash.
+  # Replaces the contents of <i>hsh</i> with the contents of other hash
   #
-  # ISO 15.2.13.4.16
-  def initialize(*args, &block)
-    self.__init_core(block, *args)
+  # ISO 15.2.13.4.23
+  def replace(hash)
+    self.clear
+    hash = hash.to_hash
+    hash.each_key{|k|
+      self[k] = hash[k]
+    }
+    if hash.default_proc
+      self.default_proc = hash.default_proc
+    else
+      self.default = hash.default
+    end
+    self
   end
+  # ISO 15.2.13.4.17
+  alias initialize_copy replace
 
   ##
   # Return a hash which contains the content of
@@ -113,7 +179,7 @@ class Hash
   # ISO 15.2.13.4.22
   def merge(other, &block)
     h = {}
-    raise "can't convert argument into Hash" unless other.respond_to?(:to_hash)
+    raise TypeError, "can't convert argument into Hash" unless other.respond_to?(:to_hash)
     other = other.to_hash
     self.each_key{|k| h[k] = self[k]}
     if block
@@ -126,12 +192,43 @@ class Hash
     h
   end
 
-  # 1.8/1.9 Hash#reject! returns Hash; ISO says nothing.
+  # internal method for Hash inspection
+  def _inspect
+    return "{}" if self.size == 0
+    "{"+self.map {|k,v|
+      k._inspect + "=>" + v._inspect
+    }.join(", ")+"}"
+  end
+  ##
+  # Return the contents of this hash as a string. 
+ #
+  # ISO 15.2.13.4.30 (x)
+  def inspect
+    begin
+      self._inspect
+    rescue SystemStackError
+      "{...}"
+    end
+  end
+  # ISO 15.2.13.4.31 (x)
+  alias to_s inspect
+
+  ##
+  #  call-seq:
+  #     hsh.reject! {| key, value | block }  -> hsh or nil
+  #     hsh.reject!                          -> an_enumerator
+  #
+  #  Equivalent to <code>Hash#delete_if</code>, but returns
+  #  <code>nil</code> if no changes were made.
+  #
+  #  1.8/1.9 Hash#reject! returns Hash; ISO says nothing.
+  #
   def reject!(&b)
+    return to_enum :reject! unless block_given?
+
     keys = []
-    self.each_key{|k|
-      v = self[k]
-      if b.call(k, v)
+    self.each{|k,v|
+      if b.call([k, v])
         keys.push(k)
       end
     }
@@ -142,24 +239,49 @@ class Hash
     self
   end
 
-  # 1.8/1.9 Hash#reject returns Hash; ISO says nothing.
+  ##
+  #  call-seq:
+  #     hsh.reject {|key, value| block}   -> a_hash
+  #     hsh.reject                        -> an_enumerator
+  #
+  #  Returns a new hash consisting of entries for which the block returns false.
+  #
+  #  If no block is given, an enumerator is returned instead.
+  #
+  #     h = { "a" => 100, "b" => 200, "c" => 300 }
+  #     h.reject {|k,v| k < "b"}  #=> {"b" => 200, "c" => 300}
+  #     h.reject {|k,v| v > 100}  #=> {"a" => 100}
+  #
+  #  1.8/1.9 Hash#reject returns Hash; ISO says nothing.
+  #
   def reject(&b)
+    return to_enum :reject unless block_given?
+
     h = {}
-    self.each_key{|k|
-      v = self[k]
-      unless b.call(k, v)
+    self.each{|k,v|
+      unless b.call([k, v])
         h[k] = v
       end
     }
     h
   end
 
-  # 1.9 Hash#select! returns Hash; ISO says nothing.
+  ##
+  #  call-seq:
+  #     hsh.select! {| key, value | block }  -> hsh or nil
+  #     hsh.select!                          -> an_enumerator
+  #
+  #  Equivalent to <code>Hash#keep_if</code>, but returns
+  #  <code>nil</code> if no changes were made.
+  #
+  #  1.9 Hash#select! returns Hash; ISO says nothing.
+  #
   def select!(&b)
+    return to_enum :select! unless block_given?
+
     keys = []
-    self.each_key{|k|
-      v = self[k]
-      unless b.call(k, v)
+    self.each{|k,v|
+      unless b.call([k, v])
         keys.push(k)
       end
     }
@@ -170,24 +292,43 @@ class Hash
     self
   end
 
-  # 1.9 Hash#select returns Hash; ISO says nothing.
+  ##
+  #  call-seq:
+  #     hsh.select {|key, value| block}   -> a_hash
+  #     hsh.select                        -> an_enumerator
+  #
+  #  Returns a new hash consisting of entries for which the block returns true.
+  #
+  #  If no block is given, an enumerator is returned instead.
+  #
+  #     h = { "a" => 100, "b" => 200, "c" => 300 }
+  #     h.select {|k,v| k > "a"}  #=> {"b" => 200, "c" => 300}
+  #     h.select {|k,v| v < 200}  #=> {"a" => 100}
+  #
+  #  1.9 Hash#select returns Hash; ISO says nothing
+  #
   def select(&b)
+    return to_enum :select unless block_given?
+
     h = {}
-    self.each_key{|k|
-      v = self[k]
-      if b.call(k, v)
+    self.each{|k,v|
+      if b.call([k, v])
         h[k] = v
       end
     }
     h
   end
+
+  def __update(h)
+    h.each_key{|k| self[k] = h[k]}
+    self
+  end
 end
 
 ##
 # Hash is enumerable
 #
 # ISO 15.2.13.3
-module Enumerable; end
 class Hash
   include Enumerable
 end

data/modules/mruby/mrblib/kernel.rb

@@ -4,43 +4,47 @@
 # ISO 15.3.1
 module Kernel
 
-  # 15.3.1.2.1
-  def self.`(s)
-    raise NotImplementedError.new("` not implemented")
-  end
-
+  # 15.3.1.2.1 Kernel.`
+  # provided by Kernel#`
   # 15.3.1.3.5
   def `(s)
-    Kernel.`(s)
+    raise NotImplementedError.new("backquotes not implemented")
   end
 
+  ##
+  # 15.3.1.2.3  Kernel.eval
+  # 15.3.1.3.12 Kernel#eval
+  # NotImplemented by mruby core; use mruby-eval gem
+
+  ##
+  # ISO 15.3.1.2.8 Kernel.loop
+  # provided by Kernel#loop
+
   ##
   # Calls the given block repetitively.
   #
-  # ISO 15.3.1.2.8
-  def self.loop #(&block)
+  # ISO 15.3.1.3.29
+  def loop
+    return to_enum :loop unless block_given?
+
     while(true)
       yield
     end
+  rescue StopIteration
+    nil
   end
 
-  # 15.3.1.2.3
-  def self.eval(s)
-    raise NotImplementedError.new("eval not implemented")
+  # 11.4.4 Step c)
+  def !~(y)
+    !(self =~ y)
   end
 
-  # 15.3.1.3.12
-  def eval(s)
-    Kernel.eval(s)
+  # internal method for inspect
+  def _inspect
+    self.inspect
   end
 
-  ##
-  # Alias for +Kernel.loop+.
-  #
-  # ISO 15.3.1.3.29
-  def loop #(&block)
-    while(true)
-      yield
-    end
+  def to_enum(*a)
+    raise NotImplementedError.new("fiber required for enumerator")
   end
 end

data/modules/mruby/mrblib/mrblib.rake

@@ -1,13 +1,13 @@
 MRuby.each_target do
-  current_dir = File.dirname(__FILE__).relative_path_from(Dir.pwd)
+  current_dir = File.dirname(__FILE__)
   relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
   current_build_dir = "#{build_dir}/#{relative_from_root}"
-  
+
   self.libmruby << objfile("#{current_build_dir}/mrblib")
 
   file objfile("#{current_build_dir}/mrblib") => "#{current_build_dir}/mrblib.c"
-  file "#{current_build_dir}/mrblib.c" => [mrbcfile] + Dir.glob("#{current_dir}/*.rb").sort do |t|
-    mrbc_, *rbfiles = t.prerequisites
+  file "#{current_build_dir}/mrblib.c" => [mrbcfile, __FILE__] + Dir.glob("#{current_dir}/*.rb").sort do |t|
+    _, _, *rbfiles = t.prerequisites
     FileUtils.mkdir_p File.dirname(t.name)
     open(t.name, 'w') do |f|
       _pp "GEN", "*.rb", "#{t.name.relative_path}"

data/modules/mruby/mrblib/numeric.rb

@@ -45,6 +45,8 @@ module Integral
   #
   # ISO 15.2.8.3.15
   def downto(num, &block)
+    return to_enum(:downto, num) unless block_given?
+
     i = self.to_i
     while(i >= num)
       block.call(i)
@@ -67,10 +69,12 @@ module Integral
   # Calls the given block +self+ times.
   #
   # ISO 15.2.8.3.22
-  def times(&block)
+  def times &block
+    return to_enum :times unless block_given?
+
     i = 0
-    while(i < self)
-      block.call(i)
+    while i < self
+      block.call i
       i += 1
     end
     self
@@ -82,6 +86,8 @@ module Integral
   #
   # ISO 15.2.8.3.27
   def upto(num, &block)
+    return to_enum(:upto, num) unless block_given?
+
     i = self.to_i
     while(i <= num)
       block.call(i)
@@ -95,10 +101,20 @@ module Integral
   # incremented by +step+ (default 1).
   #
   def step(num, step=1, &block)
+    raise ArgumentError, "step can't be 0" if step == 0
+    return to_enum(:step, num, step) unless block_given?
+
     i = if num.kind_of? Float then self.to_f else self end
-    while(i <= num)
-      block.call(i)
-      i += step
+    if step > 0
+      while(i <= num)
+        block.call(i)
+        i += step
+      end
+    else
+      while(i >= num)
+        block.call(i)
+        i += step
+      end
     end
     self
   end
@@ -161,7 +177,4 @@ class Float
     }
     n.to_i
   end
-
-  def divmod(other)
-  end
 end