aontu 0.29.0 → 0.30.1

package/lib/val/DisjunctVal.ts

@@ -1,160 +0,0 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-
-
-
-import type {
-  Val,
-  ValSpec,
-} from '../type'
-
-import {
-  DONE,
-} from '../type'
-
-import {
-  Context,
-} from '../unify'
-
-
-import {
-  Site
-} from '../lang'
-
-
-import {
-  unite
-} from '../op/op'
-
-
-
-
-// import { TOP } from '../val'
-// import { ConjunctVal } from '../val/ConjunctVal'
-// import { ListVal } from '../val/ListVal'
-// import { MapVal } from '../val/MapVal'
-import { Nil } from '../val/Nil'
-import { PrefVal } from '../val/PrefVal'
-// import { RefVal } from '../val/RefVal'
-import { ValBase } from '../val/ValBase'
-
-
-
-
-// TODO: move main logic to op/disjunct
-class DisjunctVal extends ValBase {
-  isDisjunctVal = true
-  isBinaryOp = true
-
-  // TODO: sites from normalization of orginal Disjuncts, as well as child pegs
-  constructor(
-    spec: {
-      peg: Val[]
-    },
-    ctx?: Context,
-    _sites?: Site[]
-  ) {
-    super(spec, ctx)
-  }
-
-  // NOTE: mutation!
-  append(peer: Val): DisjunctVal {
-    this.peg.push(peer)
-    return this
-  }
-
-  unify(peer: Val, ctx: Context): Val {
-    let done = true
-
-    let oval: Val[] = []
-
-    // Conjunction (&) distributes over disjunction (|)
-    for (let vI = 0; vI < this.peg.length; vI++) {
-      //oval[vI] = this.peg[vI].unify(peer, ctx)
-      oval[vI] = unite(ctx, this.peg[vI], peer)
-      done = done && DONE === oval[vI].done
-    }
-
-    // Remove duplicates, and normalize
-    if (1 < oval.length) {
-      for (let vI = 0; vI < oval.length; vI++) {
-        if (oval[vI] instanceof DisjunctVal) {
-          oval.splice(vI, 1, ...oval[vI].peg)
-        }
-      }
-
-      // TODO: not an error Nil!
-      let remove = new Nil()
-      for (let vI = 0; vI < oval.length; vI++) {
-        for (let kI = vI + 1; kI < oval.length; kI++) {
-          if (oval[kI].same(oval[vI])) {
-            oval[kI] = remove
-          }
-        }
-      }
-
-      oval = oval.filter(v => !(v instanceof Nil))
-    }
-
-    let out: Val
-
-    if (1 == oval.length) {
-      out = oval[0]
-    }
-    else if (0 == oval.length) {
-      return Nil.make(ctx, '|:empty', this)
-    }
-    else {
-      out = new DisjunctVal({ peg: oval }, ctx)
-    }
-
-    out.done = done ? DONE : this.done + 1
-
-    return out
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    let out = (super.clone(spec, ctx) as DisjunctVal)
-    out.peg = this.peg.map((entry: Val) => entry.clone(null, ctx))
-    return out
-  }
-
-
-  get canon() {
-    return this.peg.map((v: Val) => {
-      return (v as any).isBinaryOp && Array.isArray(v.peg) && 1 < v.peg.length ?
-        '(' + v.canon + ')' : v.canon
-    }).join('|')
-  }
-
-
-  gen(ctx?: Context) {
-
-    // TODO: this is not right - unresolved Disjuncts eval to undef
-    if (0 < this.peg.length) {
-
-      let vals = this.peg.filter((v: Val) => v instanceof PrefVal)
-
-      vals = 0 === vals.length ? this.peg : vals
-
-      let val = vals[0]
-
-      for (let vI = 1; vI < this.peg.length; vI++) {
-        let valnext = val.unify(this.peg[vI], ctx)
-        val = valnext
-      }
-
-      return val.gen(ctx)
-    }
-
-    return undefined
-  }
-}
-
-
-
-
-
-export {
-  DisjunctVal,
-}

package/lib/val/ListVal.ts

