Commit 7be18234 authored 8 years ago by Mick Jordan

Merge branch 'master' into feature/fastr-builtin

parents 578caecf 832f0a93

Branches

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 20 additions, 6 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 12 additions, 16 deletions

...rc/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/methods/MethodsListDispatch.java 1 addition, 1 deletion

...oracle/truffle/r/library/methods/MethodsListDispatch.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Bind.java 250 additions, 225 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/DoCall.java 11 additions, 113 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 1 addition, 1 deletion

...com/oracle/truffle/r/nodes/builtin/base/EnvFunctions.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ForceAndCall.java 22 additions, 23 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 7 additions, 8 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 4 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/Internal.java 3 additions, 7 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/Internal.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Lapply.java 25 additions, 102 deletions

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

...src/com/oracle/truffle/r/nodes/builtin/base/MatchFun.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/VApply.java 3 additions, 6 deletions

...n/src/com/oracle/truffle/r/nodes/builtin/base/VApply.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/ValuePrinters.java 1 addition, 1 deletion

...e/truffle/r/nodes/builtin/base/printer/ValuePrinters.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java 2 additions, 22 deletions

...e.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTUtils.java 4 additions, 57 deletions

...fle.r.nodes/src/com/oracle/truffle/r/nodes/RASTUtils.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ConstantNode.java 0 additions, 17 deletions

...s/src/com/oracle/truffle/r/nodes/access/ConstantNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java 2 additions, 2 deletions

.../src/com/oracle/truffle/r/nodes/builtin/RBuiltinNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinRootNode.java 0 additions, 5 deletions

.../com/oracle/truffle/r/nodes/builtin/RBuiltinRootNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/ArgumentMatcher.java 10 additions, 31 deletions

.../com/oracle/truffle/r/nodes/function/ArgumentMatcher.java

with 379 additions and 645 deletions

Please register or to comment