Commit 3e6d1f13 authored 11 years ago by Mick Jordan

Merge

parents 8b3a6b99 d38c5ca3

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/builtin/base/AsCharacter.java 21 additions, 5 deletions

.../com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsComplex.java 29 additions, 55 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/AsComplex.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java 9 additions, 17 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 21 additions, 5 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsRaw.java 41 additions, 90 deletions

...es/src/com/oracle/truffle/r/nodes/builtin/base/AsRaw.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java 142 additions, 40 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java 4 additions, 4 deletions

.../src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Cor.java 2 additions, 2 deletions

...odes/src/com/oracle/truffle/r/nodes/builtin/base/Cor.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Cov.java 2 additions, 2 deletions

...odes/src/com/oracle/truffle/r/nodes/builtin/base/Cov.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Covcor.java 7 additions, 9 deletions

...s/src/com/oracle/truffle/r/nodes/builtin/base/Covcor.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/SApply.java 1 addition, 1 deletion

...s/src/com/oracle/truffle/r/nodes/builtin/base/SApply.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UpdateAttr.java 2 additions, 2 deletions

...c/com/oracle/truffle/r/nodes/builtin/base/UpdateAttr.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UpdateAttributes.java 2 additions, 2 deletions

...oracle/truffle/r/nodes/builtin/base/UpdateAttributes.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDimNames.java 1 addition, 1 deletion

...m/oracle/truffle/r/nodes/builtin/base/UpdateDimNames.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastComplexNode.java 105 additions, 28 deletions

...src/com/oracle/truffle/r/nodes/unary/CastComplexNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleNode.java 1 addition, 15 deletions

.../src/com/oracle/truffle/r/nodes/unary/CastDoubleNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java 5 additions, 12 deletions

...src/com/oracle/truffle/r/nodes/unary/CastIntegerNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java 0 additions, 13 deletions

...src/com/oracle/truffle/r/nodes/unary/CastLogicalNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastNode.java 14 additions, 0 deletions

....nodes/src/com/oracle/truffle/r/nodes/unary/CastNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastRawNode.java 229 additions, 12 deletions

...des/src/com/oracle/truffle/r/nodes/unary/CastRawNode.java

with 638 additions and 315 deletions

Please register or to comment