Commit: 140ee01ceba8e0b4ba86adf7f88b9e4fc9719c2f - cammy (git)

A categorical programming language

Commit MetaInfo

• Revision: 140ee01ceba8e0b4ba86adf7f88b9e4fc9719c2f (tree)
• Zeit: 2022-10-23 00:23:18
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Don't render empty trails.

Saves a bit of screen space.

Ändern Zusammenfassung

• modified: honey/cammy.purs
• modified: honey/static/honey.js

Diff

--- a/honey/cammy.purs
+++ b/honey/cammy.purs
@@ -98,11 +98,12 @@ foreign import intSub :: Int -> Int -> Int
 
 pr :: forall t. (Unit -> Tramp t) -> (t -> Tramp t) -> Int -> Tramp t
 pr x _ 0 = x Unit
-pr x f n = bind f (pr x f (intSub n 1))
+pr x f n = bind f (cont (\_ -> pr x f (intSub n 1)))
 
 foreign import arrayHead :: forall t. Array t -> t
 foreign import arrayTail :: forall t. Array t -> Array t
 
 fold :: forall s t. (Unit -> Tramp t) -> (Pair t s -> Tramp t) -> Array s -> Tramp t
 fold x _ [] = x Unit
-fold x f c = bind (\t -> f (Pair t (arrayHead c))) (fold x f (arrayTail c))
+fold x f c = bind (\t -> f (Pair t (arrayHead c)))
+  (cont (\_ -> (fold x f (arrayTail c))))

--- a/honey/static/honey.js
+++ b/honey/static/honey.js
@@ -171,13 +171,15 @@ function drawFrame(canvas, sample, getChannels) {
 function tileForIndex(extractor, index, title, trail) {
     const div = document.createElement("div");
     div.setAttribute("class", "tile");
-    div.innerHTML = `
-        <h3>${title}</h3>
-        <details>
-            <summary>Trail</summary>
-            <p>${trail}</p>
-        </details>
-    `;
+    div.innerHTML = `<h3>${title}</h3>`;
+    if (trail) {
+        div.innerHTML += `
+            <details>
+                <summary>Trail</summary>
+                <p>${trail}</p>
+            </details>
+        `;
+    }
     const typeInfo = document.createElement("p");
     typeInfo.innerHTML = "Loading type information...";
     div.appendChild(typeInfo);
@@ -253,7 +255,7 @@ function tileForIndex(extractor, index, title, trail) {
 function fetchDip(extractor, dip) {
     const url = "/dip/" + encodeURIComponent(dip);
     return fetchJSON(url).then(({expr, trail}) => {
-        return tileForIndex(extractor, expr, dip, trail);
+        return tileForIndex(extractor, expr, dip, trail.trim());
     });
 }
 
@@ -271,7 +273,7 @@ window.addEventListener("load", (_) => {
         document.getElementById("dissolve-form").addEventListener("submit", (e) => {
             console.log("making dissolve request");
             fetchJSON("/dissolve", { method: "POST", body: dissolveBox.value }).then(({expr, trail}) => {
-                const div = tileForIndex(extractor, expr, "Anonymous expression", trail);
+                const div = tileForIndex(extractor, expr, "Anonymous expression", trail.trim());
                 document.body.appendChild(div);
             });
             e.preventDefault();