aontu 0.0.7 → 0.1.1

package/dist/lib/op/disjunct.js

@@ -0,0 +1,28 @@
+"use strict";
+/* Copyright (c) 2021 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.disjunct = void 0;
+const lang_1 = require("../lang");
+const val_1 = require("../val");
+const disjunct = (ctx, a, b) => {
+    let peers = [];
+    let origsites = [];
+    origsites.push(append(peers, a));
+    origsites.push(append(peers, b));
+    let out = new val_1.DisjunctVal(peers, ctx, origsites);
+    return out;
+};
+exports.disjunct = disjunct;
+function append(peers, v) {
+    let origsite = lang_1.Site.NONE;
+    if (v instanceof val_1.DisjunctVal) {
+        peers.push(...v.peg);
+        origsite = v.site;
+    }
+    // TODO: handle no-error Nil (drop) and error Nil (keep and become)
+    else if (v instanceof val_1.Val) {
+        peers.push(v);
+    }
+    return origsite;
+}
+//# sourceMappingURL=disjunct.js.map

package/dist/lib/op/disjunct.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"disjunct.js","sourceRoot":"","sources":["../../../lib/op/disjunct.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAGpD,kCAA8B;AAE9B,gCAAyC;AAIzC,MAAM,QAAQ,GAAc,CAAC,GAAa,EAAE,CAAO,EAAE,CAAO,EAAE,EAAE;IAC9D,IAAI,KAAK,GAAU,EAAE,CAAA;IACrB,IAAI,SAAS,GAAW,EAAE,CAAA;IAC1B,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IAChC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IAChC,IAAI,GAAG,GAAG,IAAI,iBAAW,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;IAChD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAqBC,4BAAQ;AAlBV,SAAS,MAAM,CAAC,KAAY,EAAE,CAAO;IACnC,IAAI,QAAQ,GAAS,WAAI,CAAC,IAAI,CAAA;IAE9B,IAAI,CAAC,YAAY,iBAAW,EAAE;QAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QACpB,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAA;KAClB;IAED,mEAAmE;SAC9D,IAAI,CAAC,YAAY,SAAG,EAAE;QACzB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/dist/lib/op/op.d.ts

@@ -0,0 +1,6 @@
+import { Context } from '../unify';
+import { Val } from '../val';
+import { disjunct } from './disjunct';
+import { unite } from './unite';
+declare type Operation = (ctx: Context, a?: Val, b?: Val) => Val;
+export { Operation, disjunct, unite, };

package/dist/lib/op/op.js

@@ -0,0 +1,9 @@
+"use strict";
+/* Copyright (c) 2021 Richard Rodger, MIT License. */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unite = exports.disjunct = void 0;
+const disjunct_1 = require("./disjunct");
+Object.defineProperty(exports, "disjunct", { enumerable: true, get: function () { return disjunct_1.disjunct; } });
+const unite_1 = require("./unite");
+Object.defineProperty(exports, "unite", { enumerable: true, get: function () { return unite_1.unite; } });
+//# sourceMappingURL=op.js.map

package/dist/lib/op/op.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"op.js","sourceRoot":"","sources":["../../../lib/op/op.ts"],"names":[],"mappings":";AAAA,qDAAqD;;;AAMrD,yCAAqC;AAQnC,yFARO,mBAAQ,OAQP;AAPV,mCAA+B;AAQ7B,sFARO,aAAK,OAQP"}

package/dist/lib/op/unite.d.ts

@@ -0,0 +1,3 @@
+import { Operation } from './op';
+declare const unite: Operation;
+export { unite };

package/dist/lib/op/unite.js

@@ -0,0 +1,53 @@
+"use strict";
+/* Copyright (c) 2021 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unite = void 0;
+const val_1 = require("../val");
+// Vals should only have to unify downwards (in .unify) over Vals they understand.
+// and for complex Vals, TOP, which means self unify if not yet done
+const unite = (ctx, a, b) => {
+    let out = a;
+    //console.log('Ua', a && a.canon, b && b.canon)
+    if (b && (val_1.TOP === a || !a)) {
+        //console.log('Utb', b.canon)
+        out = b;
+    }
+    else if (a && (val_1.TOP === b || !b)) {
+        //console.log('Uta', a.canon)
+        out = a;
+    }
+    else if (a && b && val_1.TOP !== b) {
+        if (a instanceof val_1.Nil) {
+            out = update(a, b);
+        }
+        else if (b instanceof val_1.Nil) {
+            out = update(b, a);
+        }
+        else if (b instanceof val_1.ConjunctVal ||
+            b instanceof val_1.DisjunctVal ||
+            b instanceof val_1.RefVal ||
+            b instanceof val_1.PrefVal) {
+            //console.log('U', a.canon, b.canon)
+            return b.unify(a, ctx);
+        }
+        else if (a.constructor === b.constructor && a.peg === b.peg) {
+            out = update(a, b);
+        }
+        else {
+            out = a.unify(b, ctx);
+        }
+    }
+    if (!out) {
+        out = val_1.Nil.make(ctx, 'unite', a, b);
+    }
+    if (val_1.DONE !== out.done) {
+        out = out.unify(val_1.TOP, ctx);
+    }
+    return out;
+};
+exports.unite = unite;
+function update(x, _y) {
+    // TODO: update x with y.site
+    return x;
+}
+//# sourceMappingURL=unite.js.map

package/dist/lib/op/unite.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unite.js","sourceRoot":"","sources":["../../../lib/op/unite.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAKpD,gCAUe;AAIf,kFAAkF;AAClF,oEAAoE;AACpE,MAAM,KAAK,GAAc,CAAC,GAAY,EAAE,CAAO,EAAE,CAAO,EAAE,EAAE;IAC1D,IAAI,GAAG,GAAG,CAAC,CAAA;IAEX,+CAA+C;IAE/C,IAAI,CAAC,IAAI,CAAC,SAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC1B,6BAA6B;QAC7B,GAAG,GAAG,CAAC,CAAA;KACR;SAEI,IAAI,CAAC,IAAI,CAAC,SAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC/B,6BAA6B;QAC7B,GAAG,GAAG,CAAC,CAAA;KACR;SAEI,IAAI,CAAC,IAAI,CAAC,IAAI,SAAG,KAAK,CAAC,EAAE;QAC5B,IAAI,CAAC,YAAY,SAAG,EAAE;YACpB,GAAG,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;SACnB;aACI,IAAI,CAAC,YAAY,SAAG,EAAE;YACzB,GAAG,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;SACnB;aACI,IACH,CAAC,YAAY,iBAAW;YACxB,CAAC,YAAY,iBAAW;YACxB,CAAC,YAAY,YAAM;YACnB,CAAC,YAAY,aAAO,EACpB;YAEA,oCAAoC;YACpC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;SACvB;aACI,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,EAAE;YAC3D,GAAG,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;SACnB;aACI;YACH,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;SACtB;KACF;IAED,IAAI,CAAC,GAAG,EAAE;QACR,GAAG,GAAG,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;KACnC;IAED,IAAI,UAAI,KAAK,GAAG,CAAC,IAAI,EAAE;QACrB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAG,EAAE,GAAG,CAAC,CAAA;KAC1B;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAUC,sBAAK;AAPP,SAAS,MAAM,CAAC,CAAM,EAAE,EAAO;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,CAAA;AACV,CAAC"}

package/dist/lib/unify.d.ts

@@ -1,15 +1,29 @@
-import { Val, RefVal, MapVal } from './val';
+import { Val, RefVal, MapVal, Nil } from './val';
 import { Lang } from './lang';
+declare type Path = string[];
 declare class Context {
-    root: MapVal;
-    constructor(cfg: any);
+    root: Val;
+    path: Path;
+    err: Nil[];
+    vc: number;
+    constructor(cfg: {
+        root: Val;
+        err?: Nil[];
+        vc?: number;
+    });
+    clone(cfg: {
+        root: Val;
+        path?: Path;
+    }): Context;
+    descend(key: string): Context;
     find(ref: RefVal): MapVal | undefined;
 }
 declare class Unify {
     root: Val;
     res: Val;
+    err: Nil[];
     dc: number;
     lang: Lang;
     constructor(root: Val | string, lang?: Lang);
 }
-export { Context, Unify, };
+export { Context, Path, Unify, };

package/dist/lib/unify.js

@@ -4,18 +4,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unify = exports.Context = void 0;
 const val_1 = require("./val");
 const lang_1 = require("./lang");
+const op_1 = require("./op/op");
 class Context {
     constructor(cfg) {
         this.root = cfg.root;
+        this.path = [];
+        this.err = cfg.err || [];
+        // Multiple unify passes will keep incrementing Val counter.
+        this.vc = null == cfg.vc ? 1000000000 : cfg.vc;
+    }
+    clone(cfg) {
+        return new Context({
+            root: cfg.root,
+            err: this.err,
+            vc: this.vc,
+        });
+    }
+    descend(key) {
+        return this.clone({
+            root: this.root,
+            path: this.path.concat(key),
+        });
     }
     find(ref) {
         // TODO: relative paths
-        if (ref.absolute) {
+        if (this.root instanceof val_1.MapVal && ref.absolute) {
             let node = this.root;
             let pI = 0;
             for (; pI < ref.parts.length && node instanceof val_1.MapVal; pI++) {
                 let part = ref.parts[pI];
-                node = node.val[part];
+                node = node.peg[part];
             }
             if (pI === ref.parts.length) {
                 return node;
@@ -26,19 +44,25 @@ class Context {
 exports.Context = Context;
 class Unify {
     constructor(root, lang) {
-        this.dc = 0;
         this.lang = lang || new lang_1.Lang();
         if ('string' === typeof root) {
             root = this.lang.parse(root);
         }
         this.root = root;
         this.res = root;
+        this.err = [];
         let res = root;
-        let ctx;
-        while (this.dc < 111 && val_1.DONE !== res.done) {
-            ctx = new Context({ root: res });
-            res = res.unify(val_1.TOP, ctx);
-            this.dc++;
+        let ctx = new Context({
+            root: res,
+            err: this.err,
+        });
+        // TODO: derive maxdc from res deterministically
+        // perhaps parse should count intial vals, paths, etc?
+        let maxdc = 999;
+        for (this.dc = 0; this.dc < maxdc && val_1.DONE !== res.done; this.dc++) {
+            //res = res.unify(TOP, ctx)
+            res = (0, op_1.unite)(ctx, res, val_1.TOP);
+            ctx = ctx.clone({ root: res });
         }
         this.res = res;
     }

package/dist/lib/unify.js.map

@@ -1 +1 @@
-{"version":3,"file":"unify.js","sourceRoot":"","sources":["../../lib/unify.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAIpD,+BAMc;AAEd,iCAEe;AAGf,MAAM,OAAO;IAEX,YAAY,GAAQ;QAClB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACtB,CAAC;IAED,IAAI,CAAC,GAAW;QAEd,uBAAuB;QACvB,IAAI,GAAG,CAAC,QAAQ,EAAE;YAChB,IAAI,IAAI,GAAW,IAAI,CAAC,IAAI,CAAA;YAC5B,IAAI,EAAE,GAAG,CAAC,CAAA;YACV,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,YAAY,YAAM,EAAE,EAAE,EAAE,EAAE;gBAC5D,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACxB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aACtB;YAED,IAAI,EAAE,KAAK,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC3B,OAAO,IAAI,CAAA;aACZ;SACF;IACH,CAAC;CACF;AAgCC,0BAAO;AA7BT,MAAM,KAAK;IAMT,YAAY,IAAkB,EAAE,IAAW;QAH3C,OAAE,GAAG,CAAC,CAAA;QAIJ,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,WAAI,EAAE,CAAA;QAC9B,IAAI,QAAQ,KAAK,OAAO,IAAI,EAAE;YAC5B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SAC7B;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;QAEf,IAAI,GAAG,GAAG,IAAI,CAAA;QACd,IAAI,GAAY,CAAA;QAChB,OAAO,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,UAAI,KAAK,GAAG,CAAC,IAAI,EAAE;YACzC,GAAG,GAAG,IAAI,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;YAChC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAG,EAAE,GAAG,CAAC,CAAA;YACzB,IAAI,CAAC,EAAE,EAAE,CAAA;SACV;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;CACF;AAKC,sBAAK"}
+{"version":3,"file":"unify.js","sourceRoot":"","sources":["../../lib/unify.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAIpD,+BAOc;AAEd,iCAEe;AAEf,gCAEgB;AAOhB,MAAM,OAAO;IAOX,YAAY,GAIX;QACC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAA;QAExB,4DAA4D;QAC5D,IAAI,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,UAAa,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAA;IACnD,CAAC;IAGD,KAAK,CAAC,GAGL;QACC,OAAO,IAAI,OAAO,CAAC;YACjB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,EAAE,EAAE,IAAI,CAAC,EAAE;SACZ,CAAC,CAAA;IACJ,CAAC;IAGD,OAAO,CAAC,GAAW;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SAC5B,CAAC,CAAA;IACJ,CAAC;IAGD,IAAI,CAAC,GAAW;QAEd,uBAAuB;QACvB,IAAI,IAAI,CAAC,IAAI,YAAY,YAAM,IAAI,GAAG,CAAC,QAAQ,EAAE;YAC/C,IAAI,IAAI,GAAW,IAAI,CAAC,IAAI,CAAA;YAC5B,IAAI,EAAE,GAAG,CAAC,CAAA;YACV,OAAO,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,YAAY,YAAM,EAAE,EAAE,EAAE,EAAE;gBAC5D,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACxB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aACtB;YAED,IAAI,EAAE,KAAK,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE;gBAC3B,OAAO,IAAI,CAAA;aACZ;SACF;IACH,CAAC;CACF;AA+CC,0BAAO;AA5CT,MAAM,KAAK;IAOT,YAAY,IAAkB,EAAE,IAAW;QACzC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,WAAI,EAAE,CAAA;QAC9B,IAAI,QAAQ,KAAK,OAAO,IAAI,EAAE;YAC5B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;SAC7B;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAA;QACf,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;QAEb,IAAI,GAAG,GAAG,IAAI,CAAA;QACd,IAAI,GAAG,GAAY,IAAI,OAAO,CAAC;YAC7B,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAA;QAGF,gDAAgD;QAChD,sDAAsD;QAKtD,IAAI,KAAK,GAAG,GAAG,CAAA;QACf,KAAK,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,KAAK,IAAI,UAAI,KAAK,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE;YACjE,2BAA2B;YAC3B,GAAG,GAAG,IAAA,UAAK,EAAC,GAAG,EAAE,GAAG,EAAE,SAAG,CAAC,CAAA;YAC1B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;SAC/B;QAGD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;CACF;AAMC,sBAAK"}

package/dist/lib/val.d.ts

@@ -1,100 +1,115 @@
 import { Context } from './unify';
+import { Site } from './lang';
+declare type ValMap = {
+    [key: string]: Val;
+};
 declare const DONE = -1;
 declare const TOP: Val;
 declare abstract class Val {
-    top?: boolean;
-    val?: any;
+    id: number;
     done: number;
-    constructor(val?: any);
-    get dc(): string;
+    path: string[];
+    row: number;
+    col: number;
+    url: string;
+    top?: boolean;
+    peg?: any;
+    err?: any[];
+    deps?: any;
+    constructor(peg?: any, ctx?: Context);
     same(peer: Val): boolean;
-    abstract unify(peer: Val, ctx?: Context): Val;
+    get site(): Site;
+    abstract unify(peer: Val, ctx: Context): Val;
     abstract get canon(): string;
-    abstract gen(log: any[]): any;
+    abstract gen(ctx?: Context): any;
 }
 declare class Nil extends Val {
+    nil: boolean;
     why: any;
-    constructor(why?: any);
-    unify(_peer: Val, _ctx?: Context): this;
+    primary?: Val;
+    secondary?: Val;
+    static make: (ctx?: Context, why?: any, av?: Val, bv?: Val) => Nil;
+    constructor(why?: any, ctx?: Context);
+    unify(_peer: Val, _ctx: Context): this;
     get canon(): string;
-    gen(log: any[]): undefined;
+    gen(_ctx?: Context): undefined;
 }
 declare class Integer {
 }
 declare type ScalarConstructor = StringConstructor | NumberConstructor | BooleanConstructor | (typeof Integer.constructor);
 declare class ScalarTypeVal extends Val {
-    constructor(val: ScalarConstructor);
-    unify(peer: Val, _ctx?: Context): Val;
+    constructor(peg: ScalarConstructor, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
     same(peer: Val): boolean;
-    gen(log: any[]): undefined;
+    gen(_ctx?: Context): undefined;
 }
 declare class ScalarVal<T> extends Val {
     type: any;
-    constructor(val: T, type: ScalarConstructor);
-    unify(peer: Val, _ctx?: Context): Val;
+    constructor(peg: T, type: ScalarConstructor, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
     same(peer: Val): boolean;
-    gen(_log: any[]): any;
+    gen(_ctx?: Context): any;
 }
 declare class NumberVal extends ScalarVal<number> {
-    constructor(val: number);
-    unify(peer: Val, _ctx?: Context): Val;
+    constructor(peg: number, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
 }
 declare class IntegerVal extends ScalarVal<number> {
-    constructor(val: number);
-    unify(peer: Val, _ctx?: Context): Val;
+    constructor(peg: number, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
 }
 declare class StringVal extends ScalarVal<string> {
-    constructor(val: string);
-    unify(peer: Val, _ctx?: Context): Val;
+    constructor(peg: string, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     get canon(): string;
 }
 declare class BooleanVal extends ScalarVal<boolean> {
-    constructor(val: boolean);
-    unify(peer: Val): Val;
+    constructor(peg: boolean, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     static TRUE: BooleanVal;
     static FALSE: BooleanVal;
 }
 declare class MapVal extends Val {
-    id: string;
-    constructor(val: {
-        [key: string]: Val;
-    });
-    unify(peer: Val, ctx?: Context): Val;
+    static SPREAD: symbol;
+    spread: {
+        cj: Val | undefined;
+    };
+    constructor(peg: ValMap, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     get canon(): string;
-    gen(log: any[]): any;
+    gen(ctx?: Context): any;
 }
 declare class ConjunctVal extends Val {
-    constructor(val: Val[]);
+    constructor(peg: Val[], ctx?: Context);
     append(peer: Val): ConjunctVal;
-    prepend(peer: Val): ConjunctVal;
-    unify(peer: Val, ctx?: Context): Val;
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
-    gen(log: any[]): any;
+    gen(ctx?: Context): any;
 }
 declare class DisjunctVal extends Val {
-    constructor(val: Val[]);
+    constructor(peg: Val[], ctx?: Context, _sites?: Site[]);
     append(peer: Val): DisjunctVal;
-    prepend(peer: Val): ConjunctVal;
-    unify(peer: Val, ctx?: Context): Val;
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
-    gen(log: any[]): any;
+    gen(ctx?: Context): any;
 }
 declare class RefVal extends Val {
     parts: string[];
     absolute: boolean;
-    constructor(val: string);
-    append(part: string): void;
-    unify(peer: Val, ctx?: Context): Val;
+    sep: string;
+    constructor(peg: any[], abs?: boolean);
+    append(part: any): void;
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
-    gen(log: any[]): undefined;
+    gen(_ctx?: Context): undefined;
 }
 declare class PrefVal extends Val {
     pref: Val;
-    constructor(val: any, pref?: any);
-    unify(peer: Val, ctx?: Context): Val;
+    constructor(peg: any, pref?: any, ctx?: Context);
+    unify(peer: Val, ctx: Context): Val;
     get canon(): any;
-    gen(log: any[]): any;
+    gen(ctx?: Context): any;
 }
 export { DONE, Integer, Val, TOP, Nil, ScalarTypeVal, NumberVal, StringVal, BooleanVal, IntegerVal, MapVal, ConjunctVal, DisjunctVal, RefVal, PrefVal, };