Commit b225bac4 authored 8 years ago by Adam Welc

Merged and resolved conflicts.

parents a7c6090a 620d8955

No related branches found

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/AnyNA.java 1 addition, 13 deletions

...in/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java 1 addition, 12 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/AsDouble.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java 1 addition, 12 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/AsInteger.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsVector.java 173 additions, 183 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 0 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 251 additions, 284 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/CopyDFAttr.java 0 additions, 8 deletions

...c/com/oracle/truffle/r/nodes/builtin/base/CopyDFAttr.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DimNames.java 1 addition, 13 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/DimNames.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 2 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/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/Format.java 11 additions, 13 deletions

...n/src/com/oracle/truffle/r/nodes/builtin/base/Format.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/Identical.java 1 addition, 19 deletions

...rc/com/oracle/truffle/r/nodes/builtin/base/Identical.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/IsNA.java 3 additions, 19 deletions

...tin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java

with 525 additions and 756 deletions

Please register or to comment