fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement String.prototype.toWellFormed (#43)

Browse source 
Reworks isWellFormed to be consistent style-wise with toWellFormed.
This commit is contained in:
Ben Noordhuis 2023-11-11 21:50:46 +01:00 committed by GitHub
parent afee50e89e
commit cfe4251c9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
quickjs.c
View file

@ -38212,7 +38212,7 @@ static JSValue js_string_isWellFormed(JSContext *ctx, JSValueConst this_val,
JSValue str; JSValue str;
JSValue ret; JSValue ret;
JSString *p; JSString *p;
uint32_t i, n, hi, lo; uint32_t c, i, n;
ret = JS_TRUE; ret = JS_TRUE;
str = JS_ToStringCheckObject(ctx, this_val); str = JS_ToStringCheckObject(ctx, this_val);
@ -38220,32 +38220,67 @@ static JSValue js_string_isWellFormed(JSContext *ctx, JSValueConst this_val,
return JS_EXCEPTION; return JS_EXCEPTION;
p = JS_VALUE_GET_STRING(str); p = JS_VALUE_GET_STRING(str);
if (p->is_wide_char) { if (!p->is_wide_char || p->len == 0)
goto done; // by definition well-formed
for (i = 0, n = p->len; i < n; i++) { for (i = 0, n = p->len; i < n; i++) {
hi = p->u.str16[i]; c = p->u.str16[i];
if (hi < 0xD800 || hi > 0xDFFF) if (c < 0xD800 || c > 0xDFFF)
continue; continue;
if (hi > 0xDBFF) { if (c > 0xDBFF || i+1 == n)
ret = JS_FALSE;
break; break;
} c = p->u.str16[++i];
i++; if (c < 0xDC00 || c > 0xDFFF)
if (i == n) {
ret = JS_FALSE;
break; break;
} }
lo = p->u.str16[i];
if (lo < 0xDC00 || lo > 0xDFFF) {
ret = JS_FALSE;
break;
}
}
}
if (i < n)
ret = JS_FALSE;
done:
JS_FreeValue(ctx, str); JS_FreeValue(ctx, str);
return ret; return ret;
} }
static JSValue js_string_toWellFormed(JSContext *ctx, JSValueConst this_val,
int argc, JSValueConst *argv)
{
JSValue str;
JSValue ret;
JSString *p;
uint32_t c, i, n;
str = JS_ToStringCheckObject(ctx, this_val);
if (JS_IsException(str))
return JS_EXCEPTION;
p = JS_VALUE_GET_STRING(str);
if (!p->is_wide_char || p->len == 0)
return str; // by definition well-formed
// TODO(bnoordhuis) don't clone when input is well-formed
ret = js_new_string16(ctx, p->u.str16, p->len);
JS_FreeValue(ctx, str);
if (JS_IsException(ret))
return JS_EXCEPTION;
p = JS_VALUE_GET_STRING(ret);
for (i = 0, n = p->len; i < n; i++) {
c = p->u.str16[i];
if (c < 0xD800 || c > 0xDFFF)
continue;
if (c > 0xDBFF || i+1 == n) {
p->u.str16[i] = 0xFFFD;
continue;
}
c = p->u.str16[++i];
if (c < 0xDC00 || c > 0xDFFF)
p->u.str16[--i] = 0xFFFD;
}
return ret;
}
static JSValue js_string_indexOf(JSContext *ctx, JSValueConst this_val, static JSValue js_string_indexOf(JSContext *ctx, JSValueConst this_val,
int argc, JSValueConst *argv, int lastIndexOf) int argc, JSValueConst *argv, int lastIndexOf)
{ {
@ -39398,6 +39433,7 @@ static const JSCFunctionListEntry js_string_proto_funcs[] = {
JS_CFUNC_DEF("concat", 1, js_string_concat ), JS_CFUNC_DEF("concat", 1, js_string_concat ),
JS_CFUNC_DEF("codePointAt", 1, js_string_codePointAt ), JS_CFUNC_DEF("codePointAt", 1, js_string_codePointAt ),
JS_CFUNC_DEF("isWellFormed", 0, js_string_isWellFormed ), JS_CFUNC_DEF("isWellFormed", 0, js_string_isWellFormed ),
JS_CFUNC_DEF("toWellFormed", 0, js_string_toWellFormed ),
JS_CFUNC_MAGIC_DEF("indexOf", 1, js_string_indexOf, 0 ), JS_CFUNC_MAGIC_DEF("indexOf", 1, js_string_indexOf, 0 ),
JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_string_indexOf, 1 ), JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_string_indexOf, 1 ),
JS_CFUNC_MAGIC_DEF("includes", 1, js_string_includes, 0 ), JS_CFUNC_MAGIC_DEF("includes", 1, js_string_includes, 0 ),

2
test262.conf
View file

@ -172,7 +172,7 @@ String.prototype.includes
String.prototype.isWellFormed String.prototype.isWellFormed
String.prototype.matchAll String.prototype.matchAll
String.prototype.replaceAll String.prototype.replaceAll
String.prototype.toWellFormed=skip String.prototype.toWellFormed
String.prototype.trimEnd String.prototype.trimEnd
String.prototype.trimStart String.prototype.trimStart
super super