diff options
| -rw-r--r-- | src/array.c | 13 | ||||
| -rw-r--r-- | src/class.c | 19 | ||||
| -rw-r--r-- | src/codegen.c | 14 | ||||
| -rw-r--r-- | src/time.c | 2 | ||||
| -rw-r--r-- | test/t/array.rb | 4 | ||||
| -rw-r--r-- | test/t/time.rb | 2 |
6 files changed, 38 insertions, 16 deletions
diff --git a/src/array.c b/src/array.c index ea461e029..d4f5d1c5e 100644 --- a/src/array.c +++ b/src/array.c @@ -719,24 +719,21 @@ mrb_ary_aset(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); switch(argc) { case 2: - if (mrb_fixnum_p(argv[0])) { - mrb_ary_set(mrb, self, mrb_fixnum(argv[0]), argv[1]); - } - else { + if (!mrb_fixnum_p(argv[0])) { /* Should we support Range object for 1st arg ? */ mrb_raise(mrb, E_TYPE_ERROR, "expected Fixnum for 1st argument"); } - break; + mrb_ary_set(mrb, self, mrb_fixnum(argv[0]), argv[1]); + return argv[1]; case 3: mrb_ary_splice(mrb, self, mrb_fixnum(argv[0]), mrb_fixnum(argv[1]), argv[2]); - break; + return argv[2]; default: mrb_raise(mrb, E_ARGUMENT_ERROR, "wrong number of arguments"); + return mrb_nil_value(); } - - return self; } mrb_value diff --git a/src/class.c b/src/class.c index 618a6d1f6..dcd0ae492 100644 --- a/src/class.c +++ b/src/class.c @@ -7,6 +7,7 @@ #include "mruby.h" #include <stdarg.h> #include <stdio.h> +#include <ctype.h> #include "mruby/class.h" #include "mruby/proc.h" #include "mruby/string.h" @@ -1442,11 +1443,25 @@ mrb_sym_value(mrb_state *mrb, mrb_value val) return mrb_symbol(val); } +static void +check_const_name(mrb_state *mrb, mrb_sym id) +{ + const char *s; + int len; + + s = mrb_sym2name_len(mrb, id, &len); + if (len < 1 || !ISUPPER(*s)) { + mrb_name_error(mrb, id, "wrong constant name %s", s); + } +} + mrb_value mrb_mod_const_defined(mrb_state *mrb, mrb_value mod) { mrb_value sym; mrb_get_args(mrb, "o", &sym); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); if(mrb_const_defined(mrb, mod, mrb_sym_value(mrb, sym))) { return mrb_true_value(); } @@ -1458,6 +1473,8 @@ mrb_mod_const_get(mrb_state *mrb, mrb_value mod) { mrb_value sym; mrb_get_args(mrb, "o", &sym); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); return mrb_const_get(mrb, mod, mrb_sym_value(mrb, sym)); } @@ -1466,6 +1483,8 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod) { mrb_value sym, value; mrb_get_args(mrb, "oo", &sym, &value); + + check_const_name(mrb, mrb_sym_value(mrb,sym)); mrb_const_set(mrb, mod, mrb_sym_value(mrb, sym), value); return value; } diff --git a/src/codegen.c b/src/codegen.c index 1e468867c..a6c94d871 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -2079,6 +2079,10 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv) p->nlocals = p->sp; p->ai = mrb->arena_idx; + //because of a potential bad memory access in case of gc let's allocate the irep right now + mrb_add_irep(mrb, mrb->irep_len); + mrb->irep[mrb->irep_len] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); + mrb->irep[mrb->irep_len]->plen = 0; p->idx = mrb->irep_len++; p->filename = prev->filename; if (p->filename) { @@ -2092,10 +2096,12 @@ scope_finish(codegen_scope *s, int idx) { mrb_state *mrb = s->mrb; mrb_irep *irep; - - mrb_add_irep(mrb, idx); - irep = mrb->irep[idx] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); - + + //Comment out these instructions already done in scope_new + //mrb_add_irep(mrb, idx); + //irep = mrb->irep[idx] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); + irep = mrb->irep[idx]; + irep->flags = 0; irep->idx = idx; if (s->iseq) { diff --git a/src/time.c b/src/time.c index 09ebea78a..c647ef6ce 100644 --- a/src/time.c +++ b/src/time.c @@ -395,7 +395,7 @@ mrb_time_yday(mrb_state *mrb, mrb_value self) tm = (struct mrb_time *)mrb_check_datatype(mrb, self, &mrb_time_type); if (!tm) return mrb_nil_value(); - return mrb_fixnum_value(tm->datetime.tm_yday); + return mrb_fixnum_value(tm->datetime.tm_yday + 1); } /* 15.2.19.7.32 */ diff --git a/test/t/array.rb b/test/t/array.rb index 560faf8e7..90fa85c7f 100644 --- a/test/t/array.rb +++ b/test/t/array.rb @@ -74,8 +74,8 @@ assert('Array#[]=', '15.2.12.5.5') do e3 = e1 end - [1,2,3].[]=(1,4) == [1, 4, 3] and - [1,2,3].[]=(1,2,3) == [1, 3] and + [1,2,3].[]=(1,4) == 4 and + [1,2,3].[]=(1,2,3) == 3 and e2.class == ArgumentError and e3.class == ArgumentError end diff --git a/test/t/time.rb b/test/t/time.rb index ba4ceedc4..f92459d5e 100644 --- a/test/t/time.rb +++ b/test/t/time.rb @@ -177,7 +177,7 @@ if Object.const_defined?(:Time) end assert('Time#yday', '15.2.19.7.31') do - Time.gm(2012, 12, 23).yday == 357 + Time.gm(2012, 12, 23).yday == 358 end assert('Time#year', '15.2.19.7.32') do |