Skip to content
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

Jump to bottom

Improve line:column tracking #660

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Improve line:column tracking #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f731d
Improve line:column tracking
bnoordhuis Nov 5, 2024
00f8ced
squash! make codegen
bnoordhuis Nov 7, 2024
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
51 changes: 24 additions & 27 deletions gen/function_source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "quickjs-libc.h"

const uint32_t qjsc_function_source_size = 338;
const uint32_t qjsc_function_source_size = 314;

const uint8_t qjsc_function_source[338] = {
const uint8_t qjsc_function_source[314] = {
0x11, 0x05, 0x01, 0x30, 0x74, 0x65, 0x73, 0x74,
0x73, 0x2f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
0x6f, 0x6e, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63,
Expand All @@ -23,31 +23,28 @@ const uint8_t qjsc_function_source[338] = {
0x00, 0xc2, 0x03, 0x00, 0x0d, 0xc0, 0x03, 0x01,
0x01, 0x0c, 0x43, 0xfa, 0x01, 0xc0, 0x03, 0x00,
0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0xbc,
0x2a, 0x28, 0xbc, 0x03, 0x03, 0x01, 0x04, 0x02,
0x1e, 0x0c, 0x0e, 0x1a, 0x66, 0x75, 0x6e, 0x63,
0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x28, 0x29,
0x20, 0x7b, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
0x6e, 0x20, 0x34, 0x32, 0x20, 0x7d, 0x0c, 0x03,
0xc2, 0x04, 0x08, 0xcc, 0x08, 0xea, 0x05, 0xbf,
0x00, 0xe2, 0x29, 0x04, 0xe2, 0x00, 0x00, 0x00,
0xe1, 0x61, 0x00, 0x00, 0xde, 0x42, 0x38, 0x00,
0x00, 0x00, 0x24, 0x00, 0x00, 0xc9, 0x62, 0x00,
0x00, 0x65, 0x00, 0x00, 0xaf, 0xea, 0x0b, 0x38,
0x95, 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0xef,
0x2f, 0x61, 0x02, 0x00, 0x61, 0x01, 0x00, 0x38,
0x3b, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x04,
0xe0, 0x00, 0x00, 0x00, 0x9d, 0x31, 0x01, 0x00,
0x03, 0x00, 0xca, 0x62, 0x01, 0x00, 0x42, 0x38,
0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0xcb, 0x62,
0x02, 0x00, 0x65, 0x00, 0x00, 0xaf, 0xea, 0x0b,
0x38, 0x95, 0x00, 0x00, 0x00, 0x62, 0x02, 0x00,
0xef, 0x2f, 0x68, 0x02, 0x00, 0x68, 0x01, 0x00,
0x06, 0x2e, 0xbc, 0x03, 0x01, 0x01, 0x22, 0x1f,
0x01, 0x27, 0x1c, 0x1b, 0x04, 0x0a, 0x1d, 0x12,
0x26, 0x35, 0x17, 0x11, 0x18, 0x20, 0x1c, 0x37,
0x41, 0x21, 0x1c, 0x2a, 0x18, 0x1b, 0x04, 0x26,
0x11, 0x3f, 0x17, 0x11, 0x18, 0x20, 0x1c, 0x53,
0x41, 0x00,
0x2a, 0x28, 0xbc, 0x03, 0x03, 0x01, 0x00, 0x1a,
0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
0x20, 0x66, 0x28, 0x29, 0x20, 0x7b, 0x20, 0x72,
0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x34, 0x32,
0x20, 0x7d, 0x0c, 0x03, 0xc2, 0x04, 0x08, 0xcc,
0x08, 0xea, 0x05, 0xbf, 0x00, 0xe2, 0x29, 0x04,
0xe2, 0x00, 0x00, 0x00, 0xe1, 0x61, 0x00, 0x00,
0xde, 0x42, 0x38, 0x00, 0x00, 0x00, 0x24, 0x00,
0x00, 0xc9, 0x62, 0x00, 0x00, 0x65, 0x00, 0x00,
0xaf, 0xea, 0x0b, 0x38, 0x95, 0x00, 0x00, 0x00,
0x62, 0x00, 0x00, 0xef, 0x2f, 0x61, 0x02, 0x00,
0x61, 0x01, 0x00, 0x38, 0x3b, 0x00, 0x00, 0x00,
0x65, 0x00, 0x00, 0x04, 0xe0, 0x00, 0x00, 0x00,
0x9d, 0x31, 0x01, 0x00, 0x03, 0x00, 0xca, 0x62,
0x01, 0x00, 0x42, 0x38, 0x00, 0x00, 0x00, 0x24,
0x00, 0x00, 0xcb, 0x62, 0x02, 0x00, 0x65, 0x00,
0x00, 0xaf, 0xea, 0x0b, 0x38, 0x95, 0x00, 0x00,
0x00, 0x62, 0x02, 0x00, 0xef, 0x2f, 0x68, 0x02,
0x00, 0x68, 0x01, 0x00, 0x06, 0x2e, 0xbc, 0x03,
0x01, 0x01, 0x0e, 0x00, 0x1c, 0x0a, 0x2a, 0x5d,
0x18, 0x00, 0x10, 0x08, 0x25, 0x76, 0x0e, 0x5d,
0x18, 0x00,
};

static JSContext *JS_NewCustomContext(JSRuntime *rt)
Expand Down
7 changes: 3 additions & 4 deletions gen/hello.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "quickjs-libc.h"

const uint32_t qjsc_hello_size = 105;
const uint32_t qjsc_hello_size = 103;

const uint8_t qjsc_hello[105] = {
const uint8_t qjsc_hello[103] = {
0x11, 0x04, 0x01, 0x22, 0x65, 0x78, 0x61, 0x6d,
0x70, 0x6c, 0x65, 0x73, 0x2f, 0x68, 0x65, 0x6c,
0x6c, 0x6f, 0x2e, 0x6a, 0x73, 0x01, 0x0e, 0x63,
Expand All @@ -17,8 +17,7 @@ const uint8_t qjsc_hello[105] = {
0x02, 0x29, 0x38, 0xdf, 0x00, 0x00, 0x00, 0x42,
0xe0, 0x00, 0x00, 0x00, 0x04, 0xe1, 0x00, 0x00,
0x00, 0x24, 0x01, 0x00, 0x0e, 0x06, 0x2e, 0xbc,
0x03, 0x01, 0x01, 0x04, 0x01, 0x01, 0x17, 0x02,
0x00,
0x03, 0x01, 0x01, 0x02, 0x48, 0x0e, 0x00,
};

static JSContext *JS_NewCustomContext(JSRuntime *rt)
Expand Down
59 changes: 27 additions & 32 deletions gen/hello_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#include "quickjs-libc.h"

const uint32_t qjsc_fib_module_size = 314;
const uint32_t qjsc_fib_module_size = 282;

const uint8_t qjsc_fib_module[314] = {
const uint8_t qjsc_fib_module[282] = {
0x11, 0x03, 0x01, 0x2c, 0x65, 0x78, 0x61, 0x6d,
0x70, 0x6c, 0x65, 0x73, 0x2f, 0x66, 0x69, 0x62,
0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e,
Expand All @@ -19,37 +19,33 @@ const uint8_t qjsc_fib_module[314] = {
0xb4, 0xa7, 0xea, 0x03, 0xb4, 0x28, 0xd1, 0xb5,
0xac, 0xea, 0x03, 0xb5, 0x28, 0xdd, 0xd1, 0xb5,
0x9e, 0xef, 0xdd, 0xd1, 0xb6, 0x9e, 0xef, 0x9d,
0x28, 0xbc, 0x03, 0x02, 0x08, 0x20, 0x04, 0x00,
0x07, 0x06, 0x07, 0x06, 0x12, 0x09, 0x08, 0x07,
0x07, 0x10, 0x07, 0x06, 0x07, 0x06, 0x12, 0x13,
0x08, 0x07, 0x08, 0x16, 0x0c, 0x0c, 0x07, 0x04,
0x0c, 0x0a, 0x0c, 0x0c, 0x07, 0x04, 0x8d, 0x01,
0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
0x20, 0x66, 0x69, 0x62, 0x28, 0x6e, 0x29, 0x0a,
0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
0x20, 0x28, 0x6e, 0x20, 0x3c, 0x3d, 0x20, 0x30,
0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x28, 0xbc, 0x03, 0x02, 0x08, 0x06, 0x00, 0x0f,
0x0e, 0x10, 0x1b, 0x1a, 0x8d, 0x01, 0x66, 0x75,
0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66,
0x69, 0x62, 0x28, 0x6e, 0x29, 0x0a, 0x7b, 0x0a,
0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28,
0x6e, 0x20, 0x3c, 0x3d, 0x20, 0x30, 0x29, 0x0a,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x30,
0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c,
0x73, 0x65, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e,
0x20, 0x3d, 0x3d, 0x20, 0x31, 0x29, 0x0a, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b,
0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73,
0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
0x65, 0x6c, 0x73, 0x65, 0x20, 0x69, 0x66, 0x20,
0x28, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x29,
0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
0x31, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
0x72, 0x6e, 0x20, 0x66, 0x69, 0x62, 0x28, 0x6e,
0x20, 0x2d, 0x20, 0x31, 0x29, 0x20, 0x2b, 0x20,
0x66, 0x69, 0x62, 0x28, 0x6e, 0x20, 0x2d, 0x20,
0x32, 0x29, 0x3b, 0x0a, 0x7d, 0x08, 0xea, 0x05,
0xbf, 0x00, 0xe1, 0x29, 0x06, 0x2e, 0xbc, 0x03,
0x01, 0x01, 0x06, 0x01, 0x01, 0x00, 0x07, 0x14,
0x02, 0x00,
0x20, 0x66, 0x69, 0x62, 0x28, 0x6e, 0x20, 0x2d,
0x20, 0x31, 0x29, 0x20, 0x2b, 0x20, 0x66, 0x69,
0x62, 0x28, 0x6e, 0x20, 0x2d, 0x20, 0x32, 0x29,
0x3b, 0x0a, 0x7d, 0x08, 0xea, 0x05, 0xbf, 0x00,
0xe1, 0x29, 0x06, 0x2e, 0xbc, 0x03, 0x01, 0x01,
0x00, 0x00,
};

const uint32_t qjsc_hello_module_size = 185;
const uint32_t qjsc_hello_module_size = 183;

const uint8_t qjsc_hello_module[185] = {
const uint8_t qjsc_hello_module[183] = {
0x11, 0x07, 0x01, 0x30, 0x65, 0x78, 0x61, 0x6d,
0x70, 0x6c, 0x65, 0x73, 0x2f, 0x68, 0x65, 0x6c,
0x6c, 0x6f, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c,
Expand All @@ -71,9 +67,8 @@ const uint8_t qjsc_hello_module[185] = {
0x00, 0x00, 0x00, 0x42, 0xe2, 0x00, 0x00, 0x00,
0x04, 0xe4, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00,
0xbc, 0x0a, 0xef, 0x24, 0x02, 0x00, 0x0e, 0x06,
0x2e, 0xbc, 0x03, 0x01, 0x01, 0x0a, 0x01, 0x01,
0x00, 0x04, 0x0a, 0x02, 0x62, 0x00, 0x4d, 0x30,
0x00,
0x2e, 0xbc, 0x03, 0x01, 0x01, 0x08, 0x18, 0x28,
0x36, 0x17, 0x62, 0x00, 0x2a, 0x20, 0x00,
};

static JSContext *JS_NewCustomContext(JSRuntime *rt)
Expand Down
Loading
Loading