user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the parser more careful about keywords

Browse source 
Keywords are now only recognized in contexts where they are valid. The
lexer no longer recognizes them, all words are lexed as IDENT tokens,
that get interpreted by the parser.
This commit is contained in:
Marijn Haverbeke 2011-05-13 21:30:08 +02:00
parent be9aa1cc5e
commit 57ffa2a487
6 changed files with 614 additions and 1154 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/comp/pretty/pprust.rs
View file

@ -9,7 +9,6 @@ import util::common;
import pp::end; import pp::wrd; import pp::space; import pp::line;
const uint indent_unit = 4u;
const int as_prec = 5;
const uint default_columns = 78u;
type ps = @rec(pp::ps s,
@ -494,7 +493,7 @@ fn print_expr(ps s, &@ast::expr expr) {
print_literal(s, lit);
}
case (ast::expr_cast(?expr,?ty,_)) {
print_maybe_parens(s, expr, as_prec);
print_maybe_parens(s, expr, front::parser::as_prec);
space(s.s);
wrd1(s, "as");
print_type(s, ty);
@ -888,7 +887,7 @@ fn print_maybe_parens(ps s, @ast::expr expr, int outer_prec) {
add_them = operator_prec(op) < outer_prec;
}
case (ast::expr_cast(_,_,_)) {
add_them = as_prec < outer_prec;
add_them = front::parser::as_prec < outer_prec;
}
case (_) {
add_them = false;