Mercurial > urweb
changeset 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 |
| files | demo/hello.urs lib/ur/basis.urs lib/ur/top.ur lib/ur/top.urs src/corify.sml src/elab_print.sig src/elaborate.sml src/monoize.sml src/urweb.grm |
| diffstat | 9 files changed, 206 insertions(+), 134 deletions(-) [+] |
line wrap: on
line diff
--- a/demo/hello.urs Sun Apr 12 10:08:11 2009 -0400 +++ b/demo/hello.urs Sun Apr 12 11:08:00 2009 -0400 @@ -1,1 +1,1 @@ -val main : unit -> transaction page +val main : unit -> transaction (page [])
--- a/lib/ur/basis.urs Sun Apr 12 10:08:11 2009 -0400 +++ b/lib/ur/basis.urs Sun Apr 12 11:08:00 2009 -0400 @@ -408,40 +408,64 @@ con css_class :: {Unit} -> Type (* The argument lists categories of properties that this class could set usefully. *) -con tag :: {Type} -> {Unit} -> {Unit} -> {Type} -> {Type} -> Type +con tag :: {Type} -> {Unit} -> {Unit} -> {Type} -> {Type} -> {Unit} -> Type +(* Arguments: + * 1. Attributes + * 2. Context for this tag + * 3. Context for inner XML + * 4. Form fields used + * 5. Form fields defined + * 6. CSS property categories that the tag might use + *) +con xml :: {Unit} -> {Type} -> {Type} -> {Unit} -> Type +(* Arguments: + * 1. Context + * 2. Form fields used + * 3. Form fields defined + * 4. CSS property categories that this XML fragment might use + *) -con xml :: {Unit} -> {Type} -> {Type} -> Type -val cdata : ctx ::: {Unit} -> use ::: {Type} -> string -> xml ctx use [] +con css_subset :: {Unit} -> {Unit} -> Type +val css_subset : cs1 ::: {Unit} -> cs2 ::: {Unit} -> [cs1 ~ cs2] + => css_subset cs1 (cs1 ++ cs2) + +val cdata : ctx ::: {Unit} -> use ::: {Type} -> css ::: {Unit} -> string -> xml ctx use [] css val tag : attrsGiven ::: {Type} -> attrsAbsent ::: {Type} -> ctxOuter ::: {Unit} -> ctxInner ::: {Unit} -> useOuter ::: {Type} -> useInner ::: {Type} -> bindOuter ::: {Type} -> bindInner ::: {Type} + -> css ::: {Unit} -> cssOuter ::: {Unit} -> cssInner ::: {Unit} -> [attrsGiven ~ attrsAbsent] => [useOuter ~ useInner] => [bindOuter ~ bindInner] => $attrsGiven -> tag (attrsGiven ++ attrsAbsent) - ctxOuter ctxInner useOuter bindOuter - -> xml ctxInner useInner bindInner - -> xml ctxOuter (useOuter ++ useInner) (bindOuter ++ bindInner) + ctxOuter ctxInner useOuter bindOuter cssOuter + -> css_subset cssOuter css + -> css_subset cssInner css + -> xml ctxInner useInner bindInner cssInner + -> xml ctxOuter (useOuter ++ useInner) (bindOuter ++ bindInner) css val join : ctx ::: {Unit} - -> use1 ::: {Type} -> bind1 ::: {Type} -> bind2 ::: {Type} - -> [use1 ~ bind1] => [bind1 ~ bind2] => - xml ctx use1 bind1 - -> xml ctx (use1 ++ bind1) bind2 - -> xml ctx use1 (bind1 ++ bind2) + -> use1 ::: {Type} -> bind1 ::: {Type} -> bind2 ::: {Type} + -> css ::: {Unit} -> css1 ::: {Unit} -> css2 ::: {Unit} + -> [use1 ~ bind1] => [bind1 ~ bind2] + => xml ctx use1 bind1 css1 + -> xml ctx (use1 ++ bind1) bind2 css2 + -> css_subset css1 css + -> css_subset css2 css + -> xml ctx use1 (bind1 ++ bind2) css val useMore : ctx ::: {Unit} -> use1 ::: {Type} -> use2 ::: {Type} - -> bind ::: {Type} + -> bind ::: {Type} -> css ::: {Unit} -> [use1 ~ use2] => - xml ctx use1 bind - -> xml ctx (use1 ++ use2) bind + xml ctx use1 bind css + -> xml ctx (use1 ++ use2) bind css con xhtml = xml [Html] con page = xhtml [] [] -con xbody = xml [Body] [] [] -con xtr = xml [Body, Tr] [] [] -con xform = xml [Body, Form] [] [] +con xbody = xml [Body] [] [] [] +con xtr = xml [Body, Tr] [] [] [] +con xform = xml [Body, Form] [] [] [] (*** HTML details *) @@ -453,21 +477,21 @@ con tabl = [Body, Table] con tr = [Body, Tr] -val dyn : use ::: {Type} -> bind ::: {Type} -> unit - -> tag [Signal = signal (xml body use bind)] body [] use bind +val dyn : use ::: {Type} -> bind ::: {Type} -> unit -> css ::: {Unit} + -> tag [Signal = signal (xml body use bind css)] body [] use bind css -val head : unit -> tag [] html head [] [] -val title : unit -> tag [] head [] [] [] +val head : unit -> tag [] html head [] [] [] +val title : unit -> tag [] head [] [] [] [] -val body : unit -> tag [Onload = transaction unit] html body [] [] +val body : unit -> tag [Onload = transaction unit] html body [] [] [] con bodyTag = fn (attrs :: {Type}) => ctx ::: {Unit} -> [[Body] ~ ctx] => - unit -> tag attrs ([Body] ++ ctx) ([Body] ++ ctx) [] [] + unit -> tag attrs ([Body] ++ ctx) ([Body] ++ ctx) [] [] [] con bodyTagStandalone = fn (attrs :: {Type}) => ctx ::: {Unit} -> [[Body] ~ ctx] => - unit -> tag attrs ([Body] ++ ctx) [] [] [] + unit -> tag attrs ([Body] ++ ctx) [] [] [] [] val br : bodyTagStandalone [] @@ -492,19 +516,19 @@ type url val bless : string -> url -val a : bodyTag [Link = transaction page, Href = url, Onclick = transaction unit] +val a : css ::: {Unit} -> bodyTag [Link = transaction (page css), Href = url, Onclick = transaction unit] val img : bodyTag [Src = url] -val form : ctx ::: {Unit} -> bind ::: {Type} +val form : ctx ::: {Unit} -> bind ::: {Type} -> css ::: {Unit} -> [[Body] ~ ctx] => - xml form [] bind - -> xml ([Body] ++ ctx) [] [] + xml form [] bind css + -> xml ([Body] ++ ctx) [] [] css con formTag = fn (ty :: Type) (inner :: {Unit}) (attrs :: {Type}) => ctx ::: {Unit} -> [[Form] ~ ctx] => nm :: Name -> unit - -> tag attrs ([Form] ++ ctx) inner [] [nm = ty] + -> tag attrs ([Form] ++ ctx) inner [] [nm = ty] [] val textbox : formTag string [] [Value = string, Size = int, Source = source string] val password : formTag string [] [Value = string, Size = int] val textarea : formTag string [] [Rows = int, Cols = int] @@ -513,42 +537,40 @@ con radio = [Body, Radio] val radio : formTag string radio [] -val radioOption : unit -> tag [Value = string] radio [] [] [] +val radioOption : unit -> tag [Value = string] radio [] [] [] [] con select = [Select] val select : formTag string select [] -val option : unit -> tag [Value = string, Selected = bool] select [] [] [] +val option : unit -> tag [Value = string, Selected = bool] select [] [] [] [] -val submit : ctx ::: {Unit} -> use ::: {Type} +val submit : ctx ::: {Unit} -> use ::: {Type} -> css ::: {Unit} -> [[Form] ~ ctx] => unit - -> tag [Value = string, Action = $use -> transaction page] - ([Form] ++ ctx) ([Form] ++ ctx) use [] + -> tag [Value = string, Action = $use -> transaction (page css)] + ([Form] ++ ctx) ([Form] ++ ctx) use [] [] +(*** Tables *) + +val tabl : other ::: {Unit} -> [other ~ [Body, Table]] => + unit -> tag [Border = int] ([Body] ++ other) ([Body, Table] ++ other) [] [] [Table] +val tr : other ::: {Unit} -> [other ~ [Body, Table, Tr]] => + unit -> tag [] ([Body, Table] ++ other) ([Body, Tr] ++ other) [] [] [] +val th : other ::: {Unit} -> [other ~ [Body, Tr]] => + unit -> tag [] ([Body, Tr] ++ other) ([Body] ++ other) [] [] [Cell] +val td : other ::: {Unit} -> [other ~ [Body, Tr]] => + unit -> tag [] ([Body, Tr] ++ other) ([Body] ++ other) [] [] [Cell] + (*** AJAX-oriented widgets *) con cformTag = fn (attrs :: {Type}) => ctx ::: {Unit} -> [[Body] ~ ctx] => - unit -> tag attrs ([Body] ++ ctx) [] [] [] + unit -> tag attrs ([Body] ++ ctx) [] [] [] [] val ctextbox : cformTag [Value = string, Size = int, Source = source string] val button : cformTag [Value = string, Onclick = transaction unit] -(*** Tables *) - -val tabl : other ::: {Unit} -> [other ~ [Body, Table]] => - unit -> tag [Border = int] ([Body] ++ other) ([Body, Table] ++ other) [] [] -val tr : other ::: {Unit} -> [other ~ [Body, Table, Tr]] => - unit -> tag [] ([Body, Table] ++ other) ([Body, Tr] ++ other) [] [] -val th : other ::: {Unit} -> [other ~ [Body, Tr]] => - unit -> tag [] ([Body, Tr] ++ other) ([Body] ++ other) [] [] -val td : other ::: {Unit} -> [other ~ [Body, Tr]] => - unit -> tag [] ([Body, Tr] ++ other) ([Body] ++ other) [] [] - (** Aborting *) -val error : t ::: Type -> xml [Body] [] [] -> t - - +val error : t ::: Type -> xml [Body] [] [] [] -> t
--- a/lib/ur/top.ur Sun Apr 12 10:08:11 2009 -0400 +++ b/lib/ur/top.ur Sun Apr 12 11:08:00 2009 -0400 @@ -71,7 +71,7 @@ fun compose (t1 ::: Type) (t2 ::: Type) (t3 ::: Type) (f1 : t2 -> t3) (f2 : t1 -> t2) (x : t1) = f1 (f2 x) -fun txt (t ::: Type) (ctx ::: {Unit}) (use ::: {Type}) (_ : show t) (v : t) = +fun txt (t ::: Type) (ctx ::: {Unit}) (use ::: {Type}) (css ::: {Unit}) (_ : show t) (v : t) = cdata (show v) fun foldUR (tf :: Type) (tr :: {Unit} -> Type) @@ -94,11 +94,11 @@ f [nm] [rest] ! r1.nm r2.nm (acc (r1 -- nm) (r2 -- nm))) (fn _ _ => i) -fun foldURX2 (tf1 :: Type) (tf2 :: Type) (ctx :: {Unit}) +fun foldURX2 (css ::: {Unit}) (tf1 :: Type) (tf2 :: Type) (ctx :: {Unit}) (f : nm :: Name -> rest :: {Unit} -> [[nm] ~ rest] => - tf1 -> tf2 -> xml ctx [] []) = - foldUR2 [tf1] [tf2] [fn _ => xml ctx [] []] + tf1 -> tf2 -> xml ctx [] [] css) = + foldUR2 [tf1] [tf2] [fn _ => xml ctx [] [] css] (fn (nm :: Name) (rest :: {Unit}) [[nm] ~ rest] v1 v2 acc => <xml>{f [nm] [rest] ! v1 v2}{acc}</xml>) <xml/> @@ -124,20 +124,20 @@ f [nm] [t] [rest] ! r1.nm r2.nm (acc (r1 -- nm) (r2 -- nm))) (fn _ _ => i) -fun foldRX K (tf :: K -> Type) (ctx :: {Unit}) +fun foldRX K (css ::: {Unit}) (tf :: K -> Type) (ctx :: {Unit}) (f : nm :: Name -> t :: K -> rest :: {K} -> [[nm] ~ rest] => - tf t -> xml ctx [] []) = - foldR [tf] [fn _ => xml ctx [] []] + tf t -> xml ctx [] [] css) = + foldR [tf] [fn _ => xml ctx [] [] css] (fn (nm :: Name) (t :: K) (rest :: {K}) [[nm] ~ rest] r acc => <xml>{f [nm] [t] [rest] ! r}{acc}</xml>) <xml/> -fun foldRX2 K (tf1 :: K -> Type) (tf2 :: K -> Type) (ctx :: {Unit}) +fun foldRX2 K (css ::: {Unit}) (tf1 :: K -> Type) (tf2 :: K -> Type) (ctx :: {Unit}) (f : nm :: Name -> t :: K -> rest :: {K} -> [[nm] ~ rest] => - tf1 t -> tf2 t -> xml ctx [] []) = - foldR2 [tf1] [tf2] [fn _ => xml ctx [] []] + tf1 t -> tf2 t -> xml ctx [] [] css) = + foldR2 [tf1] [tf2] [fn _ => xml ctx [] [] css] (fn (nm :: Name) (t :: K) (rest :: {K}) [[nm] ~ rest] r1 r2 acc => <xml>{f [nm] [t] [rest] ! r1 r2}{acc}</xml>) @@ -151,18 +151,18 @@ (fn fs _ => f fs) () -fun queryX (tables ::: {{Type}}) (exps ::: {Type}) (ctx ::: {Unit}) +fun queryX (tables ::: {{Type}}) (exps ::: {Type}) (ctx ::: {Unit}) (css ::: {Unit}) [tables ~ exps] (q : sql_query tables exps) (f : $(exps ++ map (fn fields :: {Type} => $fields) tables) - -> xml ctx [] []) = + -> xml ctx [] [] css) = query q (fn fs acc => return <xml>{acc}{f fs}</xml>) <xml/> -fun queryX' (tables ::: {{Type}}) (exps ::: {Type}) (ctx ::: {Unit}) +fun queryX' (tables ::: {{Type}}) (exps ::: {Type}) (ctx ::: {Unit}) (css ::: {Unit}) [tables ~ exps] (q : sql_query tables exps) (f : $(exps ++ map (fn fields :: {Type} => $fields) tables) - -> transaction (xml ctx [] [])) = + -> transaction (xml ctx [] [] css)) = query q (fn fs acc => r <- f fs;
--- a/lib/ur/top.urs Sun Apr 12 10:08:11 2009 -0400 +++ b/lib/ur/top.urs Sun Apr 12 11:08:00 2009 -0400 @@ -39,8 +39,8 @@ val compose : t1 ::: Type -> t2 ::: Type -> t3 ::: Type -> (t2 -> t3) -> (t1 -> t2) -> (t1 -> t3) -val txt : t ::: Type -> ctx ::: {Unit} -> use ::: {Type} -> show t -> t - -> xml ctx use [] +val txt : t ::: Type -> ctx ::: {Unit} -> use ::: {Type} -> css ::: {Unit} -> show t -> t + -> xml ctx use [] css val foldUR : tf :: Type -> tr :: ({Unit} -> Type) -> (nm :: Name -> rest :: {Unit} @@ -54,11 +54,11 @@ tf1 -> tf2 -> tr rest -> tr ([nm] ++ rest)) -> tr [] -> r :: {Unit} -> folder r -> $(mapU tf1 r) -> $(mapU tf2 r) -> tr r -val foldURX2: tf1 :: Type -> tf2 :: Type -> ctx :: {Unit} +val foldURX2: css ::: {Unit} -> tf1 :: Type -> tf2 :: Type -> ctx :: {Unit} -> (nm :: Name -> rest :: {Unit} -> [[nm] ~ rest] => - tf1 -> tf2 -> xml ctx [] []) - -> r :: {Unit} -> folder r -> $(mapU tf1 r) -> $(mapU tf2 r) -> xml ctx [] [] + tf1 -> tf2 -> xml ctx [] [] css) + -> r :: {Unit} -> folder r -> $(mapU tf1 r) -> $(mapU tf2 r) -> xml ctx [] [] css val foldR : K --> tf :: (K -> Type) -> tr :: ({K} -> Type) -> (nm :: Name -> t :: K -> rest :: {K} @@ -74,18 +74,18 @@ -> tr [] -> r :: {K} -> folder r -> $(map tf1 r) -> $(map tf2 r) -> tr r -val foldRX : K --> tf :: (K -> Type) -> ctx :: {Unit} +val foldRX : K --> css ::: {Unit} -> tf :: (K -> Type) -> ctx :: {Unit} -> (nm :: Name -> t :: K -> rest :: {K} -> [[nm] ~ rest] => - tf t -> xml ctx [] []) - -> r :: {K} -> folder r -> $(map tf r) -> xml ctx [] [] + tf t -> xml ctx [] [] css) + -> r :: {K} -> folder r -> $(map tf r) -> xml ctx [] [] css -val foldRX2 : K --> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> ctx :: {Unit} +val foldRX2 : K --> css ::: {Unit} -> tf1 :: (K -> Type) -> tf2 :: (K -> Type) -> ctx :: {Unit} -> (nm :: Name -> t :: K -> rest :: {K} -> [[nm] ~ rest] => - tf1 t -> tf2 t -> xml ctx [] []) + tf1 t -> tf2 t -> xml ctx [] [] css) -> r :: {K} -> folder r - -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] [] + -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] [] css val queryI : tables ::: {{Type}} -> exps ::: {Type} -> [tables ~ exps] => @@ -94,19 +94,19 @@ -> transaction unit) -> transaction unit -val queryX : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit} +val queryX : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit} -> css ::: {Unit} -> [tables ~ exps] => sql_query tables exps -> ($(exps ++ map (fn fields :: {Type} => $fields) tables) - -> xml ctx [] []) - -> transaction (xml ctx [] []) + -> xml ctx [] [] css) + -> transaction (xml ctx [] [] css) -val queryX' : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit} +val queryX' : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit} -> css ::: {Unit} -> [tables ~ exps] => sql_query tables exps -> ($(exps ++ map (fn fields :: {Type} => $fields) tables) - -> transaction (xml ctx [] [])) - -> transaction (xml ctx [] []) + -> transaction (xml ctx [] [] css)) + -> transaction (xml ctx [] [] css) val oneOrNoRows : tables ::: {{Type}} -> exps ::: {Type} -> [tables ~ exps] =>
--- a/src/corify.sml Sun Apr 12 10:08:11 2009 -0400 +++ b/src/corify.sml Sun Apr 12 11:08:00 2009 -0400 @@ -923,10 +923,11 @@ ran' as (L.CApp ((L.CApp - ((L.CApp ((L.CModProj (basis', [], "xml"), _), - (L.CRecord (_, [((L.CName "Html", _), - _)]), _)), _), _), - _), _), _))) => + ((L.CApp + ((L.CApp ((L.CModProj (basis', [], "xml"), _), + (L.CRecord (_, [((L.CName "Html", _), + _)]), _)), _), _), + _), _), _), _), _))) => let val ran = (L.TRecord (L.CRecord ((L.KType, loc), []), loc), loc) val ranT = (L.CApp ((L.CModProj (basis, [], "transaction"), loc),
--- a/src/elab_print.sig Sun Apr 12 10:08:11 2009 -0400 +++ b/src/elab_print.sig Sun Apr 12 11:08:00 2009 -0400 @@ -36,6 +36,7 @@ val p_decl : ElabEnv.env -> Elab.decl Print.printer val p_sgn_item : ElabEnv.env -> Elab.sgn_item Print.printer val p_sgn : ElabEnv.env -> Elab.sgn Print.printer + val p_str : ElabEnv.env -> Elab.str Print.printer val p_file : ElabEnv.env -> Elab.file Print.printer val debug : bool ref
--- a/src/elaborate.sml Sun Apr 12 10:08:11 2009 -0400 +++ b/src/elaborate.sml Sun Apr 12 11:08:00 2009 -0400 @@ -3284,30 +3284,40 @@ (L'.CApp (tf, arg), _) => (case (hnormCon env tf, hnormCon env arg) of ((L'.CModProj (basis, [], "transaction"), _), - (L'.CApp (tf, arg3), _)) => + (L'.CApp (tf, arg4), _)) => (case (basis = !basis_r, - hnormCon env tf, hnormCon env arg3) of + hnormCon env tf, hnormCon env arg4) of (true, - (L'.CApp (tf, arg2), _), + (L'.CApp (tf, arg3), _), ((L'.CRecord (_, []), _))) => - (case (hnormCon env tf) of - (L'.CApp (tf, arg1), _) => - (case (hnormCon env tf, - hnormCon env arg1, - hnormCon env arg2) of - (tf, arg1, - (L'.CRecord (_, []), _)) => - let - val t = (L'.CApp (tf, arg1), loc) - val t = (L'.CApp (t, arg2), loc) - val t = (L'.CApp (t, arg3), loc) - val t = (L'.CApp ( - (L'.CModProj - (basis, [], "transaction"), loc), + (case hnormCon env tf of + (L'.CApp (tf, arg2), _) => + (case hnormCon env tf of + (L'.CApp (tf, arg1), _) => + (case (hnormCon env tf, + hnormCon env arg1, + hnormCon env arg2, + hnormCon env arg3, + hnormCon env arg4) of + (tf, + arg1, + (L'.CRecord (_, []), _), + arg2, + arg4) => + let + val t = (L'.CApp (tf, arg1), loc) + val t = (L'.CApp (t, arg2), loc) + val t = (L'.CApp (t, arg3), loc) + val t = (L'.CApp (t, arg4), loc) + + val t = (L'.CApp ( + (L'.CModProj + (basis, [], "transaction"), loc), t), loc) - in - (L'.SgiVal (x, n, makeRes t), loc) - end + in + (L'.SgiVal (x, n, makeRes t), loc) + end + | _ => all) | _ => all) | _ => all) | _ => all) @@ -3622,6 +3632,16 @@ [] => () | _ => raise Fail "Unresolved disjointness constraints in top.urs" val (topStr, topSgn', gs) = elabStr (env', D.empty) (L.StrConst topStr, ErrorMsg.dummySpan) + + val () = subSgn env' topSgn' topSgn + + val () = app (fn (env, k, s1, s2) => + unifySummaries env (k, normalizeRecordSummary env s1, normalizeRecordSummary env s2) + handle CUnify' err => (ErrorMsg.errorAt (#2 k) "Error in Top final record unification"; + cunifyError env err)) + (!delayedUnifs) + val () = delayedUnifs := [] + val () = case gs of [] => () | _ => app (fn Disjoint (loc, env, denv, c1, c2) => @@ -3631,7 +3651,8 @@ (prefaces "Unresolved constraint in top.ur" [("loc", PD.string (ErrorMsg.spanToString loc)), ("c1", p_con env c1), - ("c2", p_con env c2)]; + ("c2", p_con env c2), + ("topStr", p_str env topStr)]; raise Fail "Unresolved constraint in top.ur")) | TypeClass (env, c, r, loc) => let @@ -3642,8 +3663,6 @@ | NONE => expError env (Unresolvable (loc, c)) end) gs - val () = subSgn env' topSgn' topSgn - val (env', top_n) = E.pushStrNamed env' "Top" topSgn val () = top_r := top_n
--- a/src/monoize.sml Sun Apr 12 10:08:11 2009 -0400 +++ b/src/monoize.sml Sun Apr 12 11:08:00 2009 -0400 @@ -127,10 +127,14 @@ readType (mt env dtmap t, loc) | L.CFfi ("Basis", "url") => (L'.TFfi ("Basis", "string"), loc) - | L.CApp ((L.CApp ((L.CApp ((L.CFfi ("Basis", "xml"), _), _), _), _), _), _) => + | L.CApp ((L.CApp ((L.CApp ((L.CApp ((L.CFfi ("Basis", "xml"), _), _), _), _), _), _), _), _) => (L'.TFfi ("Basis", "string"), loc) | L.CApp ((L.CApp ((L.CFfi ("Basis", "xhtml"), _), _), _), _) => (L'.TFfi ("Basis", "string"), loc) + | L.CApp ((L.CFfi ("Basis", "css_class"), _), _) => + (L'.TFfi ("Basis", "string"), loc) + | L.CApp ((L.CApp ((L.CFfi ("Basis", "css_subset"), _), _), _), _) => + (L'.TRecord [], loc) | L.CApp ((L.CFfi ("Basis", "transaction"), _), t) => (L'.TFun ((L'.TRecord [], loc), mt env dtmap t), loc) @@ -2003,7 +2007,9 @@ | L.EApp ( (L.ECApp ( - (L.ECApp ((L.EFfi ("Basis", "cdata"), _), _), _), + (L.ECApp ( + (L.ECApp ((L.EFfi ("Basis", "cdata"), _), _), _), + _), _), _), _), se) => let @@ -2012,19 +2018,32 @@ ((L'.EFfiApp ("Basis", "htmlifyString", [se]), loc), fm) end + | L.ECApp ((L.ECApp ((L.EFfi ("Basis", "css_subset"), _), _), _), _) => + ((L'.ERecord [], loc), fm) + | L.EApp ( (L.EApp ( - (L.ECApp ( - (L.ECApp ( + (L.EApp ( + (L.EApp ( (L.ECApp ( (L.ECApp ( - (L.EFfi ("Basis", "join"), - _), _), _), + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.EFfi ("Basis", "join"), + _), _), _), + _), _), + _), _), + _), _), + _), _), + _), _), _), _), - _), _), - _), _), - xml1), _), - xml2) => + xml1), _), + xml2), _), + _), _), + _) => let val (xml1, fm) = monoExp (env, st, fm) xml1 val (xml2, fm) = monoExp (env, st, fm) xml2 @@ -2035,18 +2054,26 @@ | L.EApp ( (L.EApp ( (L.EApp ( - (L.ECApp ( - (L.ECApp ( + (L.EApp ( + (L.EApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( - (L.EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), - attrs), _), - tag), _), + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + _), _), _), _), _), _), + attrs), _), + tag), _), + _), _), + _), _), xml) => let fun getTag' (e, _) =
--- 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