diff options
| -rw-r--r-- | enumerator.c | 21 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | internal.h | 5 | ||||
| -rw-r--r-- | range.c | 3 |
4 files changed, 27 insertions, 3 deletions
diff --git a/enumerator.c b/enumerator.c index 615f933778..436541070f 100644 --- a/enumerator.c +++ b/enumerator.c @@ -2777,6 +2777,27 @@ arith_seq_exclude_end_p(VALUE self) return RTEST(arith_seq_exclude_end(self)); } +int +rb_arithmetic_sequence_extract(VALUE obj, VALUE *begin, VALUE *end, VALUE *step, int *exclude_end) +{ + if (rb_obj_is_kind_of(obj, rb_cArithSeq)) { + *begin = arith_seq_begin(obj); + *end = arith_seq_end(obj); + *step = arith_seq_step(obj); + *exclude_end = arith_seq_exclude_end_p(obj); + return 1; + } + else if (rb_obj_is_kind_of(obj, rb_cRange)) { + *begin = RANGE_BEG(obj); + *end = RANGE_END(obj); + *step = INT2FIX(1); + *exclude_end = RTEST(RANGE_EXCL(obj)); + return 1; + } + + return 0; +} + /* * call-seq: * aseq.first -> num or nil diff --git a/include/ruby/intern.h b/include/ruby/intern.h index e8d49b820a..2a90ab2272 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -244,6 +244,7 @@ VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, const VALUE *, rb_enumerator return SIZED_ENUMERATOR(obj, argc, argv, size_fn); \ } while (0) #define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0) +int rb_arithmetic_sequence_extract(VALUE, VALUE *, VALUE *, VALUE *, int *); /* error.c */ VALUE rb_exc_new(VALUE, const char*, long); VALUE rb_exc_new_cstr(VALUE, const char*); diff --git a/internal.h b/internal.h index 7f6b063750..014d1ab98a 100644 --- a/internal.h +++ b/internal.h @@ -1964,6 +1964,11 @@ ARGVSTR2ARGC(VALUE argv_str) rb_pid_t rb_fork_ruby(int *status); void rb_last_status_clear(void); +/* range.c */ +#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0]) +#define RANGE_END(r) (RSTRUCT(r)->as.ary[1]) +#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2]) + /* rational.c */ VALUE rb_rational_canonicalize(VALUE x); VALUE rb_rational_uminus(VALUE self); @@ -24,9 +24,6 @@ static ID id_beg, id_end, id_excl; static VALUE r_cover_p(VALUE, VALUE, VALUE, VALUE); -#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0]) -#define RANGE_END(r) (RSTRUCT(r)->as.ary[1]) -#define RANGE_EXCL(r) (RSTRUCT(r)->as.ary[2]) #define RANGE_SET_BEG(r, v) (RSTRUCT_SET(r, 0, v)) #define RANGE_SET_END(r, v) (RSTRUCT_SET(r, 1, v)) #define RANGE_SET_EXCL(r, v) (RSTRUCT_SET(r, 2, v)) |