diff options
| author | bors <bors@rust-lang.org> | 2013-02-13 18:49:29 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-13 18:49:29 -0800 |
| commit | 6efa3543a8b38f0dcbe89e7bf6d14f571bad46ac (patch) | |
| tree | 52ddd48eee689ac78b216e2165a63d9ea90ffa39 /src/libsyntax/parse/token.rs | |
| parent | 0ae74bef188fe4f1fff69c0fa85d308c40bce7f8 (diff) | |
| parent | f9d789fa083220cc9d84cbea94868606600c64a9 (diff) | |
| download | rust-6efa3543a8b38f0dcbe89e7bf6d14f571bad46ac.tar.gz rust-6efa3543a8b38f0dcbe89e7bf6d14f571bad46ac.zip | |
auto merge of #4922 : jbclements/rust/add-deriving-eq-to-asts, r=catamorphism
r? Apply deriving_eq to the data structures in ast.rs, and get rid of the custom definitions of eq that were everywhere. resulting ast.rs is about 400 lines shorter. Also: add a few test cases and a bunch of comments. Also: change ast_ty_to_ty_cache to use node ids rather than ast::ty's. I believe this was a suggestion related to my changes, and it appears to pass all tests. Also: tiny doc fix, remove references to crate keywords.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index dbcb3d756c8..92d25d5d193 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -25,6 +25,7 @@ use std::oldmap::HashMap; #[auto_encode] #[auto_decode] +#[deriving_eq] pub enum binop { PLUS, MINUS, @@ -86,6 +87,7 @@ pub enum Token { LIT_STR(ast::ident), /* Name components */ + // an identifier contains an "is_mod_name" boolean. IDENT(ast::ident, bool), UNDERSCORE, LIFETIME(ast::ident), @@ -517,12 +519,6 @@ pub fn reserved_keyword_table() -> HashMap<~str, ()> { words } -impl binop : cmp::Eq { - pure fn eq(&self, other: &binop) -> bool { - ((*self) as uint) == ((*other) as uint) - } - pure fn ne(&self, other: &binop) -> bool { !(*self).eq(other) } -} impl Token : cmp::Eq { pure fn eq(&self, other: &Token) -> bool { |
