Commit: 1531cf447f5e70bb057715d9a060945323a839ad - cammy (git)

A categorical programming language

Commit MetaInfo

• Revisión: 1531cf447f5e70bb057715d9a060945323a839ad (tree)
• Tiempo: 2022-10-10 03:31:36
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Stop fucking around with the trampoline for now.

Cambiar Resumen

• modified: honey/static/honey.js

Diferencia incremental

--- a/honey/static/honey.js
+++ b/honey/static/honey.js
@@ -39,7 +39,7 @@ function rescueNaN(f) { return isNaN(f) ? [true, f] : [false, null]; }
 // X -> Tramp X
 function done(result) { return ["pure", result]; }
 // [1,Tramp X] -> Tramp X
-// function cont(thunk) { return ["cont", thunk]; }
+function cont(thunk) { return ["cont", thunk]; }
 // Tramp X × [X,Tramp Y] -> Tramp Y
 function bind(action, f) { return ["bind", action, f]; }
 // function join(action) { return cont(() => bind(action, ma => ma)); }
@@ -63,9 +63,9 @@ function trampoline(action) {
                 stack = [register[2], stack];
                 register = register[1];
                 break;
-            // case "cont":
-            //     register = register[1]();
-            //     break;
+            case "cont":
+                register = register[1]();
+                break;
             default:
                 console.log("stack", stack);
                 throw new Error("unknown trampoline action " + register[0]);
@@ -122,13 +122,13 @@ function compile(expr) {
             }
             case "curry": {
                 const [f] = l;
-                // XXX messy?
-                return x => done(y => trampoline(f([x, y])));
+                // XXX slightly wrong...
+                return x => done(y => f([x, y]));
             }
             case "uncurry": {
                 const [f] = l;
-                // XXX should use cont?
-                return ([x, y]) => bind(f(x), g => done(g(y)));
+                // XXX ...but also wrong here
+                return ([x, y]) => bind(f(x), g => cont(() => g(y)));
             }
             case "pr": {
                 const [z, s] = l;