Merge branch 'develop'

1 files changed, 10 insertions, 6 deletions

diff --git a/sample/FibSZ_9.in b/sample/FibSZ_9.in
index 288a8bc..b5a65a8 100644
--- a/sample/FibSZ_9.in
+++ b/sample/FibSZ_9.in
@@ -2,15 +2,10 @@
 fib(r)><Z => r~Z;
 fib(r)><S(x) => fibS(r)~x;
 fibS(r)><Z => r~S(Z);
-fibS(r)><S(x) => dup(x1,x2)~x, add(r,r2)~r1, fib(r2)~x2, fibS(r1)~x1;
+fibS(r)><S(x) => Dup(x1,x2)~x, add(r,r2)~r1, fib(r2)~x2, fibS(r1)~x1;
 
 
 
-// ------ DUP ------
-dup(x1,x2)><Z => x1~Z, x2~Z;
-dup(x1,x2)><S(x) => x1~S(w1), x2~S(w2), dup(w1,w2)~x;
-
-
 //------ ADD ------
 //Add para
 add(r,x)><Z => r~x;
@@ -21,6 +16,15 @@ add(r,x)><S(y) => r~S(w), add(w,x)~y;
 //add(r,y)><S(x) => add(r, S(y))~x;
 
 
+// ------ DUP ------
+// Dup is defined as built-in:
+//
+// Dup(x1,x2)><Z => x1~Z, x2~Z;
+// Dup(x1,x2)><S(x) => x1~S(w1), x2~S(w2), Dup(w1,w2)~x;
+
+
+
+
 // Execution
 // Fib 9
 fib(r)~S(S(S(S(S(S(S(S(S(Z)))))))));