Commit 01b774ca authored 8 years ago by Lukas Stadler

Merge pull request #264 in G/fastr from...

Merge pull request #264 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:feature/update_truffle2 to master

* commit '616ea6e1':
  update Truffle dependency

parents ded0e178 616ea6e1

Branches

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 1 addition, 1 deletion

...fle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java 14 additions, 11 deletions

...ine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java 113 additions, 0 deletions

...c/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RForeignAccessFactoryImpl.java 3 additions, 0 deletions

...e/truffle/r/engine/interop/RForeignAccessFactoryImpl.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java 2 additions, 8 deletions

.../src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RListMR.java 26 additions, 17 deletions

...gine/src/com/oracle/truffle/r/engine/interop/RListMR.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java 44 additions, 58 deletions

...ngine/src/com/oracle/truffle/r/engine/shell/RCommand.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java 2 additions, 6 deletions

...gine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java 4 additions, 0 deletions

.../com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Ceiling.java 0 additions, 5 deletions

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

...cle/truffle/r/nodes/builtin/base/ConnectionFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Diag.java 4 additions, 3 deletions

...tin/src/com/oracle/truffle/r/nodes/builtin/base/Diag.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java 0 additions, 2 deletions

...om/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsUnsorted.java 0 additions, 2 deletions

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

...n/src/com/oracle/truffle/r/nodes/builtin/base/Lapply.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LocaleFunctions.java 1 addition, 1 deletion

.../oracle/truffle/r/nodes/builtin/base/LocaleFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Merge.java 2 additions, 2 deletions

...in/src/com/oracle/truffle/r/nodes/builtin/base/Merge.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java 57 additions, 9 deletions

...om/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/builtin/CastBuilderTest.java 3 additions, 2 deletions

...c/com/oracle/truffle/r/nodes/builtin/CastBuilderTest.java
com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/casts/PredefMappersSamplers.java 0 additions, 1 deletion

...m/oracle/truffle/r/nodes/casts/PredefMappersSamplers.java

with 277 additions and 130 deletions

Please register or to comment