From 7e05b7d276e4620cfd6a881b5fa893432e948280 Mon Sep 17 00:00:00 2001
From: Lesenechal Remi <lesenechal.remi@gmail.com>
Date: Mon, 6 Jan 2020 17:46:00 +0100
Subject: [PATCH] now removes the entry-point declaration from the program
 before aggregation

---
 src/main/compile/of_mini_c.ml             | 7 ++++---
 src/stages/mini_c/misc.ml                 | 4 ++--
 vendors/ligo-utils/simple-utils/x_list.ml | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/compile/of_mini_c.ml b/src/main/compile/of_mini_c.ml
index 4387ca133..fb2945265 100644
--- a/src/main/compile/of_mini_c.ml
+++ b/src/main/compile/of_mini_c.ml
@@ -25,9 +25,10 @@ let aggregate_and_compile = fun program form ->
   | ContractForm _ -> compile_contract aggregated'
   | ExpressionForm _ -> compile_expression aggregated'
 
-let aggregate_and_compile_contract = fun program name ->
-  let%bind (exp, _) = get_entry program name in
-  aggregate_and_compile program (ContractForm exp)
+let aggregate_and_compile_contract = fun (program : Types.program) name ->
+  let%bind (exp, idx) = get_entry program name in
+  let program' = List.remove_from idx program in
+  aggregate_and_compile program' (ContractForm exp)
 
 let aggregate_and_compile_expression = fun program exp ->
   aggregate_and_compile program (ExpressionForm exp)
diff --git a/src/stages/mini_c/misc.ml b/src/stages/mini_c/misc.ml
index 5cae24799..2dae579d3 100644
--- a/src/stages/mini_c/misc.ml
+++ b/src/stages/mini_c/misc.ml
@@ -129,14 +129,14 @@ let get_entry (lst : program) (name : string) : (expression * int) result =
       then Some decl_expr
       else None
     in
-    List.find_map aux lst
+    List.find_map aux (List.rev lst)
   in
   let entry_index =
     let aux x =
       let (((decl_name , _) , _)) = x in
       Var.equal decl_name (Var.of_name name)
     in
-    List.find_index aux lst
+    (List.length lst) - (List.find_index aux (List.rev lst)) - 1
   in
   ok (entry_expression , entry_index)
 
diff --git a/vendors/ligo-utils/simple-utils/x_list.ml b/vendors/ligo-utils/simple-utils/x_list.ml
index 19bf881a5..8541c4614 100644
--- a/vendors/ligo-utils/simple-utils/x_list.ml
+++ b/vendors/ligo-utils/simple-utils/x_list.ml
@@ -5,6 +5,11 @@ let rec remove n = function
   | _  :: tl when n = 0 -> tl
   | hd :: tl -> hd :: remove (n - 1) tl
 
+let rec remove_from n = function
+  | [] -> raise (Failure "List.remove_from")
+  | _ when n = 0 -> []
+  | hd :: tl -> hd :: remove_from (n - 1) tl
+
 let map ?(acc = []) f lst =
   let rec aux acc f = function
     | [] -> acc