roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-14 07:29:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Test for opaque definitions

Browse Source
This commit is contained in:
ayazhafiz 2022-02-19 20:51:12 -05:00
parent fa24e51593
commit 3c10ad2a9f
6 changed files with 100 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/parse/src/expr.rs
View File

@ -671,6 +671,7 @@ fn append_annotation_definition<'a>(
spaces: &'a [CommentOrNewline<'a>],
loc_pattern: Loc<Pattern<'a>>,
loc_ann: Loc<TypeAnnotation<'a>>,
kind: TypeKind,
) {
let region = Region::span_across(&loc_pattern.region, &loc_ann.region);
@ -682,7 +683,7 @@ fn append_annotation_definition<'a>(
..
},
alias_arguments,
) => append_alias_definition(
) => append_type_definition(
arena,
defs,
region,
@ -690,8 +691,9 @@ fn append_annotation_definition<'a>(
Loc::at(loc_pattern.region, name),
alias_arguments,
loc_ann,
kind,
),
Pattern::GlobalTag(name) => append_alias_definition(
Pattern::GlobalTag(name) => append_type_definition(
arena,
defs,
region,
@ -699,6 +701,7 @@ fn append_annotation_definition<'a>(
Loc::at(loc_pattern.region, name),
&[],
loc_ann,
kind,
),
_ => {
let mut loc_def = Loc::at(region, Def::Annotation(loc_pattern, loc_ann));
@ -736,7 +739,7 @@ fn append_expect_definition<'a>(
defs.push(arena.alloc(loc_def));
}
fn append_alias_definition<'a>(
fn append_type_definition<'a>(
arena: &'a Bump,
defs: &mut Vec<'a, &'a Loc<Def<'a>>>,
region: Region,
@ -744,13 +747,21 @@ fn append_alias_definition<'a>(
name: Loc<&'a str>,
pattern_arguments: &'a [Loc<Pattern<'a>>],
loc_ann: Loc<TypeAnnotation<'a>>,
kind: TypeKind,
) {
let def = Def::Alias {
header: TypeHeader {
let header = TypeHeader {
name,
vars: pattern_arguments,
},
};
let def = match kind {
TypeKind::Alias => Def::Alias {
header,
ann: loc_ann,
},
TypeKind::Opaque => Def::Opaque {
header,
typ: loc_ann,
},
};
let mut loc_def = Loc::at(region, def);
@ -853,7 +864,7 @@ fn parse_defs_end<'a>(
parse_defs_end(options, column, def_state, arena, state)
}
Ok((_, BinOp::IsAliasType, state)) => {
Ok((_, op @ (BinOp::IsAliasType | BinOp::IsOpaqueType), state)) => {
let (_, ann_type, state) = specialize(
EExpr::Type,
space0_before_e(
@ -870,6 +881,11 @@ fn parse_defs_end<'a>(
def_state.spaces_after,
loc_pattern,
ann_type,
match op {
BinOp::IsAliasType => TypeKind::Alias,
BinOp::IsOpaqueType => TypeKind::Opaque,
_ => unreachable!(),
},
);
parse_defs_end(options, column, def_state, arena, state)

21
compiler/parse/tests/snapshots/pass/opaque_simple.module.result-ast Normal file
View File

@ -0,0 +1,21 @@
[
@0-9 SpaceAfter(
SpaceBefore(
Opaque {
header: TypeHeader {
name: @0-3 "Age",
vars: [],
},
typ: @7-9 Apply(
"",
"U8",
[],
),
},
[],
),
[
Newline,
],
),
]

1
compiler/parse/tests/snapshots/pass/opaque_simple.module.roc Normal file
View File

@ -0,0 +1 @@
Age := U8

50
compiler/parse/tests/snapshots/pass/opaque_with_type_arguments.module.result-ast Normal file
View File

@ -0,0 +1,50 @@
[
@0-53 SpaceAfter(
SpaceBefore(
Opaque {
header: TypeHeader {
name: @0-10 "Bookmark",
vars: [
@9-10 Identifier(
"a",
),
],
},
typ: @14-53 Record {
fields: [
@16-28 RequiredValue(
@16-23 "chapter",
[],
@25-28 Apply(
"",
"Str",
[],
),
),
@30-41 RequiredValue(
@30-36 "stanza",
[],
@38-41 Apply(
"",
"Str",
[],
),
),
@43-51 RequiredValue(
@43-48 "notes",
[],
@50-51 BoundVariable(
"a",
),
),
],
ext: None,
},
},
[],
),
[
Newline,
],
),
]

1
compiler/parse/tests/snapshots/pass/opaque_with_type_arguments.module.roc Normal file
View File

@ -0,0 +1 @@
Bookmark a := { chapter: Str, stanza: Str, notes: a }

2
compiler/parse/tests/test_parse.rs
View File

@ -191,6 +191,8 @@ mod test_parse {
pass/one_minus_two.expr,
pass/one_plus_two.expr,
pass/one_spaced_def.expr,
pass/opaque_simple.module,
pass/opaque_with_type_arguments.module,
pass/ops_with_newlines.expr,
pass/packed_singleton_list.expr,
pass/parenthetical_apply.expr,