-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into truffle-head
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
Showing
20 changed files
with
237 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
fails:File.grpowned? takes non primary groups into account | ||
fails(windows):File.grpowned? returns false if the file exist | ||
fails:FileTest.grpowned? accepts an object that has a #to_path method | ||
fails:FileTest.grpowned? returns true if the file exist | ||
fails:File.grpowned? accepts an object that has a #to_path method | ||
fails:File.grpowned? returns true if the file exist |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,2 @@ | ||
fails:File::Stat#grpowned? takes non primary groups into account | ||
fails(windows):File::Stat#grpowned? returns false if the file exist | ||
fails:File::Stat#grpowned? returns true if the file exist | ||
fails:File::Stat#grpowned? accepts an object that has a #to_path method |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
170 changes: 170 additions & 0 deletions
170
truffle/src/main/java/org/jruby/truffle/nodes/array/AppendOneNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
/* | ||
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This | ||
* code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
* redistribute it and/or modify it under the terms of the: | ||
* | ||
* Eclipse Public License version 1.0 | ||
* GNU General Public License version 2 | ||
* GNU Lesser General Public License version 2.1 | ||
*/ | ||
package org.jruby.truffle.nodes.array; | ||
|
||
import com.oracle.truffle.api.dsl.*; | ||
import com.oracle.truffle.api.source.SourceSection; | ||
import com.oracle.truffle.api.utilities.ConditionProfile; | ||
import org.jruby.truffle.nodes.RubyNode; | ||
import org.jruby.truffle.nodes.core.ArrayGuards; | ||
import org.jruby.truffle.runtime.RubyContext; | ||
import org.jruby.truffle.runtime.core.RubyArray; | ||
import org.jruby.truffle.runtime.util.ArrayUtils; | ||
|
||
import java.util.Arrays; | ||
|
||
@NodeChildren({ | ||
@NodeChild("array"), | ||
@NodeChild("value"), | ||
}) | ||
@ImportStatic(ArrayGuards.class) | ||
public abstract class AppendOneNode extends RubyNode { | ||
|
||
public AppendOneNode(RubyContext context, SourceSection sourceSection) { | ||
super(context, sourceSection); | ||
} | ||
|
||
public abstract RubyArray executeAppendOne(RubyArray array, Object value); | ||
|
||
// Append into an array with null storage | ||
|
||
@Specialization(guards = "isNull(array)") | ||
public RubyArray appendNull(RubyArray array, int value) { | ||
array.setStore(new int[]{value}, 1); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = "isNull(array)") | ||
public RubyArray appendNull(RubyArray array, long value) { | ||
array.setStore(new long[]{value}, 1); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = "isNull(array)") | ||
public RubyArray appendNull(RubyArray array, Object value) { | ||
array.setStore(new Object[]{value}, 1); | ||
return array; | ||
} | ||
|
||
// Append into empty, but non-null storage; we would be better off reusing any existing space, but don't worry for now | ||
|
||
@Specialization(guards = {"!isNull(array)", "isEmpty(array)"}) | ||
public RubyArray appendEmpty(RubyArray array, int value) { | ||
array.setStore(new int[]{value}, 1); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = {"!isNull(array)", "isEmpty(array)"}) | ||
public RubyArray appendEmpty(RubyArray array, long value) { | ||
array.setStore(new long[]{value}, 1); | ||
return array; | ||
} | ||
|
||
@Specialization(guards ={"!isNull(array)", "isEmpty(array)"}) | ||
public RubyArray appendEmpty(RubyArray array, Object value) { | ||
array.setStore(new Object[]{value}, 1); | ||
return array; | ||
} | ||
|
||
// Append of the correct type | ||
|
||
@Specialization(guards = "isIntegerFixnum(array)") | ||
public RubyArray appendInteger(RubyArray array, int value, | ||
@Cached("createBinaryProfile()") ConditionProfile extendProfile) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
int[] store = (int[]) array.getStore(); | ||
|
||
if (extendProfile.profile(newSize > store.length)) { | ||
store = Arrays.copyOf(store, ArrayUtils.capacity(store.length, newSize)); | ||
} | ||
|
||
store[oldSize] = value; | ||
array.setStore(store, newSize); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = "isLongFixnum(array)") | ||
public RubyArray appendLong(RubyArray array, long value, | ||
@Cached("createBinaryProfile()") ConditionProfile extendProfile) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
long[] store = (long[]) array.getStore(); | ||
|
||
if (extendProfile.profile(newSize > store.length)) { | ||
store = Arrays.copyOf(store, ArrayUtils.capacity(store.length, newSize)); | ||
} | ||
|
||
store[oldSize] = value; | ||
array.setStore(store, newSize); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = "isObject(array)") | ||
public RubyArray appendObject(RubyArray array, Object value, | ||
@Cached("createBinaryProfile()") ConditionProfile extendProfile) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
Object[] store = (Object[]) array.getStore(); | ||
|
||
if (extendProfile.profile(newSize > store.length)) { | ||
store = Arrays.copyOf(store, ArrayUtils.capacity(store.length, newSize)); | ||
} | ||
|
||
store[oldSize] = value; | ||
array.setStore(store, newSize); | ||
return array; | ||
} | ||
|
||
// Append forcing a generalization | ||
|
||
@Specialization(guards = "isIntegerFixnum(array)") | ||
public RubyArray appendLongIntoInteger(RubyArray array, long value) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
final int[] oldStore = (int[]) array.getStore(); | ||
long[] newStore = ArrayUtils.longCopyOf(oldStore, ArrayUtils.capacity(oldStore.length, newSize)); | ||
|
||
newStore[oldSize] = value; | ||
array.setStore(newStore, newSize); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = {"isIntegerFixnum(array)", "!isInteger(value)", "!isLong(value)"}) | ||
public RubyArray appendObjectIntoInteger(RubyArray array, Object value) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
final int[] oldStore = (int[]) array.getStore(); | ||
Object[] newStore = ArrayUtils.box(oldStore, ArrayUtils.capacity(oldStore.length, newSize) - oldStore.length); | ||
|
||
newStore[oldSize] = value; | ||
array.setStore(newStore, newSize); | ||
return array; | ||
} | ||
|
||
@Specialization(guards = {"isLongFixnum(array)", "!isInteger(value)", "!isLong(value)"}) | ||
public RubyArray appendObjectIntoLong(RubyArray array, Object value) { | ||
final int oldSize = array.getSize(); | ||
final int newSize = oldSize + 1; | ||
|
||
final long[] oldStore = (long[]) array.getStore(); | ||
Object[] newStore = ArrayUtils.box(oldStore, ArrayUtils.capacity(oldStore.length, newSize) - oldStore.length); | ||
|
||
newStore[oldSize] = value; | ||
array.setStore(newStore, newSize); | ||
return array; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters