DoneJS/quickjs-done
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added RegExp 'd' flag (bnoordhuis)

Browse source
This commit is contained in:
Fabrice Bellard 2023-12-27 17:19:44 +01:00
parent 5fc27dc7cf
commit a47f40cde8
5 changed files with 143 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -63,5 +63,5 @@ Optimization ideas:
Test262o: 0/11262 errors, 463 excluded Test262o: 0/11262 errors, 463 excluded
Test262o commit: 7da91bceb9ce7613f87db47ddd1292a2dda58b42 (es5-tests branch) Test262o commit: 7da91bceb9ce7613f87db47ddd1292a2dda58b42 (es5-tests branch)
Result: 16/76719 errors, 1497 excluded, 8231 skipped Result: 16/76773 errors, 1497 excluded, 8204 skipped
Test262 commit: 6cbb6da9473c56d95358d8e679c5a6d2b4574efb Test262 commit: 6cbb6da9473c56d95358d8e679c5a6d2b4574efb

1
libregexp.h
View file

@ -36,6 +36,7 @@
#define LRE_FLAG_DOTALL (1 << 3) #define LRE_FLAG_DOTALL (1 << 3)
#define LRE_FLAG_UTF16 (1 << 4) #define LRE_FLAG_UTF16 (1 << 4)
#define LRE_FLAG_STICKY (1 << 5) #define LRE_FLAG_STICKY (1 << 5)
#define LRE_FLAG_INDICES (1 << 6) /* Unused by libregexp, just recorded. */
#define LRE_FLAG_NAMED_GROUPS (1 << 7) /* named groups are present in the regexp */ #define LRE_FLAG_NAMED_GROUPS (1 << 7) /* named groups are present in the regexp */

1
quickjs-atom.h
View file

@ -166,6 +166,7 @@ DEF(revoke, "revoke")
DEF(async, "async") DEF(async, "async")
DEF(exec, "exec") DEF(exec, "exec")
DEF(groups, "groups") DEF(groups, "groups")
DEF(indices, "indices")
DEF(status, "status") DEF(status, "status")
DEF(reason, "reason") DEF(reason, "reason")
DEF(globalThis, "globalThis") DEF(globalThis, "globalThis")

181
quickjs.c
View file

