Commit ed3ad2b7 authored 8 years ago by Adam Welc

Merged.

parents 473d9b8a 47ed941c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

ci.hocon 1 addition, 0 deletions

ci.hocon
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/REngine.java 26 additions, 12 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 3 additions, 4 deletions

...rc/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java 2 additions, 3 deletions

...ine/src/com/oracle/truffle/r/engine/TruffleRLanguage.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/JLineConsoleHandler.java 2 additions, 2 deletions

...om/oracle/truffle/r/engine/shell/JLineConsoleHandler.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java 20 additions, 14 deletions

...ngine/src/com/oracle/truffle/r/engine/shell/RCommand.java
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java 6 additions, 3 deletions

...gine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/ObjectSize.java 27 additions, 170 deletions

...ry/src/com/oracle/truffle/r/library/utils/ObjectSize.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/Rprof.java 79 additions, 11 deletions

...library/src/com/oracle/truffle/r/library/utils/Rprof.java
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/Rprofmem.java 149 additions, 0 deletions

...rary/src/com/oracle/truffle/r/library/utils/Rprofmem.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/RBuiltinPackage.java 3 additions, 3 deletions

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

.../com/oracle/truffle/r/nodes/builtin/RBuiltinPackages.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/APerm.java 4 additions, 3 deletions

...in/src/com/oracle/truffle/r/nodes/builtin/base/APerm.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/All.java 16 additions, 13 deletions

...ltin/src/com/oracle/truffle/r/nodes/builtin/base/All.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AllNames.java 9 additions, 8 deletions

...src/com/oracle/truffle/r/nodes/builtin/base/AllNames.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Any.java 5 additions, 4 deletions

...ltin/src/com/oracle/truffle/r/nodes/builtin/base/Any.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java 6 additions, 4 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/Arg.java 5 additions, 4 deletions

...ltin/src/com/oracle/truffle/r/nodes/builtin/base/Arg.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Args.java 5 additions, 3 deletions

...tin/src/com/oracle/truffle/r/nodes/builtin/base/Args.java
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Array.java 21 additions, 4 deletions

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

with 396 additions and 272 deletions

Please register or to comment