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

Determine ability specializations before walking a body

Browse source
This commit is contained in:
Ayaz Hafiz 2022-05-06 08:51:31 -04:00 • committed by ayazhafiz
parent edee222763
commit 025d501cfd
4 changed files with 136 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/can/src/expr.rs
View file

@ -21,7 +21,7 @@ use roc_region::all::{Loc, Region};
use roc_types::subs::{ExhaustiveMark, RedundantMark, VarStore, Variable};
use roc_types::types::{Alias, Category, LambdaSet, OptAbleVar, Type};
use std::fmt::{Debug, Display};
use std::sync::{Arc, Mutex};
use std::sync::{Arc, RwLock};
use std::{char, u32};
#[derive(Clone, Default, Debug)]
@ -88,7 +88,7 @@ pub enum Expr {
/// Actual member name
Symbol,
/// Specialization to use
Arc<Mutex<Option<Symbol>>>,
Arc<RwLock<Option<Symbol>>>,
),
// Branching
@ -1328,7 +1328,11 @@ fn canonicalize_var_lookup(
Ok(symbol) => {
output.references.insert_value_lookup(symbol);
Var(symbol)
if scope.abilities_store.is_ability_member_name(symbol) {
AbilityMember(symbol, Arc::new(RwLock::new(None)))
} else {
Var(symbol)
}
}
Err(problem) => {
env.problem(Problem::RuntimeError(problem.clone()));
@ -1343,7 +1347,11 @@ fn canonicalize_var_lookup(
Ok(symbol) => {
output.references.insert_value_lookup(symbol);
Var(symbol)
if scope.abilities_store.is_ability_member_name(symbol) {
AbilityMember(symbol, Arc::new(RwLock::new(None)))
} else {
Var(symbol)
}
}
Err(problem) => {
// Either the module wasn't imported, or