diff options
| author |  Ziv Scully <ziv@mit.edu> | 2014-12-11 02:05:41 -0500 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2014-12-11 02:05:41 -0500 |
| commit | 7a2739b18042953cdfc608a5d9c96237c97cebba (patch) | |
| tree | f9598f40d97e26581e6f9f4cb910f5e335f7b0e1 /src/mono_opt.sml | |
| parent | 219524359a25417b9e140130ab77a9a330c41012 (diff) | |
| parent | d47f51e33733c851a53feb308ddaee3924910371 (diff) | |
Merge.
Diffstat (limited to 'src/mono_opt.sml')
| -rw-r--r-- | src/mono_opt.sml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mono_opt.sml b/src/mono_opt.sml index 97f78d3d..22ee36fc 100644 --- a/src/mono_opt.sml +++ b/src/mono_opt.sml @@ -167,6 +167,9 @@ fun exp e = | EFfiApp ("Basis", "strcat", [(e1, _), (e2, _)]) => exp (EStrcat (e1, e2)) + | EStrcat (e1, (EPrim (Prim.String (_, "")), _)) => #1 e1 + | EStrcat ((EPrim (Prim.String (_, "")), _), e2) => #1 e2 + | EStrcat ((EPrim (Prim.String (Prim.Html, s1)), loc), (EPrim (Prim.String (Prim.Html, s2)), _)) => let val s = @@ -220,6 +223,11 @@ fun exp e = | EWrite (EFfiApp ("Basis", "htmlifySpecialChar", [e]), _) => EFfiApp ("Basis", "htmlifySpecialChar_w", [e]) + | EWrite (EFfiApp ("Basis", "intToString", [e]), _) => + EFfiApp ("Basis", "htmlifyInt_w", [e]) + | EApp ((EFfi ("Basis", "intToString"), loc), e) => + EFfiApp ("Basis", "intToString", [(e, (TFfi ("Basis", "int"), loc))]) + | EFfiApp ("Basis", "htmlifyString", [((EFfiApp ("Basis", "intToString", [((EPrim (Prim.Int n), _), _)]), _), _)]) => EPrim (Prim.String (Prim.Html, htmlifyInt n)) | EFfiApp ("Basis", "htmlifyString", [((EFfiApp ("Basis", "intToString", es), _), _)]) => @@ -621,6 +629,8 @@ fun exp e = EFfiApp ("Basis", "attrifyChar", [e]) | EFfiApp ("Basis", "attrifyString_w", [((EFfiApp ("Basis", "str1", [e]), _), _)]) => EFfiApp ("Basis", "attrifyChar_w", [e]) + | EWrite (EFfiApp ("Basis", "str1", [e]), _) => + EFfiApp ("Basis", "writec", [e]) | EBinop (_, "+", (EPrim (Prim.Int n1), _), (EPrim (Prim.Int n2), _)) => EPrim (Prim.Int (Int64.+ (n1, n2))) |