Factor out CFACT and YFACT

codedot · codedot · commit c3f640386d68 · 2017-11-04T13:22:40.000+02:00
diff --git a/samples/cfact4.mlc b/samples/cfact4.mlc
@@ -1,4 +1,2 @@
-FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
-
-MINUS (C3 C3) (FACT C4)
+MINUS (C3 C3) (CFACT C4)
 # v1, v2: v1 (v1 (v1 v2))
diff --git a/samples/cfact5.mlc b/samples/cfact5.mlc
@@ -1,4 +1,2 @@
-FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
-
-MINUS (C3 C5) (FACT C5)
+MINUS (C3 C5) (CFACT C5)
 # v1, v2: v1 (v1 (v1 (v1 (v1 v2))))
diff --git a/samples/lib.mlc b/samples/lib.mlc
@@ -25,3 +25,5 @@ PRED = n: (f, x: n (g, h: h (g f)) (K x) I);
 MINUS = m, n: n PRED m;
 ZERO = n: n (K F) T;
 Y = (a: a a) (self, f: f (self self f));
+YFACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
+CFACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
diff --git a/samples/yfact4.mlc b/samples/yfact4.mlc
@@ -1,4 +1,2 @@
-FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
-
-MINUS (C3 C3) (FACT C4)
+MINUS (C3 C3) (YFACT C4)
 # v1, v2: v1 (v1 (v1 v2))
diff --git a/samples/yfact5.mlc b/samples/yfact5.mlc
@@ -1,4 +1,2 @@
-FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
-
-MINUS (C3 C5) (FACT C5)
+MINUS (C3 C5) (YFACT C5)
 # v1, v2: v1 (v1 (v1 (v1 (v1 v2))))
