From 0e5c9802ec8cf0d1be93bf33c5104896273de9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@nomadic-labs.com>
Date: Wed, 12 Jun 2019 00:50:48 +0200
Subject: [PATCH] More tests with lambdas

---
 src/contracts/fibo.mligo      | 6 +-----
 src/contracts/fibo2.mligo     | 7 +++++++
 src/contracts/fibo3.mligo     | 7 +++++++
 src/contracts/fibo4.mligo     | 6 ++++++
 src/test/integration_tests.ml | 3 +++
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 src/contracts/fibo2.mligo
 create mode 100644 src/contracts/fibo3.mligo
 create mode 100644 src/contracts/fibo4.mligo

diff --git a/src/contracts/fibo.mligo b/src/contracts/fibo.mligo
index ee7e2df12..efc437c30 100644
--- a/src/contracts/fibo.mligo
+++ b/src/contracts/fibo.mligo
@@ -1,12 +1,8 @@
 type storage = unit
 
-(* not supported yet
-let%entry main (p:unit) storage =
-  (fun x -> ()) ()
-*)
 
 let%entry main (p:unit) storage =
-  (fun (f : int -> int -> int) (x : int) (y : int) -> f y (x + y))
+  (fun (f : (int * int) -> int) (x : int) (y : int) -> f (y, x))
   (fun (x : int) (y : int) -> x + y)
   0
   1
diff --git a/src/contracts/fibo2.mligo b/src/contracts/fibo2.mligo
new file mode 100644
index 000000000..1daa72adb
--- /dev/null
+++ b/src/contracts/fibo2.mligo
@@ -0,0 +1,7 @@
+type storage = unit
+
+let%entry main (p:unit) storage =
+  (fun (f : int -> int) (x : int) (y : int) -> (f y))
+  (fun (x : int) -> x)
+  0
+  1
diff --git a/src/contracts/fibo3.mligo b/src/contracts/fibo3.mligo
new file mode 100644
index 000000000..ebce6b862
--- /dev/null
+++ b/src/contracts/fibo3.mligo
@@ -0,0 +1,7 @@
+type storage = unit
+
+let%entry main (p:unit) storage =
+  (fun (f : int -> int -> int) (x : int) (y : int) -> (f y) (x + y))
+  (fun (x : int) (y : int) -> x + y)
+  0
+  1
diff --git a/src/contracts/fibo4.mligo b/src/contracts/fibo4.mligo
new file mode 100644
index 000000000..207d0c96c
--- /dev/null
+++ b/src/contracts/fibo4.mligo
@@ -0,0 +1,6 @@
+type storage = unit
+
+let%entry main (p:unit) storage =
+  (fun (f : int -> int) (x : int) -> (f x))
+  (fun (x : int) -> x)
+  1
diff --git a/src/test/integration_tests.ml b/src/test/integration_tests.ml
index 0de2e619c..3b6273f7f 100644
--- a/src/test/integration_tests.ml
+++ b/src/test/integration_tests.ml
@@ -918,6 +918,9 @@ let main = test_suite "Integration (End to End)" [
     test "tez (mligo)" tez_mligo ;
     test "lambda2 mligo" lambda2_mligo ;
     (* test "fibo (mligo)" fibo_mligo ; *)
+    (* test "fibo2 (mligo)" fibo2_mligo ; *)
+    (* test "fibo3 (mligo)" fibo3_mligo ; *)
+    (* test "fibo4 (mligo)" fibo4_mligo ; *)
     test "website1 ligo" website1_ligo ;
     test "website2 ligo" website2_ligo ;
     test "website2 (mligo)" website2_mligo ;