Do not redefine common combinators

codedot · codedot · commit d1bfef1a5cbd · 2017-01-27T14:34:41.000+02:00
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ all: compile.js
 	node lambda -h
 	node lambda -ce "S hello bye world"
 	node lambda -d samples/debug.mlc
-	node lambda -pt samples/fact.mlc
+	node lambda -cpt samples/fact.mlc
 
 compile.js: grammar.jison
 	npm install jison@0.4.15
diff --git a/samples/exp.mlc b/samples/exp.mlc
@@ -1,5 +1 @@
-I = x: x;
-C2 = f, x: f (f x);
-C10 = f, x: f (f (f (f (f (f (f (f (f (f x)))))))));
-
 C10 C2 C2 I I
diff --git a/samples/fact.mlc b/samples/fact.mlc
@@ -1,30 +1,3 @@
-I = x: x;
-K = x, y: x;
-S = x, y, z: x z (y z);
+FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
 
-T = K;
-F = x, y: y;
-AND = p, q: p q F;
-OR = p, q: p T q;
-NOT = p: (a, b: p b a);
-
-C0 = f, x: x;
-C1 = f, x: f x;
-C2 = f, x: f (f x);
-C3 = f, x: f (f (f x));
-SUCC = n: (f, x: f (n f x));
-PLUS = m, n: (f, x: m f (n f x));
-MULT = m, n: (f: m (n f));
-EXP = m, n: n m;
-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;
-
-A = self, f: f (self self f);
-Y = A A;
-FACTR = self, n: (ZERO n) C1 (MULT n (self (PRED n)));
-FACT = Y FACTR;
-
-C24 = FACT (PLUS C2 C2);
-C27 = EXP C3 C3;
-MINUS C27 C24
+MINUS (C3 C3) (FACT C4)
diff --git a/samples/helper.txt b/samples/helper.txt
@@ -2,7 +2,7 @@ I = x: x;
 K = x, y: x;
 S = x, y, z: x z (y z);
 T = K;
-F = x, y: y;
+F = K I;
 AND = p, q: p q F;
 OR = p, q: p T q;
 NOT = p: (a, b: p b a);
@@ -24,5 +24,4 @@ EXP = m, n: n m;
 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;
-A = self, f: f (self self f);
-Y = A A;
+Y = (a: a a) (self, f: f (self self f));
diff --git a/samples/larger.mlc b/samples/larger.mlc
@@ -1,31 +1,3 @@
-I = x: x;
-K = x, y: x;
-S = x, y, z: x z (y z);
+FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
 
-T = K;
-F = x, y: y;
-AND = p, q: p q F;
-OR = p, q: p T q;
-NOT = p: (a, b: p b a);
-
-C0 = f, x: x;
-C1 = f, x: f x;
-C2 = f, x: f (f x);
-C3 = f, x: f (f (f x));
-SUCC = n: (f, x: f (n f x));
-PLUS = m, n: (f, x: m f (n f x));
-MULT = m, n: (f: m (n f));
-EXP = m, n: n m;
-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;
-
-A = self, f: f (self self f);
-Y = A A;
-FACTR = self, n: (ZERO n) C1 (MULT n (self (PRED n)));
-FACT = Y FACTR;
-
-C5 = PLUS C2 C3;
-C125 = C3 C5;
-C120 = FACT C5;
-MINUS C125 C120
+MINUS (C3 C5) (FACT C5)
