diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.c | 17 | ||||
| -rw-r--r-- | src/gc.c | 6 | ||||
| -rw-r--r-- | src/hash.c | 1 | ||||
| -rw-r--r-- | src/range.c | 24 | ||||
| -rw-r--r-- | src/string.c | 17 | ||||
| -rw-r--r-- | src/struct.c | 1 |
6 files changed, 33 insertions, 33 deletions
diff --git a/src/codegen.c b/src/codegen.c index 53324f321..88bce7dac 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -838,7 +838,6 @@ gen_assignment(codegen_scope *s, node *node, int sp, int val) lv++; up = up->prev; } - // assert(up!=0); } break; case NODE_IVAR: @@ -1571,15 +1570,20 @@ codegen(codegen_scope *s, node *tree, int val) break; case NODE_RETURN: - codegen(s, tree, VAL); - pop(); + if (tree) { + codegen(s, tree, VAL); + pop(); + } + else { + genop(s, MKOP_A(OP_LOADNIL, cursp())); + } if (s->loop) { genop(s, MKOP_AB(OP_RETURN, cursp(), OP_R_RETURN)); } else { genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL); } - push(); + if (val) push(); break; case NODE_YIELD: @@ -1631,6 +1635,9 @@ codegen(codegen_scope *s, node *tree, int val) codegen(s, tree, VAL); pop(); } + else { + genop(s, MKOP_A(OP_LOADNIL, cursp())); + } genop_peep(s, MKOP_AB(OP_RETURN, cursp(), OP_R_NORMAL), NOVAL); } if (val) push(); @@ -2125,6 +2132,7 @@ codegen(codegen_scope *s, node *tree, int val) genop(s, MKOP_AB(OP_METHOD, cursp(), sym)); if (val) { genop(s, MKOP_A(OP_LOADNIL, cursp())); + push(); } } break; @@ -2144,6 +2152,7 @@ codegen(codegen_scope *s, node *tree, int val) genop(s, MKOP_AB(OP_METHOD, cursp(), sym)); if (val) { genop(s, MKOP_A(OP_LOADNIL, cursp())); + push(); } } break; @@ -271,9 +271,9 @@ add_heap(mrb_state *mrb) #define DEFAULT_GC_INTERVAL_RATIO 200 #define DEFAULT_GC_STEP_RATIO 200 #define DEFAULT_MAJOR_GC_INC_RATIO 200 -#define is_generational(mrb) (mrb->is_generational_gc_mode) -#define is_major_gc(mrb) (is_generational(mrb) && mrb->gc_full) -#define is_minor_gc(mrb) (is_generational(mrb) && !mrb->gc_full) +#define is_generational(mrb) ((mrb)->is_generational_gc_mode) +#define is_major_gc(mrb) (is_generational(mrb) && (mrb)->gc_full) +#define is_minor_gc(mrb) (is_generational(mrb) && !(mrb)->gc_full) void mrb_init_heap(mrb_state *mrb) diff --git a/src/hash.c b/src/hash.c index 5fa3c1ef8..65e02aef6 100644 --- a/src/hash.c +++ b/src/hash.c @@ -152,7 +152,6 @@ mrb_hash_set(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_value val) /* mr mrb_value mrb_hash_freeze(mrb_value hash) { - //return mrb_obj_freeze(hash); return (hash); } diff --git a/src/range.c b/src/range.c index 2cdc34f5c..2e9ec26ed 100644 --- a/src/range.c +++ b/src/range.c @@ -10,10 +10,6 @@ #include "mruby/string.h" #include <string.h> -#ifndef OTHER -#define OTHER 2 -#endif - #define RANGE_CLASS (mrb_class_obj_get(mrb, "Range")) static void @@ -274,12 +270,14 @@ mrb_range_each(mrb_state *mrb, mrb_value range) } mrb_int -mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len, mrb_int err) +mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, mrb_int len) { mrb_int beg, end, b, e; struct RRange *r = mrb_range_ptr(range); - if (mrb_type(range) != MRB_TT_RANGE) return FALSE; + if (mrb_type(range) != MRB_TT_RANGE) { + mrb_raise(mrb, E_TYPE_ERROR, "expected Range."); + } beg = b = mrb_fixnum(r->edges->beg); end = e = mrb_fixnum(r->edges->end); @@ -288,10 +286,10 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, beg += len; if (beg < 0) goto out_of_range; } - if (err == 0 || err == 2) { - if (beg > len) goto out_of_range; - if (end > len) end = len; - } + + if (beg > len) goto out_of_range; + if (end > len) end = len; + if (end < 0) end += len; if (!r->excl && end < len) end++; /* include end point */ len = end - beg; @@ -302,11 +300,7 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp, return TRUE; out_of_range: - if (err) { - mrb_raisef(mrb, E_RANGE_ERROR, "%ld..%s%ld out of range", - b, r->excl? "." : "", e); - } - return OTHER; + return FALSE; } /* 15.2.14.4.12(x) */ diff --git a/src/string.c b/src/string.c index 205c39876..7af0d1d59 100644 --- a/src/string.c +++ b/src/string.c @@ -759,23 +759,22 @@ num_index: return mrb_str_dup(mrb, indx); return mrb_nil_value(); - default: + case MRB_TT_RANGE: /* check if indx is Range */ { mrb_int beg, len; mrb_value tmp; len = RSTRING_LEN(str); - switch (mrb_range_beg_len(mrb, indx, &beg, &len, len, 0)) { - case FALSE: - break; - case 2/*OTHER*/: - return mrb_nil_value(); - default: - tmp = mrb_str_subseq(mrb, str, beg, len); - return tmp; + if (mrb_range_beg_len(mrb, indx, &beg, &len, len)) { + tmp = mrb_str_subseq(mrb, str, beg, len); + return tmp; + } + else { + return mrb_nil_value(); } } + default: idx = mrb_fixnum(indx); goto num_index; } diff --git a/src/struct.c b/src/struct.c index 5026a6ab4..d7b63259e 100644 --- a/src/struct.c +++ b/src/struct.c @@ -251,7 +251,6 @@ make_struct(mrb_state *mrb, mrb_value name, mrb_value members, struct RClass * k long i, len; struct RClass *c; - //OBJ_FREEZE(members); if (mrb_nil_p(name)) { c = mrb_class_new(mrb, klass); } |