Type bounds: check trait and impl

nois-lang · Sep 10, 2024 · 2fa5403 · 2fa5403
1 parent ee3bd47
commit 2fa5403
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/phase/type-bound.ts b/src/phase/type-bound.ts
@@ -209,7 +209,7 @@ export const collectTypeBounds = (node: AstNode, ctx: Context, parentBound?: Inf
                 collectTypeBounds(node.expr, ctx, node.varType ? node.varType : undefined)
             }
             collectTypeBounds(node.pattern, ctx, node.expr?.type)
-            node.type = instantiateDefType(ctx.stdTypeIds.unit?.type ?? makeErrorType('no def'))
+            node.type = instantiateDefType(ctx.stdTypeIds.unit?.type ?? makeErrorType('no def', 'no-def'))
             break
         }
         case 'fn-def': {
@@ -226,7 +226,6 @@ export const collectTypeBounds = (node: AstNode, ctx: Context, parentBound?: Inf
         }
         case 'trait-def':
         case 'impl-def': {
-            if (node.kind === 'impl-def' && node.forTrait) break
             node.block.statements.forEach(s => collectTypeBounds(s, ctx))
             // TODO
             break

diff --git a/src/phase/type-unify.ts b/src/phase/type-unify.ts
@@ -145,12 +145,9 @@ export const unifyTypeBounds = (node: AstNode, ctx: Context, report = true): voi
             }
             break
         }
-        case 'trait-def': {
-            // TODO
-            break
-        }
+        case 'trait-def':
         case 'impl-def': {
-            // TODO
+            node.block.statements.forEach(s => unifyTypeBounds(s, ctx))
             break
         }
         case 'method-call-op': {
@@ -179,7 +176,11 @@ export const unifyType = (type: InferredType, ctx: Context): void => {
             break
         case 'field-access':
             unifyType(type.operandType, ctx)
-            if (type.operandType.kind === 'def' && type.operandType.def?.kind === 'type-def') {
+            if (type.operandType.kind === 'def') {
+                if (type.operandType.def?.kind !== 'type-def') {
+                    unreachable()
+                    break
+                }
                 const typeDef = type.operandType.def
                 if (typeDef.variants.length > 1) {
                     // TODO: make sure every variant contains such field with equal type