Commit 09ce1aab authored 10 years ago by Prahlad Joshi

Merge.

parents f315a1e0 b30c0621

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/RNode.java 4 additions, 0 deletions

...truffle.r.nodes/src/com/oracle/truffle/r/nodes/RNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RProxyNode.java 9 additions, 0 deletions

...le.r.nodes/src/com/oracle/truffle/r/nodes/RProxyNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTruffleVisitor.java 12 additions, 6 deletions

...nodes/src/com/oracle/truffle/r/nodes/RTruffleVisitor.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java 4 additions, 2 deletions

...ruffle.r.nodes/src/com/oracle/truffle/r/nodes/RTypes.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/UpdateFieldNode.java 2 additions, 2 deletions

...rc/com/oracle/truffle/r/nodes/access/UpdateFieldNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CombineBinaryListNode.java 2 additions, 2 deletions

.../oracle/truffle/r/nodes/binary/CombineBinaryListNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java 5 additions, 1 deletion

.../src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/REngine.java 34 additions, 2 deletions

...nodes/src/com/oracle/truffle/r/nodes/builtin/REngine.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java 6 additions, 0 deletions

.../com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java 16 additions, 1 deletion

...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 29 additions, 11 deletions

.../src/com/oracle/truffle/r/nodes/builtin/base/Combine.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Crossprod.java 66 additions, 8 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/Crossprod.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/DispatchedCallNode.java 1 addition, 1 deletion

...acle/truffle/r/nodes/builtin/base/DispatchedCallNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java 16 additions, 0 deletions

...oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java 292 additions, 0 deletions

...oracle/truffle/r/nodes/builtin/base/ForeignFunctions.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Fortran.java 0 additions, 144 deletions

.../src/com/oracle/truffle/r/nodes/builtin/base/Fortran.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/GroupDispatchNode.java 2 additions, 2 deletions

...racle/truffle/r/nodes/builtin/base/GroupDispatchNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/IsName.java 49 additions, 0 deletions

...s/src/com/oracle/truffle/r/nodes/builtin/base/IsName.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java 30 additions, 0 deletions

...c/com/oracle/truffle/r/nodes/builtin/base/IsTypeNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Missing.java 1 addition, 1 deletion

.../src/com/oracle/truffle/r/nodes/builtin/base/Missing.java

with 580 additions and 183 deletions

Please register or to comment