From 33ce1164e20d8f0f87cc19eed7281786de72a424 Mon Sep 17 00:00:00 2001
From: Lindsey Kuper <lkuper@mozilla.com>
Date: Fri, 8 Jul 2011 15:00:47 -0700
Subject: [PATCH] Nicer pretty-printing for anon objs.  Closes #499.

(Incidentally, what's the right way to test changes to the
pretty-printer?  There has to be a better way than what I did, which
was to log_err the results of expr_to_str as exprs passed through
trans and glance at the output.)
---
 src/comp/syntax/print/pprust.rs | 53 +++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index 0bcb7f57df31..65705ff48fb7 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -986,10 +986,57 @@ fn print_expr(&ps s, &@ast::expr expr) {
             print_expr(s, expr);
             pclose(s);
         }
-        case (ast::expr_anon_obj(_, _)) {
-            word(s.s, "anon obj");
-            // FIXME (issue #499): nicer pretty-printing of anon objs
+        case (ast::expr_anon_obj(?anon_obj, ?tps)) {
+            head(s, "obj");
+            print_type_params(s, tps);
 
+            // Fields
+            popen(s);
+            fn print_field(&ps s, &ast::anon_obj_field field) {
+                ibox(s, indent_unit);
+                print_mutability(s, field.mut);
+                print_type(s, *field.ty);
+                space(s.s);
+                word(s.s, field.ident);
+                word_space(s, "=");
+                print_expr(s, field.expr);
+                end(s);
+            }
+            fn get_span(&ast::anon_obj_field f) -> codemap::span { 
+                ret f.ty.span; 
+            }
+            alt (anon_obj.fields) {
+                case (none) { }
+                case (some(?fields)) {
+                    commasep_cmnt_ivec(s, consistent, fields, print_field, 
+                                       get_span);
+                }
+            }
+            pclose(s);
+            space(s.s);
+            bopen(s);
+
+            // Methods
+            for (@ast::method meth in anon_obj.methods) {
+                let ast::ty_param[] typarams = ~[];
+                hardbreak_if_not_bol(s);
+                maybe_print_comment(s, meth.span.lo);
+                print_fn(s, meth.node.meth.decl, meth.node.meth.proto,
+                         meth.node.ident, typarams);
+                word(s.s, " ");
+                print_block(s, meth.node.meth.body);
+            }
+            space(s.s);
+
+            // With object
+            alt (anon_obj.with_obj) {
+                case (none) { }
+                case (some(?e)) {
+                    word_space(s, "with");
+                    print_expr(s, e);
+                }
+            }
+            bclose(s, expr.span);
         }
     }
     s.ann.post(ann_node);