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

Constrain with Types SoA, sans borrow checker

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-08 16:32:25 -06:00
parent e3ef9828c7
commit 59d2de5a55
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
7 changed files with 710 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/compiler/can/src/constraint.rs
View file

@ -8,11 +8,11 @@ use roc_module::ident::TagName;
use roc_module::symbol::{ModuleId, Symbol};
use roc_region::all::{Loc, Region};
use roc_types::subs::{ExhaustiveMark, IllegalCycleMark, Variable};
use roc_types::types::{Category, PatternCategory, Type};
use roc_types::types::{Category, PatternCategory, Type, TypeTag, Types};
pub struct Constraints {
pub constraints: Vec<Constraint>,
pub types: Vec<Cell<Type>>,
pub types: Vec<Cell<Index<TypeTag>>>,
pub type_slices: Vec<TypeOrVar>,
pub variables: Vec<Variable>,
pub loc_symbols: Vec<(Symbol, Region)>,
@ -60,7 +60,7 @@ impl Default for Constraints {
pub type ExpectedTypeIndex = Index<Expected<TypeOrVar>>;
pub type PExpectedTypeIndex = Index<PExpected<TypeOrVar>>;
pub type TypeOrVar = EitherIndex<Cell<Type>, Variable>;
pub type TypeOrVar = EitherIndex<Cell<Index<TypeTag>>, Variable>;
impl Constraints {
pub fn new() -> Self {
@ -82,9 +82,9 @@ impl Constraints {
let cycles = Vec::new();
types.extend([
Cell::new(Type::EmptyRec),
Cell::new(Type::EmptyTagUnion),
Cell::new(Type::Apply(Symbol::STR_STR, vec![], Region::zero())),
Cell::new(Types::EMPTY_RECORD),
Cell::new(Types::EMPTY_TAG_UNION),
Cell::new(Types::STR),
]);
categories.extend([
@ -138,9 +138,9 @@ impl Constraints {
}
}
pub const EMPTY_RECORD: Index<Cell<Type>> = Index::new(0);
pub const EMPTY_TAG_UNION: Index<Cell<Type>> = Index::new(1);
pub const STR: Index<Cell<Type>> = Index::new(2);
pub const EMPTY_RECORD: Index<Cell<Index<TypeTag>>> = Index::new(0);
pub const EMPTY_TAG_UNION: Index<Cell<Index<TypeTag>>> = Index::new(1);
pub const STR: Index<Cell<Index<TypeTag>>> = Index::new(2);
pub const CATEGORY_RECORD: Index<Category> = Index::new(0);
pub const CATEGORY_FOREIGNCALL: Index<Category> = Index::new(1);
@ -170,16 +170,22 @@ impl Constraints {
pub const PCATEGORY_CHARACTER: Index<PatternCategory> = Index::new(10);
#[inline(always)]
pub fn push_type(&mut self, typ: Type) -> EitherIndex<Cell<Type>, Variable> {
match typ {
Type::EmptyRec => EitherIndex::from_left(Self::EMPTY_RECORD),
Type::EmptyTagUnion => EitherIndex::from_left(Self::EMPTY_TAG_UNION),
Type::Apply(Symbol::STR_STR, args, _) if args.is_empty() => {
EitherIndex::from_left(Self::STR)
}
Type::Variable(var) => Self::push_type_variable(var),
other => {
let index: Index<Cell<Type>> = Index::push_new(&mut self.types, Cell::new(other));
pub fn push_type(
&mut self,
types: &Types,
typ: Index<TypeTag>,
) -> EitherIndex<Cell<Index<TypeTag>>, Variable> {
match types[typ] {
TypeTag::EmptyRecord => EitherIndex::from_left(Self::EMPTY_RECORD),
TypeTag::EmptyTagUnion => EitherIndex::from_left(Self::EMPTY_TAG_UNION),
TypeTag::Apply {
symbol: Symbol::STR_STR,
..
} => EitherIndex::from_left(Self::STR),
TypeTag::Variable(var) => Self::push_type_variable(var),
_ => {
let index: Index<Cell<Index<TypeTag>>> =
Index::push_new(&mut self.types, Cell::new(typ));
EitherIndex::from_left(index)
}
}
@ -205,6 +211,11 @@ impl Constraints {
Ok(buf)
}
#[inline(always)]
pub const fn push_variable(&self, var: Variable) -> TypeOrVar {
Self::push_type_variable(var)
}
#[inline(always)]
const fn push_type_variable(var: Variable) -> TypeOrVar {
// that's right, we use the variable's integer value as the index