Commit 6852e712 authored 8 years ago by Lukas Stadler

Merge

parents 22e26b39 23aac6c7

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.native/fficall/src/jni/Rinternals.c 7 additions, 5 deletions

com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java 0 additions, 1 deletion

.../com/oracle/truffle/r/nodes/binary/BinaryBooleanNode.java
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java 2 additions, 2 deletions

.../src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java 11 additions, 0 deletions

.../com/oracle/truffle/r/runtime/ffi/jnr/CallRFFIHelper.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java 6 additions, 1 deletion

....runtime/src/com/oracle/truffle/r/runtime/RSerialize.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RBaseObject.java 5 additions, 5 deletions

...me/src/com/oracle/truffle/r/runtime/data/RBaseObject.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RExpression.java 4 additions, 4 deletions

...me/src/com/oracle/truffle/r/runtime/data/RExpression.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RFunction.java 1 addition, 1 deletion

...time/src/com/oracle/truffle/r/runtime/data/RFunction.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RGPBits.java 0 additions, 36 deletions

...untime/src/com/oracle/truffle/r/runtime/data/RGPBits.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RLanguage.java 1 addition, 1 deletion

...time/src/com/oracle/truffle/r/runtime/data/RLanguage.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RList.java 1 addition, 1 deletion

....runtime/src/com/oracle/truffle/r/runtime/data/RList.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RPromise.java 2 additions, 2 deletions

...ntime/src/com/oracle/truffle/r/runtime/data/RPromise.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RS4Object.java 1 addition, 1 deletion

...time/src/com/oracle/truffle/r/runtime/data/RS4Object.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RScalar.java 2 additions, 2 deletions

...untime/src/com/oracle/truffle/r/runtime/data/RScalar.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RSequence.java 2 additions, 2 deletions

...time/src/com/oracle/truffle/r/runtime/data/RSequence.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RTypedValue.java 23 additions, 2 deletions

...me/src/com/oracle/truffle/r/runtime/data/RTypedValue.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RVector.java 1 addition, 1 deletion

...untime/src/com/oracle/truffle/r/runtime/data/RVector.java
com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToVectorClosure.java 7 additions, 7 deletions

...cle/truffle/r/runtime/data/closures/RToVectorClosure.java

with 76 additions and 74 deletions

Please register or to comment