From 2b3788462fada38dab4a72d036aff5e66b8d9240 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sun, 7 Jun 2009 12:01:55 -0400
Subject: && and ||

---
 src/urweb.lex | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/urweb.lex')

diff --git a/src/urweb.lex b/src/urweb.lex
index c23dfe62..38816a3c 100644
--- a/src/urweb.lex
+++ b/src/urweb.lex
@@ -333,6 +333,9 @@ notags = [^<{\n]+;
 <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 @@ notags = [^<{\n]+;
 <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));
-- 
cgit v1.2.3