webruby 0.2.4 → 0.2.5

data/modules/mruby/src/object.c

@@ -292,6 +292,17 @@ mrb_init_object(mrb_state *mrb)
   mrb_define_method(mrb, f, "inspect", false_to_s,  MRB_ARGS_NONE());
 }
 
+static mrb_value
+inspect_type(mrb_state *mrb, mrb_value val)
+{
+  if (mrb_type(val) == MRB_TT_FALSE || mrb_type(val) == MRB_TT_TRUE) {
+    return mrb_inspect(mrb, val);
+  }
+  else {
+    return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, val));
+  }
+}
+
 static mrb_value
 convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *method, int raise)
 {
@@ -300,7 +311,7 @@ convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *metho
   m = mrb_intern_cstr(mrb, method);
   if (!mrb_respond_to(mrb, val, m)) {
     if (raise) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", val, mrb_str_new_cstr(mrb, tname));
+      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", inspect_type(mrb, val), mrb_str_new_cstr(mrb, tname));
       return mrb_nil_value();
     }
     else {
@@ -499,8 +510,9 @@ mrb_to_integer(mrb_state *mrb, mrb_value val, const char *method)
   if (mrb_fixnum_p(val)) return val;
   v = convert_type(mrb, val, "Integer", method, TRUE);
   if (!mrb_obj_is_kind_of(mrb, v, mrb->fixnum_class)) {
+    mrb_value type = inspect_type(mrb, val);
     mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S to Integer (%S#%S gives %S)",
-               val, val, mrb_str_new_cstr(mrb, method), v);
+               type, type, mrb_str_new_cstr(mrb, method), inspect_type(mrb, v));
   }
   return v;
 }

data/modules/mruby/src/state.c

@@ -136,7 +136,9 @@ mrb_irep_free(mrb_state *mrb, mrb_irep *irep)
     mrb_free(mrb, irep->iseq);
   for (i=0; i<irep->plen; i++) {
     if (mrb_type(irep->pool[i]) == MRB_TT_STRING) {
-      mrb_free(mrb, mrb_str_ptr(irep->pool[i])->ptr);
+      if ((mrb_str_ptr(irep->pool[i])->flags & MRB_STR_NOFREE) == 0) {
+        mrb_free(mrb, mrb_str_ptr(irep->pool[i])->ptr);
+      }
       mrb_free(mrb, mrb_obj_ptr(irep->pool[i]));
     }
 #ifdef MRB_WORD_BOXING
@@ -170,12 +172,17 @@ mrb_str_pool(mrb_state *mrb, mrb_value str)
 
   len = s->len;
   ns->len = len;
-  ns->ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
-  if (s->ptr) {
-    memcpy(ns->ptr, s->ptr, len);
+  if (s->flags & MRB_STR_NOFREE) {
+    ns->ptr = s->ptr;
+    ns->flags = MRB_STR_NOFREE;
+  }
+  else {
+    ns->ptr = (char *)mrb_malloc(mrb, (size_t)len+1);
+    if (s->ptr) {
+      memcpy(ns->ptr, s->ptr, len);
+    }
+    ns->ptr[len] = '\0';
   }
-  ns->ptr[len] = '\0';
-
   return mrb_obj_value(ns);
 }
 
@@ -207,10 +214,6 @@ mrb_close(mrb_state *mrb)
   mrb_free(mrb, mrb);
 }
 
-#ifndef MRB_IREP_ARRAY_INIT_SIZE
-# define MRB_IREP_ARRAY_INIT_SIZE (256u)
-#endif
-
 mrb_irep*
 mrb_add_irep(mrb_state *mrb)
 {

data/modules/mruby/src/string.c

@@ -30,9 +30,6 @@ typedef struct mrb_shared_string {
   mrb_int len;
 } mrb_shared_string;
 
-#define MRB_STR_SHARED    1
-#define MRB_STR_NOFREE    2
-
 static mrb_value str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2);
 static mrb_value mrb_str_subseq(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
 
@@ -92,6 +89,7 @@ mrb_str_modify(mrb_state *mrb, struct RString *s)
     }
     s->ptr[s->len] = '\0';
     s->aux.capa = s->len;
