Commit 41f62c5c authored 9 years ago by Mick Jordan

Merge

parents e9591956 9ec53f6a

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/RContextFactory.java 37 additions, 37 deletions

...gine/src/com/oracle/truffle/r/engine/RContextFactory.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 129 additions, 158 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 34 additions, 6 deletions

...rc/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java 13 additions, 11 deletions

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

...com/oracle/truffle/r/engine/interop/ConstantRootNode.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RAbstractVectorAccessFactory.java 102 additions, 0 deletions

...ruffle/r/engine/interop/RAbstractVectorAccessFactory.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionAccessFactory.java 76 additions, 0 deletions

...acle/truffle/r/engine/interop/RFunctionAccessFactory.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RInteropExecuteNode.java 59 additions, 0 deletions

.../oracle/truffle/r/engine/interop/RInteropExecuteNode.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/VectorReadNode.java 95 additions, 0 deletions

...c/com/oracle/truffle/r/engine/interop/VectorReadNode.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/VectorSizeNode.java 42 additions, 0 deletions

...c/com/oracle/truffle/r/engine/interop/VectorSizeNode.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java 7 additions, 7 deletions

...ine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/debug/RDebugSupportProvider.java 7 additions, 2 deletions

...le/truffle/r/engine/repl/debug/RDebugSupportProvider.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/JLineConsoleHandler.java 7 additions, 2 deletions

...om/oracle/truffle/r/engine/shell/JLineConsoleHandler.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCmdOptionsParser.java 0 additions, 123 deletions

.../com/oracle/truffle/r/engine/shell/RCmdOptionsParser.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java 87 additions, 102 deletions

...ngine/src/com/oracle/truffle/r/engine/shell/RCommand.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RscriptCommand.java 40 additions, 24 deletions

...src/com/oracle/truffle/r/engine/shell/RscriptCommand.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/StringConsoleHandler.java 9 additions, 3 deletions

...m/oracle/truffle/r/engine/shell/StringConsoleHandler.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java 39 additions, 24 deletions

.../src/com/oracle/truffle/r/library/fastr/FastRContext.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRStackTrace.java 1 addition, 0 deletions

...c/com/oracle/truffle/r/library/fastr/FastRStackTrace.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/InteropExport.java 49 additions, 0 deletions

...src/com/oracle/truffle/r/library/fastr/InteropExport.java

with 876 additions and 499 deletions

Please register or to comment