Commit 8555b925 authored 9 years ago by Mick Jordan

Merge

parents 36e1909c 503fe3fc

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 73 additions, 72 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 1 addition, 1 deletion

...rc/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java 38 additions, 1 deletion

.../src/com/oracle/truffle/r/library/fastr/FastRContext.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/parallel/ParallelFunctions.java 15 additions, 12 deletions

.../oracle/truffle/r/library/parallel/ParallelFunctions.java
com.oracle.truffle.r.native/library/fastr/src/R/fastr.R 8 additions, 0 deletions

com.oracle.truffle.r.native/library/fastr/src/R/fastr.R
com.oracle.truffle.r.native/library/lib.mk 2 additions, 1 deletion

com.oracle.truffle.r.native/library/lib.mk
com.oracle.truffle.r.native/library/methods/src/methods_dummy.c 27 additions, 29 deletions

...acle.truffle.r.native/library/methods/src/methods_dummy.c
com.oracle.truffle.r.native/library/parallel/Makefile 14 additions, 1 deletion

com.oracle.truffle.r.native/library/parallel/Makefile
com.oracle.truffle.r.native/library/parallel/src/init.c 0 additions, 62 deletions

com.oracle.truffle.r.native/library/parallel/src/init.c
com.oracle.truffle.r.native/library/parallel/src/parallel.h 0 additions, 58 deletions

com.oracle.truffle.r.native/library/parallel/src/parallel.h
com.oracle.truffle.r.native/library/parallel/src/parallel_dummy.c 46 additions, 0 deletions

...le.truffle.r.native/library/parallel/src/parallel_dummy.c
com.oracle.truffle.r.native/library/stats/Makefile 1 addition, 0 deletions

com.oracle.truffle.r.native/library/stats/Makefile
com.oracle.truffle.r.native/library/stats/src/gnur_extracts.c 1 addition, 1 deletion

...oracle.truffle.r.native/library/stats/src/gnur_extracts.c
com.oracle.truffle.r.native/library/stats/src/statsR.h 0 additions, 114 deletions

com.oracle.truffle.r.native/library/stats/src/statsR.h
com.oracle.truffle.r.native/library/stats/src/statsR_dummy.c 113 additions, 0 deletions

com.oracle.truffle.r.native/library/stats/src/statsR_dummy.c
com.oracle.truffle.r.native/library/tools/src/tools_dummy.c 16 additions, 18 deletions

com.oracle.truffle.r.native/library/tools/src/tools_dummy.c
com.oracle.truffle.r.native/library/utils/src/utils_dummy.c 41 additions, 43 deletions

com.oracle.truffle.r.native/library/utils/src/utils_dummy.c
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BasePackage.java 1 addition, 0 deletions

.../com/oracle/truffle/r/nodes/builtin/base/BasePackage.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java 0 additions, 1 deletion

...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/Match.java 4 additions, 3 deletions

...in/src/com/oracle/truffle/r/nodes/builtin/base/Match.java

with 401 additions and 417 deletions

Please register or to comment