diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-02 08:46:28 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-02 08:46:28 +0000 |
commit | ffe1cf575ecd5f9215a75728947520e9e668fb8a (patch) | |
tree | 9536b7d2a0fae33e4e3a5b7cdccfac0bc0b04a4f /array.c | |
parent | cc13bb43bcb1e6b6798bb3190eeb65494dd2d320 (diff) |
* error.c (exc_exception): clone the receiver exception instead of
creating brand new exception object of the receiver.
* eval.c (rb_eval_string_wrap): extend new ruby_top_self, not
original self.
* eval.c (rb_eval_cmd): respect ruby_wrapper if set.
* eval.c (eval): do not update ruby_class unless scope is not
provided.
* eval.c (eval): preserve wrapper information.
* eval.c (proc_invoke): ditto.
* eval.c (block_pass): ditto.
* parse.y (void_expr): too much warnings for void context
(e.g. foo[1] that can be mere Proc call).
* error.c (rb_name_error): new function to raise NameError with
name attribute set.
* eval.c (rb_f_missing): set name and args in the exception
object. [new]
* error.c (name_name): NameError#name - new method.
* error.c (nometh_args): NoMethodError#args - new method.
* lex.c (rb_reserved_word): lex_state after tRESCUE should be
EXPR_MID.
* gc.c (add_heap): allocation size of the heap unit is doubled for
each allocation.
* dir.c (isdelim): space, tab, and newline are no longer
delimiters for glob patterns.
* eval.c (svalue_to_avalue): new conversion scheme between single
value and array values.
* eval.c (avalue_to_svalue): ditto.
* eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return
and yield too.
* eval.c (rb_yield_0): use avalue_to_svalue().
* eval.c (proc_invoke): Proc#call gives avaules, whereas
Proc#yield gives mvalues.
* eval.c (bmcall): convert given value (svalue) to avalue.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -419,28 +419,31 @@ rb_ary_aref(argc, argv, ary) VALUE *argv; VALUE ary; { - VALUE arg1, arg2; + VALUE arg; long beg, len; - if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) { - beg = NUM2LONG(arg1); - len = NUM2LONG(arg2); + if (argc == 2) { + beg = NUM2LONG(argv[0]); + len = NUM2LONG(argv[1]); if (beg < 0) { beg += RARRAY(ary)->len; } return rb_ary_subseq(ary, beg, len); } - + if (argc != 1) { + rb_scan_args(argc, argv, "11", 0, 0); + } + arg = argv[0]; /* special case - speeding up */ - if (FIXNUM_P(arg1)) { - return rb_ary_entry(ary, FIX2LONG(arg1)); + if (FIXNUM_P(arg)) { + return rb_ary_entry(ary, FIX2LONG(arg)); } - else if (TYPE(arg1) == T_BIGNUM) { + else if (TYPE(arg) == T_BIGNUM) { rb_raise(rb_eIndexError, "index too big"); } else { /* check if idx is Range */ - switch (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 0)) { + switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) { case Qfalse: break; case Qnil: @@ -449,7 +452,7 @@ rb_ary_aref(argc, argv, ary) return rb_ary_subseq(ary, beg, len); } } - return rb_ary_entry(ary, NUM2LONG(arg1)); + return rb_ary_entry(ary, NUM2LONG(arg)); } static VALUE |