# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1325113527 18000
# Node ID ca3b73a7b4d0e2563f2a856dafd6f0af1eb44a14
# Parent  b71cc5ec59b3aef2665efbaa7e5d82c6aa386c92
Get a few more source files up-to-date with change to [tag] type

diff -r b71cc5ec59b3 -r ca3b73a7b4d0 src/css.sml
--- a/src/css.sml	Wed Dec 28 10:30:56 2011 -0500
+++ b/src/css.sml	Wed Dec 28 18:05:27 2011 -0500
@@ -144,7 +144,7 @@
                         (EApp (
                          (EApp (
                           (EApp (
-                           (ECApp (
+                           (EApp (
                             (ECApp (
                              (ECApp (
                               (ECApp (
@@ -152,9 +152,11 @@
                                 (ECApp (
                                  (ECApp (
                                   (ECApp (
-                                   (EFfi ("Basis", "tag"),
-                                    _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
-                           (ECon (_, _, _, SOME (ENamed class, _)), _)), _),
+                                   (ECApp (
+                                    (EFfi ("Basis", "tag"),
+                                     _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                            (ECon (_, _, _, SOME (ENamed class, _)), _)), _),
+                           _), _),
                           attrs), _),
                          tag), _),
                         xml) =>
@@ -182,7 +184,7 @@
                         (EApp (
                          (EApp (
                           (EApp (
-                           (ECApp (
+                           (EApp (
                             (ECApp (
                              (ECApp (
                               (ECApp (
@@ -190,8 +192,10 @@
                                 (ECApp (
                                  (ECApp (
                                   (ECApp (
-                                   (EFfi ("Basis", "tag"),
-                                    _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                                   (ECApp (
+                                    (EFfi ("Basis", "tag"),
+                                     _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                            _), _),
                            _), _),
                           attrs), _),
                          tag), _),
diff -r b71cc5ec59b3 -r ca3b73a7b4d0 src/monoize.sml
--- a/src/monoize.sml	Wed Dec 28 10:30:56 2011 -0500
+++ b/src/monoize.sml	Wed Dec 28 18:05:27 2011 -0500
@@ -3501,12 +3501,14 @@
 	    in
 		case #1 dynClass of
 		    L'.ENone _ => baseAll
-		  | _ => (strcat [str "<script type=\"text/javascript\">dynClass(execD(",
-				  (L'.EJavaScript (L'.Script, base), loc),
-				  str "),execD(",
-				  (L'.EJavaScript (L'.Script, dynClass), loc),
-				  str "))</script>"],
-			  fm)
+		  | L'.ESome (_, dc) => (strcat [str "<script type=\"text/javascript\">dynClass(execD(",
+				                 (L'.EJavaScript (L'.Script, base), loc),
+				                 str "),execD(",
+				                 (L'.EJavaScript (L'.Script, dc), loc),
+				                 str "))</script>"],
+			                 fm)
+                  | _ => (E.errorAt loc "Absence/presence of 'dynClass' unknown";
+                          baseAll)
             end
 
           | L.EApp (
@@ -3541,7 +3543,7 @@
                         (L.EApp (
                          (L.EApp (
                           (L.EApp (
-                           (L.ECApp (
+                           (L.EApp (
                             (L.ECApp (
                              (L.ECApp (
                               (L.ECApp (
@@ -3549,8 +3551,10 @@
                                 (L.ECApp (
                                  (L.ECApp (
                                   (L.ECApp (
-                                   (L.EFfi ("Basis", "tag"),
-                                    _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                                   (L.ECApp (
+                                    (L.EFfi ("Basis", "tag"),
+                                     _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _),
+                            _), _),
                            _), _),
                           attrs), _),
                          _), _),
diff -r b71cc5ec59b3 -r ca3b73a7b4d0 src/tag.sml
--- a/src/tag.sml	Wed Dec 28 10:30:56 2011 -0500
+++ b/src/tag.sml	Wed Dec 28 18:05:27 2011 -0500
@@ -109,7 +109,7 @@
             (EApp (
              (EApp (
               (EApp (
-               (ECApp (
+               (EApp (
                 (ECApp (
                  (ECApp (
                   (ECApp (
@@ -117,10 +117,12 @@
                     (ECApp (
                      (ECApp (
                       (ECApp (
-                       (EFfi ("Basis", "tag"),
-                        loc), given), _), absent), _), outer), _), inner), _),
-                   useOuter), _), useInner), _), bindOuter), _), bindInner), _),
-               class), _),
+                       (ECApp (
+                        (EFfi ("Basis", "tag"),
+                         loc), given), _), absent), _), outer), _), inner), _),
+                    useOuter), _), useInner), _), bindOuter), _), bindInner), _),
+                class), _),
+               dynClass), _),
               attrs), _),
              tag), _),
             xml) =>
@@ -149,7 +151,7 @@
                       (EApp (
                        (EApp (
                         (EApp (
-                         (ECApp (
+                         (EApp (
                           (ECApp (
                            (ECApp (
                             (ECApp (
@@ -157,10 +159,11 @@
                               (ECApp (
                                (ECApp (
                                 (ECApp (
-                                 (EFfi ("Basis", "tag"),
-                                  loc), given), loc), absent), loc), outer), loc), inner), loc),
-                             useOuter), loc), useInner), loc), bindOuter), loc), bindInner), loc),
-                         class), loc),
+                                 (ECApp (
+                                  (EFfi ("Basis", "tag"),
+                                   loc), given), loc), absent), loc), outer), loc), inner), loc),
+                              useOuter), loc), useInner), loc), bindOuter), loc), bindInner), loc),
+                          class), loc), dynClass), loc),
                         (ERecord xets, loc)), loc),
                        tag), loc),
                       xml), s)
diff -r b71cc5ec59b3 -r ca3b73a7b4d0 src/urweb.grm
--- a/src/urweb.grm	Wed Dec 28 10:30:56 2011 -0500
+++ b/src/urweb.grm	Wed Dec 28 18:05:27 2011 -0500
@@ -1461,9 +1461,6 @@
                                                          val e = (EApp (e, case #2 tag of
                                                                                NONE => (EVar (["Basis"], "None", Infer), pos)
                                                                              | SOME c => (EApp ((EVar (["Basis"], "Some", Infer), pos), c), pos)), pos)
-                                                         val e = (EApp (e, case #3 tag of
-                                                                               NONE => (EVar (["Basis"], "None", Infer), pos)
-                                                                             | SOME c => (EApp ((EVar (["Basis"], "Some", Infer), pos), c), pos)), pos)
                                                      in
                                                          (EApp (e, xmlOpt), pos)
                                                      end