@@ -1,196 +0,0 @@
-/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
-
-
-import type {
-  Val,
-  ValList,
-  ValSpec,
-} from '../type'
-
-import {
-  DONE,
-} from '../type'
-
-import {
-  Context,
-} from '../unify'
-
-
-import {
-  Site
-} from '../lang'
-
-
-import {
-  unite
-} from '../op/op'
-
-
-
-
-import { TOP } from '../val'
-import { ConjunctVal } from '../val/ConjunctVal'
-// import { DisjunctVal } from '../val/DisjunctVal'
-// import { MapVal } from '../val/MapVal'
-import { Nil } from '../val/Nil'
-// import { PrefVal } from '../val/PrefVal'
-// import { RefVal } from '../val/RefVal'
-import { ValBase } from '../val/ValBase'
-
-
-
-
-
-class ListVal extends ValBase {
-  isListVal = true
-
-  static SPREAD = Symbol('spread')
-
-  spread = {
-    cj: (undefined as Val | undefined),
-  }
-
-  constructor(
-    spec: {
-      peg: ValList
-    },
-    ctx?: Context
-  ) {
-    super(spec, ctx)
-
-    if (null == this.peg) {
-      throw new Error('ListVal spec.peg undefined')
-    }
-
-    let spread = (this.peg as any)[ListVal.SPREAD]
-    delete (this.peg as any)[ListVal.SPREAD]
-
-    if (spread) {
-      if ('&' === spread.o) {
-
-        // TODO: handle existing spread!
-        this.spread.cj =
-          Array.isArray(spread.v) ?
-            1 < spread.v.length ?
-              new ConjunctVal({ peg: spread.v }, ctx) :
-              spread.v :
-            spread.v
-
-        // let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
-        // this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
-      }
-    }
-  }
-
-
-  // NOTE: order of keys is not preserved!
-  // not possible in any case - consider {a,b} unify {b,a}
-  unify(peer: Val, ctx: Context): Val {
-    let done: boolean = true
-    let out: ListVal = TOP === peer ? this : new ListVal({ peg: [] }, ctx)
-
-    out.spread.cj = this.spread.cj
-
-    if (peer instanceof ListVal) {
-      out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
-        null == peer.spread.cj ? out.spread.cj : (
-          out.spread.cj =
-          // new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
-          unite(ctx, out.spread.cj, peer.spread.cj)
-        )
-      )
-    }
-
-
-    out.done = this.done + 1
-
-    // if (this.spread.cj) {
-    //   out.spread.cj =
-    //     DONE !== this.spread.cj.done ? unite(ctx, this.spread.cj) :
-    //       this.spread.cj
-    // }
-
-    let spread_cj = out.spread.cj || TOP
-
-    // Always unify children first
-    for (let key in this.peg) {
-      let keyctx = ctx.descend(key)
-      let key_spread_cj = spread_cj.clone(null, keyctx)
-
-      out.peg[key] = unite(keyctx, this.peg[key], key_spread_cj, 'list-own')
-      done = (done && DONE === out.peg[key].done)
-    }
-
-
-    if (peer instanceof ListVal) {
-      let upeer: ListVal = (unite(ctx, peer, undefined, 'list-peer-list') as ListVal)
-
-      // NOTE: peerkey is the index
-      for (let peerkey in upeer.peg) {
-        let peerchild = upeer.peg[peerkey]
-        let child = out.peg[peerkey]
-
-        let oval = out.peg[peerkey] =
-          undefined === child ? peerchild :
-            child instanceof Nil ? child :
-              peerchild instanceof Nil ? peerchild :
-                unite(ctx.descend(peerkey), child, peerchild, 'list-peer')
-
-        if (this.spread.cj) {
-          let key_ctx = ctx.descend(peerkey)
-          let key_spread_cj = spread_cj.clone(null, key_ctx)
-
-          // out.peg[peerkey] = unite(ctx, out.peg[peerkey], spread_cj)
-          oval = out.peg[peerkey] =
-            // new ConjunctVal({ peg: [out.peg[peerkey], key_spread_cj] }, key_ctx)
-            // done = false
-            unite(key_ctx, out.peg[peerkey], key_spread_cj)
-        }
-
-        done = (done && DONE === oval.done)
-
-      }
-    }
-    else if (TOP !== peer) {
-      return Nil.make(ctx, 'map', this, peer)
-    }
-
-    out.done = done ? DONE : out.done
-    return out
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    let out = (super.clone(spec, ctx) as ListVal)
-    out.peg = this.peg.map((entry: Val) => entry.clone(null, ctx))
-    if (this.spread.cj) {
-      out.spread.cj = this.spread.cj.clone(null, ctx)
-    }
-    return out
-  }
-
-
-  get canon() {
-    let keys = Object.keys(this.peg)
-    return '[' +
-      (this.spread.cj ? '&:' + this.spread.cj.canon +
-        (0 < keys.length ? ',' : '') : '') +
-      keys
-        // NOTE: handle array non-index key vals
-        .map(k => [this.peg[k].canon]).join(',') +
-      ']'
-  }
-
-  gen(ctx?: Context) {
-    let out: any = this.peg.map((v: Val) => v.gen(ctx))
-
-    return out
-  }
-}
-
-
-
-
-export {
-  ListVal,
-}

