Pretty print vectors as ~[] instead of []/~. Closes #2863.

rust-lang · Jul 10, 2012 · 0070527 · 0070527
1 parent 14f19bd
commit 0070527
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 52 deletions.
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -378,8 +378,20 @@ fn print_type_ex(s: ps, &&ty: @ast::ty, print_colons: bool) {
         word(s.s, constrs_str(cs, ty_constr_to_str));
       }
       ast::ty_vstore(t, v) {
-        print_type(s, t);
-        print_vstore(s, v);
+        // If it is a vector, print it in prefix notation.
+        // Someday it will all be like this.
+        let is_fixed = alt v { ast::vstore_fixed(_) { true } _ { false } };
+        alt t.node {
+          ast::ty_vec(*) if !is_fixed {
+            print_vstore(s, v);
+            print_type(s, t);
+          }
+          _ {
+            print_type(s, t);
+            word(s.s, "/");
+            print_vstore(s, v);
+          }
+        }
       }
       ast::ty_mac(_) {
           fail "print_type doesn't know how to print a ty_mac";
@@ -826,11 +838,11 @@ fn print_mac(s: ps, m: ast::mac) {
 
 fn print_vstore(s: ps, t: ast::vstore) {
     alt t {
-      ast::vstore_fixed(some(i)) { word(s.s, #fmt("/%u", i)); }
-      ast::vstore_fixed(none) { word(s.s, "/_"); }
-      ast::vstore_uniq { word(s.s, "/~"); }
-      ast::vstore_box { word(s.s, "/@"); }
-      ast::vstore_slice(r) { word(s.s, "/"); print_region(s, r); }
+      ast::vstore_fixed(some(i)) { word(s.s, #fmt("%u", i)); }
+      ast::vstore_fixed(none) { word(s.s, "_"); }
+      ast::vstore_uniq { word(s.s, "~"); }
+      ast::vstore_box { word(s.s, "@"); }
+      ast::vstore_slice(r) { print_region(s, r); }
     }
 }
 
@@ -841,8 +853,20 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
     s.ann.pre(ann_node);
     alt expr.node {
       ast::expr_vstore(e, v) {
-        print_expr(s, e);
-        print_vstore(s, v);
+        // If it is a vector, print it in prefix notation.
+        // Someday it will all be like this.
+        let is_fixed = alt v { ast::vstore_fixed(_) { true } _ { false } };
+        alt e.node {
+          ast::expr_vec(*) if !is_fixed {
+            print_vstore(s, v);
+            print_expr(s, e);
+          }
+          _ {
+            print_expr(s, e);
+            word(s.s, "/");
+            print_vstore(s, v);
+          }
+        }
       }
       ast::expr_vec(exprs, mutbl) {
         ibox(s, indent_unit);
@@ -1121,7 +1145,7 @@ fn print_expr_parens_if_not_bot(s: ps, ex: @ast::expr) {
       ast::expr_assign_op(_, _, _) | ast::expr_swap(_, _) |
       ast::expr_log(_, _, _) | ast::expr_assert(_) |
       ast::expr_call(_, _, true) |
-      ast::expr_check(_, _) { true }
+      ast::expr_check(_, _) | ast::expr_vstore(_, _) { true }
       _ { false }
     };
     if parens { popen(s); }

diff --git a/src/rustc/util/ppaux.rs b/src/rustc/util/ppaux.rs
@@ -223,8 +223,12 @@ fn ty_to_str(cx: ctxt, typ: t) -> str {
         parameterized(cx, base, substs.self_r, substs.tps)
       }
       ty_evec(mt, vs) {
-        #fmt["[%s]/%s", mt_to_str(cx, mt),
-             vstore_to_str(cx, vs)]
+        alt vs {
+          ty::vstore_fixed(_) {
+            #fmt["[%s]/%s", mt_to_str(cx, mt), vstore_to_str(cx, vs)]
+          }
+          _ { #fmt["%s[%s]", vstore_to_str(cx, vs), mt_to_str(cx, mt)] }
+        }
       }
       ty_estr(vs) { #fmt["str/%s", vstore_to_str(cx, vs)] }
       ty_opaque_box { "@?" }

diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs
@@ -1,2 +1,2 @@
-// error-pattern:expected `str` but found `[int]/~`
+// error-pattern:expected `str` but found `~[int]`
 fn main() { fail ~[0i]; }
diff --git a/src/test/compile-fail/vec-field.rs b/src/test/compile-fail/vec-field.rs
@@ -1,4 +1,4 @@
-// error-pattern:attempted access of field `some_field_name` on type `[int]/~`
+// error-pattern:attempted access of field `some_field_name` on type `~[int]`
 // issue #367
 
 fn f() {

diff --git a/src/test/pretty/vec-comments.pp b/src/test/pretty/vec-comments.pp
@@ -3,27 +3,27 @@
 // pp-exact:vec-comments.pp
 fn main() {
     let v1 =
-        [
-         // Comment
-         0,
-         // Comment
-         1,
-         // Comment
-         2]/~;
+        ~[
+          // Comment
+          0,
+          // Comment
+          1,
+          // Comment
+          2];
     let v2 =
-        [0, // Comment
-         1, // Comment
-         2]/~; // Comment
+        ~[0, // Comment
+          1, // Comment
+          2]; // Comment
     let v3 =
-        [
-         /* Comment */
-         0,
-         /* Comment */
-         1,
-         /* Comment */
-         2]/~;
+        ~[
+          /* Comment */
+          0,
+          /* Comment */
+          1,
+          /* Comment */
+          2];
     let v4 =
-        [0, /* Comment */
-         1, /* Comment */
-         2]/~; /* Comment */
+        ~[0, /* Comment */
+          1, /* Comment */
+          2]; /* Comment */
 }
diff --git a/src/test/pretty/vec-comments.rs b/src/test/pretty/vec-comments.rs
@@ -4,26 +4,26 @@
 fn main() {
     let v1 =
         ~[
-         // Comment
-         0,
-         // Comment
-         1,
-         // Comment
-         2];
+          // Comment
+          0,
+          // Comment
+          1,
+          // Comment
+          2];
     let v2 =
         ~[0, // Comment
-         1, // Comment
-         2]; // Comment
+          1, // Comment
+          2]; // Comment
     let v3 =
         ~[
-         /* Comment */
-         0,
-         /* Comment */
-         1,
-         /* Comment */
-         2];
+          /* Comment */
+          0,
+          /* Comment */
+          1,
+          /* Comment */
+          2];
     let v4 =
         ~[0, /* Comment */
-         1, /* Comment */
-         2]; /* Comment */
+          1, /* Comment */
+          2]; /* Comment */
 }
diff --git a/src/test/pretty/vec-type.pp b/src/test/pretty/vec-type.pp
@@ -1,5 +1,5 @@
 // pp-exact:vec-type.pp
 
-fn f1(x: [int]/~) { }
+fn f1(x: ~[int]) { }
 
-fn g1() { f1([1, 2, 3]/~); }
+fn g1() { f1(~[1, 2, 3]); }