# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1221148413 14400
# Node ID 132416711463a2e97395cfc1e88a62ebc6dbc777
# Parent  1fd2a29a7c85c07513b0c42b37fad428d7e3231e
Expand scope of base type conversion coalesce optimizations

diff -r 1fd2a29a7c85 -r 132416711463 src/mono_opt.sml
--- a/src/mono_opt.sml	Thu Sep 11 11:44:46 2008 -0400
+++ b/src/mono_opt.sml	Thu Sep 11 11:53:33 2008 -0400
@@ -155,6 +155,12 @@
         EPrim (Prim.String (htmlifyInt n))
       | EFfiApp ("Basis", "htmlifyString", [(EFfiApp ("Basis", "intToString", es), _)]) =>
         EFfiApp ("Basis", "htmlifyInt", es)
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "intToString"), _),
+                                                   (EPrim (Prim.Int n), _)), _)]) =>
+        EPrim (Prim.String (htmlifyInt n))
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "intToString"), _),
+                                                   e), _)]) =>
+        EFfiApp ("Basis", "htmlifyInt", [e])
       | EWrite (EFfiApp ("Basis", "htmlifyInt", [e]), _) =>
         EFfiApp ("Basis", "htmlifyInt_w", [e])
 
@@ -162,6 +168,12 @@
         EPrim (Prim.String (htmlifyFloat n))
       | EFfiApp ("Basis", "htmlifyString", [(EFfiApp ("Basis", "floatToString", es), _)]) =>
         EFfiApp ("Basis", "htmlifyFloat", es)
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "floatToString"), _),
+                                                   (EPrim (Prim.Float n), _)), _)]) =>
+        EPrim (Prim.String (htmlifyFloat n))
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "floatToString"), _),
+                                                   e), _)]) =>
+        EFfiApp ("Basis", "htmlifyFloat", [e])
       | EWrite (EFfiApp ("Basis", "htmlifyFloat", [e]), _) =>
         EFfiApp ("Basis", "htmlifyFloat_w", [e])
 
@@ -173,6 +185,15 @@
         EPrim (Prim.String "False")
       | EFfiApp ("Basis", "htmlifyString", [(EFfiApp ("Basis", "boolToString", es), _)]) =>
         EFfiApp ("Basis", "htmlifyBool", es)
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "boolToString"), _),
+                                                   (ECon (Enum, PConFfi {con = "True", ...}, NONE), _)), _)]) =>
+        EPrim (Prim.String "True")
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "boolToString"), _),
+                                                   (ECon (Enum, PConFfi {con = "False", ...}, NONE), _)), _)]) =>
+        EPrim (Prim.String "False")
+      | EFfiApp ("Basis", "htmlifyString", [(EApp ((EFfi ("Basis", "boolToString"), _),
+                                                   e), _)]) =>
+        EFfiApp ("Basis", "htmlifyBool", [e])
       | EWrite (EFfiApp ("Basis", "htmlifyBool", [e]), _) =>
         EFfiApp ("Basis", "htmlifyBool_w", [e])