summaryrefslogtreecommitdiff
path: root/src/urweb.lex
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-06-07 12:01:55 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-06-07 12:01:55 -0400
commit2b3788462fada38dab4a72d036aff5e66b8d9240 (patch)
tree84a97087380ae2e0bff21d4227c8293dc42e80f8 /src/urweb.lex
parent6994a00f608335fc2e835538dfd84b70aa486d0f (diff)
&& and ||
Diffstat (limited to 'src/urweb.lex')
-rw-r--r--src/urweb.lex4
1 files changed, 4 insertions, 0 deletions
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));