Mercurial > urweb

changeset 1299:3c334458c84f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typing of cut operators; fix lexing of XML comments
author Adam Chlipala <adam@chlipala.net>
date Thu, 16 Sep 2010 15:34:50 -0400
parents e665527fce1c
children e3944a8a128a
files src/elaborate.sml src/urweb.lex
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/elaborate.sml	Thu Sep 09 12:42:25 2010 -0400
+++ b/src/elaborate.sml	Thu Sep 16 15:34:50 2010 -0400
@@ -1998,6 +1998,7 @@
                             
                 val gs3 = D.prove env denv (first, rest, loc)
             in
+                checkKind env c' ck kname;
                 ((L'.ECut (e', c', {field = ft, rest = rest}), loc), (L'.TRecord rest, loc),
                  gs1 @ enD gs2 @ enD gs3)
             end
@@ -2013,6 +2014,7 @@
                             
                 val gs3 = D.prove env denv (c', rest, loc)
             in
+                checkKind env c' ck (L'.KRecord ktype, loc);
                 ((L'.ECutMulti (e', c', {rest = rest}), loc), (L'.TRecord rest, loc),
                  gs1 @ enD gs2 @ enD gs3)
             end
--- a/src/urweb.lex	Thu Sep 09 12:42:25 2010 -0400
+++ b/src/urweb.lex	Thu Sep 16 15:34:50 2010 -0400
@@ -172,7 +172,7 @@
 ws = [\ \t\012];
 intconst = [0-9]+;
 realconst = [0-9]+\.[0-9]*;
-notags = [^<{\n(]+;
+notags = ([^<{\n(]|(\([^\*]))+;
 xcom = ([^\-]|(-[^\-]))+;
 oint = [0-9][0-9][0-9];
 xint = x[0-9a-fA-F][0-9a-fA-F];