Commit 75b96298 authored 10 years ago by Adam Welc

Merged.

parents 89b8c368 6299b1f3

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.engine/src/com/oracle/truffle/r/engine/REngine.java 38 additions, 64 deletions

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

...nodes/src/com/oracle/truffle/r/nodes/RTruffleVisitor.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/AccessVarArgumentsNode.java 1 addition, 1 deletion

...oracle/truffle/r/nodes/access/AccessVarArgumentsNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/ReadVariableNode.java 1 addition, 1 deletion

...c/com/oracle/truffle/r/nodes/access/ReadVariableNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinBuilder.java 8 additions, 2 deletions

...c/com/oracle/truffle/r/nodes/builtin/RBuiltinBuilder.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinFactory.java 14 additions, 3 deletions

...c/com/oracle/truffle/r/nodes/builtin/RBuiltinFactory.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackage.java 5 additions, 5 deletions

...c/com/oracle/truffle/r/nodes/builtin/RBuiltinPackage.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java 5 additions, 3 deletions

.../com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/RBuiltinRootNode.java 1 addition, 0 deletions

.../com/oracle/truffle/r/nodes/builtin/RBuiltinRootNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Abs.java 1 addition, 1 deletion

...odes/src/com/oracle/truffle/r/nodes/builtin/base/Abs.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/All.java 3 additions, 2 deletions

...odes/src/com/oracle/truffle/r/nodes/builtin/base/All.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Any.java 2 additions, 2 deletions

...odes/src/com/oracle/truffle/r/nodes/builtin/base/Any.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Apply.java 3 additions, 2 deletions

...es/src/com/oracle/truffle/r/nodes/builtin/base/Apply.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/Array.java 1 addition, 1 deletion

...es/src/com/oracle/truffle/r/nodes/builtin/base/Array.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java 3 additions, 1 deletion

.../com/oracle/truffle/r/nodes/builtin/base/AsCharacter.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsComplex.java 3 additions, 1 deletion

...rc/com/oracle/truffle/r/nodes/builtin/base/AsComplex.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java 2 additions, 1 deletion

...src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java 2 additions, 1 deletion

...rc/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsLogical.java 2 additions, 1 deletion

...rc/com/oracle/truffle/r/nodes/builtin/base/AsLogical.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/base/AsRaw.java 2 additions, 1 deletion

...es/src/com/oracle/truffle/r/nodes/builtin/base/AsRaw.java

with 98 additions and 94 deletions

Please register or to comment