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

Now it is fixed!

Browse source
This commit is contained in:
karurochari 2024-05-16 03:25:17 +00:00
parent e09c4eac72
commit 5247ff3b62
2 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
quickjs.c
View file

@ -1805,7 +1805,6 @@ void JS_SetGCAfterCallback(JSRuntime *rt, void(*fn)())
rt->malloc_gc_after_callback = fn; rt->malloc_gc_after_callback = fn;
} }
#define malloc(s) malloc_is_forbidden(s) #define malloc(s) malloc_is_forbidden(s)
#define free(p) free_is_forbidden(p) #define free(p) free_is_forbidden(p)
#define realloc(p,s) realloc_is_forbidden(p,s) #define realloc(p,s) realloc_is_forbidden(p,s)
@ -6676,7 +6675,7 @@ static JSValue JS_ThrowError2(JSContext *ctx, JSErrorEnum error_num,
const char *fmt, va_list ap, BOOL add_backtrace) const char *fmt, va_list ap, BOOL add_backtrace)
{ {
char buf[256]; char buf[256];
JSValue obj, ret; JSValue obj, ret, msg;
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
obj = JS_NewObjectProtoClass(ctx, ctx->native_error_proto[error_num], obj = JS_NewObjectProtoClass(ctx, ctx->native_error_proto[error_num],
@ -6685,9 +6684,13 @@ static JSValue JS_ThrowError2(JSContext *ctx, JSErrorEnum error_num,
/* out of memory: throw JS_NULL to avoid recursing */ /* out of memory: throw JS_NULL to avoid recursing */
obj = JS_NULL; obj = JS_NULL;
} else { } else {
JS_DefinePropertyValue(ctx, obj, JS_ATOM_message, msg = JS_NewString(ctx, buf);
JS_NewString(ctx, buf), if (JS_IsException(msg))
JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE); msg = JS_NewString(ctx, "Invalid error message");
if (!JS_IsException(msg)) {
JS_DefinePropertyValue(ctx, obj, JS_ATOM_message, msg,
JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
}
} }
if (add_backtrace) { if (add_backtrace) {
build_backtrace(ctx, obj, NULL, 0, 0, 0); build_backtrace(ctx, obj, NULL, 0, 0, 0);
@ -18674,11 +18677,33 @@ int __attribute__((format(printf, 2, 3))) js_parse_error(JSParseState *s, const
static int js_parse_expect(JSParseState *s, int tok) static int js_parse_expect(JSParseState *s, int tok)
{ {
if (s->token.val != tok) { char buf[ATOM_GET_STR_BUF_SIZE];
/* XXX: dump token correctly in all cases */
return js_parse_error(s, "expecting '%c'", tok); if (s->token.val == tok)
return next_token(s);
switch(s->token.val) {
case TOK_EOF:
return js_parse_error(s, "Unexpected end of input");
case TOK_NUMBER:
return js_parse_error(s, "Unexpected number");
case TOK_STRING:
return js_parse_error(s, "Unexpected string");
case TOK_TEMPLATE:
return js_parse_error(s, "Unexpected string template");
case TOK_REGEXP:
return js_parse_error(s, "Unexpected regexp");
case TOK_IDENT:
return js_parse_error(s, "Unexpected identifier '%s'",
JS_AtomGetStr(s->ctx, buf, sizeof(buf),
s->token.u.ident.atom));
case TOK_ERROR:
return js_parse_error(s, "Invalid or unexpected token");
default:
return js_parse_error(s, "Unexpected token '%.*s'",
(int)(s->buf_ptr - s->token.ptr),
(const char *)s->token.ptr);
} }
return next_token(s);
} }
static int js_parse_expect_semi(JSParseState *s) static int js_parse_expect_semi(JSParseState *s)
@ -20852,7 +20877,7 @@ static int __exception js_parse_property_name(JSParseState *s,
goto fail1; goto fail1;
if (s->token.val == ':' || s->token.val == ',' || if (s->token.val == ':' || s->token.val == ',' ||
s->token.val == '}' || s->token.val == '(' || s->token.val == '}' || s->token.val == '(' ||
s->token.val == '=') { s->token.val == '=' ) {
is_non_reserved_ident = TRUE; is_non_reserved_ident = TRUE;
goto ident_found; goto ident_found;
} }
@ -20868,8 +20893,7 @@ static int __exception js_parse_property_name(JSParseState *s,
if (next_token(s)) if (next_token(s))
goto fail1; goto fail1;
if (s->token.val == ':' || s->token.val == ',' || if (s->token.val == ':' || s->token.val == ',' ||
s->token.val == '}' || s->token.val == '(' || s->token.val == '}' || s->token.val == '(') {
s->token.val == '=') {
is_non_reserved_ident = TRUE; is_non_reserved_ident = TRUE;
goto ident_found; goto ident_found;
} }
@ -21625,12 +21649,7 @@ static __exception int js_parse_class(JSParseState *s, BOOL is_class_expr,
goto fail; goto fail;
continue; continue;
} }
is_static = FALSE; is_static = (s->token.val == TOK_STATIC);
if (s->token.val == TOK_STATIC) {
int next = peek_token(s, TRUE);
if (!(next == ';' || next == '}' || next == '(' || next == '='))
is_static = TRUE;
}
prop_type = -1; prop_type = -1;
if (is_static) { if (is_static) {
if (next_token(s)) if (next_token(s))

1
quickjs.h
View file

@ -306,7 +306,6 @@ JS_EXTERN size_t JS_GetGCThreshold(JSRuntime *rt);
JS_EXTERN void JS_SetGCThresholdFixed(JSRuntime *rt, JS_BOOL fixed); JS_EXTERN void JS_SetGCThresholdFixed(JSRuntime *rt, JS_BOOL fixed);
JS_EXTERN void JS_SetGCBeforeCallback(JSRuntime *rt, JS_BOOL(*fn)()); JS_EXTERN void JS_SetGCBeforeCallback(JSRuntime *rt, JS_BOOL(*fn)());
JS_EXTERN void JS_SetGCAfterCallback(JSRuntime *rt, void(*fn)()); JS_EXTERN void JS_SetGCAfterCallback(JSRuntime *rt, void(*fn)());
/* use 0 to disable maximum stack size check */ /* use 0 to disable maximum stack size check */
JS_EXTERN void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size); JS_EXTERN void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size);
/* should be called when changing thread to update the stack top value /* should be called when changing thread to update the stack top value