commit 6634be2a56bef1c56064583ca810e061edd90fbf · jonmsterling.com/swift-pterodactyl

-5

Sources/PterodactylKernel/Core Types/Term.swift

···

       49
       49
        
       		let manifest: Term?

     

       50
       50
        
       	}

     

       51
       51
        
       	

     

       52
       52
       -
       	public struct TypedTerm: Sendable {

     

       53
       53
       -
       		let type: Type_

     

       54
       54
       -
       		let term: Term

     

       55
       55
       -
       	}

     

       56
       56
       -
       	

     

       57
       52
        
       	public struct FieldImpl: Sendable {

     

       58
       53
        
       		let type: Type_

     

       59
       54
        
       		let value: Term

+8 -3

Sources/PterodactylKernel/Evaluator.swift

···

       3
       3
        
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
        
       

     

       5
       5
        
       struct Evaluator {

     

       6
       6
       -
       	let globals: [Name: Term.TypedTerm]

     

       6
       6
       +
       	struct GlobalDef {

     

       7
       7
       +
       		var type: Term.Type_

     

       8
       8
       +
       		var term: Term?

     

       9
       9
       +
       	}

     

       10
       10
       +
       	

     

       11
       11
       +
       	let globals: [Name: GlobalDef]

     

       7
       12
        
       	let locals: [Value]

     

       8
       13
        
       

     

       9
       9
       -
       	public init(globals: [Name: Term.TypedTerm] = [:], locals: [Value] = []) {

     

       14
       14
       +
       	public init(globals: [Name: GlobalDef] = [:], locals: [Value] = []) {

     

       10
       15
        
       		self.globals = globals

     

       11
       16
        
       		self.locals = locals

     

       12
       17
        
       	}

     
···

       52
       57
        
       					let typedTerm = globals[name]!

     

       53
       58
        
       					return Value.Boundary(

     

       54
       59
        
       						type: evaluate(type: typedTerm.type),

     

       55
       55
       -
       						value: evaluate(term: typedTerm.term)

     

       60
       60
       +
       						value: typedTerm.term.map(evaluate(term:))

     

       56
       61
        
       					)

     

       57
       62
        
       				}

     

       58
       63
        
       			)