package/lib/val/MapVal.ts

@@ -1,181 +0,0 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-
-
-
-import type {
-  Val,
-  ValMap,
-  ValSpec,
-} from '../type'
-
-import {
-  DONE,
-} from '../type'
-
-import {
-  Context,
-} from '../unify'
-
-
-
-import {
-  unite
-} from '../op/op'
-
-
-
-import { TOP } from '../val'
-import { ConjunctVal } from '../val/ConjunctVal'
-// import { DisjunctVal } from '../val/DisjunctVal'
-// import { ListVal } from '../val/ListVal'
-import { Nil } from '../val/Nil'
-// import { PrefVal } from '../val/PrefVal'
-// import { RefVal } from '../val/RefVal'
-import { ValBase } from '../val/ValBase'
-
-
-class MapVal extends ValBase {
-  isMapVal = true
-
-  static SPREAD = Symbol('spread')
-
-  spread = {
-    cj: (undefined as Val | undefined),
-  }
-
-  constructor(
-    spec: {
-      peg: ValMap
-    },
-    ctx?: Context
-  ) {
-    super(spec, ctx)
-
-    if (null == this.peg) {
-      throw new Error('MapVal spec.peg undefined')
-    }
-
-    let spread = (this.peg as any)[MapVal.SPREAD]
-    delete (this.peg as any)[MapVal.SPREAD]
-
-    if (spread) {
-      if ('&' === spread.o) {
-        // TODO: handle existing spread!
-        this.spread.cj =
-          Array.isArray(spread.v) ?
-            1 < spread.v.length ?
-              new ConjunctVal({ peg: spread.v }, ctx) :
-              spread.v[0] :
-            spread.v
-      }
-    }
-  }
-
-
-  // NOTE: order of keys is not preserved!
-  // not possible in any case - consider {a,b} unify {b,a}
-  unify(peer: Val, ctx: Context): Val {
-    // let mark = Math.random()
-
-    let done: boolean = true
-    let out: MapVal = TOP === peer ? this : new MapVal({ peg: {} }, ctx)
-
-    out.spread.cj = this.spread.cj
-
-    if (peer instanceof MapVal) {
-      out.spread.cj = null == out.spread.cj ? peer.spread.cj : (
-        null == peer.spread.cj ? out.spread.cj : (
-          out.spread.cj =
-          // new ConjunctVal({ peg: [out.spread.cj, peer.spread.cj] }, ctx)
-          unite(ctx, out.spread.cj, peer.spread.cj)
-        )
-      )
-    }
-
-
-    out.done = this.done + 1
-
-    let spread_cj = out.spread.cj || TOP
-
-    // Always unify own children first
-    for (let key in this.peg) {
-      let keyctx = ctx.descend(key)
-      let key_spread_cj = spread_cj.clone(null, keyctx)
-
-      out.peg[key] = unite(keyctx, this.peg[key], key_spread_cj, 'map-own')
-      done = (done && DONE === out.peg[key].done)
-    }
-
-
-    if (peer instanceof MapVal) {
-      let upeer: MapVal = (unite(ctx, peer, undefined, 'map-peer-map') as MapVal)
-
-      for (let peerkey in upeer.peg) {
-        let peerchild = upeer.peg[peerkey]
-        let child = out.peg[peerkey]
-
-        let oval = out.peg[peerkey] =
-          undefined === child ? peerchild :
-            child instanceof Nil ? child :
-              peerchild instanceof Nil ? peerchild :
-                unite(ctx.descend(peerkey), child, peerchild, 'map-peer')
-
-        if (this.spread.cj) {
-          let key_ctx = ctx.descend(peerkey)
-          let key_spread_cj = spread_cj.clone(null, key_ctx)
-          oval = out.peg[peerkey] =
-            unite(key_ctx, out.peg[peerkey], key_spread_cj)
-        }
-
-        done = (done && DONE === oval.done)
-      }
-    }
-    else if (TOP !== peer) {
-      return Nil.make(ctx, 'map', this, peer)
-    }
-
-    out.uh.push(peer.id)
-
-    out.done = done ? DONE : out.done
-    return out
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    let out = (super.clone(spec, ctx) as MapVal)
-    out.peg = {}
-    for (let entry of Object.entries(this.peg)) {
-      out.peg[entry[0]] =
-        entry[1] instanceof ValBase ? entry[1].clone(null, ctx) : entry[1]
-    }
-    if (this.spread.cj) {
-      out.spread.cj = this.spread.cj.clone(null, ctx)
-    }
-    return out
-  }
-
-
-  get canon() {
-    let keys = Object.keys(this.peg)
-    return '{' +
-      (this.spread.cj ? '&:' + this.spread.cj.canon +
-        (0 < keys.length ? ',' : '') : '') +
-      keys
-        .map(k => [JSON.stringify(k) + ':' + this.peg[k].canon]).join(',') +
-      '}'
-  }
-
-
-  gen(ctx?: Context) {
-    let out: any = {}
-    for (let p in this.peg) {
-      out[p] = this.peg[p].gen(ctx)
-    }
-    return out
-  }
-}
-
-
-export {
-  MapVal
-}

