webruby 0.2.5 → 0.2.7

data/modules/mruby/src/proc.c

@@ -17,9 +17,16 @@ struct RProc *
 mrb_proc_new(mrb_state *mrb, mrb_irep *irep)
 {
   struct RProc *p;
+  mrb_callinfo *ci = mrb->c->ci;
 
   p = (struct RProc*)mrb_obj_alloc(mrb, MRB_TT_PROC, mrb->proc_class);
-  p->target_class = (mrb->c->ci) ? mrb->c->ci->target_class : 0;
+  p->target_class = 0;
+  if (ci) {
+    if (ci->proc)
+      p->target_class = ci->proc->target_class;
+    if (!p->target_class)
+      p->target_class = ci->target_class;
+  }
   p->body.irep = irep;
   p->env = 0;
   mrb_irep_incref(mrb, irep);

data/modules/mruby/src/range.c

@@ -176,7 +176,7 @@ r_le(mrb_state *mrb, mrb_value a, mrb_value b)
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
   /* output :a < b => -1, a = b =>  0, a > b => +1 */
 
-  if (mrb_type(r) == MRB_TT_FIXNUM) {
+  if (mrb_fixnum_p(r)) {
     mrb_int c = mrb_fixnum(r);
     if (c == 0 || c == -1) return TRUE;
   }
@@ -190,11 +190,7 @@ r_gt(mrb_state *mrb, mrb_value a, mrb_value b)
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b);
   /* output :a < b => -1, a = b =>  0, a > b => +1 */
 
-  if (mrb_type(r) == MRB_TT_FIXNUM) {
-    if (mrb_fixnum(r) == 1) return TRUE;
-  }
-
-  return FALSE;
+  return mrb_fixnum_p(r) && mrb_fixnum(r) == 1;
 }
 
 static mrb_bool
@@ -203,7 +199,7 @@ r_ge(mrb_state *mrb, mrb_value a, mrb_value b)
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
   /* output :a < b => -1, a = b =>  0, a > b => +1 */
 
-  if (mrb_type(r) == MRB_TT_FIXNUM) {
+  if (mrb_fixnum_p(r)) {
     mrb_int c = mrb_fixnum(r);
     if (c == 0 || c == 1) return TRUE;
   }

data/modules/mruby/src/state.c

@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mruby.h"
-#include "mruby/class.h"
 #include "mruby/irep.h"
 #include "mruby/variable.h"
 #include "mruby/debug.h"

data/modules/mruby/src/string.c

@@ -5,12 +5,7 @@
 */
 
 #include <ctype.h>
-#ifndef SIZE_MAX
- /* Some versions of VC++
-  * has SIZE_MAX in stdint.h
-  */
-# include <limits.h>
-#endif
+#include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -112,16 +107,6 @@ mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len)
   return str;
 }
 
-static inline void
-str_mod_check(mrb_state *mrb, mrb_value str, char *p, mrb_int len)
-{
-  struct RString *s = mrb_str_ptr(str);
-
-  if (s->ptr != p || s->len != len) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "string modified");
-  }
-}
-
 #define mrb_obj_alloc_string(mrb) ((struct RString*)mrb_obj_alloc((mrb), MRB_TT_STRING, (mrb)->string_class))
 
 /* char offset to byte offset */
@@ -1248,7 +1233,7 @@ mrb_str_include(mrb_state *mrb, mrb_value self)
   mrb_bool include_p;
 
   mrb_get_args(mrb, "o", &str2);
-  if (mrb_type(str2) == MRB_TT_FIXNUM) {
+  if (mrb_fixnum_p(str2)) {
     include_p = (memchr(RSTRING_PTR(self), mrb_fixnum(str2), RSTRING_LEN(self)) != NULL);
   }
   else {

data/modules/mruby/src/symbol.c

@@ -5,7 +5,6 @@
 */
 
 #include <ctype.h>
-#include <limits.h>
 #include <string.h>
 #include "mruby.h"
 #include "mruby/khash.h"

data/modules/mruby/src/variable.c

@@ -4,14 +4,12 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
 #include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"
-#include "mruby/variable.h"
-#include "error.h"
-#include <ctype.h>
 
 typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*);
 
@@ -756,7 +754,7 @@ mrb_cv_get(mrb_state *mrb, mrb_value mod, mrb_sym sym)
 }
 
 void
