language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 08:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Attempt to fix defs parsing

Browse source
This commit is contained in:
Richard Feldman 2019-10-30 01:24:09 -04:00
parent daf2480e55
commit 6156a5b8f9
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/parse/mod.rs
View file

@ -38,10 +38,9 @@ use parse::collection::collection;
use parse::ident::{ident, unqualified_ident, variant_or_ident, Ident}; use parse::ident::{ident, unqualified_ident, variant_or_ident, Ident};
use parse::number_literal::number_literal; use parse::number_literal::number_literal;
use parse::parser::{ use parse::parser::{
allocated, and, attempt, between, char, either, loc, map, map_with_arena, not, not_followed_by, and, attempt, between, char, either, loc, map, map_with_arena, not, not_followed_by, one_of16,
one_of16, one_of2, one_of5, one_of9, one_or_more, optional, skip_first, skip_second, string, one_of2, one_of5, one_of9, one_or_more, optional, skip_first, skip_second, string, then,
then, unexpected, unexpected_eof, zero_or_more, Either, Fail, FailReason, ParseResult, Parser, unexpected, unexpected_eof, zero_or_more, Either, Fail, FailReason, ParseResult, Parser, State,
State,
}; };
use parse::record::record; use parse::record::record;
use region::Located; use region::Located;
@ -579,10 +578,8 @@ fn parse_def_expr<'a>(
loc(move |arena, state| parse_expr(indented_more, arena, state)), loc(move |arena, state| parse_expr(indented_more, arena, state)),
and( and(
// Optionally parse additional defs. // Optionally parse additional defs.
zero_or_more(allocated(space1_before( // TODO this is broken - it doesn't keep parsing *all* the remaining defs
loc(def(original_indent)), zero_or_more(and(space1(original_indent), loc(def(original_indent)))),
original_indent,
))),
// Parse the final expression that will be returned. // Parse the final expression that will be returned.
// It should be indented the same amount as the original. // It should be indented the same amount as the original.
space1_before( space1_before(
@ -592,7 +589,7 @@ fn parse_def_expr<'a>(
), ),
), ),
), ),
move |arena, state, (loc_first_body, (mut defs, loc_ret))| { move |arena, state, (loc_first_body, (pairs, loc_ret))| {
if state.indent_col != original_indent { if state.indent_col != original_indent {
panic!("TODO return expr was indented differently from original def",); panic!("TODO return expr was indented differently from original def",);
} else { } else {
@ -605,11 +602,23 @@ fn parse_def_expr<'a>(
region: loc_first_pattern.region.clone(), region: loc_first_pattern.region.clone(),
}; };
let mut defs = Vec::with_capacity_in(pairs.len(), arena);
for (space_list, loc_def) in pairs {
defs.push(
&*arena.alloc(
arena
.alloc(loc_def.value)
.with_spaces_before(space_list, loc_def.region),
),
);
}
// Add the first def to the end of the defs. (It's fine that we // Add the first def to the end of the defs. (It's fine that we
// reorder the first one to the end, because canonicalize will // reorder the first one to the end, because canonicalize will
// sort all these defs based on their mutual dependencies anyway. Only // sort all these defs based on their mutual dependencies anyway. Only
// their regions will ever be visible to the user.) // their regions will ever be visible to the user.)
defs.push(arena.alloc(loc_first_def)); defs.push(&*arena.alloc(loc_first_def));
Ok((Expr::Defs(defs, arena.alloc(loc_ret)), state)) Ok((Expr::Defs(defs, arena.alloc(loc_ret)), state))
} }