Skip to content

try_expression: allow expression #204

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
Apr 21, 2023
Merged

try_expression: allow expression #204

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
133df30
try_expression: allow expression
aspeddro Apr 15, 2023
68300b6
update example
aspeddro Apr 15, 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
5 changes: 1 addition & 4 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,7 @@ module.exports = grammar({

try_expression: $ => seq(
'try',
choice(
$.block,
$.primary_expression,
),
$.expression,
'catch',
'{',
repeat($.switch_match),
Expand Down
18 changes: 17 additions & 1 deletion test/corpus/expressions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,12 @@ try switch foo() {
| Js.Exn.Error(obj) => "error"
}

try for i in 0 to 10 {
call()
} catch {
| Not_found => false
}

---

(source_file
Expand Down Expand Up @@ -1320,7 +1326,17 @@ try switch foo() {
(module_identifier))
(variant_identifier))
(formal_parameters (value_identifier)))
(sequence_expression (expression_statement (string (string_fragment))))))))
(sequence_expression (expression_statement (string (string_fragment)))))))

(expression_statement
(try_expression
(for_expression (value_identifier) (number) (number)
(block
(expression_statement
(call_expression (value_identifier) (arguments)))))
(switch_match
(variant_pattern (variant_identifier))
(sequence_expression (expression_statement (false)))))))

===========================================
Mutation expressions
Expand Down