Skip to content

Support qjs -m flag in combination with -e #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Support qjs -m flag in combination with -e #863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions qjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ static JSValue load_standalone_module(JSContext *ctx)
static int eval_buf(JSContext *ctx, const void *buf, int buf_len,
const char *filename, int eval_flags)
{
bool use_realpath;
JSValue val;
int ret;

Expand All @@ -119,7 +120,8 @@ static int eval_buf(JSContext *ctx, const void *buf, int buf_len,
val = JS_Eval(ctx, buf, buf_len, filename,
eval_flags | JS_EVAL_FLAG_COMPILE_ONLY);
if (!JS_IsException(val)) {
if (js_module_set_import_meta(ctx, val, true, true) < 0) {
use_realpath = (*filename != '<'); // ex. "<cmdline>"
if (js_module_set_import_meta(ctx, val, use_realpath, true) < 0) {
js_std_dump_error(ctx);
ret = -1;
goto end;
Expand Down Expand Up @@ -669,7 +671,8 @@ int main(int argc, char **argv)
JS_FreeValue(ctx, args[1]);
JS_FreeValue(ctx, args[2]);
} else if (expr) {
if (eval_buf(ctx, expr, strlen(expr), "<cmdline>", 0))
int flags = module ? JS_EVAL_TYPE_MODULE : 0;
if (eval_buf(ctx, expr, strlen(expr), "<cmdline>", flags))
goto fail;
} else if (optind >= argc) {
/* interactive mode */
Expand Down