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

Merge pull request #3052 from rtfeldman/build-encode

Browse source 
Encode/JSON in standard library typechecks
This commit is contained in:
Ayaz 2022-05-19 21:16:59 -04:00 • committed by GitHub
commit e5eb9c9f1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 847 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -899,6 +899,7 @@ fn parse_defs_end<'a>(
Loc::at(name_region, name),
args,
loc_has,
def_state.spaces_after,
arena,
state,
)?;
@ -1304,6 +1305,7 @@ fn finish_parsing_ability_def<'a>(
name: Loc<&'a str>,
args: &'a [Loc<Pattern<'a>>],
loc_has: Loc<Has<'a>>,
spaces_before: &'a [CommentOrNewline<'a>],
arena: &'a Bump,
state: State<'a>,
) -> ParseResult<'a, &'a Loc<Def<'a>>, EExpr<'a>> {
@ -1345,13 +1347,21 @@ fn finish_parsing_ability_def<'a>(
}
let def_region = Region::span_across(&name.region, &demands.last().unwrap().typ.region);
let def = TypeDef::Ability {
let def = Def::Type(TypeDef::Ability {
header: TypeHeader { name, vars: args },
loc_has,
members: demands.into_bump_slice(),
}
.into();
let loc_def = &*(arena.alloc(Loc::at(def_region, def)));
});
let loc_def = &*(if spaces_before.is_empty() {
arena.alloc(Loc::at(def_region, def))
} else {
arena.alloc(
arena
.alloc(def)
.with_spaces_before(spaces_before, def_region),
)
});
Ok((MadeProgress, loc_def, state))
}
@ -1366,7 +1376,7 @@ fn finish_parsing_ability<'a>(
state: State<'a>,
) -> ParseResult<'a, Expr<'a>, EExpr<'a>> {
let (_, loc_def, state) =
finish_parsing_ability_def(start_column, name, args, loc_has, arena, state)?;
finish_parsing_ability_def(start_column, name, args, loc_has, &[], arena, state)?;
let def_state = DefState {
defs: bumpalo::vec![in arena; loc_def],