package/lib/val/Nil.ts

@@ -1,144 +0,0 @@
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-
-
-import type {
-  Val,
-  ValSpec,
-} from '../type'
-
-import {
-  DONE,
-} from '../type'
-
-import {
-  descErr
-} from '../err'
-
-import {
-  Context,
-} from '../unify'
-
-
-import { ValBase } from '../val/ValBase'
-
-
-class Nil extends ValBase {
-  isNil = true
-
-  nil = true
-  why: any
-  primary?: Val
-  secondary?: Val
-  msg: string = ''
-
-  // TODO: include Val generating nil, thus capture type
-
-  // A Nil is an error - should not happen - unify failed
-  // refactor ,make(spec,ctx)
-  static make = (ctx?: Context, why?: any, av?: Val, bv?: Val) => {
-    let nil = new Nil({ why }, ctx)
-
-    // TODO: this should be done lazily, for multiple terms
-
-    // Terms later in same file are considered the primary error location.
-    if (null != av) {
-      nil.row = av.row
-      nil.col = av.col
-      nil.url = av.url
-
-      nil.primary = av
-
-      if (null != bv) {
-        nil.secondary = bv
-
-        let bv_loc_wins =
-          (nil.url === bv.url) && (
-            (nil.row < bv.row) ||
-            (nil.row === bv.row && nil.col < bv.col)
-          )
-
-        if (bv_loc_wins) {
-          nil.row = bv.row
-          nil.col = bv.col
-          nil.url = bv.url
-          nil.primary = bv
-          nil.secondary = av
-        }
-      }
-    }
-
-    if (ctx) {
-      ctx.err.push(nil)
-    }
-
-    return nil
-  }
-
-
-  constructor(
-    spec?: {
-      why?: string
-      msg?: string
-      err?: Nil | Nil[] | Error | Error[]
-    } | string,
-    ctx?: Context
-  ) {
-    super(spec && 'string' !== typeof spec ? spec : {}, ctx)
-
-    if (spec && 'object' === typeof spec) {
-      this.why = spec?.why
-      this.msg = 'string' === typeof spec?.msg ? spec.msg : this.msg
-      this.err = spec ? (Array.isArray(spec.err) ? [...spec.err] : [spec.err]) : []
-    }
-
-    // Nil is always DONE, by definition.
-    this.done = DONE
-  }
-
-
-  unify(_peer: Val, _ctx: Context) {
-    return this
-  }
-
-
-  clone(spec?: ValSpec, ctx?: Context): Val {
-    let out = (super.clone(spec, ctx) as Nil)
-    out.why = this.why
-
-    // Should these clone?
-    // out.primary = this.primary?.clone()
-    // out.secondary = this.secondary?.clone()
-    out.primary = this.primary
-    out.secondary = this.secondary
-
-    out.msg = this.msg
-    return out
-  }
-
-
-  get canon() {
-    return 'nil'
-  }
-
-  gen(ctx?: Context) {
-    // Unresolved nil cannot be generated, so always an error.
-
-    descErr(this, ctx)
-
-    if (Array.isArray(ctx?.err)) {
-      ctx.err.push(this)
-    }
-    else {
-      const err: any = new Error(this.msg)
-      err.aontu = true
-      throw err
-    }
-
-    return undefined
-  }
-}
-
-
-export {
-  Nil,
-}