-mrb_mod_cv_set(mrb_state *mrb, struct RClass * c, mrb_sym sym, mrb_value v)
+mrb_mod_cv_set(mrb_state *mrb, struct RClass *c, mrb_sym sym, mrb_value v)
 {
   struct RClass * cls = c;
 
@@ -823,24 +821,7 @@ mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
   struct RClass *c = mrb->c->ci->proc->target_class;
 
   if (!c) c = mrb->c->ci->target_class;
-  while (c) {
-    if (c->iv) {
-      iv_tbl *t = c->iv;
-
-      if (iv_get(mrb, t, sym, NULL)) {
-        mrb_write_barrier(mrb, (struct RBasic*)c);
-        iv_put(mrb, t, sym, v);
-        return;
-      }
-    }
-    c = c->super;
-  }
-  c = mrb->c->ci->target_class;
-  if (!c->iv) {
-    c->iv = iv_new(mrb);
-  }
-  mrb_write_barrier(mrb, (struct RBasic*)c);
-  iv_put(mrb, c->iv, sym, v);
+  mrb_mod_cv_set(mrb, c, sym, v);
 }
 
 mrb_bool

data/modules/mruby/src/vm.c

@@ -4,7 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <string.h>
 #include <setjmp.h>
 #include <stddef.h>
 #include <stdarg.h>
@@ -13,7 +12,6 @@
 #include "mruby/class.h"
 #include "mruby/hash.h"
 #include "mruby/irep.h"
-#include "mruby/numeric.h"
 #include "mruby/proc.h"
 #include "mruby/range.h"
 #include "mruby/string.h"
@@ -231,6 +229,7 @@ cipush(mrb_state *mrb)
   ci->ridx = ridx;
   ci->env = 0;
   ci->pc = 0;
+  ci->err = 0;
 
   return ci;
 }
@@ -263,6 +262,8 @@ ecall(mrb_state *mrb, int i)
 
   p = mrb->c->ensure[i];
   if (!p) return;
+  if (mrb->c->ci->eidx > i)
+    mrb->c->ci->eidx = i;
   ci = cipush(mrb);
   ci->stackidx = mrb->c->stack - mrb->c->stbase;
   ci->mid = ci[-1].mid;
@@ -601,7 +602,6 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
     stack_init(mrb);
   }
   stack_extend(mrb, irep->nregs, stack_keep);
-  mrb->c->ci->err = pc;
   mrb->c->ci->proc = proc;
   mrb->c->ci->nregs = irep->nregs + 1;
   regs = mrb->c->stack;
@@ -852,13 +852,14 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
 
     CASE(OP_EPOP) {
       /* A      A.times{ensure_pop().call} */
-      int n;
       int a = GETARG_A(i);
+      mrb_callinfo *ci = mrb->c->ci;
+      int n, eidx = ci->eidx;
 
-      for (n=0; n<a; n++) {
-        ecall(mrb, --mrb->c->ci->eidx);
+      for (n=0; n<a && eidx > ci[-1].eidx; n++) {
+        ecall(mrb, --eidx);
+        ARENA_RESTORE(mrb, ai);
       }
-      ARENA_RESTORE(mrb, ai);
       NEXT;
     }
 
@@ -2130,7 +2131,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
           ecall(mrb, n);
         }
       }
