Skip to content

Commit d09ed1b

Browse files
committed
Disable meta-object tests until JS has adopted the new type. (GR-22098)
1 parent e7393d3 commit d09ed1b

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

truffle/src/com.oracle.truffle.sl.tck/src/com/oracle/truffle/sl/tck/SLTCKLanguageProvider.java

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,20 @@ public Collection<? extends Snippet> createValueConstructors(Context context) {
118118
res.add(createValueConstructor(context, "wrapPrimitive(1)", "wrapped-number", "createWrappedNumber", TypeDescriptor.NUMBER));
119119
res.add(createValueConstructor(context, "wrapPrimitive(\"string\")", "wrapped-string", "createWrappedString", TypeDescriptor.STRING));
120120

121-
res.add(createValueConstructor(context, "typeOf(1 == 2)", "boolean-metaobject", "createBooleanMetaObject", TypeDescriptor.META_OBJECT));
122-
res.add(createValueConstructor(context, "typeOf(1)", "number-metaobject", "createNumberMetaObject", TypeDescriptor.META_OBJECT));
123-
res.add(createValueConstructor(context, "typeOf(\"str\")", "string-metaobject", "createStringMetaObject", TypeDescriptor.META_OBJECT));
124-
res.add(createValueConstructor(context, "typeOf(NULL)", "null-metaobject", "createNullMetaObject", TypeDescriptor.META_OBJECT));
125-
res.add(createValueConstructor(context, "typeOf(new())", "object-metaobject", "createObjectMetaObject", TypeDescriptor.META_OBJECT));
126-
res.add(createValueConstructor(context, "typeOf(createStringMetaObject)", "function-metaobject", "createFunctionMetaObject", TypeDescriptor.META_OBJECT));
121+
// enable after GR-22098
122+
// res.add(createValueConstructor(context, "typeOf(1 == 2)", "boolean-metaobject",
123+
// "createBooleanMetaObject", TypeDescriptor.META_OBJECT));
124+
// res.add(createValueConstructor(context, "typeOf(1)", "number-metaobject",
125+
// "createNumberMetaObject", TypeDescriptor.META_OBJECT));
126+
// res.add(createValueConstructor(context, "typeOf(\"str\")", "string-metaobject",
127+
// "createStringMetaObject", TypeDescriptor.META_OBJECT));
128+
// res.add(createValueConstructor(context, "typeOf(NULL)", "null-metaobject",
129+
// "createNullMetaObject", TypeDescriptor.META_OBJECT));
130+
// res.add(createValueConstructor(context, "typeOf(new())", "object-metaobject",
131+
// "createObjectMetaObject", TypeDescriptor.META_OBJECT));
132+
// res.add(createValueConstructor(context, "typeOf(createStringMetaObject)",
133+
// "function-metaobject",
134+
// "createFunctionMetaObject", TypeDescriptor.META_OBJECT));
127135

128136
res.add(opb.build());
129137
return Collections.unmodifiableCollection(res);
@@ -201,9 +209,14 @@ public Collection<? extends Snippet> createStatements(Context context) {
201209
res.add(createBuiltin(context, "getSize", TypeDescriptor.NUMBER, TypeDescriptor.ARRAY));
202210
res.add(createBuiltin(context, "hasSize", TypeDescriptor.BOOLEAN, TypeDescriptor.ANY));
203211
res.add(createBuiltin(context, "isExecutable", TypeDescriptor.BOOLEAN, TypeDescriptor.ANY));
204-
res.add(createBuiltin(context, "isInstance", TypeDescriptor.BOOLEAN, TypeDescriptor.META_OBJECT, TypeDescriptor.ANY));
205212
res.add(createBuiltin(context, "isNull", TypeDescriptor.BOOLEAN, TypeDescriptor.ANY));
206-
res.add(createBuiltin(context, "typeOf", TypeDescriptor.union(TypeDescriptor.META_OBJECT, TypeDescriptor.NULL), TypeDescriptor.ANY));
213+
214+
// enable after GR-22098
215+
// res.add(createBuiltin(context, "isInstance", TypeDescriptor.BOOLEAN,
216+
// TypeDescriptor.META_OBJECT,
217+
// TypeDescriptor.ANY));
218+
// res.add(createBuiltin(context, "typeOf", TypeDescriptor.union(TypeDescriptor.META_OBJECT,
219+
// TypeDescriptor.NULL), TypeDescriptor.ANY));
207220

208221
return res;
209222
}

0 commit comments

Comments
 (0)