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

Tag with no args in error msgs (#471)

Browse source
This commit is contained in:
Sébastien Besnier 2020-09-05 08:42:40 +02:00
parent 9170f126ac
commit f319fdad79
4 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/constrain/src/expr.rs
View file

@ -758,7 +758,10 @@ pub fn constrain_expr(
Box::new(Type::Variable(*ext_var)),
),
expected.clone(),
Category::TagApply(name.clone()),
Category::TagApply {
tag_name: name.clone(),
args_count: arguments.len(),
},
region,
);
let ast_con = Eq(

10
compiler/constrain/src/uniq.rs
View file

@ -620,13 +620,19 @@ pub fn constrain_expr(
let union_con = Eq(
union_type,
expected.clone(),
Category::TagApply(name.clone()),
Category::TagApply {
tag_name: name.clone(),
args_count: arguments.len(),
},
region,
);
let ast_con = Eq(
Type::Variable(*variant_var),
expected,
Category::TagApply(name.clone()),
Category::TagApply {
tag_name: name.clone(),
args_count: arguments.len(),
},
region,
);

31
compiler/reporting/src/error/type.rs
View file

@ -882,12 +882,39 @@ fn add_category<'b>(
Lambda => alloc.concat(vec![this_is, alloc.text(" an anonymous function of type:")]),
TagApply(TagName::Global(name)) => alloc.concat(vec![
TagApply {
tag_name: TagName::Global(name),
args_count: 0,
} => alloc.concat(vec![
alloc.text("This "),
alloc.global_tag_name(name.to_owned()),
if name.as_str() == "True" || name.as_str() == "False" {
alloc.text(" boolean has the type:")
} else {
alloc.text(" global tag has the type:")
},
]),
TagApply {
tag_name: TagName::Private(name),
args_count: 0,
} => alloc.concat(vec![
alloc.text("This "),
alloc.private_tag_name(*name),
alloc.text(" private tag has the type:"),
]),
TagApply {
tag_name: TagName::Global(name),
args_count: _,
} => alloc.concat(vec![
alloc.text("This "),
alloc.global_tag_name(name.to_owned()),
alloc.text(" global tag application has the type:"),
]),
TagApply(TagName::Private(name)) => alloc.concat(vec![
TagApply {
tag_name: TagName::Private(name),
args_count: _,
} => alloc.concat(vec![
alloc.text("This "),
alloc.private_tag_name(*name),
alloc.text(" private tag application has the type:"),

5
compiler/types/src/types.rs
View file

@ -927,7 +927,10 @@ pub enum Category {
Lookup(Symbol),
CallResult(Option<Symbol>),
LowLevelOpResult(LowLevel),
TagApply(TagName),
TagApply {
tag_name: TagName,
args_count: usize,
},
Lambda,
Uniqueness,
StrInterpolation,