Commit c4cebfae authored 11 years ago by Mick Jordan

Merge

parents 8efecafd 80161cb6

Branches

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/WriteVariableNode.java 1 addition, 1 deletion

.../com/oracle/truffle/r/nodes/access/WriteVariableNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java 25 additions, 25 deletions

.../com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java 36 additions, 31 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java 12 additions, 51 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsLogical.java 9 additions, 44 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/AsLogical.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java 7 additions, 1 deletion

.../src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Round.java 103 additions, 6 deletions

...es/src/com/oracle/truffle/r/nodes/builtin/base/Round.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleNode.java 118 additions, 66 deletions

.../src/com/oracle/truffle/r/nodes/unary/CastDoubleNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java 81 additions, 74 deletions

...src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java 53 additions, 60 deletions

...src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastStringNode.java 54 additions, 60 deletions

.../src/com/oracle/truffle/r/nodes/unary/CastStringNode.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RRuntime.java 276 additions, 141 deletions

....r.runtime/src/com/oracle/truffle/r/runtime/RRuntime.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/UnaryArithmetic.java 169 additions, 19 deletions

...src/com/oracle/truffle/r/runtime/ops/UnaryArithmetic.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java 50 additions, 73 deletions

...time/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test 198 additions, 4 deletions

...est/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/all/AllTests.java 101 additions, 16 deletions

...le.r.test/src/com/oracle/truffle/r/test/all/AllTests.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/failing/FailingTests.java 5 additions, 55 deletions

...t/src/com/oracle/truffle/r/test/failing/FailingTests.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/GnuROneShotRSession.java 2 additions, 1 deletion

...m/oracle/truffle/r/test/generate/GnuROneShotRSession.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/simple/TestSimpleArithmetic.java 7 additions, 7 deletions

...om/oracle/truffle/r/test/simple/TestSimpleArithmetic.java
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/simple/TestSimpleBuiltins.java 30 additions, 27 deletions

.../com/oracle/truffle/r/test/simple/TestSimpleBuiltins.java

with 1337 additions and 762 deletions

Please register or to comment