Semantic: refactoring

nois-lang · Apr 30, 2024 · 31407ba · 31407ba
1 parent bb88577
commit 31407ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/semantic/expr.ts b/src/semantic/expr.ts
@@ -338,8 +338,7 @@ export const checkForExpr = (forExpr: ForExpr, ctx: Context): void => {
 
     const iterableType = [iter, iterable]
         .map(t => extractConcreteSupertype(forExpr.expr.type!, t.identifier, ctx))
-        .filter(t => !!t)
-        .at(0)
+        .find(t => !!t)
     if (iterableType) {
         assert(iterableType!.kind === 'vid-type', `iterable type is ${iterableType!.kind}`)
         const itemType = (<VidType>iterableType).typeArgs.at(0)

diff --git a/src/semantic/index.ts b/src/semantic/index.ts
@@ -440,8 +440,10 @@ const checkTraitDef = (traitDef: TraitDef, ctx: Context) => {
 const checkImplDef = (implDef: ImplDef, ctx: Context) => {
     if (!implDef.rel) {
         const rel = ctx.impls.find(i => i.instanceDef === implDef)
-        assert(!!rel)
-        implDef.rel = rel!
+        // error is handled when preparing ctx.impls
+        if (!rel) return
+
+        implDef.rel = rel
     }
 
     const module = ctx.moduleStack.at(-1)!