+    s->flags &= ~MRB_STR_NOFREE;
     return;
   }
 }

data/modules/mruby/src/symbol.c

@@ -13,7 +13,8 @@
 
 /* ------------------------------------------------------ */
 typedef struct symbol_name {
-  size_t len;
+  mrb_bool lit;
+  uint16_t len;
   const char *name;
 } symbol_name;
 
@@ -34,8 +35,8 @@ sym_hash_func(mrb_state *mrb, const symbol_name s)
 KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1)
 KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal)
 /* ------------------------------------------------------ */
-mrb_sym
-mrb_intern(mrb_state *mrb, const char *name, size_t len)
+static mrb_sym
+sym_intern(mrb_state *mrb, const char *name, size_t len, int lit)
 {
   khash_t(n2s) *h = mrb->name2sym;
   symbol_name sname;
@@ -43,23 +44,44 @@ mrb_intern(mrb_state *mrb, const char *name, size_t len)
   mrb_sym sym;
   char *p;
 
+  if (len > UINT16_MAX) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "symbol length too long");
+  }
+  sname.lit = lit;
   sname.len = len;
   sname.name = name;
-  k = kh_get(n2s, h, sname);
+  k = kh_get(n2s, mrb, h, sname);
   if (k != kh_end(h))
     return kh_value(h, k);
 
   sym = ++mrb->symidx;
-  p = (char *)mrb_malloc(mrb, len+1);
-  memcpy(p, name, len);
-  p[len] = 0;
-  sname.name = (const char*)p;
-  k = kh_put(n2s, h, sname);
+  if (lit) {
+    sname.name = name;
+  }
+  else {
+    p = (char *)mrb_malloc(mrb, len+1);
+    memcpy(p, name, len);
+    p[len] = 0;
+    sname.name = (const char*)p;
+  }
+  k = kh_put(n2s, mrb, h, sname);
   kh_value(h, k) = sym;
 
   return sym;
 }
 
+mrb_sym
+mrb_intern(mrb_state *mrb, const char *name, size_t len)
+{
+  return sym_intern(mrb, name, len, 0);
+}
+
+mrb_sym
+mrb_intern_static(mrb_state *mrb, const char *name, size_t len)
+{
+  return sym_intern(mrb, name, len, 1);
+}
+
 mrb_sym
 mrb_intern_cstr(mrb_state *mrb, const char *name)
 {
@@ -79,10 +101,13 @@ mrb_check_intern(mrb_state *mrb, const char *name, size_t len)
   symbol_name sname;
   khiter_t k;
 
+  if (len > UINT16_MAX) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "symbol length too long");
+  }
   sname.len = len;
   sname.name = name;
 
-  k = kh_get(n2s, h, sname);
+  k = kh_get(n2s, mrb, h, sname);
   if (k != kh_end(h)) {
     return mrb_symbol_value(kh_value(h, k));
   }
@@ -129,8 +154,14 @@ mrb_free_symtbl(mrb_state *mrb)
   khiter_t k;
 
   for (k = kh_begin(h); k != kh_end(h); k++)
-    if (kh_exist(h, k)) mrb_free(mrb, (char*)kh_key(h, k).name);
-  kh_destroy(n2s,mrb->name2sym);
+    if (kh_exist(h, k)) {
+      symbol_name s = kh_key(h, k);
+
+      if (!s.lit) {
+        mrb_free(mrb, (char*)s.name);
+      }
+    }
+  kh_destroy(n2s, mrb, mrb->name2sym);
 }
 
 void
