mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove remaining use of 'pred' and make 'pred' a non-reserved word. Huzzah\!

Browse Source
This commit is contained in:
Tim Chevalier 2011-08-25 22:26:45 -07:00
parent 63f9b43d36
commit b099760269
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/comp/syntax/parse/parser.rs
View File

@ -173,7 +173,6 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
words.insert("fn", ());
words.insert("block", ());
words.insert("lambda", ());
words.insert("pred", ()); // FIXME: remove
words.insert("pure", ());
words.insert("iter", ());
words.insert("block", ());
@ -2135,11 +2134,6 @@ fn parse_item(p: &parser, attrs: &[ast::attribute]) -> option::t<@ast::item> {
expect_word(p, "fn");
ret some(parse_item_fn_or_iter(p, ast::pure_fn, ast::proto_fn, attrs,
ast::il_normal));
}
// FIXME: remove
else if eat_word(p, "pred") {
ret some(parse_item_fn_or_iter(p, ast::pure_fn, ast::proto_fn, attrs,
ast::il_normal));
} else if eat_word(p, "iter") {
ret some(parse_item_fn_or_iter(p, ast::impure_fn, ast::proto_iter,
attrs, ast::il_normal));

4
src/lib/str.rs
View File

@ -156,10 +156,10 @@ fn is_ascii(s: str) -> bool {
fn alloc(n_bytes: uint) -> str { ret rustrt::str_alloc(n_bytes); }
/// Returns true if the string has length 0
pred is_empty(s: str) -> bool { for c: u8 in s { ret false; } ret true; }
pure fn is_empty(s: str) -> bool { for c: u8 in s { ret false; } ret true; }
/// Returns true if the string has length greater than 0
pred is_not_empty(s: str) -> bool { !is_empty(s) }
pure fn is_not_empty(s: str) -> bool { !is_empty(s) }
fn is_whitespace(s: str) -> bool {
let i = 0u;