Commit: af6d60d0b960cae2aa7609da89215eadd1f59911 - cammy (git)

A categorical programming language

Commit MetaInfo

• Revision: af6d60d0b960cae2aa7609da89215eadd1f59911 (tree)
• Time: 2022-12-05 03:33:01
• Author: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Try to display equalities.

Dunno how to represent ASTs well yet.

Change Summary

• modified: honey/honey.py
• modified: honey/static/honey.js

Incremental Difference

--- a/honey/honey.py
+++ b/honey/honey.py
@@ -136,7 +136,7 @@ def compilePurescriptStub(token):
             return response
     except subprocess.CalledProcessError as cpe:
         print("Couldn't compile", sexpify(expr))
-        print(cpe.output.encode("utf-8"))
+        print(cpe.output.decode("utf-8"))
         raise
 
 @app.route("/dippers")
@@ -166,7 +166,9 @@ def dissolve(sexp):
         if merged not in hive.tuples:
             hive.tuples[merged] = len(hive.heap)
             hive.heap.append(merged)
-        return hive.tuples[merged]
+        rv = hive.tuples[merged]
+        print("dissolve", sexp, "=>", rv)
+        return rv
 
 class Dip(MethodView):
     def get(self, name):
@@ -200,8 +202,10 @@ def isTemplate(expr):
 
 def jellify(sexp):
     try:
-       return subprocess.check_output(JELLY + "jelly",
+       rv = subprocess.check_output(JELLY + "jelly",
                 input=sexp.encode("utf-8")).decode("utf-8")
+       print("jellify", sexp, "=>", rv)
+       return rv
     except subprocess.CalledProcessError:
         print("Couldn't jellify", sexp)
         raise
@@ -209,13 +213,16 @@ def jellify(sexp):
 @app.route("/dissolve", methods=["POST"])
 def dissolveNewExpression():
     sexp = request.get_data(as_text=True)
-    sexp = jellify(sexp)
     expr, trail = parse(sexp)
     if isTemplate(expr):
         print("can't handle templates yet")
         abort(500)
+    # First dissolution gets the desugared input.
     index = dissolve(expr)
-    return jsonify({"expr": index, "trail": trail})
+    # Second dissolution gets an approximate normal form.
+    expr = resolve(index)
+    index = dissolve(parse(jellify(sexpify(expr)))[0])
+    return jsonify({"index": index, "expr": expr, "trail": trail})
 
 if __name__ == "__main__":
     app.run(debug=True)

--- a/honey/static/honey.js
+++ b/honey/static/honey.js
@@ -206,14 +206,19 @@ class FetchTile extends Component {
     }
 }
 
+function dissolve(sexp) {
+    console.log("dissolve", sexp);
+    return fetchJSON("/dissolve", { method: "POST", body: sexp });
+}
+
 class AnonymousTile extends Component {
     state = { expr: "" };
 
     onSubmit = addTile => e => {
-        fetchJSON("/dissolve", { method: "POST", body: this.state.expr }).then(({expr, trail}) => {
+        dissolve(this.state.expr).then(({index, expr, trail}) => {
             const title = this.state.expr.startsWith("(") ? "anonymous expression" : this.state.expr;
-            const compiledPromise = import(`/extract/${expr}/compile`);
-            const tyPromise = fetchJSON(`/extract/${expr}/type`);
+            const compiledPromise = import(`/extract/${index}/compile`);
+            const tyPromise = fetchJSON(`/extract/${index}/type`);
             return tyPromise.then(ty =>
                 compiledPromise.then(compiled =>
                     addTile(h(Tile, { ty, compiled, title, trail: trail.trim() }))));
@@ -234,6 +239,53 @@ class AnonymousTile extends Component {
     }
 }
 
+class Equality extends Component {
+    render({ trail, lhs, rhs, index }) {
+        return h("div", { class: "tile" },
+            h("h2", {}, "Equality"),
+            h("p", {}, lhs),
+            h("p", {}, rhs),
+        );
+    }
+}
+
+class MakeEquality extends Component {
+    state = { expr1: "", expr2: "" };
+
+    onSubmit = addTile => e => {
+        const p1 = dissolve(this.state.expr1);
+        const p2 = dissolve(this.state.expr2);
+        p1.then(e1 => {
+            p2.then(e2 => {
+                console.log("makeEquality", e1, e2);
+                if (e1.index === e2.index) {
+                    addTile(h(Equality, {
+                        trail: `Generated from ${this.state.expr1} = ${this.state.expr2}`,
+                        lhs: e1.expr,
+                        rhs: e2.expr,
+                        index: e1.index,
+                    }));
+                }
+            });
+        });
+        e.preventDefault();
+    };
+
+    setExpr1 = e => this.setState({ expr1: e.target.value });
+    setExpr2 = e => this.setState({ expr2: e.target.value });
+
+    render({ addTile }) {
+        return h("div", { class: "tile" },
+            h("h2", {}, "Make an Equality"),
+            h("form", { onSubmit: this.onSubmit(addTile) },
+                h("input", { type: "textbox", onInput: this.setExpr1 }),
+                h("input", { type: "textbox", onInput: this.setExpr2 }),
+                h("button", { type: "submit" }, "Go!"),
+            ),
+        );
+    }
+}
+
 class App extends Component {
     state = { tiles: [] };
 
@@ -246,6 +298,7 @@ class App extends Component {
         return [
             h(FetchTile, { addTile }),
             h(AnonymousTile, { addTile }),
+            h(MakeEquality, { addTile }),
         ].concat(this.state.tiles);
     }
 }