# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1230823100 18000
# Node ID 1fd4c041634e02b93e04a9f3b74b919057323e19
# Parent  66463006f893c9291315832446f89f4ca12fb265
Reactive computation with more base types and records

diff -r 66463006f893 -r 1fd4c041634e src/jscomp.sml
--- a/src/jscomp.sml	Thu Jan 01 10:08:22 2009 -0500
+++ b/src/jscomp.sml	Thu Jan 01 10:18:20 2009 -0500
@@ -34,6 +34,7 @@
 structure U = MonoUtil
 
 val funcs = [(("Basis", "alert"), "alert"),
+             (("Basis", "htmlifyFloat"), "ts"),
              (("Basis", "htmlifyInt"), "ts"),
              (("Basis", "htmlifyString"), "escape"),
              (("Basis", "new_client_source"), "sc"),
@@ -111,11 +112,10 @@
                         PConVar n => str (Int.toString n)
                       | PConFfi {con, ...} => str ("\"_" ^ con ^ "\"")
 
-
-
                 fun isNullable (t, _) =
                     case t of
                         TOption _ => true
+                      | TRecord [] => true
                       | _ => false
 
                 fun unsupported s =
@@ -154,7 +154,7 @@
                   | EPrim p => (str (Prim.toString p), st)
                   | ERel n =>
                     if n < inner then
-                        (str ("uwr" ^ var n), st)
+                        (str ("_" ^ var n), st)
                     else
                         let
                             val n = n - inner
@@ -246,10 +246,10 @@
                     let
                         val locals = List.tabulate
                                      (varDepth e,
-                                   fn i => str ("var uwr" ^ Int.toString (len + inner + i) ^ ";"))
+                                   fn i => str ("var _" ^ Int.toString (len + inner + i) ^ ";"))
                         val (e, st) = jsE (inner + 1) (e, st)
                     in
-                        (strcat (str ("function(uwr"
+                        (strcat (str ("function(_"
                                       ^ Int.toString (len + inner)
                                       ^ "){")
                                  :: locals
@@ -286,7 +286,7 @@
                     let
                         val (e, st) = jsE inner (e, st)
                     in
-                        (strcat [str "{uw_x:", e, str "}"], st)
+                        (strcat [str "{_x:", e, str "}"], st)
                     end
                   | ERecord ((x, e, _) :: xes) =>
                     let
@@ -297,14 +297,14 @@
                                       let
                                           val (e, st) = jsE inner (e, st)
                                       in
-                                          (str (",uw_" ^ x ^ ":")
+                                          (str (",_" ^ x ^ ":")
                                            :: e
                                            :: es,
                                            st)
                                       end)
                                   ([str "}"], st) xes
                     in
-                        (strcat (str ("{uw_" ^ x ^ ":")
+                        (strcat (str ("{_" ^ x ^ ":")
                                  :: e
                                  :: es),
                          st)
@@ -314,7 +314,7 @@
                         val (e, st) = jsE inner (e, st)
                     in
                         (strcat [e,
-                                 str ("." ^ x)], st)
+                                 str ("._" ^ x)], st)
                     end
 
                   | ECase _ => raise Fail "Jscomp: ECase"
@@ -356,7 +356,7 @@
                         val (e1, st) = jsE inner (e1, st)
                         val (e2, st) = jsE (inner + 1) (e2, st)
                     in
-                        (strcat [str ("(uwr" ^ Int.toString (len + inner) ^ "="),
+                        (strcat [str ("(_" ^ Int.toString (len + inner) ^ "="),
                                  e1,
                                  str ",",
                                  e2,
@@ -415,7 +415,7 @@
 
                                           val locals = List.tabulate
                                                            (varDepth e,
-                                                         fn i => str ("var uwr" ^ Int.toString (len + i) ^ ";"))
+                                                         fn i => str ("var _" ^ Int.toString (len + i) ^ ";"))
                                           val (e, st) = jsExp m skip env 0 (e, st)
                                       in
                                           (EJavaScript (m, orig, SOME (strcat (#2 e) (locals @ [e]))), st)
diff -r 66463006f893 -r 1fd4c041634e tests/stypes.ur
--- a/tests/stypes.ur	Thu Jan 01 10:08:22 2009 -0500
+++ b/tests/stypes.ur	Thu Jan 01 10:18:20 2009 -0500
@@ -1,5 +1,14 @@
 fun main () : transaction page =
     sInt <- source 0;
+    sFloat <- source 1.23;
+    sBoth <- source (7, 42.1);
+
+    sOpt <- source None;
+
     return <xml><body>
-      <dyn signal={n <- signal sInt; return <xml>{[n]}</xml>}/> <a onclick={set sInt 1}>Change</a><br/>
+      <dyn signal={n <- signal sInt; return <xml>{[n + 3]}</xml>}/> <a onclick={set sInt 1}>Change</a><br/>
+
+      <dyn signal={n <- signal sFloat; return <xml>{[n + 1.0]}</xml>}/> <a onclick={set sFloat 4.56}>Change</a><br/>
+
+      <dyn signal={p <- signal sBoth; return <xml>{[p.1]}, {[p.2]}</xml>}/> <a onclick={set sBoth (8, 100.001)}>Change</a><br/>
     </body></xml>