Commit 62955bbd authored 10 years ago by Adam Welc

Merged.

parents 5835c02e da9399ac

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/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/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/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/DynLoadFunctions.java 15 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 1 addition, 1 deletion

...racle/truffle/r/nodes/builtin/base/GroupDispatchNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/NextMethodDispatchNode.java 1 addition, 1 deletion

.../truffle/r/nodes/builtin/base/NextMethodDispatchNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Order.java 3 additions, 3 deletions

...es/src/com/oracle/truffle/r/nodes/builtin/base/Order.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Paste.java 7 additions, 0 deletions

...es/src/com/oracle/truffle/r/nodes/builtin/base/Paste.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/ProcTime.java 2 additions, 2 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/ProcTime.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/RepeatLength.java 142 additions, 0 deletions

...com/oracle/truffle/r/nodes/builtin/base/RepeatLength.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/S3DispatchNode.java 1 addition, 1 deletion

...m/oracle/truffle/r/nodes/builtin/base/S3DispatchNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/UseMethodDispatchNode.java 1 addition, 1 deletion

...e/truffle/r/nodes/builtin/base/UseMethodDispatchNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java 45 additions, 6 deletions

...acle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/R/Rprofile.R 153 additions, 0 deletions

...e.r.runtime/src/com/oracle/truffle/r/runtime/R/Rprofile.R
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvironment.java 4 additions, 3 deletions

...untime/src/com/oracle/truffle/r/runtime/REnvironment.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RPackages.java 1 addition, 1 deletion

...r.runtime/src/com/oracle/truffle/r/runtime/RPackages.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java 11 additions, 3 deletions

....r.runtime/src/com/oracle/truffle/r/runtime/RProfile.java

with 746 additions and 183 deletions

Please register or to comment