Implement inference and checking for type operator chains

compiler-core/building-types/src/lib.rs

@@ -15,6 +15,7 @@ pub enum QueryKey {
     Indexed(FileId),
     Lowered(FileId),
     Resolved(FileId),
+    Bracketed(FileId),
     Checked(FileId),
 }
 
@@ -34,6 +35,7 @@ pub trait QueryProxy {
     type Indexed;
     type Lowered;
     type Resolved;
+    type Bracketed;
     type Checked;
 
     fn parsed(&self, id: FileId) -> QueryResult<Self::Parsed>;
@@ -46,6 +48,8 @@ pub trait QueryProxy {
 
     fn resolved(&self, id: FileId) -> QueryResult<Self::Resolved>;
 
+    fn bracketed(&self, id: FileId) -> QueryResult<Self::Bracketed>;
+
     fn checked(&self, id: FileId) -> QueryResult<Self::Checked>;
 
     fn prim_id(&self) -> FileId;

compiler-core/building/src/engine.rs

@@ -95,6 +95,7 @@ struct DerivedStorage {
     indexed: FxHashMap<FileId, DerivedState<Arc<IndexedModule>>>,
     lowered: FxHashMap<FileId, DerivedState<Arc<LoweredModule>>>,
     resolved: FxHashMap<FileId, DerivedState<Arc<ResolvedModule>>>,
+    bracketed: FxHashMap<FileId, DerivedState<Arc<sugar::Bracketed>>>,
     checked: FxHashMap<FileId, DerivedState<Arc<CheckedModule>>>,
 }
 
@@ -421,6 +422,7 @@ impl QueryEngine {
                 QueryKey::Indexed(k) => derived_changed!(indexed, k),
                 QueryKey::Lowered(k) => derived_changed!(lowered, k),
                 QueryKey::Resolved(k) => derived_changed!(resolved, k),
+                QueryKey::Bracketed(k) => derived_changed!(bracketed, k),
                 QueryKey::Checked(k) => derived_changed!(checked, k),
             }
         }
@@ -700,6 +702,19 @@ impl QueryEngine {
         )
     }
 
+    pub fn bracketed(&self, id: FileId) -> QueryResult<Arc<sugar::Bracketed>> {
+        self.query(
+            QueryKey::Bracketed(id),
+            |storage| storage.derived.bracketed.get(&id),
+            |storage| storage.derived.bracketed.entry(id),
+            |this| {
+                let lowered = this.lowered(id)?;
+                let bracketed = sugar::bracketed(this, &lowered)?;
+                Ok(Arc::new(bracketed))
+            },
+        )
+    }
+
     pub fn checked(&self, id: FileId) -> QueryResult<Arc<CheckedModule>> {
         self.query(
             QueryKey::Checked(id),
@@ -730,6 +745,8 @@ impl QueryProxy for QueryEngine {
 
     type Resolved = Arc<ResolvedModule>;
 
+    type Bracketed = Arc<sugar::Bracketed>;
+
     type Checked = Arc<CheckedModule>;
 
     fn parsed(&self, id: FileId) -> QueryResult<Self::Parsed> {
@@ -752,6 +769,10 @@ impl QueryProxy for QueryEngine {
         QueryEngine::resolved(self, id)
     }
 
+    fn bracketed(&self, id: FileId) -> QueryResult<Self::Bracketed> {
+        QueryEngine::bracketed(self, id)
+    }
+
     fn checked(&self, id: FileId) -> QueryResult<Self::Checked> {
         QueryEngine::checked(self, id)
     }

compiler-core/checking/Cargo.toml

@@ -15,3 +15,4 @@ petgraph = "0.8.3"
 resolving = { version = "0.1.0", path = "../resolving" }
 rustc-hash = "2.1.1"
 smol_str = "0.3.2"
+sugar = { version = "0.1.0", path = "../sugar" }

compiler-core/checking/src/algorithm.rs

@@ -1,4 +1,4 @@
-pub mod convert;
+pub mod inspect;
 pub mod items;
 pub mod kind;
 pub mod quantify;