aboutsummaryrefslogtreecommitdiffstats
path: root/range.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-26 10:08:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-26 10:08:02 +0000
commit64f2b9f99055aaaab9abbf53da1f72b2825df503 (patch)
tree5e573c91f2076b46ccb8f546eea1a5f4fdbb92d5 /range.c
parent2c6518c37d71d6a096708f628132dce6b11c4a68 (diff)
downloadruby-64f2b9f99055aaaab9abbf53da1f72b2825df503.tar.gz
range.c: modify check
* range.c (range_initialize_copy): disallow to modify after initialized. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'range.c')
-rw-r--r--range.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/range.c b/range.c
index 99fdf9cede..ebd0811a98 100644
--- a/range.c
+++ b/range.c
@@ -82,6 +82,15 @@ rb_range_new(VALUE beg, VALUE end, int exclude_end)
return range;
}
+static void
+range_modify(VALUE range)
+{
+ /* Ranges are immutable, so that they should be initialized only once. */
+ if (RANGE_EXCL(range) != Qnil) {
+ rb_name_error(idInitialize, "`initialize' called twice");
+ }
+}
+
/*
* call-seq:
* Range.new(begin, end, exclude_end=false) -> rng
@@ -97,15 +106,19 @@ range_initialize(int argc, VALUE *argv, VALUE range)
VALUE beg, end, flags;
rb_scan_args(argc, argv, "21", &beg, &end, &flags);
- /* Ranges are immutable, so that they should be initialized only once. */
- if (RANGE_EXCL(range) != Qnil) {
- rb_name_error(idInitialize, "`initialize' called twice");
- }
+ range_modify(range);
range_init(range, beg, end, RBOOL(RTEST(flags)));
return Qnil;
}
-#define range_initialize_copy rb_struct_init_copy /* :nodoc: */
+/* :nodoc: */
+static VALUE
+range_initialize_copy(VALUE range, VALUE orig)
+{
+ range_modify(range);
+ rb_struct_init_copy(range, orig);
+ return range;
+}
/*
* call-seq:
@@ -1244,6 +1257,7 @@ range_loader(VALUE range, VALUE obj)
rb_raise(rb_eTypeError, "not a dumped range object");
}
+ range_modify(range);
RANGE_SET_BEG(range, rb_ivar_get(obj, id_beg));
RANGE_SET_END(range, rb_ivar_get(obj, id_end));
RANGE_SET_EXCL(range, rb_ivar_get(obj, id_excl));