diff src/urweb.grm @ 719:5c099b1308ae

hello compiles with CSS
author Adam Chlipala <adamc@hcoop.net>
date Sun, 12 Apr 2009 11:08:00 -0400
parents f152f215a02c
children acb8537f58f0
line wrap: on
line diff
--- a/src/urweb.grm	Sun Apr 12 10:08:11 2009 -0400
+++ b/src/urweb.grm	Sun Apr 12 11:08:00 2009 -0400
@@ -1208,11 +1208,12 @@
 
 xml    : xmlOne xml                     (let
                                              val pos = s (xmlOneleft, xmlright)
+                                             val e = (EVar (["Basis"], "join", Infer), pos)
+                                             val e = (EApp (e, xmlOne), pos)
+                                             val e = (EApp (e, xml), pos)
+                                             val e = (EApp (e, (EVar (["Basis"], "css_subset", Infer), pos)), pos)
                                          in
-                                             (EApp ((EApp (
-                                                     (EVar (["Basis"], "join", Infer), pos),
-                                                  xmlOne), pos),
-                                                    xml), pos)
+                                             (EApp (e, (EVar (["Basis"], "css_subset", Infer), pos)), pos)
                                          end)
        | xmlOne                         (xmlOne)
 
@@ -1227,6 +1228,7 @@
                                                      let
                                                          val e = (EVar (["Basis"], "cdata", DontInfer), pos)
                                                          val e = (ECApp (e, (CWild (KWild, pos), pos)), pos)
+                                                         val e = (ECApp (e, (CRecord [], pos)), pos)
                                                      in
                                                          (ECApp (e, (CRecord [], pos)), pos)
                                                      end
@@ -1267,13 +1269,13 @@
 
 tag    : tagHead attrs                  (let
                                              val pos = s (tagHeadleft, attrsright)
+                                             val e = (EVar (["Basis"], "tag", Infer), pos)
+                                             val e = (EApp (e, (ERecord attrs, pos)), pos)
+                                             val e = (EApp (e, (EApp (#2 tagHead, (ERecord [], pos)), pos)), pos)
+                                             val e = (EApp (e, (EVar (["Basis"], "css_subset", Infer), pos)), pos)
+                                             val e = (EApp (e, (EVar (["Basis"], "css_subset", Infer), pos)), pos)
                                          in
-                                             (#1 tagHead,
-                                              (EApp ((EApp ((EVar (["Basis"], "tag", Infer), pos),
-                                                            (ERecord attrs, pos)), pos),
-                                                     (EApp (#2 tagHead,
-                                                            (ERecord [], pos)), pos)),
-                                               pos))
+                                             (#1 tagHead, e)
                                          end)
 
 tagHead: BEGIN_TAG                      (let