From f6d55712bce407d915b83f4d1e28b74805eea977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ce=CC=81dric=20Pasteur?= <cedric.pasteur@m4x.org>
Date: Thu, 15 Jul 2010 17:02:56 +0200
Subject: [PATCH] Revert "Normalize small tweak."

This reverts commit eb39fcffece07464799b42427a1e33a53c4fba04.

This change is completely wrong (sorry Leonard ...)
---
 compiler/minils/transformations/normalize.ml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/compiler/minils/transformations/normalize.ml b/compiler/minils/transformations/normalize.ml
index fc5ce45..db7fdca 100644
--- a/compiler/minils/transformations/normalize.ml
+++ b/compiler/minils/transformations/normalize.ml
@@ -80,6 +80,11 @@ let rec merge e x ci_a_list =
     | [e] -> e
     | l -> { e with e_desc = Eapp(mk_app Etuple, l, None) }
 
+let ifthenelse context e1 e2 e3 =
+  let context, n = intro context e1 in
+  let context, e2 = whenc context e2 ctrue n in
+  let context, e3 = whenc context e3 cfalse n in
+    context, merge e1 n [ctrue, e2; cfalse, e3]
 
 let const e c =
   let rec const = function
@@ -149,6 +154,11 @@ let rec translate kind context e =
                context, ((field, e) :: field_desc_list))
             l (context, []) in
         context, { e with e_desc = Estruct l }
+    | Eapp({ a_op = Eifthenelse }, [e1; e2; e3], _) ->
+        let context, e1 = translate Any context e1 in
+        let context, e2 = translate Act context e2 in
+        let context, e3 = translate Act context e3 in
+          ifthenelse context e1 e2 e3
     | Eapp(app, e_list, r) ->
         let context, e_list = translate_app kind context app.a_op e_list in
           context, { e with e_desc = Eapp(app, e_list, r) }
@@ -167,14 +177,6 @@ and translate_app kind context op e_list =
     | Etuple, e_list ->
         let context, e_list = translate_list kind context e_list in
           context, e_list
-    | Eifthenelse, [e1; e2; e3] ->
-        let context, e1 = translate Any context e1 in
-        let context, e2 = translate Act context e2 in
-        let context, e3 = translate Act context e3 in
-        let context, n = intro context e1 in
-        let context, e2 = whenc context e2 ctrue n in
-        let context, e3 = whenc context e3 cfalse n in
-          context, [merge e1 n [ctrue, e2; cfalse, e3]]
     | Efield, [e'] ->
         let context, e' = translate Exp context e' in
           context, [e']