@@ -381,14 +412,9 @@ mrb_sym2str(mrb_state *mrb, mrb_sym sym)
 {
   size_t len;
   const char *name = mrb_sym2name_len(mrb, sym, &len);
-  mrb_value str;
 
   if (!name) return mrb_undef_value(); /* can't happen */
-  str = mrb_str_new_static(mrb, name, len);
-  if (symname_p(name) && strlen(name) == len) {
-    return str;
-  }
-  return mrb_str_dump(mrb, str);
+  return mrb_str_new_static(mrb, name, len);
 }
 
 const char*

data/modules/mruby/src/variable.c

@@ -311,7 +311,7 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
   khash_t(iv) *h = &t->h;
   khiter_t k;
 
-  k = kh_put(iv, h, sym);
+  k = kh_put(iv, mrb, h, sym);
   kh_value(h, k) = val;
 }
 
@@ -321,7 +321,7 @@ iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   khash_t(iv) *h = &t->h;
   khiter_t k;
 
-  k = kh_get(iv, h, sym);
+  k = kh_get(iv, mrb, h, sym);
   if (k != kh_end(h)) {
     if (vp) *vp = kh_value(h, k);
     return TRUE;
@@ -336,10 +336,10 @@ iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   khiter_t k;
 
   if (h) {
-    k = kh_get(iv, h, sym);
+    k = kh_get(iv, mrb, h, sym);
     if (k != kh_end(h)) {
       mrb_value val = kh_value(h, k);
-      kh_del(iv, h, k);
+      kh_del(iv, mrb, h, k);
       if (vp) *vp = val;
       return TRUE;
     }
@@ -360,7 +360,7 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
         n = (*func)(mrb, kh_key(h, k), kh_value(h, k), p);
         if (n > 0) return FALSE;
         if (n < 0) {
-          kh_del(iv, h, k);
+          kh_del(iv, mrb, h, k);
         }
       }
     }
@@ -386,7 +386,7 @@ iv_copy(mrb_state *mrb, iv_tbl *t)
 static void
 iv_free(mrb_state *mrb, iv_tbl *t)
 {
-  kh_destroy(iv, &t->h);
+  kh_destroy(iv, mrb, &t->h);
 }
 
 #endif

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

@@ -258,3 +258,37 @@ assert('Class#inherited') do
 
   assert_equal(Baz, Foo.subclass_name)
 end
+
+assert('singleton tests') do
+  bar = String.new
+
+  baz = class << bar
+    def self.run_baz
+      200
+    end
+  end
+
+  assert_false baz.singleton_methods.include? :run_baz
+
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    baz.run_baz
+  end
+
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    bar.run_baz
+  end
+
+  baz = class << bar
+    def self.run_baz
+      300
+    end
+    self
+  end
+
+  assert_true baz.singleton_methods.include? :run_baz
+  assert_equal 300, baz.run_baz
+
+  assert_raise(NoMethodError, 'should raise NoMethodError') do
+    bar.run_baz
+  end
+end

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

@@ -83,7 +83,7 @@ assert('Module#attr', '15.2.2.4.11') do
   assert_true AttrTest.respond_to?(:cattr)
   assert_true test.respond_to?(:iattr)
 
-  assert_false AttrTest.respond_to?(:vattr=)
+  assert_false AttrTest.respond_to?(:cattr=)
   assert_false test.respond_to?(:iattr=)
 
   test.iattr_val = 'test'

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

@@ -74,3 +74,31 @@ assert('Splat and mass assignment') do
   assert_equal 7, b
   assert_equal [8,9], c
 end
+
+assert('Return values of case statements') do
+  a = [] << case 1
+  when 3 then 2
+  when 2 then 2
+  when 1 then 2
+  end
+
+  b = [] << case 1
+  when 2 then 2
+  else
+  end
+
+  def fb
+    n = 0
+    Proc.new do
+      n += 1
+      case
+      when n % 15 == 0
+      else n
+      end
+    end
+  end
+
+  assert_equal [2], a
+  assert_equal [nil], b
+  assert_equal 1, fb.call
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webruby
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Xuejie Xiao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies: []
 description: compile your favourite Ruby source code for the browser!
 email: xxuejie@gmail.com
@@ -74,6 +74,8 @@ files:
 - modules/emscripten/src/embind/embind.js
 - modules/emscripten/src/embind/emval.js
 - modules/emscripten/src/emrun_postjs.js
+- modules/emscripten/src/emrun_prejs.js
+- modules/emscripten/src/emscripten-source-map.min.js
 - modules/emscripten/src/experimental/allow_loopvars_from_memsetcpy_inasm.diff
 - modules/emscripten/src/experimental/batching.diff
 - modules/emscripten/src/experimental/functypeopt.diff
@@ -161,8 +163,6 @@ files:
 - modules/emscripten/src/relooper/test_inf.txt
 - modules/emscripten/src/relooper/testit.sh
 - modules/emscripten/src/relooper/updateit.sh
-- modules/emscripten/src/relooper.js
-- modules/emscripten/src/relooper.js.raw.js
 - modules/emscripten/src/runtime.js
 - modules/emscripten/src/settings.js
 - modules/emscripten/src/shell.html
@@ -1081,7 +1081,6 @@ files:
 - modules/emscripten/third_party/websockify/wsirc.html
 - modules/emscripten/third_party/websockify/wstelnet.html
 - modules/emscripten/tools/__init__.py
-- modules/emscripten/tools/__init__.pyc
 - modules/emscripten/tools/asm_module.py
 - modules/emscripten/tools/autodebugger.py
 - modules/emscripten/tools/autodebugger_c.py
@@ -1091,7 +1090,6 @@ files:
 - modules/emscripten/tools/bindings_generator.py
 - modules/emscripten/tools/bisect_pair.py
 - modules/emscripten/tools/cache.py
-- modules/emscripten/tools/cache.pyc
 - modules/emscripten/tools/clean_webconsole.py
 - modules/emscripten/tools/crunch-worker.js
 - modules/emscripten/tools/diff_autodebugger.py
@@ -1205,13 +1203,10 @@ files:
 - modules/emscripten/tools/find_bigvars.py
 - modules/emscripten/tools/fix_closure.py
 - modules/emscripten/tools/gen_struct_info.py
-- modules/emscripten/tools/gen_struct_info.pyc
 - modules/emscripten/tools/ie7_fix.py
 - modules/emscripten/tools/js-optimizer.js
 - modules/emscripten/tools/js_optimizer.py
-- modules/emscripten/tools/js_optimizer.pyc
 - modules/emscripten/tools/jsrun.py
-- modules/emscripten/tools/jsrun.pyc
 - modules/emscripten/tools/ll-strip.py
 - modules/emscripten/tools/make_file.py
 - modules/emscripten/tools/make_minigzip.py
@@ -1259,20 +1254,17 @@ files:
 - modules/emscripten/tools/reproduceriter.js
 - modules/emscripten/tools/reproduceriter.py
 - modules/emscripten/tools/response_file.py
-- modules/emscripten/tools/response_file.pyc
 - modules/emscripten/tools/scan_js.py
 - modules/emscripten/tools/scan_ll.py
 - modules/emscripten/tools/scons/site_scons/site_tools/emscripten/__init__.py
 - modules/emscripten/tools/scons/site_scons/site_tools/emscripten/emscripten.py
 - modules/emscripten/tools/settings_template_readonly.py
 - modules/emscripten/tools/shared.py
-- modules/emscripten/tools/shared.pyc
 - modules/emscripten/tools/source-maps/sourcemap2json.js
 - modules/emscripten/tools/source-maps/sourcemapper.js
 - modules/emscripten/tools/split.py
 - modules/emscripten/tools/split_asm.py
 - modules/emscripten/tools/tempfiles.py
-- modules/emscripten/tools/tempfiles.pyc
 - modules/emscripten/tools/test-js-optimizer-asm-last-output.js
 - modules/emscripten/tools/test-js-optimizer-asm-last.js
 - modules/emscripten/tools/test-js-optimizer-asm-minlast-output.js
@@ -1560,7 +1552,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: webruby