Merge remote-tracking branch 'graydon/master' into typestate_4

2 files changed, 3 insertions, 3 deletions

diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index db625124be4..0653e45d268 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -379,7 +379,7 @@ type anon_obj = rec(
     option::t[vec[obj_field]] fields,
     vec[@method] methods,
     // with_obj: the original object being extended, if it exists.
-    option::t[ident] with_obj);
+    option::t[@expr] with_obj);
 
 type _mod = rec(vec[@view_item] view_items,
                 vec[@item] items);
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index a2f877f2c23..a39f57e5216 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -820,13 +820,13 @@ fn parse_bottom_expr(&parser p) -> @ast::expr {
         }
 
         let vec[@ast::method] meths = [];
-        let option::t[ast::ident] with_obj = none[ast::ident];
+        let option::t[@ast::expr] with_obj = none[@ast::expr];
 
         expect(p, token::LBRACE);
 
         while (p.peek() != token::RBRACE) {
             if (eat_word(p, "with")) {
-                with_obj = some[ast::ident](parse_ident(p));
+                with_obj = some[@ast::expr](parse_expr(p));
             } else {
                 vec::push[@ast::method](meths,
                                          parse_method(p));