diff src/jscomp.sml @ 1323:0d8bd8ae8417

Fix JavaScript unit unurlification; URL blessing client-side
author Adam Chlipala <adamc@hcoop.net>
date Fri, 26 Nov 2010 11:57:04 -0500
parents c17e6144510b
children 02fc16faecf3
line wrap: on
line diff
--- a/src/jscomp.sml	Sun Nov 21 15:43:24 2010 -0500
+++ b/src/jscomp.sml	Fri Nov 26 11:57:04 2010 -0500
@@ -278,8 +278,8 @@
 
         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 @@
               | 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