Commit 8cf7fe96 authored 8 years ago by Mick Jordan

Merge branch 'master' into feature/rprof

parents dd6dec1a 0afab52f

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AllNames.java 0 additions, 1 deletion

...src/com/oracle/truffle/r/nodes/builtin/base/AllNames.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Array.java 19 additions, 1 deletion

...in/src/com/oracle/truffle/r/nodes/builtin/base/Array.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java 12 additions, 75 deletions

.../com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java 3 additions, 2 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java 2 additions, 2 deletions

.../com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Combine.java 1 addition, 1 deletion

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

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

...om/oracle/truffle/r/nodes/builtin/base/FileFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FormatC.java 1 addition, 1 deletion

.../src/com/oracle/truffle/r/nodes/builtin/base/FormatC.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GetFunctions.java 0 additions, 1 deletion

...com/oracle/truffle/r/nodes/builtin/base/GetFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Match.java 1 addition, 1 deletion

...in/src/com/oracle/truffle/r/nodes/builtin/base/Match.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NZChar.java 1 addition, 1 deletion

...n/src/com/oracle/truffle/r/nodes/builtin/base/NZChar.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/NamespaceFunctions.java 6 additions, 0 deletions

...acle/truffle/r/nodes/builtin/base/NamespaceFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java 1 addition, 1 deletion

.../src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Parse.java 1 addition, 1 deletion

...in/src/com/oracle/truffle/r/nodes/builtin/base/Parse.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Paste.java 4 additions, 23 deletions

...in/src/com/oracle/truffle/r/nodes/builtin/base/Paste.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Primitive.java 25 additions, 10 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/Primitive.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Scan.java 15 additions, 16 deletions

...tin/src/com/oracle/truffle/r/nodes/builtin/base/Scan.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Transpose.java 65 additions, 81 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/Transpose.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateAttributes.java 6 additions, 6 deletions

...oracle/truffle/r/nodes/builtin/base/UpdateAttributes.java

with 165 additions and 226 deletions

Please register or to comment