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

special-case the closure tags

Browse source
This commit is contained in:
Folkert 2021-11-24 21:14:58 +01:00
parent 3e640f78bf
commit cb8e9acb92
4 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,6 +130,11 @@ impl SolvedType {
ext: Box::new(solved_ext),
}
}
ClosureTag { name, ext } => {
let solved_ext = Self::from_type(solved_subs, &Type::Variable(*ext));
let solved_tags = vec![(TagName::Closure(*name), vec![])];
SolvedType::TagUnion(solved_tags, Box::new(solved_ext))
}
TagUnion(tags, box_ext) => {
let solved_ext = Self::from_type(solved_subs, box_ext);
let mut solved_tags = Vec::with_capacity(tags.len());

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

@ -169,6 +169,11 @@ pub enum Type {
Record(SendMap<Lowercase, RecordField<Type>>, Box<Type>),
TagUnion(Vec<(TagName, Vec<Type>)>, Box<Type>),
FunctionOrTagUnion(TagName, Symbol, Box<Type>),
/// A function name that is used in our defunctionalization algorithm
ClosureTag {
name: Symbol,
ext: Variable,
},
Alias {
symbol: Symbol,
type_arguments: Vec<(Lowercase, Type)>,
@ -378,6 +383,15 @@ impl fmt::Debug for Type {
}
}
}
Type::ClosureTag { name, ext } => {
write!(f, "ClosureTag(")?;
name.fmt(f)?;
write!(f, ", ")?;
ext.fmt(f)?;
write!(f, ")")
}
Type::RecursiveTagUnion(rec, tags, ext) => {
write!(f, "[")?;
@ -462,7 +476,7 @@ impl Type {
use Type::*;
match self {
Variable(v) => {
ClosureTag { ext: v, .. } | Variable(v) => {
if let Some(replacement) = substitutions.get(v) {
*self = replacement.clone();
}
@ -590,7 +604,7 @@ impl Type {
arg.substitute_alias(rep_symbol, actual);
}
}
EmptyRec | EmptyTagUnion | Erroneous(_) | Variable(_) => {}
EmptyRec | EmptyTagUnion | ClosureTag { .. } | Erroneous(_) | Variable(_) => {}
}
}
@ -627,7 +641,7 @@ impl Type {
}
Apply(symbol, _) if *symbol == rep_symbol => true,
Apply(_, args) => args.iter().any(|arg| arg.contains_symbol(rep_symbol)),
EmptyRec | EmptyTagUnion | Erroneous(_) | Variable(_) => false,
EmptyRec | EmptyTagUnion | ClosureTag { .. } | Erroneous(_) | Variable(_) => false,
}
}
@ -635,7 +649,7 @@ impl Type {
use Type::*;
match self {
Variable(v) => *v == rep_variable,
ClosureTag { ext: v, .. } | Variable(v) => *v == rep_variable,
Function(args, closure, ret) => {
ret.contains_variable(rep_variable)
|| closure.contains_variable(rep_variable)
@ -819,7 +833,7 @@ impl Type {
}
}
}
EmptyRec | EmptyTagUnion | Erroneous(_) | Variable(_) => {}
EmptyRec | EmptyTagUnion | ClosureTag { .. } | Erroneous(_) | Variable(_) => {}
}
}
}
@ -872,7 +886,7 @@ fn symbols_help(tipe: &Type, accum: &mut ImSet<Symbol>) {
accum.insert(*symbol);
args.iter().for_each(|arg| symbols_help(arg, accum));
}
EmptyRec | EmptyTagUnion | Erroneous(_) | Variable(_) => {}
EmptyRec | EmptyTagUnion | ClosureTag { .. } | Erroneous(_) | Variable(_) => {}
}
}
@ -882,7 +896,7 @@ fn variables_help(tipe: &Type, accum: &mut ImSet<Variable>) {
match tipe {
EmptyRec | EmptyTagUnion | Erroneous(_) => (),
Variable(v) => {
ClosureTag { ext: v, .. } | Variable(v) => {
accum.insert(*v);
}
@ -979,7 +993,7 @@ fn variables_help_detailed(tipe: &Type, accum: &mut VariableDetail) {
match tipe {
EmptyRec | EmptyTagUnion | Erroneous(_) => (),
Variable(v) => {
ClosureTag { ext: v, .. } | Variable(v) => {
accum.type_variables.insert(*v);
}