commit ed61805022a27e44cc7809ccb9c3a64ced7977ec · jonmsterling.com/swift-pterodactyl

+14 -3
Sources/PterodactylKernel/Plug.swift
···

       42
       42
        
       			let fibre = fam.instantiate(with: arg)

     

       43
       43
        
       			return Value.Boundary(type: fibre, value: boundary.value?.plug(frame: frame))

     

       44
       44
        
       			

     

       45
       45
       -
       		case let .recordType(_, fields: fields):

     

       45
       45
       +
       		case let .recordType(boundName, fields: fields):

     

       46
       46
        
       			guard case let .proj(fieldName) = frame else {

     

       47
       47
        
       				fatalError("Attempted to plug element of record type into invalid frame")

     

       48
       48
        
       			}

     

       49
       49
        
       			guard let field = fields[fieldName] else {

     

       50
       50
        
       				fatalError("Attempted to project invalid field from element of record type")

     

       51
       51
        
       			}

     

       52
       52
       -
       			let fieldTypeValue = field.type.instantiate(with: .shift(neutral: self))

     

       52
       52
       +
       			let prefix = fields.prefix(until: fieldName)

     

       53
       53
       +
       			let prefixImpls = prefix.mapWithKeys { (key, spec) in

     

       54
       54
       +
       				Value.FieldImpl(

     

       55
       55
       +
       					type: spec.type,

     

       56
       56
       +
       					value: Closure(

     

       57
       57
       +
       						evaluator: Evaluator(globals: [:], locals: [.shift(neutral: self)]),

     

       58
       58
       +
       						body: .cut(term: .local(index: 0), frame: .proj(fieldName: key))

     

       59
       59
       +
       					)

     

       60
       60
       +
       				)

     

       61
       61
       +
       			}

     

       62
       62
       +
       			let prefixRecord: Value = .record(boundName: boundName, fields: prefixImpls)

     

       63
       63
       +
       			let fieldTypeValue = field.type.instantiate(with: prefixRecord)

     

       53
       64
        
       			let value = boundary.value?.plug(frame: frame) ?? field.manifest.map { manifest in

     

       54
       54
       -
       				manifest.instantiate(with: .shift(neutral: self))

     

       65
       65
       +
       				return manifest.instantiate(with: .shift(neutral: self))

     

       55
       66
        
       			}

     

       56
       67
        
       			return Value.Boundary(type: fieldTypeValue, value: value)

     

       57
       68
        
       		}