Join inherent impls with their type def; resolve methods

nois-lang · Aug 3, 2024 · 855ad73 · 855ad73
1 parent 40bdf77
commit 855ad73
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/src/ast/type-def.ts b/src/ast/type-def.ts
@@ -2,6 +2,7 @@ import { BaseAstNode } from '.'
 import { ParseNode, filterNonAstNodes } from '../parser'
 import { Context } from '../scope'
 import { Name, buildName } from './operand'
+import { ImplDef } from './statement'
 import { Generic, Type, buildGeneric, buildType } from './type'
 
 export type TypeDef = BaseAstNode & {
@@ -10,6 +11,7 @@ export type TypeDef = BaseAstNode & {
     generics: Generic[]
     variants: Variant[]
     pub: boolean
+    impl?: ImplDef
 }
 
 export const buildTypeDef = (node: ParseNode, ctx: Context): TypeDef => {

diff --git a/src/phase/module-resolve.ts b/src/phase/module-resolve.ts
@@ -2,6 +2,7 @@ import { AstNode } from '../ast'
 import { Context, Definition, addError, defKey } from '../scope'
 import { duplicateDefError } from '../semantic/error'
 import { todo } from '../util/todo'
+import { findById } from './name-resolve'
 
 /**
  * Resolve module definitions available from the outside
@@ -21,7 +22,10 @@ export const resolveModuleScope = (node: AstNode, ctx: Context): void => {
             break
         }
         case 'impl-def': {
-            // TODO
+            if (node.forTrait) break
+            const typeDef = findById(node.identifier, ctx)
+            if (typeDef?.kind !== 'type-def') break
+            typeDef.impl = node
             break
         }
         case 'var-def': {

diff --git a/src/phase/name-resolve.ts b/src/phase/name-resolve.ts
@@ -252,6 +252,10 @@ export const findById = (id: Identifier, ctx: Context): Definition | undefined =
     return findWithinDef(def, id.names[1], ctx)
 }
 
+export const findNameInStack = (name: string, stack: DefinitionMap): Definition | undefined => {
+    return stack.get(name)
+}
+
 const addDef = (name: string, def: Definition, ctx: Context): void => {
     const m = ctx.moduleStack.at(-1)!
     const scope = m.scopeStack.at(-1) ?? m.topScope
@@ -278,7 +282,12 @@ const findWithinDef = (def: Definition, name: Name, ctx: Context): Definition |
             return <FnDef | undefined>def.block.statements.find(s => s.kind === 'fn-def' && defKey(s) === key)
         }
         case 'type-def': {
-            return def.variants.find(v => defKey(v) === key)
+            const variant = def.variants.find(v => defKey(v) === key)
+            if (variant) return variant
+            if (def.impl) {
+                return findWithinDef(def.impl, name, ctx)
+            }
+            return undefined
         }
         default: {
             // TODO: report error
@@ -287,10 +296,6 @@ const findWithinDef = (def: Definition, name: Name, ctx: Context): Definition |
     }
 }
 
-const findNameInStack = (name: string, stack: DefinitionMap): Definition | undefined => {
-    return stack.get(name)
-}
-
 const withScope = <T>(ctx: Context, f: () => T): T => {
     const m = ctx.moduleStack.at(-1)!
     m.scopeStack.push(new Map())

diff --git a/src/phase/type-bound.ts b/src/phase/type-bound.ts
@@ -4,7 +4,7 @@ import { Context } from '../scope'
 import { operatorImplMap } from '../semantic/op'
 import { InferredType, makeInferredType } from '../typecheck'
 import { boolId, charId, floatId, intId, stringId, unitId } from '../typecheck/type'
-import { assert, todo } from '../util/todo'
+import { assert } from '../util/todo'
 import { findById } from './name-resolve'
 
 /**
@@ -202,7 +202,7 @@ export const collectTypeBounds = (node: AstNode, ctx: Context, parentBound?: Inf
             assert(!!methodId)
             const methodDef = findById(methodId!, ctx)
             if (methodDef) {
-                todo()
+                // TODO
             }
             // TODO
             break