# HG changeset patch # User Adam Chlipala # Date 1215119675 14400 # Node ID 94afff1ff7f6429bdd3f2480f861bfa954338373 # Parent 1a4c51fa615c5414f80f93fe5f677bd8963d11af More fun with HTML diff -r 1a4c51fa615c -r 94afff1ff7f6 lib/basis.lig --- a/lib/basis.lig Thu Jul 03 17:02:42 2008 -0400 +++ b/lib/basis.lig Thu Jul 03 17:14:35 2008 -0400 @@ -20,3 +20,8 @@ val head : tag [Html] [Head] val title : tag [Head] [] + +val body : tag [Html] [Body] +val p : tag [Body] [Body] +val b : tag [Body] [Body] +val i : tag [Body] [Body] diff -r 1a4c51fa615c -r 94afff1ff7f6 src/elaborate.sml --- a/src/elaborate.sml Thu Jul 03 17:02:42 2008 -0400 +++ b/src/elaborate.sml Thu Jul 03 17:14:35 2008 -0400 @@ -1810,6 +1810,11 @@ | L.DStr (x, sgno, str) => let + val () = if x = "Basis" then + raise Fail "Not allowed to redefine structure 'Basis'" + else + () + val formal = Option.map (elabSgn (env, denv)) sgno val (str', sgn', gs') = diff -r 1a4c51fa615c -r 94afff1ff7f6 src/lacweb.grm --- a/src/lacweb.grm Thu Jul 03 17:02:42 2008 -0400 +++ b/src/lacweb.grm Thu Jul 03 17:14:35 2008 -0400 @@ -259,7 +259,12 @@ | FN SYMBOL kcolon kind DARROW eexp (ECAbs (kcolon, SYMBOL, kind, eexp), s (FNleft, eexpright)) | FN SYMBOL COLON cexp DARROW eexp (EAbs (SYMBOL, SOME cexp, eexp), s (FNleft, eexpright)) | FN SYMBOL DARROW eexp (EAbs (SYMBOL, NONE, eexp), s (FNleft, eexpright)) - | FN cterm TWIDDLE cterm DARROW eexp(EDisjoint (cterm1, cterm2, eexp), s (cterm1left, eexpright)) + | LBRACK cterm TWIDDLE cterm RBRACK DARROW eexp(EDisjoint (cterm1, cterm2, eexp), s (LBRACKleft, RBRACKright)) + | FN UNIT DARROW eexp (let + val loc = s (FNleft, eexpright) + in + (EAbs ("_", SOME (TRecord (CRecord [], loc), loc), eexp), loc) + end) | LPAREN eexp RPAREN DCOLON cexp (EAnnot (eexp, cexp), s (LPARENleft, cexpright)) | eterm DOT ident (EField (eterm, ident), s (etermleft, identright)) diff -r 1a4c51fa615c -r 94afff1ff7f6 tests/html.lac --- a/tests/html.lac Thu Jul 03 17:02:42 2008 -0400 +++ b/tests/html.lac Thu Jul 03 17:14:35 2008 -0400 @@ -1,5 +1,9 @@ -val text : xml[Html] = +val main = fn () => Hello World! + + + Hello World! +