提交: 03bf7e79b7c5d4752fde089b7ce753e5a4efbc4d - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 03bf7e79b7c5d4752fde089b7ce753e5a4efbc4d (tree)
• 时间: 2021-09-08 11:42:47
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Uncurry nat/add and nat/mul, fix compilation.

This is enough to get everything unbroken up to list/gauss.

更改概述

• modified: compile.sh
• modified: hive/nat/double.cammy
• modified: hive/nat/exp.cammy
• modified: hive/nat/fact.cammy
• modified: hive/nat/mul.cammy
• modified: hive/nat/sqr.cammy
• delete: hive/nat/square.cammy
• modified: hive/nat/sum.cammy

差异

--- a/compile.sh
+++ b/compile.sh
@@ -11,6 +11,7 @@ cat "$1"
 frame=$(nix-build frame/)
 jelly=$(nix-build jelly/Cargo.nix -A rootCrate.build)
 <"$1" $frame/bin/frame hive/ | $jelly/bin/jelly >"$tmpdir/program.cammy"
+cat "$tmpdir/program.cammy"
 
 fullname=$(basename -- $1)
 name="${fullname%.*}"
@@ -20,7 +21,7 @@ movelist=$(nix-build movelist/)
 ty=$($movelist/bin/movelist type-check <"$tmpdir/program.cammy")
 
 # Compute the final piece.
-cat "$tmpdir/program.cammy"
+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.
 csc -O3 -o "$name" "$tmpdir/$name.scm"

--- a/hive/nat/double.cammy
+++ b/hive/nat/double.cammy
@@ -1 +1 @@
-(comp dup (uncurry nat/add))
+(comp dup nat/add)

--- a/hive/nat/exp.cammy
+++ b/hive/nat/exp.cammy
@@ -1 +1 @@
-(pr (curry (comp (comp ignore zero) succ)) (curry (comp (pair app snd) (uncurry nat/mul))))
+(pr (curry (comp (comp ignore zero) succ)) (curry (comp (pair app snd) nat/mul)))

--- a/hive/nat/fact.cammy
+++ b/hive/nat/fact.cammy
@@ -1,4 +1,4 @@
 (comp (pr
     (comp zero (pair id succ))
-    (comp (pair (comp fst succ) snd) (pair fst (uncurry nat/mul)))
+    (comp (pair (comp fst succ) snd) (pair fst nat/mul))
 ) snd)

--- a/hive/nat/mul.cammy
+++ b/hive/nat/mul.cammy
@@ -1 +1 @@
-(pr (curry (comp ignore zero)) (curry (comp (pair app snd) (uncurry nat/add))))
+(uncurry (pr (curry (comp ignore zero)) (curry (comp (pair app snd) nat/add))))

--- a/hive/nat/sqr.cammy
+++ b/hive/nat/sqr.cammy
@@ -1 +1 @@
-(comp dup (uncurry nat/mul))
+(comp dup nat/mul)

--- a/hive/nat/square.cammy
+++ /dev/null
@@ -1 +0,0 @@
-(comp dup (uncurry nat/mul))

--- a/hive/nat/sum.cammy
+++ b/hive/nat/sum.cammy
@@ -1 +1 @@
-(fold zero (uncurry nat/add))
+(fold zero nat/add)