---

yaml
---
r: 11698
b: refs/heads/master
c: 19c651f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6224fdcd08bf94f0410e804ff8f144fc5494ec6d
+refs/heads/master: 19c651f4a18597b72113777a9122fc1f2a1ac6bb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/syntax/parse/parser.rs

@@ -416,6 +416,21 @@ fn parse_ret_ty(p: parser) -> (ast::ret_style, @ast::ty) {
     }
 }
 
+fn parse_region(p: parser) -> ast::region {
+    alt p.token {
+        token::IDENT(sid, _) if p.look_ahead(1u) == token::DOT {
+            let string = p.get_str(sid);
+            p.bump(); p.bump();
+            if string == "self" {
+                ast::re_self
+            } else {
+                ast::re_named(string)
+            }
+        }
+        _ { ast::re_inferred }
+    }
+}
+
 fn parse_ty(p: parser, colons_before_params: bool) -> @ast::ty {
     let lo = p.span.lo;
 
@@ -467,6 +482,11 @@ fn parse_ty(p: parser, colons_before_params: bool) -> @ast::ty {
         let t = ast::ty_vec(parse_mt(p));
         expect(p, token::RBRACKET);
         t
+    } else if p.token == token::BINOP(token::AND) {
+        p.bump();
+        let region = parse_region(p);
+        let mt = parse_mt(p);
+        ast::ty_rptr(region, mt)
     } else if eat_word(p, "fn") {
         let proto = parse_fn_ty_proto(p);
         alt proto {