Skip to content
Snippets Groups Projects
Commit ed9e26be authored by Lukas Stadler's avatar Lukas Stadler
Browse files

Merge pull request #482 in G/fastr from...

Merge pull request #482 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:feature/update_truffle to master

* commit '2ec95e20':
  update Truffle, explicitly use DSLGenerator.DEFAULT in RTypes
parents a231df9e 2ec95e20
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,8 @@ import com.oracle.truffle.api.dsl.ImplicitCast; ...@@ -26,6 +26,8 @@ import com.oracle.truffle.api.dsl.ImplicitCast;
import com.oracle.truffle.api.dsl.TypeCast; import com.oracle.truffle.api.dsl.TypeCast;
import com.oracle.truffle.api.dsl.TypeCheck; import com.oracle.truffle.api.dsl.TypeCheck;
import com.oracle.truffle.api.dsl.TypeSystem; import com.oracle.truffle.api.dsl.TypeSystem;
import com.oracle.truffle.api.dsl.internal.DSLOptions;
import com.oracle.truffle.api.dsl.internal.DSLOptions.DSLGenerator;
import com.oracle.truffle.api.frame.FrameSlot; import com.oracle.truffle.api.frame.FrameSlot;
import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.r.runtime.RType; import com.oracle.truffle.r.runtime.RType;
...@@ -52,6 +54,7 @@ import com.oracle.truffle.r.runtime.nodes.RNode; ...@@ -52,6 +54,7 @@ import com.oracle.truffle.r.runtime.nodes.RNode;
MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class, MaterializedFrame.class, FrameSlot.class, RAbstractIntVector.class, RAbstractDoubleVector.class, RAbstractLogicalVector.class, RAbstractComplexVector.class,
RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RSymbol.class, RPromise.class, RLanguage.class, RAbstractStringVector.class, RAbstractRawVector.class, RList.class, RAbstractVector.class, RSymbol.class, RPromise.class, RLanguage.class,
RPairList.class, RExternalPtr.class, RS4Object.class, RAbstractContainer.class, RAttributable.class, RArgsValuesAndNames.class, RTypedValue.class, RType.class, Object[].class}) RPairList.class, RExternalPtr.class, RS4Object.class, RAbstractContainer.class, RAttributable.class, RArgsValuesAndNames.class, RTypedValue.class, RType.class, Object[].class})
@DSLOptions(defaultGenerator = DSLGenerator.DEFAULT)
public class RTypes { public class RTypes {
@TypeCheck(RNull.class) @TypeCheck(RNull.class)
......
...@@ -28,7 +28,7 @@ suite = { ...@@ -28,7 +28,7 @@ suite = {
"suites" : [ "suites" : [
{ {
"name" : "truffle", "name" : "truffle",
"version" : "3c34543a8b7ff5edd74b76aafbeb3af52bd4afe7", "version" : "f0c06d466056ad23e05aa3d21b98405cd72f117b",
"urls" : [ "urls" : [
{"url" : "https://github.com/graalvm/truffle", "kind" : "git"}, {"url" : "https://github.com/graalvm/truffle", "kind" : "git"},
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"}, {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment