@fraczak/k 6.2.4 → 6.3.2

package/tests/test-kvm.mjs

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import k from "../index.mjs";
 import { lowerToKVM, executeKVM } from "../kvm.mjs";
 import codes from "../codes.mjs";
-import { fromObject, Product, Variant } from "../Value.mjs";
+import { fromObject } from "../Value.mjs";
 import run, { run_converged } from "../run.mjs";
 
 function runKVM(script, data, options = {}) {

package/tests/test-repl.mjs

@@ -18,7 +18,7 @@ import {
   lineTerminatesSnippet
 } from "../repl.mjs";
 import { decodeObject, objectToFunction } from "../object.mjs";
-import { Product } from "../Value.mjs";
+import { Value } from "../Value.mjs";
 
 const state = createState();
 
@@ -123,7 +123,7 @@ assert(completions.includes(`:load --no-alias ${libPath}`));
 output = await evaluateInput(`:ko ${koPath} succ`, state);
 assert.equal(output[0], `saved ${koPath} (succ)`);
 const objectFn = objectToFunction(decodeObject(fs.readFileSync(koPath)));
-const objectResult = objectFn(new Product({}, [["closed-product", []]]));
+const objectResult = objectFn(Value.product({}, [["closed-product", []]]));
 assert.equal(objectResult.toJSON(), "succ");
 
 fs.writeFileSync(sourcePath, "$ nat = <{} zero, nat succ>;\nsucc = $nat |succ $nat;\ntwice = succ succ;\n");
@@ -145,7 +145,7 @@ assert.match(output[0], /^\$ bool = @/);
 const boolHash = codecState.typeAliases.bool;
 const valueModuleUrl = pathToFileURL(path.resolve("Value.mjs")).href;
 fs.writeFileSync(codecPath, `
-import { Product, Variant } from ${JSON.stringify(valueModuleUrl)};
+import { Value } from ${JSON.stringify(valueModuleUrl)};
 
 export const name = "yn";
 export const codes = [${JSON.stringify(boolHash)}];
@@ -153,7 +153,7 @@ export const codes = [${JSON.stringify(boolHash)}];
 export function parse(text) {
   const tag = text.trim();
   if (tag !== "true" && tag !== "false") throw new Error("expected true or false");
-  return new Variant(tag, new Product({}));
+  return Value.variant(tag, Value.product({}));
 }
 
 export function print(value) {

package/tests/test-structural-values.mjs

@@ -0,0 +1,27 @@
+import assert from "node:assert/strict";
+
+import { Value, isProduct, isVariant, isValue } from "../Value.mjs";
+import { INT_PATTERN, print as printInt } from "../codecs/int.mjs";
+import { print as printUnit } from "../codecs/unit.mjs";
+import { valueToK } from "../codecs/runtime/show-value.mjs";
+import { decodeWire, encodeToWire } from "../codecs/runtime/prefix-codec.mjs";
+
+const foreign = await import("../Value.mjs?structural-values-regression");
+
+assert.notEqual(foreign.Value, Value);
+
+const foreignUnit = foreign.Value.product({});
+const foreignTwo = foreign.Value.variant("+",
+  foreign.Value.variant("1",
+    foreign.Value.variant("0",
+      foreign.Value.variant("_", foreignUnit))));
+
+assert.equal(isProduct(foreignUnit), true);
+assert.equal(isVariant(foreignTwo), true);
+assert.equal(isValue(foreignTwo), true);
+assert.equal(printUnit(foreignUnit), "{}");
+assert.equal(printInt(foreignTwo), "2");
+assert.equal(valueToK(foreignTwo), "{}|_|0|1|+");
+
+const decoded = decodeWire(encodeToWire(foreignTwo, INT_PATTERN)).value;
+assert.equal(printInt(decoded), "2");

package/valueIO.mjs

@@ -9,7 +9,7 @@
  */
 
 import { parse as parseValueText } from "./valueParser.mjs";
-import { Value, fromObject } from "./Value.mjs";
+import { fromObject } from "./Value.mjs";
 
 /**
  * Parse a value from text with optional type information

package/valueParser.jison

@@ -1,6 +1,6 @@
 %{
 
-import { Product, Variant } from "./Value.mjs";
+import { Value } from "./Value.mjs";
 
 //--------------------------
 
@@ -87,19 +87,19 @@ input_with_eof
 exp
     : lc labelled rc                    { $$ = {value: $2.value, start: $1.start, end: $3.end}; }
     | lb exps rb                        { $$ = {value: $2.value, start: $1.start, end: $3.end}; }
-    | str            { $$ = {value: new Variant($1.value, new Product({})), start: $1.start, end: $1.end}; }
-    | name           { $$ = {value: new Variant($1.value, new Product({})), start: $1.start, end: $1.end}; }
+    | str            { $$ = {value: Value.variant($1.value, Value.product({})), start: $1.start, end: $1.end}; }
+    | name           { $$ = {value: Value.variant($1.value, Value.product({})), start: $1.start, end: $1.end}; }
     ;
 
 exps
-    : /* empty */                       { $$ = {value: new Product({})}; }
+    : /* empty */                       { $$ = {value: Value.product({})}; }
     | non_empty_exps                    {
                                           if ($1.list.length === 1) {
-                                            $$ = {value: new Variant('0', $1.list[0].value)};
+                                            $$ = {value: Value.variant('0', $1.list[0].value)};
                                           } else {
                                             const product = {};
                                             $1.list.forEach( (e, i) => product[i] = e.value );
-                                            $$ = {value: new Product(product)};
+                                            $$ = {value: Value.product(product)};
                                           };
                                         }
     ;
@@ -111,10 +111,10 @@ non_empty_exps
     ;
 
 labelled
-    : /* empty */                       { $$ = {value: new Product({})}; }
+    : /* empty */                       { $$ = {value: Value.product({})}; }
     | non_empty_labelled                {
                                           if ($1.list.length === 1) {
-                                            $$ = {value: new Variant($1.list[0].label, $1.list[0].value)};
+                                            $$ = {value: Value.variant($1.list[0].label, $1.list[0].value)};
                                           } else {
                                             const product = {};
                                             for (const {label, value} of $1.list) {
@@ -122,7 +122,7 @@ labelled
                                                 anError(@0,`Duplicate label '${label}'.`);
                                               product[label] = value;
                                             }
-                                            $$ = {value: new Product(product)};
+                                            $$ = {value: Value.product(product)};
                                           };
                                         }
     ;

package/valueParser.mjs

@@ -75,7 +75,7 @@
 
 
 
-import { Product, Variant } from "./Value.mjs";
+import { Value } from "./Value.mjs";
 
 //--------------------------
 
@@ -144,19 +144,19 @@ case 10: case 11:
  this.$ = {value: $$[$0-1].value, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
 case 12: case 13:
- this.$ = {value: new Variant($$[$0].value, new Product({})), start: $$[$0].start, end: $$[$0].end}; 
+ this.$ = {value: Value.variant($$[$0].value, Value.product({})), start: $$[$0].start, end: $$[$0].end}; 
 break;
 case 14: case 18:
- this.$ = {value: new Product({})}; 
+ this.$ = {value: Value.product({})}; 
 break;
 case 15:
 
                                           if ($$[$0].list.length === 1) {
-                                            this.$ = {value: new Variant('0', $$[$0].list[0].value)};
+                                            this.$ = {value: Value.variant('0', $$[$0].list[0].value)};
                                           } else {
                                             const product = {};
                                             $$[$0].list.forEach( (e, i) => product[i] = e.value );
-                                            this.$ = {value: new Product(product)};
+                                            this.$ = {value: Value.product(product)};
                                           };
                                         
 break;
@@ -169,7 +169,7 @@ break;
 case 19:
 
                                           if ($$[$0].list.length === 1) {
-                                            this.$ = {value: new Variant($$[$0].list[0].label, $$[$0].list[0].value)};
+                                            this.$ = {value: Value.variant($$[$0].list[0].label, $$[$0].list[0].value)};
                                           } else {
                                             const product = {};
                                             for (const {label, value} of $$[$0].list) {
@@ -177,7 +177,7 @@ case 19:
                                                 anError(this._$,`Duplicate label '${label}'.`);
                                               product[label] = value;
                                             }
-                                            this.$ = {value: new Product(product)};
+                                            this.$ = {value: Value.product(product)};
                                           };
                                         
 break;