Commit 5faf7fe1 authored 8 years ago by Adam Welc

Merged.

parents 2c06a506 3ea1e7ec

Branches

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

ci.hocon 9 additions, 1 deletion

ci.hocon
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 12 additions, 17 deletions

...fle.r.engine/src/com/oracle/truffle/r/engine/REngine.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java 18 additions, 23 deletions

...rc/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RInteropExecuteNode.java 6 additions, 2 deletions

.../oracle/truffle/r/engine/interop/RInteropExecuteNode.java
com.oracle.truffle.r.native/fficall/src/common/errors_fastr.c 41 additions, 0 deletions

...oracle.truffle.r.native/fficall/src/common/errors_fastr.c
com.oracle.truffle.r.native/fficall/src/jni/Memory.c 6 additions, 1 deletion

com.oracle.truffle.r.native/fficall/src/jni/Memory.c
com.oracle.truffle.r.native/library/methods/src/methods_dummy.c 0 additions, 1 deletion

...acle.truffle.r.native/library/methods/src/methods_dummy.c
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackage.java 2 additions, 3 deletions

...c/com/oracle/truffle/r/nodes/builtin/RBuiltinPackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java 1 addition, 1 deletion

.../com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Args.java 1 addition, 1 deletion

...tin/src/com/oracle/truffle/r/nodes/builtin/base/Args.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsFunction.java 1 addition, 2 deletions

...c/com/oracle/truffle/r/nodes/builtin/base/AsFunction.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java 5 additions, 3 deletions

.../com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Bind.java 3 additions, 3 deletions

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

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

...n/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EnvFunctions.java 3 additions, 2 deletions

...com/oracle/truffle/r/nodes/builtin/base/EnvFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java 17 additions, 18 deletions

...om/oracle/truffle/r/nodes/builtin/base/EvalFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForceAndCall.java 35 additions, 52 deletions

...com/oracle/truffle/r/nodes/builtin/base/ForceAndCall.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FrameFunctions.java 164 additions, 126 deletions

...m/oracle/truffle/r/nodes/builtin/base/FrameFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GetFunctions.java 3 additions, 4 deletions

...com/oracle/truffle/r/nodes/builtin/base/GetFunctions.java

with 335 additions and 264 deletions

Please register or to comment