Skip to content

Commit

Permalink
Improve column number tracking
Browse files Browse the repository at this point in the history 
- simplify column number tracking using a pointer to the beginning of line
  instead of `eol` + `mark`.
- add `js_parse_error_pos` to report syntax errors with exact source position
  for token parsing errors. This makes the syntax error reports much more precise.
  eg: exact position of UTF-8 encoding error, invalid escape sequence, etc.
- add `JSSourcePos` type to use single opaque object for token source position
- add `emit_pos` to set the precise source position in code generation
- change `emit_op` to no longer emit source positions from `s->last_line_num` and `s->last_col_num`.
- remove `last_line_num` and `last_col_num` `JSParserState` members
- runtime errors on calls report the column number of calling function or method name.
- runtime errors on `new` expressions report the column number of the `neẁ` keyword.
- do not show source position in backtrace if debug information is missing
- fix spurious parsing bugs when `js_parse_skip_parens_token` could not reparse
  the current token because of stack overflow detection.
- `js_parse_save_pos` now saves the current token and `js_parse_seek_back` always
  restores the token, hence never fails, while `js_parse_seek_token` reparses the
  saved token. This is needed to handle the weird semantics of `"\1"; "use strict";`
- simplify html comment detection
- update **tests/test_builtin,js** with more informative messages
- improve `assert()` and **tests/test_language.js** tests
- update **v8.txt** for updated column numbers in remaining errors
  • Loading branch information
@chqrlie
chqrlie committed May 18, 2024
1 parent 5a7e578 commit cfcc36d
Show file tree
Hide file tree
Showing 8 changed files with 1,943 additions and 1,735 deletions.
21 changes: 12 additions & 9 deletions gen/function_source.c
View file
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 = 384;
const uint32_t qjsc_function_source_size = 404;

