提交: 2c4a70a552da3ea9ed7c9a2a8941aaa8b8aa0985 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 2c4a70a552da3ea9ed7c9a2a8941aaa8b8aa0985 (tree)
• 时间: 2022-03-06 13:17:10
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Clean up old parts of movelist.

更改概述

• modified: default.nix
• delete: eggs.nix
• delete: eggs.scm
• add: hive/bool/all.cammy
• add: hive/bool/any.cammy
• add: hive/fun/distribl.cammy
• add: hive/list/cat_maybes.cammy
• add: hive/monads/maybe/bind.cammy
• modified: movelist/movelist.scm
• modified: todo.txt

差异

--- a/default.nix
+++ b/default.nix
@@ -7,14 +7,6 @@ let
   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;
-  }) [ "eggDerivation" "fetchegg" ]) ++ [ pkgs.chicken ];
-  CHICKEN_REPOSITORY_PATH = builtins.concatStringsSep ":"
-    (map (egg: "${egg.out}/lib/chicken/${toString pkgs.chicken.binaryVersion}") eggs);
-  CHICKEN_INCLUDE_PATH = builtins.concatStringsSep ":"
-    (map (egg: "${egg.out}/share") eggs);
 in pkgs.stdenv.mkDerivation {
   name = "cammy";
   version = "0.2";
@@ -23,14 +15,11 @@ in pkgs.stdenv.mkDerivation {
 
   buildInputs = [ pkgs.makeWrapper ];
 
-  inherit (pkgs) bash chicken python3;
-  inherit CHICKEN_REPOSITORY_PATH CHICKEN_INCLUDE_PATH jelly movelist;
-
   installPhase = ''
     mkdir -p $out/bin/
 
-    # To be removed
-    makeWrapper ${movelist}/bin/movelist $out/bin/cammy-movelist
+    # djinn
+    makeWrapper ${movelist}/bin/movelist $out/bin/cammy-djinn
 
     # jelly
     makeWrapper ${jelly}/bin/jelly $out/bin/cammy-jelly

--- a/eggs.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{ pkgs, stdenv }:
-rec {
-  inherit (pkgs) eggDerivation fetchegg;
-
-  matchable = eggDerivation {
-    name = "matchable-1.1";
-
-    src = fetchegg {
-      name = "matchable";
-      version = "1.1";
-      sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v";
-    };
-
-    buildInputs = [
-      
-    ];
-  };
-
-  r7rs = eggDerivation {
-    name = "r7rs-1.0.5";
-
-    src = fetchegg {
-      name = "r7rs";
-      version = "1.0.5";
-      sha256 = "0zyi1z4m1995hm2wfc5wpi8jjgxcwk03qknq5v2ygff3akxazsf6";
-    };
-
-    buildInputs = [
-      matchable
-      srfi-1
-      srfi-13
-    ];
-  };
-
-  srfi-1 = eggDerivation {
-    name = "srfi-1-0.5.1";
-
-    src = fetchegg {
-      name = "srfi-1";
-      version = "0.5.1";
-      sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j";
-    };
-
-    buildInputs = [
-      
-    ];
-  };
-
-  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";
-
-    src = fetchegg {
-      name = "srfi-13";
-      version = "0.3.2";
-      sha256 = "137yv5hkhnapgh7iq3siiq1vfqdmvck4gsax7p6pmch6adg2wcy4";
-    };
-
-    buildInputs = [
-      srfi-14
-    ];
-  };
-
-  srfi-14 = eggDerivation {
-    name = "srfi-14-0.2.1";
-
-    src = fetchegg {
-      name = "srfi-14";
-      version = "0.2.1";
-      sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p";
-    };
-
-    buildInputs = [
-      
-    ];
-  };
-
-  srfi-144 = eggDerivation {
-    name = "srfi-144-0.1.3";
-
-    src = fetchegg {
-      name = "srfi-144";
-      version = "0.1.3";
-      sha256 = "0i2446bwqirc47a08fdmhxjc231i4kzdqlxsv1avy13klain7mad";
-    };
-
-    buildInputs = [
-      r7rs
-    ];
-  };
-
-  srfi-145 = eggDerivation {
-    name = "srfi-145-0.1";
-
-    src = fetchegg {
-      name = "srfi-145";
-      version = "0.1";
-      sha256 = "1r4278xhpmm8gww64j6akpyv3qjnn14b6nsisyb9qm7yx3pkpim9";
-    };
-
-    buildInputs = [
-      
-    ];
-  };
-
-  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";
-
-    src = fetchegg {
-      name = "srfi-189";
-      version = "0.1";
-      sha256 = "1nmrywpi9adi5mm1vcbxxsgw0j3v6m7s4j1mii7icj83xn81cgvx";
-    };
-
-    buildInputs = [
-      r7rs
-      srfi-1
-      srfi-145
-    ];
-  };
-
-  stb-image-write = eggDerivation {
-    name = "stb-image-write-0.3";
-
-    src = fetchegg {
-      name = "stb-image-write";
-      version = "0.3";
-      sha256 = "08qjvsih3jdniclcbsh06yd67vz3kya6ny42fwhlbkyxlj8c92s3";
-    };
-
-    buildInputs = [
-      
-    ];
-  };
-}
-

--- a/eggs.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-srfi-144
-srfi-160
-srfi-189
-matchable
-stb-image-write

--- /dev/null
+++ b/hive/bool/all.cammy
@@ -0,0 +1,3 @@
+(fold t conj)
+
+Whether every element in a list is true.

--- /dev/null
+++ b/hive/bool/any.cammy
@@ -0,0 +1,3 @@
+(fold f disj)
+
+Whether any element in a list is true.

--- /dev/null
+++ b/hive/fun/distribl.cammy
@@ -0,0 +1,3 @@
+(uncurry (case (curry left) (curry right)))
+
+Distribute to the left.

--- /dev/null
+++ b/hive/list/cat_maybes.cammy
@@ -0,0 +1,3 @@
+(fold nil (comp fun/distribl (case cons snd)))
+
+Select the left-hand elements of a list of sums.

--- /dev/null
+++ b/hive/monads/maybe/bind.cammy
@@ -0,0 +1,3 @@
+(comp @0 (case @1 right))
+
+Bind for the maybe monad.

--- a/movelist/movelist.scm
+++ b/movelist/movelist.scm
@@ -62,13 +62,13 @@
 (define (type-check expr)
   (car (run 1 (q) (fresh (s t) (== q (list s t)) (cammyo expr s t)))))
 
+(define (last xs)
+  (if (null? (cdr xs)) (car xs) (last (cdr xs))))
+
 (define (djinn x s t)
-  (run x (q) (cammyo q s t)))
+  (last (run x (q) (cammyo q s t))))
 
 (match (map (lambda (s) (read (open-input-string s)))
             (command-line-arguments))
-       [('type-check) (begin
-                         (display (type-check (read))) (newline))]
-       [('djinn (? number? count) in out) (begin
-                                            (display (djinn count in out))
-                                            (newline))])
+       [(in out (? number? count)) (begin (display (djinn count in out))
+                                          (newline))])

--- a/todo.txt
+++ b/todo.txt
@@ -55,4 +55,3 @@
   * 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
-* f/dot2pair