提交: 0cb2292a98b637165644cd19cf47133202a2dd79 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 0cb2292a98b637165644cd19cf47133202a2dd79 (tree)
• 时间: 2022-02-28 13:57:22
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Call jelly from RPython.

That was a headache, but it appears to work.

更改概述

• modified: cammy-rpy/builder.nix
• add: cammy-rpy/cammylib/jelly.py
• modified: cammy-rpy/draw.nix
• modified: cammy-rpy/frame.nix
• modified: cammy-rpy/repl.nix
• modified: cammy-rpy/repl.py
• modified: cammy-rpy/weave.nix
• modified: default.nix
• modified: todo.txt

差异

--- a/cammy-rpy/builder.nix
+++ b/cammy-rpy/builder.nix
@@ -1,4 +1,5 @@
-{ nixpkgs ? import <nixpkgs> {} }:
+entrypoint: exe: enableJIT:
+{ nixpkgs ? import <nixpkgs> {}, jelly ? null }:
 let
   inherit (nixpkgs.pkgs)
   fetchFromGitLab stdenv
@@ -14,7 +15,6 @@ let
     sha256 = "03cshgvh8qcsyac4q4vf0sbvcm1m2ikgwycwip4cc7sw9pzpw6a3";
   };
 in
-entrypoint: exe: enableJIT:
   let
     opt = if enableJIT then "jit" else "2";
   in stdenv.mkDerivation {
@@ -33,6 +33,8 @@ entrypoint: exe: enableJIT:
       pypyPackages.pytest libffi
     ];
 
+    JELLY_PATH = "${jelly}/bin/jelly";
+
     buildPhase = ''
       source $stdenv/setup
       mkdir -p ./rpython/_cache

--- /dev/null
+++ b/cammy-rpy/cammylib/jelly.py
@@ -0,0 +1,33 @@
+import os
+
+from rpython.rlib.rfile import create_fdopen_rfile
+
+from cammylib.parser import parse
+
+jelly_path = os.environ["JELLY_PATH"]
+
+def jellify(sexp):
+    """
+    Optimize a Cammy expression.
+    """
+
+    rin, win = os.pipe()
+    rout, wout = os.pipe()
+    # NB: We must close all four pipe FDs in both processes.
+    pid = os.fork()
+    if pid:
+        os.close(rin)
+        with create_fdopen_rfile(win, mode="w") as handle:
+            handle.write(sexp.asStr())
+        os.close(wout)
+        with create_fdopen_rfile(rout, mode="r") as handle:
+            # NB: jelly doesn't return a trail.
+            return parse(handle.read())[0]
+    else:
+        os.dup2(rin, 0)
+        os.dup2(wout, 1)
+        os.close(rin)
+        os.close(win)
+        os.close(rout)
+        os.close(wout)
+        os.execv(jelly_path, ["jelly"])

--- a/cammy-rpy/draw.nix
+++ b/cammy-rpy/draw.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {} }:
 let
-  makeBuilder = import ./builder.nix { inherit nixpkgs; };
+  makeBuilder = import ./builder.nix;
 in
   makeBuilder ./draw.py "cammy-draw" false # true

--- a/cammy-rpy/frame.nix
+++ b/cammy-rpy/frame.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {} }:
 let
-  makeBuilder = import ./builder.nix { inherit nixpkgs; };
+  makeBuilder = import ./builder.nix;
 in
   makeBuilder ./frame.py "cammy-frame" false

--- a/cammy-rpy/repl.nix
+++ b/cammy-rpy/repl.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {} }:
 let
-  makeBuilder = import ./builder.nix { inherit nixpkgs; };
+  makeBuilder = import ./builder.nix;
 in
   makeBuilder ./repl.py "cammy-repl" false

--- a/cammy-rpy/repl.py
+++ b/cammy-rpy/repl.py
@@ -7,6 +7,7 @@ from rpython.rlib.rfile import create_stdio
 
 from cammylib.arrows import buildArrow, BuildProblem
 from cammylib.hive import Hive, MissingAtom
