Skip to content

Commit a834095

Browse files
ABBAPOHABBAPOH
committed
Pass lines everywhere
1 parent b9dbcf4 commit a834095

File tree

2 files changed

+62
-16
lines changed

2 files changed

+62
-16
lines changed

‎quickjs.c

+47-15
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ struct JSContext {
442442
/* if NULL, eval is not supported */
443443
JSValue (*eval_internal)(JSContext *ctx, JSValue this_obj,
444444
const char *input, size_t input_len,
445-
const char *filename, int flags, int scope_idx);
445+
const char *filename, int line, int flags, int scope_idx);
446446
void *user_opaque;
447447
};
448448

@@ -1255,7 +1255,7 @@ static void js_async_function_resolve_mark(JSRuntime *rt, JSValue val,
12551255
JS_MarkFunc *mark_func);
12561256
static JSValue JS_EvalInternal(JSContext *ctx, JSValue this_obj,
12571257
const char *input, size_t input_len,
1258-
const char *filename, int flags, int scope_idx);
1258+
const char *filename, int line, int flags, int scope_idx);
12591259
static void js_free_module_def(JSContext *ctx, JSModuleDef *m);
12601260
static void js_mark_module_def(JSRuntime *rt, JSModuleDef *m,
12611261
JS_MarkFunc *mark_func);
@@ -33359,12 +33359,12 @@ static __exception int js_parse_program(JSParseState *s)
3335933359