const uint8_t qjsc_function_source[384] = {
const uint8_t qjsc_function_source[404] = {
0x0c, 0x06, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61,
0x6c, 0x02, 0x66, 0x30, 0x74, 0x65, 0x73, 0x74,
0x73, 0x2f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
Expand All @@ -23,7 +23,7 @@ const uint8_t qjsc_function_source[384] = {
0xe0, 0x01, 0x00, 0x01, 0x00, 0x0c, 0x43, 0xfa,
0x01, 0xb4, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00,
0x00, 0x03, 0x00, 0xbb, 0x2a, 0x28, 0xb6, 0x03,
0x03, 0x01, 0x04, 0x02, 0x1e, 0x0c, 0x0e, 0x1a,
0x03, 0x01, 0x04, 0x02, 0x2c, 0x0c, 0x0d, 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,
Expand All @@ -47,12 +47,15 @@ const uint8_t qjsc_function_source[384] = {
0x38, 0xdc, 0x00, 0x00, 0x00, 0xaf, 0xe9, 0x0b,
0x38, 0x92, 0x00, 0x00, 0x00, 0x62, 0x03, 0x00,
0xee, 0x2f, 0x68, 0x03, 0x00, 0x68, 0x02, 0x00,
0xc4, 0x28, 0xb6, 0x03, 0x01, 0x01, 0x28, 0x60,
0x01, 0x49, 0x02, 0x21, 0x1a, 0x1b, 0x04, 0x1e,
0x1d, 0x12, 0x26, 0x49, 0x1d, 0x0c, 0x06, 0x11,
0x18, 0x2a, 0x1c, 0x37, 0x41, 0x21, 0x1c, 0x34,
0x18, 0x1b, 0x04, 0x26, 0x11, 0x3f, 0x1d, 0x0c,
0x06, 0x11, 0x18, 0x2a, 0x1c, 0x53, 0x41, 0x00,
0xc4, 0x28, 0xb6, 0x03, 0x01, 0x01, 0x3c, 0xc6,
0x1e, 0x1b, 0x03, 0x00, 0x08, 0x08, 0x0c, 0x1b,
0x04, 0x2a, 0x07, 0x12, 0x11, 0x11, 0x16, 0x1b,
0x07, 0x11, 0x24, 0x1b, 0x0c, 0x11, 0x0b, 0x07,
0x0b, 0x00, 0x07, 0x08, 0x19, 0x1b, 0x0a, 0x1b,
0x12, 0x1b, 0x03, 0x07, 0x17, 0x1b, 0x03, 0x08,
0x0e, 0x11, 0x04, 0x2a, 0x07, 0x12, 0x11, 0x11,
0x16, 0x1b, 0x07, 0x11, 0x24, 0x1b, 0x0c, 0x11,
0x0b, 0x07, 0x0b, 0x00,
};

static JSContext *JS_NewCustomContext(JSRuntime *rt)
Expand Down
8 changes: 4 additions & 4 deletions gen/hello.c
View file
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 = 89;
const uint32_t qjsc_hello_size = 95;

const uint8_t qjsc_hello[89] = {
const uint8_t qjsc_hello[95] = {
0x0c, 0x04, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
0x6c, 0x65, 0x06, 0x6c, 0x6f, 0x67, 0x16, 0x48,
0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72,
Expand All @@ -15,8 +15,8 @@ const uint8_t qjsc_hello[89] = {
0x14, 0x01, 0xa0, 0x01, 0x00, 0x00, 0x00, 0x38,
0xd9, 0x00, 0x00, 0x00, 0x42, 0xda, 0x00, 0x00,
0x00, 0x04, 0xdb, 0x00, 0x00, 0x00, 0x24, 0x01,
0x00, 0xcc, 0x28, 0xb8, 0x03, 0x01, 0x01, 0x00,
0x00,
0x00, 0xcc, 0x28, 0xb8, 0x03, 0x01, 0x01, 0x06,
0x1b, 0x10, 0x1b, 0x08, 0x1b, 0x07, 0x00,
};

static JSContext *JS_NewCustomContext(JSRuntime *rt)
Expand Down
66 changes: 34 additions & 32 deletions gen/hello_module.c
View file
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 = 310;
const uint32_t qjsc_fib_module_size = 316;

const uint8_t qjsc_fib_module[310] = {
const uint8_t qjsc_fib_module[316] = {
0x0c, 0x03, 0x2c, 0x65, 0x78, 0x61, 0x6d, 0x70,
0x6c, 0x65, 0x73, 0x2f, 0x66, 0x69, 0x62, 0x5f,
0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x6a,
Expand All @@ -19,36 +19,37 @@ const uint8_t qjsc_fib_module[310] = {
0xb3, 0x28, 0xd0, 0xb4, 0xac, 0xe9, 0x03, 0xb4,
0x28, 0xdc, 0xd0, 0xb4, 0x9e, 0xee, 0xdc, 0xd0,
0xb5, 0x9e, 0xee, 0x9d, 0x28, 0xb2, 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, 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, 0xe9, 0x05, 0xbe, 0x00, 0xe0, 0x29,
0x06, 0x2e, 0xb2, 0x03, 0x01, 0x01, 0x06, 0x01,
0x01, 0x00, 0x07, 0x14, 0x02, 0x00,
0x08, 0x2c, 0x04, 0x02, 0x07, 0x0a, 0x07, 0x05,
0x12, 0x0a, 0x07, 0x0d, 0x08, 0x0a, 0x07, 0x0a,
0x07, 0x05, 0x12, 0x00, 0x07, 0x0d, 0x09, 0x0e,
0x07, 0x08, 0x07, 0x08, 0x07, 0x03, 0x07, 0x0b,
0x07, 0x1a, 0x07, 0x08, 0x07, 0x08, 0x07, 0x03,
0x07, 0x0b, 0x07, 0x03, 0x07, 0x23, 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, 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, 0xe9, 0x05,
0xbe, 0x00, 0xe0, 0x29, 0x06, 0x2e, 0xb2, 0x03,
0x01, 0x01, 0x00, 0x00,
};

const uint32_t qjsc_hello_module_size = 177;
const uint32_t qjsc_hello_module_size = 191;

const uint8_t qjsc_hello_module[177] = {
const uint8_t qjsc_hello_module[191] = {
0x0c, 0x07, 0x30, 0x65, 0x78, 0x61, 0x6d, 0x70,
0x6c, 0x65, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6c,
0x6f, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
Expand All @@ -69,9 +70,10 @@ const uint8_t qjsc_hello_module[177] = {
0x00, 0x00, 0x00, 0x42, 0xdd, 0x00, 0x00, 0x00,
0x04, 0xdf, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00,
0xbb, 0x0a, 0xee, 0x24, 0x02, 0x00, 0x0e, 0x06,
0x2e, 0xb2, 0x03, 0x01, 0x01, 0x0a, 0x01, 0x01,
0x00, 0x04, 0x0a, 0x02, 0x62, 0x00, 0x4d, 0x30,
0x00,
0x2e, 0xb2, 0x03, 0x01, 0x01, 0x18, 0x00, 0x04,
0x08, 0x00, 0x1b, 0x10, 0x1b, 0x08, 0x1b, 0x07,
0x17, 0x0f, 0x1b, 0x10, 0x1b, 0x08, 0x1b, 0x18,
0x11, 0x08, 0x0c, 0x07, 0x07, 0x1f, 0x00,
};

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

0 comments on commit cfcc36d

Please sign in to comment.