-      mrb->c->ci->err = 0;
+      ERR_PC_CLR(mrb);
       mrb->jmp = prev_jmp;
       if (mrb->exc) {
         return mrb_obj_value(mrb->exc);

data/modules/mruby/tasks/mrbgem_spec.rake

@@ -149,7 +149,7 @@ module MRuby
         end
       end # generate_gem_init
 
-      def print_gem_init_header(f)
+      def print_gem_comment(f)
         f.puts %Q[/*]
         f.puts %Q[ * This file is loading the irep]
         f.puts %Q[ * Ruby GEM code.]
@@ -158,15 +158,23 @@ module MRuby
         f.puts %Q[ *   This file was generated!]
         f.puts %Q[ *   All manual changes will get lost.]
         f.puts %Q[ */]
+      end
+
+      def print_gem_init_header(f)
+        print_gem_comment(f)
+        f.puts %Q[#include <stdlib.h>] unless rbfiles.empty?
+        f.puts %Q[#include "mruby.h"]
+        f.puts %Q[#include "mruby/irep.h"] unless rbfiles.empty?
+      end
+
+      def print_gem_test_header(f)
+        print_gem_comment(f)
         f.puts %Q[#include <stdlib.h>]
         f.puts %Q[#include "mruby.h"]
+        f.puts %Q[#include "mruby/array.h"]
         f.puts %Q[#include "mruby/irep.h"]
-        f.puts %Q[#include "mruby/dump.h"]
         f.puts %Q[#include "mruby/string.h"]
-        f.puts %Q[#include "mruby/proc.h"]
         f.puts %Q[#include "mruby/variable.h"]
-        f.puts %Q[#include "mruby/array.h"]
-        f.puts %Q[#include "mruby/hash.h"]
       end
 
       def version_ok?(req_versions)

data/modules/mruby/tasks/mrbgems_test.rake

@@ -3,12 +3,12 @@ MRuby.each_target do
     test_rbobj = g.test_rbireps.ext(exts.object)
 
     file test_rbobj => g.test_rbireps
-    file g.test_rbireps => [g.test_rbfiles].flatten + [g.build.mrbcfile, libfile("#{build_dir}/lib/libmruby")] do |t|
+    file g.test_rbireps => [g.test_rbfiles].flatten + [g.build.mrbcfile] do |t|
       open(t.name, 'w') do |f|
-        g.print_gem_init_header(f)
+        g.print_gem_test_header(f)
         test_preload = [g.dir, MRUBY_ROOT].map {|dir|
           File.expand_path(g.test_preload, dir)
-        }.find {|file| File.exists?(file) }
+        }.find {|file| File.exist?(file) }
 
         g.build.mrbc.run f, test_preload, "gem_test_irep_#{g.funcname}_preload"
         g.test_rbfiles.flatten.each_with_index do |rbfile, i|

data/modules/mruby/tasks/mruby_build_commands.rake

@@ -106,7 +106,7 @@ module MRuby
     private
     def get_dependencies(file)
       file = file.ext('d') unless File.extname(file) == '.d'
-      if File.exists?(file)
+      if File.exist?(file)
         File.read(file).gsub("\\\n ", "").scan(/^\S+:\s+(.+)$/).flatten.map {|s| s.split(' ') }.flatten
       else
         []
@@ -265,7 +265,7 @@ module MRuby
       # if mrbc execution fail, drop the file
       unless $?.exitstatus
         File.delete(out.path)
-        exit -1
+        exit(-1)
       end
     end
   end

data/modules/mruby/tasks/mruby_build_gem.rake

@@ -2,7 +2,7 @@ module MRuby
   module LoadGems
     def gembox(gemboxfile)
       gembox = File.expand_path("#{gemboxfile}.gembox", "#{MRUBY_ROOT}/mrbgems")
-      fail "Can't find gembox '#{gembox}'" unless File.exists?(gembox)
+      fail "Can't find gembox '#{gembox}'" unless File.exist?(gembox)
 
       GemBox.config = self
       GemBox.path = gembox
@@ -25,7 +25,7 @@ module MRuby
 
       gemrake = File.join(gemdir, "mrbgem.rake")
 
-      fail "Can't find #{gemrake}" unless File.exists?(gemrake)
+      fail "Can't find #{gemrake}" unless File.exist?(gemrake)
       Gem.current = nil
       load gemrake
       return nil unless Gem.current
@@ -50,7 +50,7 @@ module MRuby
         url = params[:git]
         gemdir = "#{gem_clone_dir}/#{url.match(/([-\w]+)(\.[-\w]+|)$/).to_a[1]}"
 
-        if File.exists?(gemdir)
+        if File.exist?(gemdir)
           if $pull_gems
             git.run_pull gemdir, url
           else

data/modules/mruby/test/init_mrbtest.c

@@ -1,9 +1,6 @@
 #include <stdlib.h>
 #include "mruby.h"
 #include "mruby/irep.h"
-#include "mruby/dump.h"
-#include "mruby/string.h"
-#include "mruby/proc.h"
 
 extern const uint8_t mrbtest_irep[];
 

data/modules/mruby/test/t/array.rb

@@ -46,6 +46,9 @@ assert('Array#[]', '15.2.12.5.4') do
   end
 
   assert_equal(2, [1,2,3].[](1))
+  assert_equal(nil, [1,2,3].[](4))
+  assert_equal(3, [1,2,3].[](-1))
+  assert_equal(nil, [1,2,3].[](-4))
 end
 
 assert('Array#[]=', '15.2.12.5.5') do
@@ -81,8 +84,14 @@ end
 
 assert('Array#delete_at', '15.2.12.5.9') do
   a = [1,2,3]
-  a.delete_at(1)
+  assert_equal(2, a.delete_at(1))
   assert_equal([1,3], a)
+  assert_equal(nil, a.delete_at(3))
+  assert_equal([1,3], a)
+  assert_equal(nil, a.delete_at(-3))
+  assert_equal([1,3], a)
+  assert_equal(3, a.delete_at(-1))
+  assert_equal([1], a)
 end
 
 assert('Array#each', '15.2.12.5.10') do
@@ -129,6 +138,7 @@ assert('Array#index', '15.2.12.5.14') do
   a = [1,2,3]
 
   assert_equal(1, a.index(2))
+  assert_equal(nil, a.index(0))
 end
 
 assert('Array#initialize', '15.2.12.5.15') do
@@ -225,6 +235,7 @@ assert('Array#rindex', '15.2.12.5.26') do
   a = [1,2,3]
 
   assert_equal(1, a.rindex(2))
+  assert_equal(nil, a.rindex(0))
 end
 
 assert('Array#shift', '15.2.12.5.27') do

data/modules/mruby/test/t/class.rb

@@ -235,6 +235,23 @@ assert('class to return the last value') do
   assert_equal(m, :m)
 end
 
+assert('raise when superclass is not a class') do
+  module FirstModule; end
+  assert_raise(TypeError, 'should raise TypeError') do
+    class FirstClass < FirstModule; end
+  end
+
+  class SecondClass; end
+  assert_raise(TypeError, 'should raise TypeError') do
+    class SecondClass < false; end
+  end
+
+  class ThirdClass; end
+  assert_raise(TypeError, 'should raise TypeError') do
+    class ThirdClass < ThirdClass; end
+  end
+end
+
 assert('Class#inherited') do
   class Foo
     @@subclass_name = nil
@@ -260,25 +277,40 @@ assert('Class#inherited') do
 end
 
 assert('singleton tests') do
+  module FooMod
+    def run_foo_mod
+      100
+    end
+  end
+
   bar = String.new
 
   baz = class << bar
+    extend FooMod
     def self.run_baz
       200
     end
   end
 
+  assert_false baz.singleton_methods.include? :run_foo_mod
   assert_false baz.singleton_methods.include? :run_baz
 
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    baz.run_foo_mod
+  end
   assert_raise(NoMethodError, 'should raise NoMethodError') do
     baz.run_baz
   end
 
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    bar.run_foo_mod
+  end
   assert_raise(NoMethodError, 'should raise NoMethodError') do
     bar.run_baz
   end
 
   baz = class << bar
+    extend FooMod
     def self.run_baz
       300
     end
@@ -286,9 +318,44 @@ assert('singleton tests') do
   end
 
   assert_true baz.singleton_methods.include? :run_baz
+  assert_true baz.singleton_methods.include? :run_foo_mod
+  assert_equal 100, baz.run_foo_mod
   assert_equal 300, baz.run_baz
 
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    bar.run_foo_mod
+  end
   assert_raise(NoMethodError, 'should raise NoMethodError') do
     bar.run_baz
   end
+
+  fv = false
+  class << fv
+    def self.run_false
+      5
+    end
+  end
+
+  nv = nil
+  class << nv
+    def self.run_nil
+      6
+    end
+  end
+
+  tv = true
+  class << tv
+    def self.run_nil
+      7
+    end
+  end
+
+  assert_raise(TypeError, 'should raise TypeError') do
+    num = 1.0
+    class << num
+      def self.run_nil
+        7
+      end
+    end
+  end
 end