Skip to content

JavaScript parser: fix parsing of labels #1442

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 2 commits into from
Mar 31, 2023
Merged

JavaScript parser: fix parsing of labels #1442

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
c34ead5
JavaScript parser: test parsing of labels
vouillon Mar 30, 2023
ae0e093
JavaScript parser: fix parsing of labels
vouillon Mar 30, 2023
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

## Bug fixes
* Compiler: put custom header at the top of the output file (fix #1441)
* Compiler (js parser): fix parsing of js labels (fix #1440)

# 5.1.1 (2023-03-15) - Lille
## Bug fixes
Expand Down
4 changes: 1 addition & 3 deletions compiler/lib/js_parser.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,9 +509,7 @@ stmt1:
| debugger_stmt { $1 }

label:
| T_IDENTIFIER {
let name, _raw = $1 in
Label.of_string name }
| id { Label.of_string $1 }

(* Library definitions *)

Expand Down
9 changes: 9 additions & 0 deletions compiler/tests-compiler/js_parser_printer.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,3 +1035,12 @@ var y = async => async
2: 0:var, 4:y (identifier), 6:=, 8:{, 10:async, 15::, 17:35, 19:}, 0:; (virtual),
4: 0:var, 4:y (identifier), 6:=, 8:async, 14:x (identifier), 16:=>, 19:x (identifier), 0:; (virtual),
5: 0:var, 4:y (identifier), 6:=, 8:async, 14:=>, 17:async, 0:; (virtual), |}]

let%expect_test "label parsing" =
parse_print_token
~extra:true
{|
get:{of:{from:{async:{break async}break from}break of}break get}
|};
[%expect
{| 2: 0:get, 3::, 4:{, 5:of, 7::, 8:{, 9:from, 13::, 14:{, 15:async, 20::, 21:{, 22:break, 28:async, 0:; (virtual), 33:}, 34:break, 40:from, 0:; (virtual), 44:}, 45:break, 51:of, 0:; (virtual), 53:}, 54:break, 60:get, 0:; (virtual), 63:}, |}]