From 0de429f2205e351ac4ca182aca072e25e09ed33a Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Fri, 26 Nov 2010 11:57:04 -0500
Subject: Fix JavaScript unit unurlification; URL blessing client-side

---
 src/jscomp.sml   | 19 ++++++++++++++++---
 src/settings.sml |  5 ++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/jscomp.sml b/src/jscomp.sml
index 6beb6a32..992a2e30 100644
--- a/src/jscomp.sml
+++ b/src/jscomp.sml
@@ -278,8 +278,8 @@ fun process file =
 
         fun unurlifyExp loc (t : typ, st) =
             case #1 t of
-                TRecord [] => ("null", st)
-              | TFfi ("Basis", "unit") => ("null", st)
+                TRecord [] => ("(i++,null)", st)
+              | TFfi ("Basis", "unit") => ("(i++,null)", st)
               | TRecord [(x, t)] =>
                 let
                     val (e, st) = unurlifyExp loc (t, st)
@@ -1285,9 +1285,22 @@ fun process file =
               | SOME line => lines (line :: acc)
         val lines = lines []
 
+        val urlRules = foldr (fn (r, s) =>
+                                 "cons({allow:"
+                                 ^ (if #action r = Settings.Allow then "true" else "false")
+                                 ^ ",prefix:"
+                                 ^ (if #kind r = Settings.Prefix then "true" else "false")
+                                 ^ ",pattern:\""
+                                 ^ #pattern r
+                                 ^ "\"},"
+                                 ^ s
+                                 ^ ")") "null" (Settings.getUrlRules ())
+
+        val urlRules = "urlRules = " ^ urlRules ^ ";\n\n"
+
         val script =
             if !foundJavaScript then
-                lines ^ String.concat (rev (#script st))
+                lines ^ urlRules ^ String.concat (rev (#script st))
             else
                 ""
     in
diff --git a/src/settings.sml b/src/settings.sml
index b5ba4f9b..7a943217 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -207,7 +207,10 @@ val jsFuncsBase = basisM [("alert", "alert"),
                           ("isspace", "isSpace"),
                           ("isxdigit", "isXdigit"),
                           ("tolower", "toLower"),
-                          ("toupper", "toUpper")]
+                          ("toupper", "toUpper"),
+
+                          ("checkUrl", "checkUrl"),
+                          ("bless", "bless")]
 val jsFuncs = ref jsFuncsBase
 fun setJsFuncs ls = jsFuncs := foldl (fn ((k, v), m) => M.insert (m, k, v)) jsFuncsBase ls
 fun jsFunc x = M.find (!jsFuncs, x)
-- 
cgit v1.2.3