Commit 6eebd667 authored 10 years ago by Michael Haupt

merge

parents 3a406ce9 9fd82d00

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 9 additions, 0 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/ColSums.java 13 additions, 4 deletions

.../src/com/oracle/truffle/r/nodes/builtin/base/ColSums.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java 2 additions, 2 deletions

...c/com/oracle/truffle/r/nodes/builtin/base/UpdateDiag.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/array/ArrayPositionCast.java 1 addition, 1 deletion

...racle/truffle/r/nodes/access/array/ArrayPositionCast.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/array/read/AccessArrayNode.java 2 additions, 2 deletions

...le/truffle/r/nodes/access/array/read/AccessArrayNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java 2 additions, 2 deletions

...m/oracle/truffle/r/nodes/binary/BinaryArithmeticNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java 160 additions, 75 deletions

.../com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CombineBinaryNode.java 1 addition, 1 deletion

.../com/oracle/truffle/r/nodes/binary/CombineBinaryNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastStringNode.java 1 addition, 1 deletion

.../src/com/oracle/truffle/r/nodes/unary/CastStringNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java 6 additions, 3 deletions

...acle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
com.oracle.truffle.r.options/src/com/oracle/truffle/r/options/FastROptions.java 2 additions, 0 deletions

...ptions/src/com/oracle/truffle/r/options/FastROptions.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RComplexVector.java 9 additions, 1 deletion

...src/com/oracle/truffle/r/runtime/data/RComplexVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDoubleVector.java 1 addition, 1 deletion

.../src/com/oracle/truffle/r/runtime/data/RDoubleVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RIntVector.java 1 addition, 1 deletion

...ime/src/com/oracle/truffle/r/runtime/data/RIntVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RList.java 4 additions, 0 deletions

....runtime/src/com/oracle/truffle/r/runtime/data/RList.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractComplexVector.java 10 additions, 0 deletions

.../truffle/r/runtime/data/model/RAbstractComplexVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractDoubleVector.java 10 additions, 0 deletions

...e/truffle/r/runtime/data/model/RAbstractDoubleVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractIntVector.java 10 additions, 0 deletions

...acle/truffle/r/runtime/data/model/RAbstractIntVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractLogicalVector.java 10 additions, 0 deletions

.../truffle/r/runtime/data/model/RAbstractLogicalVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/model/RAbstractRawVector.java 4 additions, 0 deletions

...acle/truffle/r/runtime/data/model/RAbstractRawVector.java

with 258 additions and 94 deletions

Please register or to comment