bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: Divide keywords into contextual/restricted. No bad words

Browse source
This commit is contained in:
Brian Anderson 2012-04-24 22:33:49 -07:00
parent 08d0707556
commit c9e3f387f4
4 changed files with 62 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustsyntax/parse/common.rs
View file

@ -43,7 +43,7 @@ fn parse_path_list_ident(p: parser) -> ast::path_list_ident {
}
fn parse_value_ident(p: parser) -> ast::ident {
check_bad_expr_word(p);
check_restricted_keywords(p);
ret parse_ident(p);
}
@ -87,15 +87,15 @@ fn expect_keyword(p: parser, word: str) {
}
}
fn is_bad_expr_word(p: parser, word: str) -> bool {
p.bad_expr_words.contains_key(word)
fn is_restricted_keyword(p: parser, word: str) -> bool {
p.restricted_keywords.contains_key(word)
}
fn check_bad_expr_word(p: parser) {
fn check_restricted_keywords(p: parser) {
alt p.token {
token::IDENT(_, false) {
let w = token_to_str(p.reader, p.token);
if is_bad_expr_word(p, w) {
if is_restricted_keyword(p, w) {
p.fatal("found `" + w + "` in expression position");
}
}