@ -42894,6 +42894,9 @@ static JSValue js_compile_regexp(JSContext *ctx, JSValueConst pattern,
/* XXX: re_flags = LRE_FLAG_OCTAL unless strict mode? */ /* XXX: re_flags = LRE_FLAG_OCTAL unless strict mode? */
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
switch(str[i]) { switch(str[i]) {
case 'd':
mask = LRE_FLAG_INDICES;
break;
case 'g': case 'g':
mask = LRE_FLAG_GLOBAL; mask = LRE_FLAG_GLOBAL;
break; break;
@ -43237,6 +43240,11 @@ static JSValue js_regexp_get_flags(JSContext *ctx, JSValueConst this_val)
if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT) if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
return JS_ThrowTypeErrorNotAnObject(ctx); return JS_ThrowTypeErrorNotAnObject(ctx);
res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "hasIndices"));
if (res < 0)
goto exception;
if (res)
*p++ = 'd';
res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_global)); res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_global));
if (res < 0) if (res < 0)
goto exception; goto exception;
@ -43316,25 +43324,32 @@ static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
{ {
JSRegExp *re = js_get_regexp(ctx, this_val, TRUE); JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
JSString *str; JSString *str;
JSValue str_val, obj, val, groups = JS_UNDEFINED; JSValue t, ret, str_val, obj, val, groups;
JSValue indices, indices_groups;
uint8_t *re_bytecode; uint8_t *re_bytecode;
int ret;
uint8_t **capture, *str_buf; uint8_t **capture, *str_buf;
int capture_count, shift, i, re_flags; int rc, capture_count, shift, i, re_flags;
int64_t last_index; int64_t last_index;
const char *group_name_ptr; const char *group_name_ptr;
if (!re) if (!re)
return JS_EXCEPTION; return JS_EXCEPTION;
str_val = JS_ToString(ctx, argv[0]); str_val = JS_ToString(ctx, argv[0]);
if (JS_IsException(str_val)) if (JS_IsException(str_val))
return str_val;
val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
if (JS_IsException(val) ||
JS_ToLengthFree(ctx, &last_index, val)) {
JS_FreeValue(ctx, str_val);
return JS_EXCEPTION; return JS_EXCEPTION;
}
ret = JS_EXCEPTION;
obj = JS_NULL;
groups = JS_UNDEFINED;
indices = JS_UNDEFINED;
indices_groups = JS_UNDEFINED;
capture = NULL;
val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
if (JS_IsException(val) || JS_ToLengthFree(ctx, &last_index, val))
goto fail;
re_bytecode = re->bytecode->u.str8; re_bytecode = re->bytecode->u.str8;
re_flags = lre_get_flags(re_bytecode); re_flags = lre_get_flags(re_bytecode);
if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) { if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) {
@ -43342,27 +43357,23 @@ static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
} }
str = JS_VALUE_GET_STRING(str_val); str = JS_VALUE_GET_STRING(str_val);
capture_count = lre_get_capture_count(re_bytecode); capture_count = lre_get_capture_count(re_bytecode);
capture = NULL;
if (capture_count > 0) { if (capture_count > 0) {
capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2); capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2);
if (!capture) { if (!capture)
JS_FreeValue(ctx, str_val); goto fail;
return JS_EXCEPTION;
}
} }
shift = str->is_wide_char; shift = str->is_wide_char;
str_buf = str->u.str8; str_buf = str->u.str8;
if (last_index > str->len) { if (last_index > str->len) {
ret = 2; rc = 2;
} else { } else {
ret = lre_exec(capture, re_bytecode, rc = lre_exec(capture, re_bytecode,
str_buf, last_index, str->len, str_buf, last_index, str->len,
shift, ctx); shift, ctx);
} }
obj = JS_NULL; if (rc != 1) {
if (ret != 1) { if (rc >= 0) {
if (ret >= 0) { if (rc == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
if (ret == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex, if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
JS_NewInt32(ctx, 0)) < 0) JS_NewInt32(ctx, 0)) < 0)
goto fail; goto fail;
@ -43371,7 +43382,6 @@ static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
JS_ThrowInternalError(ctx, "out of memory in regexp execution"); JS_ThrowInternalError(ctx, "out of memory in regexp execution");
goto fail; goto fail;
} }
JS_FreeValue(ctx, str_val);
} else { } else {
int prop_flags; int prop_flags;
if (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) { if (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) {
@ -43389,52 +43399,124 @@ static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
if (JS_IsException(groups)) if (JS_IsException(groups))
goto fail; goto fail;
} }
if (re_flags & LRE_FLAG_INDICES) {
indices = JS_NewArray(ctx);
if (JS_IsException(indices))
goto fail;
if (group_name_ptr) {
indices_groups = JS_NewObjectProto(ctx, JS_NULL);
if (JS_IsException(indices_groups))
goto fail;
}
}
for(i = 0; i < capture_count; i++) { for(i = 0; i < capture_count; i++) {
int start, end; const char *name = NULL;
uint8_t **match = &capture[2 * i];
int start = -1;
int end = -1;
JSValue val; JSValue val;
if (capture[2 * i] == NULL ||
capture[2 * i + 1] == NULL) { if (group_name_ptr && i > 0) {
if (*group_name_ptr) name = group_name_ptr;
group_name_ptr += strlen(group_name_ptr) + 1;
}
if (match[0] && match[1]) {
start = (match[0] - str_buf) >> shift;
end = (match[1] - str_buf) >> shift;
}
if (!JS_IsUndefined(indices)) {
val = JS_UNDEFINED; val = JS_UNDEFINED;
} else { if (start != -1) {
start = (capture[2 * i] - str_buf) >> shift; val = JS_NewArray(ctx);
end = (capture[2 * i + 1] - str_buf) >> shift; if (JS_IsException(val))
goto fail;
if (JS_DefinePropertyValueUint32(ctx, val, 0,
JS_NewInt32(ctx, start),
prop_flags) < 0) {
JS_FreeValue(ctx, val);
goto fail;
}
if (JS_DefinePropertyValueUint32(ctx, val, 1,
JS_NewInt32(ctx, end),
prop_flags) < 0) {
JS_FreeValue(ctx, val);
goto fail;
}
}
if (name && !JS_IsUndefined(indices_groups)) {
val = JS_DupValue(ctx, val);
if (JS_DefinePropertyValueStr(ctx, indices_groups,
name, val, prop_flags) < 0) {
JS_FreeValue(ctx, val);
goto fail;
}
}
if (JS_DefinePropertyValueUint32(ctx, indices, i, val,
prop_flags) < 0) {
goto fail;
}
}
val = JS_UNDEFINED;
if (start != -1) {
val = js_sub_string(ctx, str, start, end); val = js_sub_string(ctx, str, start, end);
if (JS_IsException(val)) if (JS_IsException(val))
goto fail; goto fail;
} }
if (group_name_ptr && i > 0) {
if (*group_name_ptr) { if (name) {
if (JS_DefinePropertyValueStr(ctx, groups, group_name_ptr, if (JS_DefinePropertyValueStr(ctx, groups, name,
JS_DupValue(ctx, val), JS_DupValue(ctx, val),
prop_flags) < 0) { prop_flags) < 0) {
JS_FreeValue(ctx, val); JS_FreeValue(ctx, val);
goto fail; goto fail;
} }
} }
group_name_ptr += strlen(group_name_ptr) + 1;
}
if (JS_DefinePropertyValueUint32(ctx, obj, i, val, prop_flags) < 0) if (JS_DefinePropertyValueUint32(ctx, obj, i, val, prop_flags) < 0)
goto fail; goto fail;
} }
t = groups, groups = JS_UNDEFINED;
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_groups, if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_groups,
groups, prop_flags) < 0) t, prop_flags) < 0) {
goto fail; goto fail;
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_index,
JS_NewInt32(ctx, (capture[0] - str_buf) >> shift), prop_flags) < 0)
goto fail;
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_input, str_val, prop_flags) < 0)
goto fail1;
} }
js_free(ctx, capture);
return obj; t = JS_NewInt32(ctx, (capture[0] - str_buf) >> shift);
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_index, t, prop_flags) < 0)
goto fail;
t = str_val, str_val = JS_UNDEFINED;
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_input, t, prop_flags) < 0)
goto fail;
if (!JS_IsUndefined(indices)) {
t = indices_groups, indices_groups = JS_UNDEFINED;
if (JS_DefinePropertyValue(ctx, indices, JS_ATOM_groups,
t, prop_flags) < 0) {
goto fail;
}
t = indices, indices = JS_UNDEFINED;
if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_indices,
t, prop_flags) < 0) {
goto fail;
}
}
}
ret = obj;
obj = JS_UNDEFINED;
fail: fail:
JS_FreeValue(ctx, groups); JS_FreeValue(ctx, indices_groups);
JS_FreeValue(ctx, indices);
JS_FreeValue(ctx, str_val); JS_FreeValue(ctx, str_val);
fail1: JS_FreeValue(ctx, groups);
JS_FreeValue(ctx, obj); JS_FreeValue(ctx, obj);
js_free(ctx, capture); js_free(ctx, capture);
return JS_EXCEPTION; return ret;
} }
/* delete portions of a string that match a given regex */ /* delete portions of a string that match a given regex */
@ -44284,12 +44366,13 @@ static const JSCFunctionListEntry js_regexp_funcs[] = {
static const JSCFunctionListEntry js_regexp_proto_funcs[] = { static const JSCFunctionListEntry js_regexp_proto_funcs[] = {
JS_CGETSET_DEF("flags", js_regexp_get_flags, NULL ), JS_CGETSET_DEF("flags", js_regexp_get_flags, NULL ),
JS_CGETSET_DEF("source", js_regexp_get_source, NULL ), JS_CGETSET_DEF("source", js_regexp_get_source, NULL ),
JS_CGETSET_MAGIC_DEF("global", js_regexp_get_flag, NULL, 1 ), JS_CGETSET_MAGIC_DEF("global", js_regexp_get_flag, NULL, LRE_FLAG_GLOBAL ),
JS_CGETSET_MAGIC_DEF("ignoreCase", js_regexp_get_flag, NULL, 2 ), JS_CGETSET_MAGIC_DEF("ignoreCase", js_regexp_get_flag, NULL, LRE_FLAG_IGNORECASE ),
JS_CGETSET_MAGIC_DEF("multiline", js_regexp_get_flag, NULL, 4 ), JS_CGETSET_MAGIC_DEF("multiline", js_regexp_get_flag, NULL, LRE_FLAG_MULTILINE ),
JS_CGETSET_MAGIC_DEF("dotAll", js_regexp_get_flag, NULL, 8 ), JS_CGETSET_MAGIC_DEF("dotAll", js_regexp_get_flag, NULL, LRE_FLAG_DOTALL ),
JS_CGETSET_MAGIC_DEF("unicode", js_regexp_get_flag, NULL, 16 ), JS_CGETSET_MAGIC_DEF("unicode", js_regexp_get_flag, NULL, LRE_FLAG_UTF16 ),
JS_CGETSET_MAGIC_DEF("sticky", js_regexp_get_flag, NULL, 32 ), JS_CGETSET_MAGIC_DEF("sticky", js_regexp_get_flag, NULL, LRE_FLAG_STICKY ),
JS_CGETSET_MAGIC_DEF("hasIndices", js_regexp_get_flag, NULL, LRE_FLAG_INDICES ),
JS_CFUNC_DEF("exec", 1, js_regexp_exec ), JS_CFUNC_DEF("exec", 1, js_regexp_exec ),
JS_CFUNC_DEF("compile", 2, js_regexp_compile ), JS_CFUNC_DEF("compile", 2, js_regexp_compile ),
JS_CFUNC_DEF("test", 1, js_regexp_test ), JS_CFUNC_DEF("test", 1, js_regexp_test ),

2
test262.conf
View file

@ -154,7 +154,7 @@ Reflect.setPrototypeOf
regexp-dotall regexp-dotall
regexp-duplicate-named-groups=skip regexp-duplicate-named-groups=skip
regexp-lookbehind regexp-lookbehind
regexp-match-indices=skip regexp-match-indices
regexp-named-groups regexp-named-groups
regexp-unicode-property-escapes regexp-unicode-property-escapes
regexp-v-flag=skip regexp-v-flag=skip