language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-30 01:43:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Refactor parser methods to not return State as part of ParseError

Browse source 
As previously discovered with #4464, it's easy to accidentally mis-use the State value returned on the Err path.

There were mixed assumptions about what that State represents: (1) the State where the error occurred, or (2) the State at the beginning of the thing we were just parsing.

I fixed this up to always mean (2) - at which point we don't actually need to return the State at all - so it's impossible for further discrepency to creep in.

I also took the liberty to refactor a few more methods to be purely combinator-based, rather than calling `parse` directly.
This commit is contained in:
Joshua Warner 2022-11-15 21:25:51 -05:00
parent 3cd57e078e
commit 2d9aba2242
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
17 changed files with 374 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/compiler/parse/src/state.rs
View file

@ -58,9 +58,9 @@ impl<'a> State<'a> {
&self,
indent: u32,
e: impl Fn(Position) -> E,
) -> Result<u32, (Progress, E, State<'a>)> {
) -> Result<u32, (Progress, E)> {
if self.column() < indent {
Err((Progress::NoProgress, e(self.pos()), self.clone()))
Err((Progress::NoProgress, e(self.pos())))
} else {
Ok(std::cmp::max(indent, self.line_indent()))
}