3336033360
static void js_parse_init(JSContext *ctx, JSParseState *s,
3336133361
const char *input, size_t input_len,
33362-
const char *filename)
33362+
const char *filename, int line)
3336333363
{
3336433364
memset(s, 0, sizeof(*s));
3336533365
s->ctx = ctx;
3336633366
s->filename = filename;
33367-
s->line_num = 1;
33367+
s->line_num = line;
3336833368
s->col_num = 1;
3336933369
s->buf_start = s->buf_ptr = (const uint8_t *)input;
3337033370
s->buf_end = s->buf_ptr + input_len;
@@ -33416,7 +33416,7 @@ JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj)
3341633416
/* `export_name` and `input` may be pure ASCII or UTF-8 encoded */
3341733417
static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
3341833418
const char *input, size_t input_len,
33419-
const char *filename, int flags, int scope_idx)
33419+
const char *filename, int line, int flags, int scope_idx)
3342033420
{
3342133421
JSParseState s1, *s = &s1;
3342233422
int err, eval_type;
@@ -33428,7 +33428,7 @@ static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
3342833428
JSModuleDef *m;
3342933429
bool is_strict_mode;
3343033430

33431-
js_parse_init(ctx, s, input, input_len, filename);
33431+
js_parse_init(ctx, s, input, input_len, filename, line);
3343233432
skip_shebang(&s->buf_ptr, s->buf_end);
3343333433

3343433434
eval_type = flags & JS_EVAL_TYPE_MASK;
@@ -33458,7 +33458,7 @@ static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
3345833458
is_strict_mode = true;
3345933459
}
3346033460
}
33461-
fd = js_new_function_def(ctx, NULL, true, false, filename, 1, 1);
33461+
fd = js_new_function_def(ctx, NULL, true, false, filename, line, 1);
3346233462
if (!fd)
3346333463
goto fail1;
3346433464
s->cur_func = fd;
@@ -33531,12 +33531,12 @@ static JSValue __JS_EvalInternal(JSContext *ctx, JSValue this_obj,
3353133531
/* the indirection is needed to make 'eval' optional */
3353233532
static JSValue JS_EvalInternal(JSContext *ctx, JSValue this_obj,
3353333533
const char *input, size_t input_len,
33534-
const char *filename, int flags, int scope_idx)
33534+
const char *filename, int line, int flags, int scope_idx)
3353533535
{
3353633536
if (unlikely(!ctx->eval_internal)) {
3353733537
return JS_ThrowTypeError(ctx, "eval is not supported");
3353833538
}
33539-
return ctx->eval_internal(ctx, this_obj, input, input_len, filename,
33539+
return ctx->eval_internal(ctx, this_obj, input, input_len, filename, line,
3354033540
flags, scope_idx);
3354133541
}
3354233542

@@ -33552,7 +33552,7 @@ static JSValue JS_EvalObject(JSContext *ctx, JSValue this_obj,
3355233552
str = JS_ToCStringLen(ctx, &len, val);
3355333553
if (!str)
3355433554
return JS_EXCEPTION;
33555-
ret = JS_EvalInternal(ctx, this_obj, str, len, "<input>", flags, scope_idx);
33555+
ret = JS_EvalInternal(ctx, this_obj, str, len, "<input>", 1, flags, scope_idx);
3355633556
JS_FreeCString(ctx, str);
3355733557
return ret;
3355833558

@@ -33562,20 +33562,52 @@ JSValue JS_EvalThis(JSContext *ctx, JSValue this_obj,
3356233562
const char *input, size_t input_len,
3356333563
const char *filename, int eval_flags)
3356433564
{
33565+
JSEvalOptions options = {
33566+
.version = JS_EVAL_OPTIONS_VERSION,
33567+
.filename = filename,
33568+
.line_num = 1,
33569+
.eval_flags = eval_flags
33570+
};
33571+
return JS_EvalThis2(ctx, this_obj, input, input_len, &options);
33572+
}
33573+
33574+
JSValue JS_EvalThis2(JSContext *ctx, JSValue this_obj,
33575+
const char *input, size_t input_len,
33576+
JSEvalOptions *options)
33577+
{
33578+
const char *filename = "<unnamed>";
33579+
int line = 1;
33580+
int eval_flags = 0;
33581+
if (options) {
33582+
if (options->filename)
33583+
filename = options->filename;
33584+
line = options->line_num;
33585+
eval_flags = options->eval_flags;
33586+
}
3356533587
JSValue ret;
3356633588

3356733589
assert((eval_flags & JS_EVAL_TYPE_MASK) == JS_EVAL_TYPE_GLOBAL ||
3356833590
(eval_flags & JS_EVAL_TYPE_MASK) == JS_EVAL_TYPE_MODULE);
33569-
ret = JS_EvalInternal(ctx, this_obj, input, input_len, filename,
33591+
ret = JS_EvalInternal(ctx, this_obj, input, input_len, filename, line,
3357033592
eval_flags, -1);
3357133593
return ret;
3357233594
}
3357333595

3357433596
JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
3357533597
const char *filename, int eval_flags)
3357633598
{
33577-
return JS_EvalThis(ctx, ctx->global_obj, input, input_len, filename,
33578-
eval_flags);
33599+
JSEvalOptions options = {
33600+
.version = JS_EVAL_OPTIONS_VERSION,
33601+
.filename = filename,
33602+
.line_num = 1,
33603+
.eval_flags = eval_flags
33604+
};
33605+
return JS_EvalThis2(ctx, ctx->global_obj, input, input_len, &options);
33606+
}
33607+
33608+
JSValue JS_Eval2(JSContext *ctx, const char *input, size_t input_len, JSEvalOptions *options)
33609+
{
33610+
return JS_EvalThis2(ctx, ctx->global_obj, input, input_len, options);
3357933611
}
3358033612

3358133613
int JS_ResolveModule(JSContext *ctx, JSValue obj)
@@ -45204,7 +45236,7 @@ JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len, const char
4520445236
JSParseState s1, *s = &s1;
4520545237
JSValue val = JS_UNDEFINED;
4520645238

45207-
js_parse_init(ctx, s, buf, buf_len, filename);
45239+
js_parse_init(ctx, s, buf, buf_len, filename, 1);
4520845240
if (json_next_token(s))
4520945241
goto fail;
4521045242
val = json_parse_value(s);
@@ -56146,7 +56178,7 @@ bool JS_DetectModule(const char *input, size_t input_len)
5614656178
return false;
5614756179
}
5614856180
JS_AddIntrinsicRegExp(ctx); // otherwise regexp literals don't parse
56149-
val = __JS_EvalInternal(ctx, JS_UNDEFINED, input, input_len, "<unnamed>",
56181+
val = __JS_EvalInternal(ctx, JS_UNDEFINED, input, input_len, "<unnamed>", 1,
5615056182
JS_EVAL_TYPE_MODULE|JS_EVAL_FLAG_COMPILE_ONLY, -1);
5615156183
if (JS_IsException(val)) {
5615256184
const char *msg = JS_ToCString(ctx, rt->current_exception);

‎quickjs.h

+15-1
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,16 @@ typedef struct JSClassDef {
516516
JSClassExoticMethods *exotic;
517517
} JSClassDef;
518518

519+
#define JS_EVAL_OPTIONS_VERSION 1
520+
521+
typedef struct JSEvalOptions {
522+
int version;
523+
const char *filename;
524+
int eval_flags;
525+
int line_num;
526+
// can add new fields in ABI-compatible manner by incrementing JS_EVAL2_VERSION
527+
} JSEvalOptions;
528+
519529
#define JS_INVALID_CLASS_ID 0
520530
JS_EXTERN JSClassID JS_NewClassID(JSRuntime *rt, JSClassID *pclass_id);
521531
/* Returns the class ID if `v` is an object, otherwise returns JS_INVALID_CLASS_ID. */
@@ -769,10 +779,14 @@ JS_EXTERN bool JS_DetectModule(const char *input, size_t input_len);
769779
/* 'input' must be zero terminated i.e. input[input_len] = '\0'. */
770780
JS_EXTERN JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
771781
const char *filename, int eval_flags);
772-
/* same as JS_Eval() but with an explicit 'this_obj' parameter */
782+
JS_EXTERN JSValue JS_Eval2(JSContext *ctx, const char *input, size_t input_len,
783+
JSEvalOptions *options);
773784
JS_EXTERN JSValue JS_EvalThis(JSContext *ctx, JSValue this_obj,
774785
const char *input, size_t input_len,
775786
const char *filename, int eval_flags);
787+
JS_EXTERN JSValue JS_EvalThis2(JSContext *ctx, JSValue this_obj,
788+
const char *input, size_t input_len,
789+
JSEvalOptions *options);
776790
JS_EXTERN JSValue JS_GetGlobalObject(JSContext *ctx);
777791
JS_EXTERN int JS_IsInstanceOf(JSContext *ctx, JSValue val, JSValue obj);
778792
JS_EXTERN int JS_DefineProperty(JSContext *ctx, JSValue this_obj,

0 commit comments

Comments
 (0)