changeset 1590:60d438cdb3a5

Adjust for different ml-lex behavior between SML/NJ and MLton
author Adam Chlipala <adam@chlipala.net>
date Sat, 05 Nov 2011 12:32:20 -0400
parents fb0388f1180e
children 20f898c29525
files src/urweb.lex tests/sigbug.ur tests/sigbug.urs
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/urweb.lex	Sat Nov 05 11:33:59 2011 -0400
+++ b/src/urweb.lex	Sat Nov 05 12:32:20 2011 -0400
@@ -416,7 +416,7 @@
 <INITIAL> "structure" => (Tokens.STRUCTURE (pos yypos, pos yypos + size yytext));
 <INITIAL> "signature" => (Tokens.SIGNATURE (pos yypos, pos yypos + size yytext));
 <INITIAL> "struct"    => (Tokens.STRUCT (pos yypos, pos yypos + size yytext));
-<INITIAL> "sig"       => (if yypos = 2 then initialSig () else (); Tokens.SIG (pos yypos, pos yypos + size yytext));
+<INITIAL> "sig"       => (if yypos <= 2 then initialSig () else (); Tokens.SIG (pos yypos, pos yypos + size yytext));
 <INITIAL> "let"       => (Tokens.LET (pos yypos, pos yypos + size yytext));
 <INITIAL> "in"        => (Tokens.IN (pos yypos, pos yypos + size yytext));
 <INITIAL> "end"       => (Tokens.END (pos yypos, pos yypos + size yytext));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sigbug.ur	Sat Nov 05 12:32:20 2011 -0400
@@ -0,0 +1,3 @@
+val z = 3
+val x = 1
+val y = 2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sigbug.urs	Sat Nov 05 12:32:20 2011 -0400
@@ -0,0 +1,3 @@
+val x : inta
+val y : into
+val z : introx