Merge pull request #50 from Kacarott/multiply

Multiply

Author: Kacarott

src/lambda-calculus.js

@@ -15,7 +15,7 @@ Kacarott - https://github.com/Kacarott
 */
 
 // Default options
-const config = { verbosity: "Calm"      //  Calm | Concise | Loquacious | Verbose
+export const config = { verbosity: "Calm"      //  Calm | Concise | Loquacious | Verbose
                , purity: "Let"          //  Let | LetRec | PureLC
                , numEncoding: "Church"  //  None | Church | Scott | BinaryScott
                };
@@ -97,9 +97,9 @@ primitives.setThunk( "trace", new Tuple( Primitive( function(v) { console.info(S
 
 const Y = new L("f",new A(new L("x",new A(new V("f"),new A(new V("x"),new V("x")))),new L("x",new A(new V("f"),new A(new V("x"),new V("x"))))));
 
-function fromInt(n) { return fromIntWith()(n); }
+export function fromInt(n) { return fromIntWith()(n); }
 
-function fromIntWith(cfg={}) {
+export function fromIntWith(cfg={}) {
   const {numEncoding,verbosity} = Object.assign( {}, config, cfg );
   return function fromInt(n) {
     if ( numEncoding === "Church" )
@@ -132,9 +132,9 @@ function fromIntWith(cfg={}) {
   } ;
 }
 
-function toInt(term) { return toIntWith()(term); }
+export function toInt(term) { return toIntWith()(term); }
 
-function toIntWith(cfg={}) {
+export function toIntWith(cfg={}) {
   const {numEncoding,verbosity} = Object.assign( {}, config, cfg );
   return function toInt(term) {
     try {
@@ -314,9 +314,9 @@ function parseWith(cfg={}) {
   }
 }
 
-function compile(code) { return compileWith()(code); }
+export function compile(code) { return compileWith()(code); }
 
-function compileWith(cfg={}) {
+export function compileWith(cfg={}) {
   const {numEncoding,purity,verbosity} = Object.assign( {}, config, cfg );
   return function compile(code) {
     if (typeof code !== "string" || !code) throw new TypeError("missing code");
@@ -426,13 +426,3 @@ function printStackTrace(error, term, stack) { console.log("printStackTrace",con
 }
 
 Object.defineProperty( Function.prototype, "valueOf", { value: function valueOf() { return toInt(this); } } );
-
-export {
-  config,
-  compile,
-  compileWith,
-  fromInt,
-  fromIntWith,
-  toInt,
-  toIntWith,
-};

tests/multiply/initialSolution.txt

@@ -0,0 +1 @@
+multiply = \ m n . n (m s ) z

tests/multiply/solution.txt

@@ -1 +1 @@
-multiply = \ m n . n (m s ) z
+multiply = \ m n s . n ( m s )

tests/multiply/test.js

@@ -6,27 +6,25 @@ chaiConfig.truncateThreshold = 0;
 import * as LC from "../../src/lambda-calculus.js";
 LC.config.purity = "LetRec";
 LC.config.numEncoding = "Church";
-// LC.config.verbosity = "Concise"; // reinstate for production
+LC.config.verbosity = "Concise";
 
 const solutionText = readFileSync(new URL("./solution.txt", import.meta.url), {encoding: "utf8"});
+const {multiply} = LC.compile(solutionText);
+const fromInt = LC.fromIntWith(LC.config);
+const toInt = LC.toIntWith(LC.config);
 
-describe("Multiply",function(){
-  // REVIEW Is this intentional? If so, it should be tested that `compile` throws
-  // and remove other test cases.
-  try {
-    const {multiply} = LC.compile(solutionText);
-    it("example tests",()=>{
-      assert.equal( multiply(7)(7), 49 );
-      assert.equal( multiply(11)(11), 121 );
+describe("Multiply",()=>{
+
+    it("example tests",function(){
+      assert.equal( toInt(multiply(fromInt(7))(fromInt(7))), 49 );
+      assert.equal( toInt(multiply(fromInt(11))(fromInt(11))), 121 );
     });
-    it("random tests",()=>{
+
+    it("random tests",function(){
       const rnd = (m,n=0) => Math.random() * (n-m) + m | 0 ;
       for ( let i=1; i<=100; i++ ) {
         const m = rnd(i), n = rnd(i);
-        assert.equal( multiply(m)(n), m*n );
+        assert.equal( toInt(multiply(fromInt(m))(fromInt(n))), m*n );
       }
     });
-  } catch (e) {
-    console.error(e);
-  }
 });