language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Refactor some parsing code

Browse source
This commit is contained in:
Richard Feldman 2019-09-18 19:02:26 -04:00
parent 1df7a51144
commit 9c520d3785
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/parse/blankspace.rs
View file

@ -148,12 +148,7 @@ fn spaces<'a>(require_at_least_one: bool, _min_indent: u16) -> impl Parser<'a, &
return if require_at_least_one && chars_parsed <= 1 { return if require_at_least_one && chars_parsed <= 1 {
// We've parsed 1 char and it was not a space, // We've parsed 1 char and it was not a space,
// but we require parsing at least one space! // but we require parsing at least one space!
Err(unexpected( Err(unexpected(nonblank, 0, state.clone(), state.attempting))
nonblank,
chars_parsed,
state.clone(),
state.attempting,
))
} else { } else {
Ok((space_list.into_bump_slice(), state)) Ok((space_list.into_bump_slice(), state))
}; };

20
src/parse/mod.rs
View file

@ -12,12 +12,12 @@ use bumpalo::collections::Vec;
use bumpalo::Bump; use bumpalo::Bump;
use operator::Operator; use operator::Operator;
use parse::ast::{Attempting, Expr}; use parse::ast::{Attempting, Expr};
use parse::blankspace::{space0, space1_before}; use parse::blankspace::{space0, space0_before, space1_before};
use parse::ident::{ident, Ident}; use parse::ident::{ident, Ident};
use parse::number_literal::number_literal; use parse::number_literal::number_literal;
use parse::parser::{ use parse::parser::{
and, attempt, char, either, loc, map, map_with_arena, one_of3, one_of4, one_of6, one_or_more, and, attempt, char, either, loc, map, map_with_arena, one_of4, one_of6, one_or_more, optional,
optional, skip_first, string, unexpected, unexpected_eof, Either, ParseResult, Parser, State, skip_first, string, unexpected, unexpected_eof, Either, ParseResult, Parser, State,
}; };
use parse::string_literal::string_literal; use parse::string_literal::string_literal;
use region::Located; use region::Located;
@ -50,22 +50,20 @@ fn parse_expr<'a>(min_indent: u16, arena: &'a Bump, state: State<'a>) -> ParseRe
// First parse the body without operators, then try to parse possible operators after. // First parse the body without operators, then try to parse possible operators after.
loc(move |arena, state| parse_expr_body_without_operators(min_indent, arena, state)), loc(move |arena, state| parse_expr_body_without_operators(min_indent, arena, state)),
optional(and( optional(and(
and(space0(min_indent), and(loc(operator()), space0(min_indent))), and(space0(min_indent), loc(operator())),
loc(move |arena, state| parse_expr(min_indent, arena, state)), space0_before(
move |arena, state| parse_expr(min_indent, arena, state),
min_indent,
),
)), )),
), ),
|arena, (loc_expr1, opt_operator)| match opt_operator { |arena, (loc_expr1, opt_operator)| match opt_operator {
Some(((spaces_before_op, (loc_op, spaces_after_op)), loc_expr2)) => { Some(((spaces_before_op, loc_op), loc_expr2)) => {
let loc_expr1 = if spaces_before_op.is_empty() { let loc_expr1 = if spaces_before_op.is_empty() {
loc_expr1 loc_expr1
} else { } else {
Expr::with_spaces_after(arena, loc_expr1, spaces_before_op) Expr::with_spaces_after(arena, loc_expr1, spaces_before_op)
}; };
let loc_expr2 = if spaces_after_op.is_empty() {
loc_expr2
} else {
Expr::with_spaces_after(arena, loc_expr2, spaces_after_op)
};
let tuple = arena.alloc((loc_expr1, loc_op, loc_expr2)); let tuple = arena.alloc((loc_expr1, loc_op, loc_expr2));
Expr::Operator(tuple) Expr::Operator(tuple)