mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
enumerator.c: rb_arithmetic_sequence_extract
New public C-API for extracting components of Enumerator::ArithmeticSequence or Range. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3a637971a2
commit
914a290324
4 changed files with 27 additions and 3 deletions
21
enumerator.c
21
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
|
||||
|
|
|
@ -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*);
|
||||
|
|
|
@ -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);
|
||||
|
|
3
range.c
3
range.c
|
@ -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))
|
||||
|
|
Loading…
Add table
Reference in a new issue