From bb85be162005536fd28d19e809dcd58cefc03535 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Feb 2001 11:38:20 +0000
Subject: * array.c (rb_ary_sort_bang): returns self, even if its length is  
 less than 2.

* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
  SCOPE_DONT_RECYCLE of ruby_scope is set.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index 1dc1627fb..93b3659d0 100644
--- a/array.c
+++ b/array.c
@@ -384,7 +384,7 @@ rb_ary_entry(ary, offset)
     if (RARRAY(ary)->len == 0) return Qnil;
 
     if (offset < 0) {
-	offset = RARRAY(ary)->len + offset;
+	offset += RARRAY(ary)->len;
     }
     if (offset < 0 || RARRAY(ary)->len <= offset) {
 	return Qnil;
@@ -431,7 +431,7 @@ rb_ary_aref(argc, argv, ary)
 	beg = NUM2LONG(arg1);
 	len = NUM2LONG(arg2);
 	if (beg < 0) {
-	    beg = RARRAY(ary)->len + beg;
+	    beg += RARRAY(ary)->len;
 	}
 	return rb_ary_subseq(ary, beg, len);
     }
@@ -480,6 +480,27 @@ rb_ary_last(ary)
     return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
 }
 
+static VALUE
+rb_ary_fetch(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE pos, ifnone;
+    long idx;
+
+    rb_scan_args(argc, argv, "11", &pos, &ifnone);
+    idx = NUM2LONG(pos);
+
+    if (idx < 0) {
+	idx +=  RARRAY(ary)->len;
+    }
+    if (idx < 0 || RARRAY(ary)->len <= idx) {
+	return ifnone;
+    }
+    return RARRAY(ary)->ptr[idx];
+}
+
 static VALUE
 rb_ary_index(ary, val)
     VALUE ary;
@@ -979,7 +1000,7 @@ rb_ary_sort_bang(ary)
     VALUE ary;
 {
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len <= 1) return Qnil;
+    if (RARRAY(ary)->len <= 1) return ary;
 
     FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
     rb_ensure(sort_internal, ary, sort_unlock, ary);
@@ -1649,6 +1670,7 @@ Init_Array()
     rb_define_method(rb_cArray, "[]", rb_ary_aref, -1);
     rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1);
     rb_define_method(rb_cArray, "at", rb_ary_at, 1);
+    rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
     rb_define_method(rb_cArray, "first", rb_ary_first, 0);
     rb_define_method(rb_cArray, "last", rb_ary_last, 0);
     rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
-- 
cgit