Merge pull request #7653 from k77ch7/ruby-3.1-fix-strunct-values_at

enebo · web-flow · commit cb36ca277bba · 2023-02-13T10:27:42.000-06:00
Fix Struct#values_at when passed an integer Range argument for edge cases
diff --git a/core/src/main/java/org/jruby/RubyRange.java b/core/src/main/java/org/jruby/RubyRange.java
@@ -1233,8 +1233,8 @@ public static IRubyObject rangeBeginLength(ThreadContext context, IRubyObject ra
         IRubyObject _beg = sites.begin.call(context, range, range);
         IRubyObject _end = sites.end.call(context, range, range);
         boolean excludeEnd = sites.exclude_end.call(context, range, range).isTrue();
-        int beg = _beg.convertToInteger().getIntValue();
-        int end = _end.convertToInteger().getIntValue();
+        int beg = _beg.isNil() ? 0 : _beg.convertToInteger().getIntValue();
+        int end = _end.isNil() ? -1 :_end.convertToInteger().getIntValue();
         int origBeg = beg;
         int origEnd = end;
 
diff --git a/core/src/main/java/org/jruby/RubyStruct.java b/core/src/main/java/org/jruby/RubyStruct.java
@@ -828,35 +828,37 @@ private IRubyObject aset(int idx, IRubyObject value) {
         return values[newIdx] = value;
     }
 
-    // NOTE: copied from RubyArray, both RE, Struct, and Array should share one impl
     @JRubyMethod(rest = true)
     public IRubyObject values_at(IRubyObject[] args) {
+        final Ruby runtime = metaClass.runtime;
         final int olen = values.length;
         RubyArray result = getRuntime().newArray(args.length);
 
         for (int i = 0; i < args.length; i++) {
             final IRubyObject arg = args[i];
-            if ( arg instanceof RubyFixnum ) {
+            if (arg instanceof RubyFixnum ) {
                 result.append( aref(arg) );
                 continue;
             }
 
-            final int[] begLen;
-            if ( ! ( arg instanceof RubyRange ) ) {
-                // do result.append
-            }
-            else if ( ( begLen = ((RubyRange) args[i]).begLenInt(olen, 0) ) == null ) {
-                continue;
-            }
-            else {
+            final int [] begLen = new int[2];
+            if (arg instanceof RubyRange &&
+                    RubyRange.rangeBeginLength(runtime.getCurrentContext(),(RubyRange) args[i], olen, begLen, 1).isTrue()) {
                 final int beg = begLen[0];
                 final int len = begLen[1];
-                for (int j = 0; j < len; j++) {
-                    result.append( aref(j + beg) );
+                int end = olen < beg + len ? olen : beg + len;
+                int j;
+                for (j = beg; j < end; j++) {
+                    result.push(aref(j));
+                }
+                if ( beg + len > j ) {
+                    IRubyObject [] tmp = new IRubyObject[beg + len - j];
+                    Helpers.fillNil(tmp, getRuntime());
+                    result.push(tmp);
                 }
                 continue;
             }
-            result.append( aref(RubyNumeric.num2int(arg)) );
+            result.push(aref(RubyNumeric.num2int(arg)));
         }
 
         return result;
diff --git a/spec/tags/ruby/core/struct/values_at_tags.txt b/spec/tags/ruby/core/struct/values_at_tags.txt
