Commit 8d40fd41 authored 10 years ago by Mick Jordan

Merge

parents 9c8619ec 13be3fc4

Branches

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 21 additions, 19 deletions

...fle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Any.java 1 addition, 2 deletions

...ltin/src/com/oracle/truffle/r/nodes/builtin/base/Any.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CumSum.java 5 additions, 5 deletions

...n/src/com/oracle/truffle/r/nodes/builtin/base/CumSum.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java 3 additions, 6 deletions

...oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/MatMult.java 22 additions, 11 deletions

.../src/com/oracle/truffle/r/nodes/builtin/base/MatMult.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/SortFunctions.java 1 addition, 1 deletion

...om/oracle/truffle/r/nodes/builtin/base/SortFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Substr.java 3 additions, 1 deletion

...n/src/com/oracle/truffle/r/nodes/builtin/base/Substr.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateSubstr.java 3 additions, 1 deletion

...com/oracle/truffle/r/nodes/builtin/base/UpdateSubstr.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CombineBinaryLogicalNode.java 2 additions, 4 deletions

...acle/truffle/r/nodes/binary/CombineBinaryLogicalNode.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ResourceHandler.java 0 additions, 45 deletions

...ime/src/com/oracle/truffle/r/runtime/ResourceHandler.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDoubleVector.java 13 additions, 5 deletions

.../src/com/oracle/truffle/r/runtime/data/RDoubleVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RIntVector.java 13 additions, 5 deletions

...ime/src/com/oracle/truffle/r/runtime/data/RIntVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RLogicalVector.java 13 additions, 5 deletions

...src/com/oracle/truffle/r/runtime/data/RLogicalVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java 1 addition, 1 deletion

...untime/src/com/oracle/truffle/r/runtime/data/RVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractVector.java 5 additions, 0 deletions

.../oracle/truffle/r/runtime/data/model/RAbstractVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryCompare.java 20 additions, 43 deletions

...e/src/com/oracle/truffle/r/runtime/ops/BinaryCompare.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/BinaryLogic.java 18 additions, 29 deletions

...ime/src/com/oracle/truffle/r/runtime/ops/BinaryLogic.java

with 144 additions and 183 deletions

Please register or to comment