From 7deef5aa7de803b1d53b20697b2ce2f60ea08f20 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 10 Jan 2013 14:38:05 +0900 Subject: remove compiler warnings. --- tasks/mrbgems_test.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index f247718a0..51aad4ec3 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -19,10 +19,10 @@ MRuby.each_target do end f.puts %Q[void mrb_#{g.funcname}_gem_test(mrb_state *mrb);] unless g.test_objs.empty? f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {] - f.puts %Q[ mrb_state *mrb2;] - f.puts %Q[ mrb_value val1, val2, ary1, ary2;] - f.puts %Q[ int ai;] unless g.test_rbfiles.empty? + f.puts %Q[ mrb_state *mrb2;] + f.puts %Q[ mrb_value val1, val2, ary1, ary2;] + f.puts %Q[ int ai;] g.test_rbfiles.count.times do |i| f.puts %Q[ ai = mrb_gc_arena_save(mrb);] f.puts %Q[ mrb2 = mrb_open();] -- cgit v1.2.3 From 1a528da40b25a1c492f5433e4a7b6d3e4ad6740f Mon Sep 17 00:00:00 2001 From: skandhas Date: Thu, 10 Jan 2013 17:02:41 +0800 Subject: add mrb_check_hash_type --- include/mruby/hash.h | 1 + src/hash.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/mruby/hash.h b/include/mruby/hash.h index bb12962ca..acb9de93b 100644 --- a/include/mruby/hash.h +++ b/include/mruby/hash.h @@ -29,6 +29,7 @@ mrb_value mrb_hash_fetch(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_valu mrb_value mrb_hash_delete_key(mrb_state *mrb, mrb_value hash, mrb_value key); mrb_value mrb_hash(mrb_state *mrb, mrb_value obj); mrb_value mrb_hash_keys(mrb_state *mrb, mrb_value hash); +mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash); /* RHASH_TBL allocates st_table if not available. */ #define RHASH(obj) ((struct RHash*)((obj).value.p)) diff --git a/src/hash.c b/src/hash.c index c7a419250..26d9b78b0 100644 --- a/src/hash.c +++ b/src/hash.c @@ -187,6 +187,12 @@ mrb_hash_modify_check(mrb_state *mrb, mrb_value hash) //if (OBJ_FROZEN(hash)) mrb_error_frozen("hash"); } +mrb_value +mrb_check_hash_type(mrb_state *mrb, mrb_value hash) +{ + return mrb_check_convert_type(mrb, hash, MRB_TT_HASH, "Hash", "to_hash"); +} + khash_t(ht) * mrb_hash_tbl(mrb_state *mrb, mrb_value hash) { -- cgit v1.2.3 From 77a5ed70931f9b798803f7daf699a8f7b43cdae2 Mon Sep 17 00:00:00 2001 From: Yuichiro MASUI Date: Fri, 11 Jan 2013 02:33:39 +0900 Subject: Removed gem libraries in mrbc --- tools/mrbc/mrbc.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mrbc/mrbc.rake b/tools/mrbc/mrbc.rake index bff88312a..74e04bed5 100644 --- a/tools/mrbc/mrbc.rake +++ b/tools/mrbc/mrbc.rake @@ -6,7 +6,7 @@ MRuby.each_target do objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") } file exec => objs + ["#{build_dir}/lib/libmruby_core.a"] do |t| - link t.name, t.prerequisites, [], gems.map { |g| g.mruby_libs } + link t.name, t.prerequisites end end end -- cgit v1.2.3 From 5d9aeb1502961874d5a7c58aca47877c2f914b08 Mon Sep 17 00:00:00 2001 From: Yuichiro MASUI Date: Fri, 11 Jan 2013 02:50:22 +0900 Subject: Fixed mrbtest result numbers --- tasks/mrbgems_test.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index 51aad4ec3..bbdc0169f 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -43,9 +43,9 @@ MRuby.each_target do f.puts %Q[ ] %w(ok_test ko_test kill_test).each do |vname| - f.puts %Q[ val1 = mrb_gv_get(mrb2, mrb_intern(mrb, "$#{vname}"));] - f.puts %Q[ if(mrb_fixnum_p(val1)) {] - f.puts %Q[ val2 = mrb_gv_get(mrb, mrb_intern(mrb, "$#{vname}"));] + f.puts %Q[ val2 = mrb_gv_get(mrb2, mrb_intern(mrb2, "$#{vname}"));] + f.puts %Q[ if(mrb_fixnum_p(val2)) {] + f.puts %Q[ val1 = mrb_gv_get(mrb, mrb_intern(mrb, "$#{vname}"));] f.puts %Q[ mrb_gv_set(mrb, mrb_intern(mrb, "$#{vname}"), mrb_fixnum_value(mrb_fixnum(val1) + mrb_fixnum(val2)));] f.puts %Q[ }\n] end -- cgit v1.2.3