提交: aefa9fce4e94ae7dc359bc4cb0ff1a6fcc4aadb1 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: aefa9fce4e94ae7dc359bc4cb0ff1a6fcc4aadb1 (tree)
• 时间: 2022-10-13 12:16:41
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Expand dissolved expressions correctly.

This might be a hack.

更改概述

• modified: honey/honey.py

差异

--- a/honey/honey.py
+++ b/honey/honey.py
@@ -113,11 +113,15 @@ def sexpify(expr):
 @app.route("/extract/<int:token>/type")
 def getType(token):
     expr = resolve(token)
-    types = subprocess.check_output(MOVELIST + "cammy-type",
-            input=sexpify(expr).encode("utf-8")).decode("utf-8").split("\n")
-    s, _ = parse(types[0].strip())
-    t, _ = parse(types[1].strip())
-    return jsonify({"source": s, "target": t})
+    try:
+        types = subprocess.check_output(MOVELIST + "cammy-type",
+                input=sexpify(expr).encode("utf-8")).decode("utf-8").split("\n")
+        s, _ = parse(types[0].strip())
+        t, _ = parse(types[1].strip())
+        return jsonify({"source": s, "target": t})
+    except subprocess.CalledProcessError:
+        print("Couldn't typecheck", sexpify(expr))
+        raise
 
 @app.route("/dippers")
 def dippers():
@@ -133,12 +137,16 @@ def resolve(i):
 def dissolve(sexp):
     if isinstance(sexp, int): return sexp
     if isinstance(sexp, str):
+        if sexp in symbols:
+            return symbols[sexp][0]
         if sexp not in strs:
             strs[sexp] = len(heap)
             heap.append(sexp)
         return strs[sexp]
     else:
         merged = tuple([sexp[0]] + [dissolve(arg) for arg in sexp[1:]])
+        if merged[0] in templates:
+            merged = substitute(merged[1:], templates(merged[0]))
         if merged not in tuples:
             tuples[merged] = len(heap)
             heap.append(merged)