提交: 09a112ec6d9740e181d405b6fb8355b7c8dcb27d - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 09a112ec6d9740e181d405b6fb8355b7c8dcb27d (tree)
• 时间: 2022-03-30 11:50:39
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Call djinn from REPL.

更改概述

• modified: cammy-rpy/builder.nix
• add: cammy-rpy/cammylib/djinn.py
• modified: cammy-rpy/cammylib/parser.py
• modified: cammy-rpy/repl.py
• modified: default.nix
• modified: hive/demo/metaball.cammy
• modified: hive/f/cube.cammy
• add: hive/fun/factorl.cammy
• add: hive/fun/factorr.cammy
• modified: hive/iter-fractal.cammy
• modified: hive/list/uncons.cammy
• modified: hive/nat/cube.cammy
• modified: hive/nat/double.cammy
• modified: hive/nat/pred.cammy
• modified: hive/nat/sqr.cammy
• modified: hive/v2/complex/norm.cammy
• modified: hive/v2/complex/sqr.cammy
• modified: hive/v2/const.cammy
• modified: hive/v3/norm.cammy
• delete: hive/{fun => pair}/dup.cammy

差异

--- a/cammy-rpy/builder.nix
+++ b/cammy-rpy/builder.nix
@@ -1,5 +1,5 @@
 entrypoint: exe: enableJIT:
-{ nixpkgs ? import <nixpkgs> {}, jelly ? null }:
+{ nixpkgs ? import <nixpkgs> {}, jelly ? null, movelist ? null }:
 let
   inherit (nixpkgs.pkgs)
   fetchFromGitLab stdenv
@@ -34,6 +34,7 @@ in
     ];
 
     JELLY_PATH = "${jelly}/bin/jelly";
+    MOVELIST_PATH = "${movelist}/bin/movelist";
 
     buildPhase = ''
       source $stdenv/setup

--- /dev/null
+++ b/cammy-rpy/cammylib/djinn.py
@@ -0,0 +1,15 @@
+import os
+
+from rpython.rlib.rfile import create_popen_file
+
+from cammylib.parser import parse
+
+movelist_path = os.environ["MOVELIST_PATH"]
+
+def askDjinn(dom, cod):
+    "Synthesize a Cammy expression with the given domain and codomain."
+    command = "%s '%s' '%s' 1" % (movelist_path, dom.asStr(), cod.asStr())
+    with create_popen_file(command, "r") as handle:
+        s = handle.read()
+    sexp, trail = parse(s)
+    return sexp

--- a/cammy-rpy/cammylib/parser.py
+++ b/cammy-rpy/cammylib/parser.py
@@ -52,9 +52,16 @@ class CammyParser(object):
 
 
 def parse(s):
+    "Parse a Cammy expression, preserving any trailing text."
     parser = CammyParser(s)
     sexp = parser.takeExpression()
     # Parser is now fast-forwarded to the end of the S-expression, so we can
     # slice from that point and get the docstring/etc.
     trail = s[parser.position():]
     return sexp, trail
+
+
+def parseTypes(s):
+    "Parse two types separated by whitespace."
+    parser = CammyParser(s)
+    return parser.takeExpression(), parser.takeExpression()

--- a/cammy-rpy/repl.py
+++ b/cammy-rpy/repl.py
@@ -6,8 +6,9 @@ from rpython.rlib.rfile import create_stdio
 
 from cammylib.arrows import BuildProblem, T
 from cammylib.hive import Hive, MissingAtom
+from cammylib.djinn import askDjinn
 from cammylib.jelly import jellify
-from cammylib.parser import parse
+from cammylib.parser import parse, parseTypes
 from cammylib.types import ConstraintStore, TypeExtractor, TypeFormatter, UnificationFailed
 
 LINE_BUFFER_LENGTH = 1024
@@ -49,6 +50,11 @@ def command(hive, code, line):
             print "Arrow is not an element"
         else:
             print arrow.run(T()).asStr()
+    elif code == "d":
+        # Invoke djinn.
+        dom, cod = parseTypes(line)
+        sexp = askDjinn(dom, cod)
+        print sexp.asStr()
 
 def repl(hive, stdin, stdout):
     while True:

--- a/default.nix
+++ b/default.nix
@@ -3,12 +3,12 @@ let
   inherit (nixpkgs) pkgs;
   jelly = (import jelly/Cargo.nix { pkgs = nixpkgs; }).rootCrate.build;
   movelist = import ./movelist { inherit nixpkgs; };
-  cammy-comb = import ./cammy-rpy/comb.nix { inherit nixpkgs jelly; };
-  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-rename = import ./cammy-rpy/rename.nix { inherit nixpkgs jelly; };
-  cammy-weave = import ./cammy-rpy/weave.nix { inherit nixpkgs jelly; };
+  cammy-comb = import ./cammy-rpy/comb.nix { inherit nixpkgs jelly movelist; };
+  cammy-draw = import ./cammy-rpy/draw.nix { inherit nixpkgs jelly movelist; };
+  cammy-frame = import ./cammy-rpy/frame.nix { inherit nixpkgs jelly movelist; };
+  cammy-repl = import ./cammy-rpy/repl.nix { inherit nixpkgs jelly movelist; };
+  cammy-rename = import ./cammy-rpy/rename.nix { inherit nixpkgs jelly movelist; };
+  cammy-weave = import ./cammy-rpy/weave.nix { inherit nixpkgs jelly movelist; };
 in pkgs.stdenv.mkDerivation {
   name = "cammy";
   version = "0.2";

--- a/hive/demo/metaball.cammy
+++ b/hive/demo/metaball.cammy
@@ -1,9 +1,3 @@
-(comp
-  (sdf2/metaballs (comp f/4 f-recip)
-    (fun/const
-      (comp
-      (pair (pair (comp (comp f/4 f-recip) fun/dup) (comp f/3 f-recip))
-        (comp
-        (pair (pair (pair (comp f-one f-negate) f-zero) (comp f/2 f-recip))
-          nil) cons)) cons)))
-  sdf2d)
+(comp (sdf2/metaballs (comp f/4 f-recip) (fun/const (comp (pair (pair (comp (comp f/4 f-recip) pair/dup) (comp f/3 f-recip)) (comp (pair (pair (pair (comp f-one f-negate) f-zero) (comp f/2 f-recip)) nil) cons)) cons))) sdf2d)
+
+

--- a/hive/f/cube.cammy
+++ b/hive/f/cube.cammy
@@ -1,3 +1,3 @@
-(comp (pair id (comp fun/dup f-mul)) f-mul)
+(comp (pair id (comp pair/dup f-mul)) f-mul)
 
 The cube of a floating-point number.

--- /dev/null
+++ b/hive/fun/factorl.cammy
@@ -0,0 +1,3 @@
+(pair (case fst fst) (case (comp snd left) (comp snd right)))
+
+Factor out a product from a sum.

--- /dev/null
+++ b/hive/fun/factorr.cammy
@@ -0,0 +1,3 @@
+(pair (case (comp fst left) (comp fst right)) (case snd snd))
+
+Factor out a product from a sum.

--- a/hive/iter-fractal.cammy
+++ b/hive/iter-fractal.cammy
@@ -1,8 +1,4 @@
-(comp
-  (fun/apppair
-    (fun/const (comp @1 nonempty/unfold))
-    (pair (comp (fun/const f-zero) fun/dup) @0))
-  snd)
+(comp (fun/apppair (fun/const (comp @1 nonempty/unfold)) (pair (comp (fun/const f-zero) pair/dup) @0)) snd)
 
 Iterate an [IFS](https://en.wikipedia.org/wiki/Iterated_function_system) for a
 given number of steps.

--- a/hive/list/uncons.cammy
+++ b/hive/list/uncons.cammy
@@ -3,6 +3,4 @@
     (pair/mapsnd (comp (case cons nil) left))
     (comp fun/distribr (sum/mapright ignore))))
 
-[X] -> (X x [X]) + 1
-
 Try to decompose a list at its extremal cell.

--- a/hive/nat/cube.cammy
+++ b/hive/nat/cube.cammy
@@ -1,3 +1,3 @@
-(comp (comp fun/dup (pair fst (comp snd nat/sqr))) nat/mul)
+(comp (comp pair/dup (pair fst (comp snd nat/sqr))) nat/mul)
 
 The cube of a natural number.

--- a/hive/nat/double.cammy
+++ b/hive/nat/double.cammy
@@ -1,3 +1,3 @@
-(comp fun/dup nat/add)
+(comp pair/dup nat/add)
 
 Double a natural number by adding it to itself.

--- a/hive/nat/pred.cammy
+++ b/hive/nat/pred.cammy
@@ -1,3 +1,3 @@
-(comp (pr (comp zero fun/dup) (comp fst (pair succ id))) snd)
+(comp (pr (comp zero pair/dup) (comp fst (pair succ id))) snd)
 
 The predecessor of a natural number. Zero is mapped to itself.

--- a/hive/nat/sqr.cammy
+++ b/hive/nat/sqr.cammy
@@ -1 +1,3 @@
-(comp fun/dup nat/mul)
+(comp pair/dup nat/mul)
+
+

--- a/hive/v2/complex/norm.cammy
+++ b/hive/v2/complex/norm.cammy
@@ -1,3 +1,3 @@
-(comp (comp fun/dup f/dot2) f/sqrt-pos)
+(comp (comp pair/dup f/dot2) f/sqrt-pos)
 
 The norm of a complex number.

--- a/hive/v2/complex/sqr.cammy
+++ b/hive/v2/complex/sqr.cammy
@@ -1,3 +1,3 @@
-(comp fun/dup v2/complex/mul)
+(comp pair/dup v2/complex/mul)
 
 

--- a/hive/v2/const.cammy
+++ b/hive/v2/const.cammy
@@ -1 +1,3 @@
-(fun/const (comp @0 fun/dup))
+(fun/const (comp @0 pair/dup))
+
+

--- a/hive/v3/norm.cammy
+++ b/hive/v3/norm.cammy
@@ -1 +1,3 @@
-(comp (comp (comp fun/dup f/dot3) f-sqrt) (case id f-zero))
+(comp (comp (comp pair/dup f/dot3) f-sqrt) (case id f-zero))
+
+