提交: 08f8e5d64c1756b567b874d8fd61effbf748eb89 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 08f8e5d64c1756b567b874d8fd61effbf748eb89 (tree)
• 时间: 2021-09-24 11:26:25
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Create a new Nix-assembled entrypoint.

更改概述

• add: cammy.sh
• modified: eggs.nix
• modified: eggs.scm
• modified: jelly/src/main.rs
• modified: movelist/default.nix
• modified: shell.nix

差异

--- /dev/null
+++ b/cammy.sh
@@ -0,0 +1,36 @@
+#!@bash@/bin/bash
+
+set -eux -o pipefail
+
+export CHICKEN_REPOSITORY_PATH=@CHICKEN_REPOSITORY_PATH@
+export CHICKEN_INCLUDE_PATH=@CHICKEN_INCLUDE_PATH@
+
+frame="@frame@/bin/frame"
+jelly="@jelly@/bin/jelly"
+movelist="@movelist@/bin/movelist"
+
+# Configure a temporary directory.
+tmpdir=$(mktemp -d)
+
+# Get the hive and the program to compile.
+hive="$1"
+input="$2"
+
+fullname=$(basename -- $input)
+name="${fullname%.*}"
+
+# Pull from the frame and clarify the jelly.
+<$input $frame $hive | $jelly >"$tmpdir/program.cammy"
+cat "$tmpdir/program.cammy"
+
+# Typecheck with movelist.
+ty=$($movelist type-check <"$tmpdir/program.cammy")
+
+# Compute the final piece.
+sed -i -e 's,case,cammy-case,g' -e 's,cons,cammy-cons,g' -e 's,map,cammy-map,g' "$tmpdir/program.cammy"
+cat stub.scm <(echo '(cammy-run') "$tmpdir/program.cammy" <(echo "'$ty)") >"$tmpdir/$name.scm"
+# Compile with Chicken.
+@chicken@/bin/csc -static -O3 -o "$name" "$tmpdir/$name.scm"
+
+# Clean up temporary files.
+rm -r "$tmpdir"

--- a/eggs.nix
+++ b/eggs.nix
@@ -16,20 +16,6 @@ rec {
     ];
   };
 
-  mini-kanren = eggDerivation {
-    name = "mini-kanren-1.2.0";
-
-    src = fetchegg {
-      name = "mini-kanren";
-      version = "1.2.0";
-      sha256 = "0zwwgkqan4gxqr80vjf4k3x6qr2m4j4dczdxkfxkchdwmmgp7r8m";
-    };
-
-    buildInputs = [
-      srfi-1
-    ];
-  };
-
   r7rs = eggDerivation {
     name = "r7rs-1.0.5";
 
@@ -60,6 +46,20 @@ rec {
     ];
   };
 
+  srfi-128 = eggDerivation {
+    name = "srfi-128-0.11";
+
+    src = fetchegg {
+      name = "srfi-128";
+      version = "0.11";
+      sha256 = "1lq513l0lniyih9xar1jfpan4iazp39lj6bsp8cn7yllbki5xhkf";
+    };
+
+    buildInputs = [
+      srfi-13
+    ];
+  };
+
   srfi-13 = eggDerivation {
     name = "srfi-13-0.3.2";
 
@@ -116,6 +116,20 @@ rec {
     ];
   };
 
+  srfi-160 = eggDerivation {
+    name = "srfi-160-0.5.3";
+
+    src = fetchegg {
+      name = "srfi-160";
+      version = "0.5.3";
+      sha256 = "033j5c25s7xr6in4z4w8kqj2xy69bd254ilf7c0nal020pb2yp2r";
+    };
+
+    buildInputs = [
+      srfi-128
+    ];
+  };
+
   srfi-189 = eggDerivation {
     name = "srfi-189-0.1";
 

--- a/eggs.scm
+++ b/eggs.scm
@@ -1,5 +1,5 @@
-srfi-6
 srfi-144
+srfi-160
 srfi-189
 matchable
 stb-image-write

--- a/jelly/src/main.rs
+++ b/jelly/src/main.rs
@@ -40,6 +40,9 @@ fn main() -> std::io::Result<()> {
         // Needed with pair-precompose as a special case.
         rw!("pair-factor"; "(pair ?r ?r)" => "(comp ?r (pair id id))"),
 
+        // Turn braided products into symmetric products.
+        rw!("pair-braiding-symm"; "(comp (pair snd fst) (pair snd fst))" => "id"),
+
         // free for left
         rw!("left-elim-case"; "(comp left (case ?f ?g))" => "?f"),
         // free for right

--- a/movelist/default.nix
+++ b/movelist/default.nix
@@ -18,7 +18,7 @@ in pkgs.stdenv.mkDerivation {
   src = ./.;
 
   buildPhase = ''
-    csc -O3 -o movelist movelist.scm
+    csc -static -O3 -o movelist movelist.scm
   '';
 
   installPhase = ''

--- a/shell.nix
+++ b/shell.nix
@@ -12,7 +12,7 @@ in pkgs.stdenv.mkDerivation {
     gdb
     # debugging stub.scm
     chicken rlwrap ] ++
-    (with eggs; [ srfi-144 srfi-189 mini-kanren ]) ++ [
+    (with eggs; [ srfi-144 srfi-160 srfi-189 stb-image-write ]) ++ [
     # maintaining movelist/
     egg2nix
     # maintaining frame/