From 168251ff0e1d596d1bdcf705c5d62821ed2cd4ec Mon Sep 17 00:00:00 2001
From: Galfour <gabriel.alfour@gmail.com>
Date: Fri, 19 Apr 2019 18:25:32 +0000
Subject: [PATCH] move predicate compilation

---
 src/ligo/compiler/compiler_program.ml | 29 +++++++++++++++++++++++----
 src/ligo/operators/operators.ml       | 16 ++++-----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/ligo/compiler/compiler_program.ml b/src/ligo/compiler/compiler_program.ml
index 1a1e8660c..89dd8eb8e 100644
--- a/src/ligo/compiler/compiler_program.ml
+++ b/src/ligo/compiler/compiler_program.ml
@@ -182,10 +182,31 @@ and translate_expression (expr:expression) : michelson result =
         let%bind lst' = bind_list @@ List.map translate_expression lst in
         let%bind predicate = get_predicate str lst in
         let%bind code = match (predicate, List.length lst) with
-          | Constant c, 0 -> ok (seq @@ lst' @ [c])
-          | Unary f, 1 -> ok (seq @@ lst' @ [f])
-          | Binary f, 2 -> ok (seq @@ lst' @ [f])
-          | Ternary f, 3 -> ok (seq @@ lst' @ [f])
+          | Constant c, 0 -> ok (seq @@ lst' @ [
+              c ; i_pair ;
+            ])
+          | Unary f, 1 -> ok (seq @@ lst' @ [
+              i_unpair ;
+              f ;
+              i_pair ;
+            ])
+          | Binary f, 2 -> ok (seq @@ lst' @ [
+              i_unpair ;
+              dip i_unpair ;
+              i_swap ;
+              f ;
+              i_pair ;
+            ])
+          | Ternary f, 3 -> ok (seq @@ lst' @ [
+              i_unpair ;
+              dip i_unpair ;
+              dip (dip i_unpair) ;
+              i_swap ;
+              dip i_swap ;
+              i_swap ;
+              f ;
+              i_pair ;
+            ])
           | _ -> simple_fail "bad arity"
         in
         return code
diff --git a/src/ligo/operators/operators.ml b/src/ligo/operators/operators.ml
index 4671fd348..041e002fb 100644
--- a/src/ligo/operators/operators.ml
+++ b/src/ligo/operators/operators.ml
@@ -201,21 +201,13 @@ module Compiler = struct
     | Binary of michelson
     | Ternary of michelson
 
-  let simple_constant c = Constant ( seq [
-      c ; i_pair ;
-    ])
+  let simple_constant c = Constant c
 
-  let simple_unary c = Unary ( seq [
-      i_unpair ; c ; i_pair ;
-    ])
+  let simple_unary c = Unary c
 
-  let simple_binary c = Binary ( seq [
-      i_unpair ; dip i_unpair ; i_swap ; c ; i_pair ;
-    ])
+  let simple_binary c = Binary c
 
-  let simple_ternary c = Ternary ( seq [
-      i_unpair ; dip i_unpair ; dip (dip i_unpair) ; i_swap ; dip i_swap ; i_swap ; c ; i_pair ;
-    ])
+  let simple_ternary c = Ternary c
 
   let predicates = Map.String.of_list [
     ("ADD_INT" , simple_binary @@ prim I_ADD) ;