Mercurial > urweb

diff src/urweb.lex @ 842:d1b6acaec265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
&& and ||
author Adam Chlipala <adamc@hcoop.net>
date Sun, 07 Jun 2009 12:01:55 -0400
parents 5154a047c6bc
children 10114d7b7477
line wrap: on
line diff
--- a/src/urweb.lex	Sun Jun 07 11:13:18 2009 -0400
+++ b/src/urweb.lex	Sun Jun 07 12:01:55 2009 -0400
@@ -333,6 +333,9 @@
 <INITIAL> "---"       => (Tokens.MINUSMINUSMINUS (pos yypos, pos yypos + size yytext));
 <INITIAL> "^"         => (Tokens.CARET (pos yypos, pos yypos + size yytext));
 
+<INITIAL> "&&"        => (Tokens.ANDALSO (pos yypos, pos yypos + size yytext));
+<INITIAL> "||"        => (Tokens.ORELSE (pos yypos, pos yypos + size yytext));
+
 <INITIAL> "="         => (Tokens.EQ (pos yypos, pos yypos + size yytext));
 <INITIAL> "<>"        => (Tokens.NE (pos yypos, pos yypos + size yytext));
 <INITIAL> "<"         => (Tokens.LT (pos yypos, pos yypos + size yytext));
@@ -377,6 +380,7 @@
 <INITIAL> "then"      => (Tokens.THEN (pos yypos, pos yypos + size yytext));
 <INITIAL> "else"      => (Tokens.ELSE (pos yypos, pos yypos + size yytext));
 
+
 <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));