fixed Promise return in the REPL by using a wrapper object in async std.evalScript() (github issue #231)
This commit is contained in:
parent
c6cc6a9a5e
commit
00967aac24
4 changed files with 20 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -28,7 +28,7 @@ endif
|
|||
# Windows cross compilation from Linux
|
||||
#CONFIG_WIN32=y
|
||||
# use link time optimization (smaller and faster executables but slower build)
|
||||
CONFIG_LTO=y
|
||||
#CONFIG_LTO=y
|
||||
# consider warnings as errors (for development)
|
||||
#CONFIG_WERROR=y
|
||||
# force 32 bit build for some utilities
|
||||
|
|
|
@ -379,7 +379,9 @@ optional properties:
|
|||
stack frames below the evalScript.
|
||||
@item async
|
||||
Boolean (default = false). If true, @code{await} is accepted in the
|
||||
script and a promise is returned.
|
||||
script and a promise is returned. The promise is resolved with an
|
||||
object whose @code{value} property holds the value returned by the
|
||||
script.
|
||||
@end table
|
||||
|
||||
@item loadScript(filename)
|
||||
|
|
16
quickjs.c
16
quickjs.c
|
@ -34182,9 +34182,21 @@ static __exception int js_parse_program(JSParseState *s)
|
|||
|
||||
if (!s->is_module) {
|
||||
/* return the value of the hidden variable eval_ret_idx */
|
||||
emit_op(s, OP_get_loc);
|
||||
emit_u16(s, fd->eval_ret_idx);
|
||||
if (fd->func_kind == JS_FUNC_ASYNC) {
|
||||
/* wrap the return value in an object so that promises can
|
||||
be safely returned */
|
||||
emit_op(s, OP_object);
|
||||
emit_op(s, OP_dup);
|
||||
|
||||
emit_op(s, OP_get_loc);
|
||||
emit_u16(s, fd->eval_ret_idx);
|
||||
|
||||
emit_op(s, OP_put_field);
|
||||
emit_atom(s, JS_ATOM_value);
|
||||
} else {
|
||||
emit_op(s, OP_get_loc);
|
||||
emit_u16(s, fd->eval_ret_idx);
|
||||
}
|
||||
emit_return(s, TRUE);
|
||||
} else {
|
||||
emit_return(s, FALSE);
|
||||
|
|
3
repl.js
3
repl.js
|
@ -1310,7 +1310,7 @@ import * as os from "os";
|
|||
/* result is a promise */
|
||||
result.then(print_eval_result, print_eval_error);
|
||||
} else {
|
||||
print_eval_result(result);
|
||||
print_eval_result({ value: result });
|
||||
}
|
||||
} catch (error) {
|
||||
print_eval_error(error);
|
||||
|
@ -1318,6 +1318,7 @@ import * as os from "os";
|
|||
}
|
||||
|
||||
function print_eval_result(result) {
|
||||
result = result.value;
|
||||
eval_time = os.now() - eval_start_time;
|
||||
std.puts(colors[styles.result]);
|
||||
print(result);
|
||||
|
|
Loading…
Reference in a new issue