提交: d33882093f56758a151388896270bd7cb62539f3 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修訂: d33882093f56758a151388896270bd7cb62539f3 (tree)
• 時間: 2023-01-14 09:06:27
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Optimize dissolved expressions, always.

Similar to the old logic, but now that I have a REPL again, I can
quickly iterate.

Change Summary

• modified: honey/honey.py
• modified: new-repl.py
• modified: todo.txt

差異

--- a/honey/honey.py
+++ b/honey/honey.py
@@ -242,8 +242,12 @@ def dissolveNewExpression():
     if isTemplate(expr):
         print("can't handle templates yet")
         abort(500)
-    # First dissolution gets the desugared input.
-    index = dissolve(expr)
+    # It's unclear whether we should jellify here.
+    # For learning purposes, it's important to be able to write directly to the heap...
+    # But also, we should prize normal forms and encourage users to see them as equivalent.
+    # For now, we'll dissolve, jellify, dissolve.
+    sexp = jellify(sexpify(resolve(dissolve(expr))))
+    index = dissolve(parse(sexp)[0])
     return jsonify({"index": index, "trail": trail})
 
 if __name__ == "__main__":

--- a/new-repl.py
+++ b/new-repl.py
@@ -4,6 +4,7 @@
 import readline
 import sys
 from textwrap import dedent
+import urllib.parse
 
 import requests
 
@@ -39,7 +40,11 @@ def sexpify(expr):
     else: return expr
 
 def fetchDipper(base, name):
-    return getJSON(base + "/dip/" + name)
+    component = urllib.parse.quote(name, safe="")
+    return getJSON(base + "/dip/" + component)
+
+def dissolve(base, sexp):
+    return requests.post(base + "/dissolve", data=sexp).json()
 
 class DipperCompleter:
     def __init__(self, dippers):
@@ -63,18 +68,13 @@ def repl(base):
             done = True
         else:
             if line.startswith(":"):
-                print("I think it's a command")
+                print("I don't have any commands, sorry")
             else:
-                print("I think it's a sugared Cammy expression")
-                if line.startswith("("):
-                    print("I think it's an application")
-                else:
-                    print("I'm gonna guess that it's a dip!")
-                    obj = fetchDipper(base, line)
-                    trail = obj.get("trail", "").strip()
-                    if trail: print("Trail:", trail)
-                    term = extractor.fullyExtract(obj["expr"])
-                    print("Term:", sexpify(term))
+                obj = dissolve(base, line)
+                trail = obj.get("trail", "").strip()
+                if trail: print("Trail:", trail)
+                term = extractor.fullyExtract(obj["index"])
+                print("Term:", sexpify(term))
 
 def installCompletion(dippers):
     readline.parse_and_bind("tab: complete")
@@ -82,7 +82,7 @@ def installCompletion(dippers):
     readline.set_completer_delims("() ")
 
 if __name__ == "__main__":
-    base = sys.argv[-1]
+    base = sys.argv[1]
     dippers = fetchDippers(base)
     installCompletion(dippers)
     repl(base)

--- a/todo.txt
+++ b/todo.txt
@@ -40,10 +40,6 @@
         * Perhaps generate monad instances automatically?
     * Basic enums, for better sum types
       * Haskell-style ADTs are basically polynomial functors
-* REPL improvements
-  * : commands
-    * help, describe commands
-    * edit an atom's trail
 * The case for trees
   * data Tree a = Leaf | Branch a (Tree a) (Tree a)
   * well-founded whenever lists are well-founded
@@ -96,8 +92,6 @@
     * Special case of reader monad
   * Distributive law: [N, X] + 1 → [N, X + 1]
     * Creates a stream+maybe monad: X → [N, X + 1]
-* Subtypes?
-  * Interval type?
 * Moore machines: For state type Q and input type S, Q × S -> Q
   * Suppose we have output/observation type O and Q -> O
     * Then Moore machines are equivalent to compact encodings [S] -> O
@@ -130,8 +124,6 @@
   * https://okmij.org/ftp/continuations/undelimited.html
 * It's about time to rewrite the multisampling logic in Cammy
   * Mostly just needs pixel radius to be passed to image
-* Use Elliott's techniques to compile to a graph?
-  * And then display the graph!
 * Zippers http://strictlypositive.org/diff.pdf
   * Zipper for lists looks like existing FIFO code, just needs the helpers
     * Lenses?
@@ -375,6 +367,11 @@
   * Let's rewrite Honey with FastAPI!
     * And use PyPy!
     * But not right now!
+* New REPL
+  * Not sure if there's much need for commands
+    * Making new dippers, maybe?
+    * Realized that ":" is not the best command-starter
+      * Technically ")" would be the best choice since it can't start a legal term
 * Slogans?
   * Cammy is compositional
   * Cammy is chimeric