diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2011-12-28 18:05:27 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2011-12-28 18:05:27 -0500 |
| commit | 20a5fbfa1207f2aaf79fc3547e424231aedf27c8 (patch) | |
| tree | 105850027486f19df08828bcff6f848427666f1b | |
| parent | 60641180b57089c353d52e3d9f9ff8769a483ff3 (diff) | |
Get a few more source files up-to-date with change to [tag] type
| -rw-r--r-- | src/css.sml | 18 | ||||
| -rw-r--r-- | src/monoize.sml | 22 | ||||
| -rw-r--r-- | src/tag.sml | 23 | ||||
| -rw-r--r-- | src/urweb.grm | 3 |
4 files changed, 37 insertions, 29 deletions
diff --git a/src/css.sml b/src/css.sml index 73f180d9..90c0b5dd 100644 --- a/src/css.sml +++ b/src/css.sml @@ -144,7 +144,7 @@ fun summarize file = (EApp ( (EApp ( (EApp ( - (ECApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( @@ -152,9 +152,11 @@ fun summarize file = (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 @@ fun summarize file = (EApp ( (EApp ( (EApp ( - (ECApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( @@ -190,8 +192,10 @@ fun summarize file = (ECApp ( (ECApp ( (ECApp ( - (EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + (ECApp ( + (EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + _), _), _), _), attrs), _), tag), _), diff --git a/src/monoize.sml b/src/monoize.sml index 3d3b0395..2b3abb61 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -3501,12 +3501,14 @@ fun monoExp (env, st, fm) (all as (e, loc)) = 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 @@ fun monoExp (env, st, fm) (all as (e, loc)) = (L.EApp ( (L.EApp ( (L.EApp ( - (L.ECApp ( + (L.EApp ( (L.ECApp ( (L.ECApp ( (L.ECApp ( @@ -3549,8 +3551,10 @@ fun monoExp (env, st, fm) (all as (e, loc)) = (L.ECApp ( (L.ECApp ( (L.ECApp ( - (L.EFfi ("Basis", "tag"), - _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + (L.ECApp ( + (L.EFfi ("Basis", "tag"), + _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), _), + _), _), _), _), attrs), _), _), _), diff --git a/src/tag.sml b/src/tag.sml index dc648739..26c23586 100644 --- a/src/tag.sml +++ b/src/tag.sml @@ -109,7 +109,7 @@ fun exp env (e, s) = (EApp ( (EApp ( (EApp ( - (ECApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( @@ -117,10 +117,12 @@ fun exp env (e, s) = (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 @@ fun exp env (e, s) = (EApp ( (EApp ( (EApp ( - (ECApp ( + (EApp ( (ECApp ( (ECApp ( (ECApp ( @@ -157,10 +159,11 @@ fun exp env (e, s) = (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 --git a/src/urweb.grm b/src/urweb.grm index 167e841d..7ec580f3 100644 --- a/src/urweb.grm +++ b/src/urweb.grm @@ -1461,9 +1461,6 @@ xmlOne : NOTAGS (EApp ((EVar (["Basis"], "cdata", Infer) 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 |