+from cammylib.jelly import jellify
 from cammylib.parser import parse
 from cammylib.types import ConstraintStore, TypeExtractor, UnificationFailed
 
@@ -37,6 +38,8 @@ def repl(hive, stdin, stdout):
             print "Canonicalized:", sexp.asStr()
         except MissingAtom as ma:
             print "Couldn't canonicalize S-expression; missing atom:", ma.atom
+        sexp = jellify(sexp)
+        print "Jellified:", sexp.asStr()
         try:
             arrow = buildArrow(sexp)
             print "Arrow:", arrow

--- a/cammy-rpy/weave.nix
+++ b/cammy-rpy/weave.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? import <nixpkgs> {} }:
 let
-  makeBuilder = import ./builder.nix { inherit nixpkgs; };
+  makeBuilder = import ./builder.nix;
 in
   makeBuilder ./weave.py "cammy-weave" false

--- a/default.nix
+++ b/default.nix
@@ -4,10 +4,10 @@ let
   frame = import ./frame { inherit nixpkgs; };
   jelly = (import jelly/Cargo.nix { pkgs = nixpkgs; }).rootCrate.build;
   movelist = import ./movelist { inherit nixpkgs; };
-  cammy-draw = import ./cammy-rpy/draw.nix { inherit nixpkgs; };
-  cammy-frame = import ./cammy-rpy/frame.nix { inherit nixpkgs; };
-  cammy-repl = import ./cammy-rpy/repl.nix { inherit nixpkgs; };
-  cammy-weave = import ./cammy-rpy/weave.nix { inherit nixpkgs; };
+  cammy-draw = import ./cammy-rpy/draw.nix { inherit nixpkgs jelly; };
+  cammy-frame = import ./cammy-rpy/frame.nix { inherit nixpkgs jelly; };
+  cammy-repl = import ./cammy-rpy/repl.nix { inherit nixpkgs jelly; };
+  cammy-weave = import ./cammy-rpy/weave.nix { inherit nixpkgs jelly; };
   eggs = builtins.attrValues (removeAttrs (import ./eggs.nix {
     inherit pkgs;
     stdenv = pkgs.stdenv;

--- a/todo.txt
+++ b/todo.txt
@@ -1,18 +1,17 @@
 * Literate Cammy
-  * RPython modules will go in cammy-rpy/cammylib/
-  * RPython entrypoints will go in cammy-rpy/
-    * Write filterSource expressions to grab only one entrypoint + modules
-      * cammy-rpy/builder.nix
-  * Nix expressions also go in cammy-rpy/ next to entrypoints
   * Entrypoints:
-    * cammy-repl $HIVE: REPL session with a hive
-    * cammy-weave $HIVE: document a hive
+    - cammy-repl $HIVE: REPL session with a hive
+    - cammy-weave $HIVE: document a hive
     * cammy-tangle $HIVE: take an expression on stdin, return framed optimized
       expression on stdout
       * cammy-frame $HIVE | jelly
-    * cammy-draw ...: take an expression and canvas params, make a PNG
-    * cammy-frame $HIVE: take an expression on stdin, return framed expression
+    - cammy-draw ...: take an expression and canvas params, make a PNG
+    - cammy-frame $HIVE: take an expression on stdin, return framed expression
       on stdout
+    * cammy-jelly $EXPR: print an optimized expression on stdout
+      * $EXPR is a path!
+        * This is wholly due to RPython issues
+      * When $EXPR is "-", read from stdin
 * REPL improvements
   * allow mid-functor newlines
   * jellification
@@ -58,3 +57,4 @@
 * Moore machines: For state type Q and input type S, Q × S -> Q
   * Moore transducers: [Q × S, Q] -> [Q × S, Q]
 * Mealy machines: For state type Q, input type S, and output type L, Q × S -> Q × L
+* Jets