Simplify AST for expr_anon_obj.

6 files changed, 8 insertions, 9 deletions

diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs
index 5f8e301d6e2..4a4b3db4785 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/comp/syntax/ast.rs
@@ -296,7 +296,7 @@ tag expr_ {
     expr_if_check(@expr, block, option::t[@expr]);
     expr_port(option::t[@ty]);
     expr_chan(@expr);
-    expr_anon_obj(anon_obj, vec[ty_param], obj_def_ids);
+    expr_anon_obj(anon_obj, vec[ty_param]);
 }
 
 type lit = spanned[lit_];
diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs
index f36eeddeeb6..64c28ad829a 100644
--- a/src/comp/syntax/fold.rs
+++ b/src/comp/syntax/fold.rs
@@ -429,8 +429,8 @@ fn noop_fold_expr(&expr_ e, ast_fold fld) -> expr_ {
                 })
                 }
         case (expr_chan(?e)) { expr_chan(fld.fold_expr(e)) }
-        case (expr_anon_obj(?ao, ?typms, ?odis)) {
-            expr_anon_obj(fold_anon_obj(ao), typms, odis)
+        case (expr_anon_obj(?ao, ?typms)) {
+            expr_anon_obj(fold_anon_obj(ao), typms)
                 }
     }
 }
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 1e4ca951d07..209ddcc7ff6 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -801,8 +801,7 @@ fn parse_bottom_expr(&parser p) -> @ast::expr {
         // "spanned".
         let ast::anon_obj ob =
             rec(fields=fields, methods=meths, with_obj=with_obj);
-        auto odid = rec(ty=p.get_id(), ctor=p.get_id());
-        ex = ast::expr_anon_obj(ob, ty_params, odid);
+        ex = ast::expr_anon_obj(ob, ty_params);
     } else if (eat_word(p, "rec")) {
         expect(p, token::LPAREN);
         auto fields = [parse_field(p)];
@@ -1592,7 +1591,7 @@ fn stmt_ends_with_semi(&ast::stmt stmt) -> bool {
                 case (ast::expr_if_check(_, _, _)) { false }
                 case (ast::expr_port(_)) { true }
                 case (ast::expr_chan(_)) { true }
-                case (ast::expr_anon_obj(_,_,_)) { false }
+                case (ast::expr_anon_obj(_,_)) { false }
                 case (ast::expr_assert(_)) { true }
             }
         }
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index 86ae4cbd295..2ae7c36553f 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -953,7 +953,7 @@ fn print_expr(&ps s, &@ast::expr expr) {
             print_expr(s, expr);
             pclose(s);
         }
-        case (ast::expr_anon_obj(_, _, _)) {
+        case (ast::expr_anon_obj(_, _)) {
             word(s.s, "anon obj");
             // FIXME (issue #499): nicer pretty-printing of anon objs
 
diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs
index a709814a9a3..96dccf28b12 100644
--- a/src/comp/syntax/visit.rs
+++ b/src/comp/syntax/visit.rs
@@ -371,7 +371,7 @@ fn visit_expr[E](&@expr ex, &E e, &vt[E] v) {
         case (expr_assert(?x)) { vt(v).visit_expr(x, e, v); }
         case (expr_port(_)) { }
         case (expr_chan(?x)) { vt(v).visit_expr(x, e, v); }
-        case (expr_anon_obj(?anon_obj, _, _)) {
+        case (expr_anon_obj(?anon_obj, _)) {
             alt (anon_obj.fields) {
                 case (none) { }
                 case (some(?fields)) {
diff --git a/src/comp/syntax/walk.rs b/src/comp/syntax/walk.rs
index 79e8ca6dca6..2b74f81f9b3 100644
--- a/src/comp/syntax/walk.rs
+++ b/src/comp/syntax/walk.rs
@@ -380,7 +380,7 @@ fn walk_expr(&ast_visitor v, @ast::expr e) {
         case (ast::expr_assert(?x)) { walk_expr(v, x); }
         case (ast::expr_port(_)) { }
         case (ast::expr_chan(?x)) { walk_expr(v, x); }
-        case (ast::expr_anon_obj(?anon_obj, _, _)) {
+        case (ast::expr_anon_obj(?anon_obj, _)) {
             // Fields
 
             alt (anon_obj.fields) {