Commit: a61be0ee5cb44a56b79e7beed0ea5cd734a1fa18 - cammy (git)

A categorical programming language

Commit MetaInfo

• Revisión: a61be0ee5cb44a56b79e7beed0ea5cd734a1fa18 (tree)
• Tiempo: 2022-10-18 10:31:27
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Many animations work in Honey!

deco-circles, red-ellipse, and max-headroom all work! jupiter-storm is
still giving a blank screen, but it seems like the fundamentals are
finally there.

We are currently pegging the CPU at 5 frames/s. I would like to
eventually get to about 20 frames/s.

Cambiar Resumen

• modified: honey/static/honey.js

Diferencia incremental

--- a/honey/static/honey.js
+++ b/honey/static/honey.js
@@ -37,9 +37,10 @@ class Extractor {
     }
 }
 
-function fixNaN(x) { return isNaN(x) ? [false, null] : [true, x]; }
+function fixNaN(x) {
+    return isNaN(x) ? Cammy.right(Cammy.ignore(null)) : Cammy.left(x);
+}
 function rescueNaN(f) { return x => fixNaN(f(x)); }
-function rescueNaN2(f) { return xy => fixNaN(f(Cammy.fst(xy), Cammy.snd(xy))); }
 
 const prims = {
     "id": Cammy.id,
@@ -54,8 +55,8 @@ const prims = {
     "f": _ => false,
     "not": b => !b,
     "either": Cammy.either,
-    "disj": ([b, c]) => b || c,
-    "conj": ([b, c]) => b && c,
+    "disj": bc => Cammy.fst(bc) || Cammy.snd(bc),
+    "conj": bc => Cammy.fst(bc) && Cammy.snd(bc),
     "zero": _ => 0,
     "succ": n => n + 1,
     "n-add": xy => Cammy.natAdd(Cammy.fst(xy))(Cammy.snd(xy)),
@@ -68,13 +69,13 @@ const prims = {
     "f-add": xy => Cammy.fst(xy) + Cammy.snd(xy),
     "f-mul": xy => Cammy.fst(xy) * Cammy.snd(xy),
     "f-negate": x => -x,
-    "f-recip": rescueNaN(x => 1 / x),
+    "f-recip": x => 1 / x,
     "f-sign": x => x <= -0.0,
     "f-floor": rescueNaN(Math.floor),
     "f-sqrt": rescueNaN(Math.sqrt),
     "f-lt": xy => Cammy.fst(xy) < Cammy.snd(xy),
-    "f-sin": rescueNaN(Math.sin),
-    "f-cos": rescueNaN(Math.cos),
+    "f-sin": x => Number.isFinite(x) ? Math.sin(x) : 0.0,
+    "f-cos": x => Number.isFinite(x) ? Math.cos(x) : 0.0,
     "f-atan2": yx => Math.atan2(Cammy.fst(yx), Cammy.snd(yx)),
 };
 function compile(expr) {
@@ -196,7 +197,6 @@ function tileForIndex(extractor, index, title, trail) {
                         const canvas = document.createElement("canvas");
                         canvas.width = 100; canvas.height = 100;
                         div.appendChild(canvas);
-                        Cammy.runTrampoline(compiled(Cammy.makePair(0)(0)));
                         drawFrame(canvas, (x, y) => Cammy.runTrampoline(compiled(Cammy.makePair(x)(y))), getChannels);
                     } else {
                         div.innerHTML += "Not sure how to display this image yet.";
@@ -208,6 +208,8 @@ function tileForIndex(extractor, index, title, trail) {
                         const canvas = document.createElement("canvas");
                         canvas.width = 100; canvas.height = 100;
                         div.appendChild(canvas);
+                        console.log("test run",
+                            Cammy.runTrampoline(compiled(Cammy.makePair(Cammy.makePair(0)(0))(0))));
                         let start;
                         function stepFrame(timestamp) {
                             if (start === undefined) { start = timestamp; }
@@ -215,7 +217,7 @@ function tileForIndex(extractor, index, title, trail) {
                             drawFrame(canvas, (x, y) => {
                                 return Cammy.runTrampoline(compiled(Cammy.makePair(Cammy.makePair(x)(y))(t)));
                             }, getChannels);
-                            setTimeout(() => window.requestAnimationFrame(stepFrame), 1000);
+                            setTimeout(() => window.requestAnimationFrame(stepFrame), 200);
                         }
                         window.requestAnimationFrame(stepFrame);
                     } else {