---

yaml
---
r: 20990
b: refs/heads/snap-stage3
c: 436a90e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 43c9c637d345ca75ffec7583806ebd8b0520e31b
+refs/heads/snap-stage3: 436a90e3d78a81379e36c8acec49e170bb1cd0e6
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/parse/parser.rs

@@ -2440,66 +2440,19 @@ class parser {
             tps = ~[];
         }
 
-        let mut ident;
-        let ty, traits;
-        if !self.is_keyword(~"of") &&
-                !self.token_is_keyword(~"of", self.look_ahead(1)) &&
-                !self.token_is_keyword(~"for", self.look_ahead(1)) &&
-                self.look_ahead(1) != token::BINOP(token::SLASH) &&
-                (self.look_ahead(1) != token::LT
-                 || (self.look_ahead(1) == token::LT && tps.is_not_empty())) {
-
-            // This is a new-style impl declaration.
-            ident = @~"__extensions__";     // XXX: clownshoes
-
-            // Parse the type.
-            ty = self.parse_ty(false);
-
-            // Parse traits, if necessary.
-            if self.token == token::COLON {
-                self.bump();
-                traits = self.parse_trait_ref_list(token::LBRACE);
-            } else {
-                traits = ~[];
-            }
-        } else {
-            self.warn(~"old-style named impl?");
-            let mut ident_old;
-            if self.token == token::BINOP(token::SLASH) {
-                self.parse_region_param();
-                ident_old = none;
-                tps = self.parse_ty_params();
-            } else if self.is_keyword(~"of") {
-                ident_old = none;
-            } else {
-                ident_old = some(self.parse_ident());
-                self.parse_region_param();
-                tps = self.parse_ty_params();
-            }
+        // This is a new-style impl declaration.
+        let ident = @~"__extensions__";     // XXX: clownshoes
 
-            if self.eat_keyword(~"of") {
-                let for_atom = (*self.reader.interner()).intern(@~"for");
-                traits = self.parse_trait_ref_list
-                    (token::IDENT(for_atom, false));
-                if traits.len() >= 1 && option::is_none(ident_old) {
-                    ident_old = some(vec::last(traits[0].path.idents));
-                }
-                if traits.len() == 0 {
-                    self.fatal(~"BUG: 'of' but no trait");
-                }
-                if traits.len() > 1 {
-                    self.fatal(~"BUG: multiple traits");
-                }
-            } else {
-                traits = ~[];
-            };
-            ident = match ident_old {
-              some(name) => name,
-              none => { self.expect_keyword(~"of"); fail; }
-            };
-            self.expect_keyword(~"for");
-            ty = self.parse_ty(false);
-        }
+        // Parse the type.
+        let ty = self.parse_ty(false);
+
+        // Parse traits, if necessary.
+        let traits = if self.token == token::COLON {
+            self.bump();
+            self.parse_trait_ref_list(token::LBRACE)
+        } else {
+            ~[]
+        };
 
         let mut meths = ~[];
         self.expect(token::LBRACE);