admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #730 from masamitsu-murase/modify_range_initialize

Browse Source 
Modify `Range#initialize`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-01-13 18:11:19 -08:00
parent a3c3f00323 4bf76a67f1
commit 315ecb60cd
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gc.c
+4 -2
View File
@@ -455,8 +455,10 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
{
struct RRange *r = (struct RRange*)obj;
mrb_gc_mark_value(mrb, r->edges->beg);
mrb_gc_mark_value(mrb, r->edges->end);
if (r->edges) {
mrb_gc_mark_value(mrb, r->edges->beg);
mrb_gc_mark_value(mrb, r->edges->end);
}
}
break;
src/range.c
+18 -6
View File
@@ -100,12 +100,15 @@ mrb_range_excl(mrb_state *mrb, mrb_value range)
}
static void
range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, mrb_int exclude_end)
range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, int exclude_end)
{
struct RRange *r = mrb_range_ptr(range);
range_check(mrb, beg, end);
r->excl = exclude_end;
if (!r->edges) {
r->edges = (struct mrb_range_edges *)mrb_malloc(mrb, sizeof(struct mrb_range_edges));
}
r->edges->beg = beg;
r->edges->end = end;
}
@@ -122,11 +125,15 @@ mrb_value
mrb_range_initialize(mrb_state *mrb, mrb_value range)
{
mrb_value beg, end;
mrb_value flags;
int exclusive;
int n;
mrb_get_args(mrb, "ooo", &beg, &end, &flags);
n = mrb_get_args(mrb, "oo|b", &beg, &end, &exclusive);
if (n != 3) {
exclusive = 0;
}
/* Ranges are immutable, so that they should be initialized only once. */
range_init(mrb, range, beg, end, mrb_test(flags));
range_init(mrb, range, beg, end, exclusive);
return range;
}
/*
@@ -408,6 +415,7 @@ mrb_value
range_initialize_copy(mrb_state *mrb, mrb_value copy)
{
mrb_value src;
struct RRange *r;
mrb_get_args(mrb, "o", &src);
@@ -415,7 +423,9 @@ range_initialize_copy(mrb_state *mrb, mrb_value copy)
if (!mrb_obj_is_instance_of(mrb, src, mrb_obj_class(mrb, copy))) {
mrb_raise(mrb, E_TYPE_ERROR, "wrong argument class");
}
*mrb_range_ptr(copy) = *mrb_range_ptr(src);
r = mrb_range_ptr(src);
range_init(mrb, copy, r->edges->beg, r->edges->end, r->excl);
return copy;
}
@@ -426,6 +436,8 @@ mrb_init_range(mrb_state *mrb)
struct RClass *r;
r = mrb_define_class(mrb, "Range", mrb->object_class);
MRB_SET_INSTANCE_TT(r, MRB_TT_RANGE);
mrb_include_module(mrb, r, mrb_class_get(mrb, "Enumerable"));
mrb_define_method(mrb, r, "begin", mrb_range_beg, ARGS_NONE()); /* 15.2.14.4.3 */
@@ -436,7 +448,7 @@ mrb_init_range(mrb_state *mrb)
mrb_define_method(mrb, r, "exclude_end?", mrb_range_excl, ARGS_NONE()); /* 15.2.14.4.6 */
mrb_define_method(mrb, r, "first", mrb_range_beg, ARGS_NONE()); /* 15.2.14.4.7 */
mrb_define_method(mrb, r, "include?", mrb_range_include, ARGS_REQ(1)); /* 15.2.14.4.8 */
mrb_define_method(mrb, r, "initialize", mrb_range_initialize, ARGS_REQ(4)); /* 15.2.14.4.9 */
mrb_define_method(mrb, r, "initialize", mrb_range_initialize, ARGS_ANY()); /* 15.2.14.4.9 */
mrb_define_method(mrb, r, "last", mrb_range_end, ARGS_NONE()); /* 15.2.14.4.10 */
mrb_define_method(mrb, r, "member?", mrb_range_include, ARGS_REQ(1)); /* 15.2.14.4.11 */