language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make State::xyzlcol a LineColumn, and change everything wanting a Position to use State::pos() instead

Browse source
This commit is contained in:
Joshua Warner 2021-12-23 18:11:09 -08:00
parent d2dcb462c7
commit 1b257da356
10 changed files with 127 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/parse/src/expr.rs
View file

@ -25,7 +25,7 @@ fn expr_end<'a>() -> impl Parser<'a, (), EExpr<'a>> {
if state.has_reached_end() {
Ok((NoProgress, (), state))
} else {
Err((NoProgress, EExpr::BadExprEnd(state.xyzlcol), state))
Err((NoProgress, EExpr::BadExprEnd(state.pos()), state))
}
}
}
@ -175,7 +175,7 @@ fn record_field_access_chain<'a>() -> impl Parser<'a, Vec<'a, &'a str>, EExpr<'a
}
}
Err((MadeProgress, fail, state)) => Err((MadeProgress, fail, state)),
Err((NoProgress, _, state)) => Err((NoProgress, EExpr::Access(state.xyzlcol), state)),
Err((NoProgress, _, state)) => Err((NoProgress, EExpr::Access(state.pos()), state)),
}
}
@ -233,7 +233,7 @@ fn parse_loc_term<'a>(
fn underscore_expression<'a>() -> impl Parser<'a, Expr<'a>, EExpr<'a>> {
move |arena: &'a Bump, state: State<'a>| {
let start = state.xyzlcol;
let start = state.pos();
let (_, _, next_state) = word1(b'_', EExpr::Underscore).parse(arena, state)?;
@ -280,7 +280,7 @@ fn loc_possibly_negative_or_negated_term<'a>(
}
fn fail_expr_start_e<'a, T: 'a>() -> impl Parser<'a, T, EExpr<'a>> {
|_arena, state: State<'a>| Err((NoProgress, EExpr::Start(state.xyzlcol), state))
|_arena, state: State<'a>| Err((NoProgress, EExpr::Start(state.pos()), state))
}
fn unary_negate<'a>() -> impl Parser<'a, (), EExpr<'a>> {
@ -302,7 +302,7 @@ fn unary_negate<'a>() -> impl Parser<'a, (), EExpr<'a>> {
Ok((MadeProgress, (), state))
} else {
// this is not a negated expression
Err((NoProgress, EExpr::UnaryNot(state.xyzlcol), state))
Err((NoProgress, EExpr::UnaryNot(state.pos()), state))
}
}
}
@ -790,7 +790,7 @@ fn parse_defs_end<'a>(
let state = match space0_e(min_indent, EExpr::Space, EExpr::IndentStart).parse(arena, state) {
Err((MadeProgress, _, s)) => {
return Err((MadeProgress, EExpr::DefMissingFinalExpr(s.xyzlcol), s));
return Err((MadeProgress, EExpr::DefMissingFinalExpr(s.pos()), s));
}
Ok((_, spaces, state)) => {
def_state.spaces_after = spaces;
@ -916,7 +916,7 @@ fn parse_defs_expr<'a>(
Err((_, fail, state)) => {
return Err((
MadeProgress,
EExpr::DefMissingFinalExpr2(arena.alloc(fail), state.xyzlcol),
EExpr::DefMissingFinalExpr2(arena.alloc(fail), state.pos()),
state,
));
}
@ -1342,7 +1342,7 @@ fn parse_expr_end<'a>(
}
}
} else if options.check_for_arrow && state.bytes().starts_with(b"->") {
Err((MadeProgress, EExpr::BadOperator("->", state.xyzlcol), state))
Err((MadeProgress, EExpr::BadOperator("->", state.pos()), state))
} else {
// roll back space parsing
let state = expr_state.initial.clone();
@ -1662,7 +1662,7 @@ mod when {
return Err((
progress,
// TODO maybe pass case_indent here?
EWhen::PatternAlignment(5, state.xyzlcol),
EWhen::PatternAlignment(5, state.pos()),
state,
));
}
@ -1733,7 +1733,7 @@ mod when {
let indent = pattern_indent_level - indent_column;
Err((
MadeProgress,
EWhen::PatternAlignment(indent, state.xyzlcol),
EWhen::PatternAlignment(indent, state.pos()),
state,
))
}
@ -1855,13 +1855,13 @@ mod when {
match pattern_indent_level {
Some(wanted) if state.xyzlcol.column > wanted => {
// this branch is indented too much
Err((NoProgress, EWhen::IndentPattern(state.xyzlcol), initial))
Err((NoProgress, EWhen::IndentPattern(state.pos()), initial))
}
Some(wanted) if state.xyzlcol.column < wanted => {
let indent = wanted - state.xyzlcol.column;
Err((
NoProgress,
EWhen::PatternAlignment(indent, state.xyzlcol),
EWhen::PatternAlignment(indent, state.pos()),
initial,
))
}
@ -2386,12 +2386,12 @@ where
macro_rules! bad_made_progress {
($op:expr) => {{
Err((MadeProgress, to_error($op, state.xyzlcol), state))
Err((MadeProgress, to_error($op, state.pos()), state))
}};
}
match chomped {
"" => Err((NoProgress, to_expectation(state.xyzlcol), state)),
"" => Err((NoProgress, to_expectation(state.pos()), state)),
"+" => good!(BinOp::Plus, 1),
"-" => good!(BinOp::Minus, 1),
"*" => good!(BinOp::Star, 1),
@ -2402,7 +2402,7 @@ where
"<" => good!(BinOp::LessThan, 1),
"." => {
// a `.` makes no progress, so it does not interfere with `.foo` access(or)
Err((NoProgress, to_error(".", state.xyzlcol), state))
Err((NoProgress, to_error(".", state.pos()), state))
}
"=" => good!(BinOp::Assignment, 1),
":" => good!(BinOp::HasType, 1),
@ -2417,7 +2417,7 @@ where
"%%" => good!(BinOp::DoublePercent, 2),
"->" => {
// makes no progress, so it does not interfere with `_ if isGood -> ...`
Err((NoProgress, to_error("->", state.xyzlcol), state))
Err((NoProgress, to_error("->", state.pos()), state))
}
"<-" => good!(BinOp::Backpassing, 2),
_ => bad_made_progress!(chomped),