language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-11-25 21:37:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve parsing of scalar literals

Browse source 
* Unify parsing of string literals and scalar literals, to (e.g.) ensure escapes are handled uniformly. Notably, this makes unicode escapes valid in scalar literals.
* Add a variety of custom error messages about specific failure cases of parsing string/scalar literals. For example, if we're expecting a string (e.g. a package name in the header) and the user tried using single quotes, give a clear message about that.
* Fix formatting of unicode escapes (they previously used {}, now correctly use () to match roc strings)
This commit is contained in:
Joshua Warner 2023-01-07 14:41:08 -08:00
parent 6fc593142d
commit 94070e8ba6
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
22 changed files with 411 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/compiler/test_syntax/fuzz/Cargo.lock generated
View file

@ -448,7 +448,6 @@ dependencies = [
"roc_module",
"roc_parse",
"roc_region",
"roc_test_utils",
]
[[package]]

2
crates/compiler/test_syntax/tests/snapshots/fail/multi_no_end.expr.result-ast
View file

@ -1 +1 @@
Expr(Str(EndlessMulti(@3), @0), @0)
Expr(Str(EndlessMultiLine(@3), @0), @0)

2
crates/compiler/test_syntax/tests/snapshots/fail/single_no_end.expr.result-ast
View file

@ -1 +1 @@
Expr(Str(EndlessSingle(@1), @0), @0)
Expr(Str(EndlessSingleLine(@1), @0), @0)

1
crates/compiler/test_syntax/tests/snapshots/pass/control_characters_in_scalar.expr.formatted.roc Normal file
View file

@ -0,0 +1 @@
'\u(7)'

3
crates/compiler/test_syntax/tests/snapshots/pass/control_characters_in_scalar.expr.result-ast Normal file
View file

@ -0,0 +1,3 @@
SingleQuote(
"\u{7}",
)

1
crates/compiler/test_syntax/tests/snapshots/pass/control_characters_in_scalar.expr.roc Normal file
View file

@ -0,0 +1 @@
''

3
crates/compiler/test_syntax/tests/test_snapshots.rs
View file

@ -258,6 +258,7 @@ mod test_snapshots {
pass/comment_before_op.expr,
pass/comment_inside_empty_list.expr,
pass/comment_with_non_ascii.expr,
pass/control_characters_in_scalar.expr,
pass/crash.expr,
pass/dbg.expr,
pass/def_without_newline.expr,
@ -567,7 +568,7 @@ mod test_snapshots {
("\\n", EscapedChar::Newline),
("\\r", EscapedChar::CarriageReturn),
("\\t", EscapedChar::Tab),
("\\\"", EscapedChar::Quote),
("\\\"", EscapedChar::DoubleQuote),
] {
let actual = parse_expr_with(&arena, arena.alloc(to_input(string)));
let expected_slice = to_expected(*escaped, &arena);