diff src/urweb.lex @ 2220:794017f378de

Merge.
author Ziv Scully <ziv@mit.edu>
date Mon, 24 Nov 2014 20:47:38 -0500
parents 6d126af2e1cb
children d4ed20beb93b 278e10629ba1
line wrap: on
line diff
--- a/src/urweb.lex	Mon Nov 24 20:41:24 2014 -0500
+++ b/src/urweb.lex	Mon Nov 24 20:47:38 2014 -0500
@@ -277,19 +277,19 @@
                                    continue ())
                           end);
 
-<INITIAL> "<" {id} "/>"=>(let
+<INITIAL> "<" {xmlid} "/>"=>(let
 			      val tag = String.substring (yytext, 1, size yytext - 3)
 			  in
 			      Tokens.XML_BEGIN_END (tag, yypos, yypos + size yytext)
 			  end);
-<INITIAL> "<" {id} ">"=> (let
+<INITIAL> "<" {xmlid} ">"=> (let
 			      val tag = String.substring (yytext, 1, size yytext - 2)
 			  in
 			      YYBEGIN XML;
 			      xmlTag := tag :: (!xmlTag);
 			      Tokens.XML_BEGIN (tag, yypos, yypos + size yytext)
 			  end);
-<XML> "</" {id} ">"   => (let
+<XML> "</" {xmlid} ">" => (let
 			      val id = String.substring (yytext, 2, size yytext - 3)
 			  in
 			      case !xmlTag of
@@ -304,7 +304,7 @@
 			          Tokens.END_TAG (id, yypos, yypos + size yytext)
 			  end);
 
-<XML> "<" {id}        => (YYBEGIN XMLTAG;
+<XML> "<" {xmlid}     => (YYBEGIN XMLTAG;
 			  Tokens.BEGIN_TAG (String.extract (yytext, 1, NONE),
 					    yypos, yypos + size yytext));