Commit: 8b1976afe564a720daabd0c759e553b734e61da6 - cammy (git)

A categorical programming language

Commit MetaInfo

• Revision: 8b1976afe564a720daabd0c759e553b734e61da6 (tree)
• Time: 2022-12-01 08:37:48
• Author: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Wire up jelly to Honey.

Change Summary

• modified: default.nix
• modified: honey/default.nix
• modified: honey/honey.py

Incremental Difference

--- a/default.nix
+++ b/default.nix
@@ -58,5 +58,5 @@ in {
     '';
   };
   movelist = movelist;
-  honey = pkgs.callPackage ./honey { cammy = movelist; };
+  honey = pkgs.callPackage ./honey { inherit jelly; cammy = movelist; };
 }

--- a/honey/default.nix
+++ b/honey/default.nix
@@ -1,6 +1,6 @@
 { stdenv,
   python3Packages, purescript,
-  cammy }:
+  cammy, jelly }:
 stdenv.mkDerivation {
   name = "honey";
   version = "0.0.1";
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
     mkdir -p $out/share/
     substitute honey.py $out/share/honey.py \
       --subst-var-by CAMMY "${cammy}/bin/" \
+      --subst-var-by JELLY "${jelly}/bin/" \
       --subst-var-by PURS "${purescript}/bin/" \
       --subst-var-by SHARE "$out/share/"
     cp constants.py parser.py $out/share/

--- a/honey/honey.py
+++ b/honey/honey.py
@@ -11,6 +11,7 @@ from constants import CORE_TEMPLATES
 from parser import parse
 
 CAMMY = "@CAMMY@"
+JELLY = "@JELLY@"
 PURESCRIPT = "@PURS@"
 SHAREPATH = "@SHARE@"
 
@@ -209,9 +210,18 @@ def isTemplate(expr):
     if isinstance(expr, str): return expr.startswith("@")
     return any(isTemplate(arg) for arg in expr)
 
+def jellify(sexp):
+    try:
+       return subprocess.check_output(JELLY + "jelly",
+                input=sexp.encode("utf-8")).decode("utf-8")
+    except subprocess.CalledProcessError:
+        print("Couldn't jellify", sexp)
+        raise
+
 @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")