Skip to content

Commit 5299e09

Browse files
authored
Simplify a number of JS_IsFoo() functions (#1137)
1 parent 7238ee6 commit 5299e09

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

quickjs.c

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10237,60 +10237,42 @@ bool JS_SetConstructorBit(JSContext *ctx, JSValueConst func_obj, bool val)
1023710237

1023810238
bool JS_IsRegExp(JSValueConst val)
1023910239
{
10240-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10241-
return false;
10242-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_REGEXP;
10240+
return JS_CLASS_REGEXP == JS_GetClassID(val);
1024310241
}
1024410242

1024510243
bool JS_IsMap(JSValueConst val)
1024610244
{
10247-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10248-
return false;
10249-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_MAP;
10245+
return JS_CLASS_MAP == JS_GetClassID(val);
1025010246
}
1025110247

1025210248
bool JS_IsSet(JSValueConst val)
1025310249
{
10254-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10255-
return false;
10256-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_SET;
10250+
return JS_CLASS_SET == JS_GetClassID(val);
1025710251
}
1025810252

1025910253
bool JS_IsWeakRef(JSValueConst val)
1026010254
{
10261-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10262-
return false;
10263-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_WEAK_REF;
10255+
return JS_CLASS_WEAK_REF == JS_GetClassID(val);
1026410256
}
1026510257

1026610258
bool JS_IsWeakSet(JSValueConst val)
1026710259
{
10268-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10269-
return false;
10270-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_WEAKSET;
10260+
return JS_CLASS_WEAKSET == JS_GetClassID(val);
1027110261
}
1027210262

1027310263
bool JS_IsWeakMap(JSValueConst val)
1027410264
{
10275-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10276-
return false;
10277-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_WEAKMAP;
10265+
return JS_CLASS_WEAKMAP == JS_GetClassID(val);
1027810266
}
1027910267

1028010268
bool JS_IsDataView(JSValueConst val)
1028110269
{
10282-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10283-
return false;
10284-
return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_DATAVIEW;
10270+
return JS_CLASS_DATAVIEW == JS_GetClassID(val);
1028510271
}
1028610272

1028710273
bool JS_IsError(JSContext *ctx, JSValueConst val)
1028810274
{
10289-
JSObject *p;
10290-
if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
10291-
return false;
10292-
p = JS_VALUE_GET_OBJ(val);
10293-
return (p->class_id == JS_CLASS_ERROR);
10275+
return JS_CLASS_ERROR == JS_GetClassID(val);
1029410276
}
1029510277

1029610278
/* used to avoid catching interrupt exceptions */

0 commit comments

Comments
 (0)