comparison src/urweb.lex @ 842:d1b6acaec265

&& and ||
author Adam Chlipala <adamc@hcoop.net>
date Sun, 07 Jun 2009 12:01:55 -0400
parents 5154a047c6bc
children 10114d7b7477
comparison
equal deleted inserted replaced
841:44c2c089ca15 842:d1b6acaec265
331 <INITIAL> "++" => (Tokens.PLUSPLUS (pos yypos, pos yypos + size yytext)); 331 <INITIAL> "++" => (Tokens.PLUSPLUS (pos yypos, pos yypos + size yytext));
332 <INITIAL> "--" => (Tokens.MINUSMINUS (pos yypos, pos yypos + size yytext)); 332 <INITIAL> "--" => (Tokens.MINUSMINUS (pos yypos, pos yypos + size yytext));
333 <INITIAL> "---" => (Tokens.MINUSMINUSMINUS (pos yypos, pos yypos + size yytext)); 333 <INITIAL> "---" => (Tokens.MINUSMINUSMINUS (pos yypos, pos yypos + size yytext));
334 <INITIAL> "^" => (Tokens.CARET (pos yypos, pos yypos + size yytext)); 334 <INITIAL> "^" => (Tokens.CARET (pos yypos, pos yypos + size yytext));
335 335
336 <INITIAL> "&&" => (Tokens.ANDALSO (pos yypos, pos yypos + size yytext));
337 <INITIAL> "||" => (Tokens.ORELSE (pos yypos, pos yypos + size yytext));
338
336 <INITIAL> "=" => (Tokens.EQ (pos yypos, pos yypos + size yytext)); 339 <INITIAL> "=" => (Tokens.EQ (pos yypos, pos yypos + size yytext));
337 <INITIAL> "<>" => (Tokens.NE (pos yypos, pos yypos + size yytext)); 340 <INITIAL> "<>" => (Tokens.NE (pos yypos, pos yypos + size yytext));
338 <INITIAL> "<" => (Tokens.LT (pos yypos, pos yypos + size yytext)); 341 <INITIAL> "<" => (Tokens.LT (pos yypos, pos yypos + size yytext));
339 <INITIAL> ">" => (Tokens.GT (pos yypos, pos yypos + size yytext)); 342 <INITIAL> ">" => (Tokens.GT (pos yypos, pos yypos + size yytext));
340 <INITIAL> "<=" => (Tokens.LE (pos yypos, pos yypos + size yytext)); 343 <INITIAL> "<=" => (Tokens.LE (pos yypos, pos yypos + size yytext));
375 <INITIAL> "case" => (Tokens.CASE (pos yypos, pos yypos + size yytext)); 378 <INITIAL> "case" => (Tokens.CASE (pos yypos, pos yypos + size yytext));
376 <INITIAL> "if" => (Tokens.IF (pos yypos, pos yypos + size yytext)); 379 <INITIAL> "if" => (Tokens.IF (pos yypos, pos yypos + size yytext));
377 <INITIAL> "then" => (Tokens.THEN (pos yypos, pos yypos + size yytext)); 380 <INITIAL> "then" => (Tokens.THEN (pos yypos, pos yypos + size yytext));
378 <INITIAL> "else" => (Tokens.ELSE (pos yypos, pos yypos + size yytext)); 381 <INITIAL> "else" => (Tokens.ELSE (pos yypos, pos yypos + size yytext));
379 382
383
380 <INITIAL> "structure" => (Tokens.STRUCTURE (pos yypos, pos yypos + size yytext)); 384 <INITIAL> "structure" => (Tokens.STRUCTURE (pos yypos, pos yypos + size yytext));
381 <INITIAL> "signature" => (Tokens.SIGNATURE (pos yypos, pos yypos + size yytext)); 385 <INITIAL> "signature" => (Tokens.SIGNATURE (pos yypos, pos yypos + size yytext));
382 <INITIAL> "struct" => (Tokens.STRUCT (pos yypos, pos yypos + size yytext)); 386 <INITIAL> "struct" => (Tokens.STRUCT (pos yypos, pos yypos + size yytext));
383 <INITIAL> "sig" => (if yypos = 2 then initialSig () else (); Tokens.SIG (pos yypos, pos yypos + size yytext)); 387 <INITIAL> "sig" => (if yypos = 2 then initialSig () else (); Tokens.SIG (pos yypos, pos yypos + size yytext));
384 <INITIAL> "let" => (Tokens.LET (pos yypos, pos yypos + size yytext)); 388 <INITIAL> "let" => (Tokens.LET (pos yypos, pos yypos + size yytext));