comparison src/urweb.lex @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 403f0cc65b9c
children 6d126af2e1cb
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
443 <INITIAL> "class" => (Tokens.CLASS (pos yypos, pos yypos + size yytext)); 443 <INITIAL> "class" => (Tokens.CLASS (pos yypos, pos yypos + size yytext));
444 <INITIAL> "cookie" => (Tokens.COOKIE (pos yypos, pos yypos + size yytext)); 444 <INITIAL> "cookie" => (Tokens.COOKIE (pos yypos, pos yypos + size yytext));
445 <INITIAL> "style" => (Tokens.STYLE (pos yypos, pos yypos + size yytext)); 445 <INITIAL> "style" => (Tokens.STYLE (pos yypos, pos yypos + size yytext));
446 <INITIAL> "task" => (Tokens.TASK (pos yypos, pos yypos + size yytext)); 446 <INITIAL> "task" => (Tokens.TASK (pos yypos, pos yypos + size yytext));
447 <INITIAL> "policy" => (Tokens.POLICY (pos yypos, pos yypos + size yytext)); 447 <INITIAL> "policy" => (Tokens.POLICY (pos yypos, pos yypos + size yytext));
448 <INITIAL> "ffi" => (Tokens.FFI (pos yypos, pos yypos + size yytext));
448 449
449 <INITIAL> "Type" => (Tokens.TYPE (pos yypos, pos yypos + size yytext)); 450 <INITIAL> "Type" => (Tokens.TYPE (pos yypos, pos yypos + size yytext));
450 <INITIAL> "Name" => (Tokens.NAME (pos yypos, pos yypos + size yytext)); 451 <INITIAL> "Name" => (Tokens.NAME (pos yypos, pos yypos + size yytext));
451 <INITIAL> "Unit" => (Tokens.KUNIT (pos yypos, pos yypos + size yytext)); 452 <INITIAL> "Unit" => (Tokens.KUNIT (pos yypos, pos yypos + size yytext));
452 453