Change the ivec type syntax to [T].

erickt · erickt · commit 4ea04c925fb1 · 2011-08-05T08:23:27.000-07:00
This preserves the old syntax for now.
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
@@ -554,6 +554,11 @@ fn parse_ty(p: &parser) -> @ast::ty {
         t = ast::ty_vec(parse_mt(p));
         hi = p.get_hi_pos();
         expect(p, token::RBRACKET);
+    } else if (p.peek() == token::LBRACKET) {
+        expect(p, token::LBRACKET);
+        t = ast::ty_ivec(parse_mt(p));
+        hi = p.get_hi_pos();
+        expect(p, token::RBRACKET);
     } else if (eat_word(p, "fn")) {
         let flo = p.get_last_lo_pos();
         t = parse_ty_fn(ast::proto_fn, p, flo);
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
@@ -287,24 +287,13 @@ fn print_type(s: &ps, ty: &ast::ty) {
       ast::ty_box(mt) { word(s.s, "@"); print_mt(s, mt); }
       ast::ty_vec(mt) { word(s.s, "vec["); print_mt(s, mt); word(s.s, "]"); }
       ast::ty_ivec(mt) {
-        let parens =
-            alt mt.ty.node {
-              ast::ty_box(_) | ast::ty_vec(_) | ast::ty_ptr(_) |
-              ast::ty_port(_) | ast::ty_chan(_) {
-                true
-              }
-              ast::ty_path(pt, _) { ivec::len(pt.node.types) > 0u }
-              _ { false }
-            };
-        if parens { popen(s); }
-        print_type(s, *mt.ty);
-        if parens { pclose(s); }
         word(s.s, "[");
         alt mt.mut {
-          ast::mut. { word(s.s, "mutable"); }
-          ast::maybe_mut. { word(s.s, "mutable?"); }
+          ast::mut. { word_space(s, "mutable"); }
+          ast::maybe_mut. { word_space(s, "mutable?"); }
           ast::imm. {}
         }
+        print_type(s, *mt.ty);
         word(s.s, "]");
       }
       ast::ty_ptr(mt) { word(s.s, "*"); print_mt(s, mt); }
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
@@ -73,13 +73,13 @@ mod map_reduce {
     type reducer = fn(str, getter) ;
 
     tag ctrl_proto {
-        find_reducer(u8[], chan[chan[reduce_proto]]);
+        find_reducer([u8], chan[chan[reduce_proto]]);
         mapper_done;
     }
 
     tag reduce_proto { emit_val(int); done; ref; release; }
 
-    fn start_mappers(ctrl: chan[ctrl_proto], inputs: vec[str]) -> task[] {
+    fn start_mappers(ctrl: chan[ctrl_proto], inputs: vec[str]) -> [task] {
         let tasks = ~[];
         // log_err "starting mappers";
         for i: str  in inputs {
diff --git a/src/test/compiletest/compiletest.rs b/src/test/compiletest/compiletest.rs
@@ -25,7 +25,7 @@ fn main(args: vec[str]) {
     run_tests(config);
 }
 
-fn parse_config(args: &str[]) -> config {
+fn parse_config(args: &[str]) -> config {
     let opts =
         ~[getopts::reqopt("compile-lib-path"),
           getopts::reqopt("run-lib-path"), getopts::reqopt("rustc-path"),
@@ -117,7 +117,7 @@ fn test_opts(config: &config) -> test::test_opts {
 }
 
 type tests_and_conv_fn =
-    {tests: test::test_desc[], to_task: fn(&fn() ) -> task };
+    {tests: [test::test_desc], to_task: fn(&fn() ) -> task };
 
 fn make_tests(cx: &cx) -> tests_and_conv_fn {
     log #fmt("making tests from %s", cx.config.src_base);
diff --git a/src/test/compiletest/header.rs b/src/test/compiletest/header.rs
@@ -11,7 +11,7 @@ export is_test_ignored;
 
 type test_props = {
     // Lines that should be expected, in order, on standard out
-    error_patterns: str[],
+    error_patterns: [str],
     // Extra flags to pass to the compiler
     compile_flags: option::t[str],
     // If present, the name of a file that this test should match when
diff --git a/src/test/compiletest/procsrv.rs b/src/test/compiletest/procsrv.rs
@@ -27,7 +27,7 @@ type reqchan = chan[request];
 type handle = {task: option::t[task], chan: reqchan};
 
 tag request {
-    exec(str, str, str[], chan[response]);
+    exec(str, str, [str], chan[response]);
     stop;
 }
 
@@ -189,7 +189,7 @@ fn clone_str(s: &str) -> str {
     new
 }
 
-fn clone_ivecstr(v: &str[]) -> str[] {
+fn clone_ivecstr(v: &[str]) -> [str] {
     let r = ~[];
     for t: str in ivec::slice(v, 0u, ivec::len(v)) {
         r += ~[clone_str(t)];
diff --git a/src/test/pretty/ivec-type.pp b/src/test/pretty/ivec-type.pp
@@ -0,0 +1,9 @@
+// pp-exact:ivec-type.pp
+
+fn f1(x: [int]) { }
+
+fn g1() { f1(~[1, 2, 3]); }
+
+fn f2(x: [int]) { }
+
+fn g2() { f2(~[1, 2, 3]); }
diff --git a/src/test/pretty/ivec-type.rs b/src/test/pretty/ivec-type.rs
@@ -0,0 +1,9 @@
+// pp-exact:ivec-type.pp
+
+fn f1(x: int[]) { }
+
+fn g1() { f1(~[1, 2, 3]); }
+
+fn f2(x: [int]) { }
+
+fn g2() { f2(~[1, 2, 3]); }
diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs
@@ -2,6 +2,6 @@ tag option[T] { some(T); none; }
 
 type r[T] = {mutable v: (option[T])[]};
 
-fn f[T]() -> T[] { ret ~[]; }
+fn f[T]() -> [T] { ret ~[]; }
 
-fn main() { let r: r[int] = {mutable v: ~[]}; r.v = f(); }
+fn main() { let r: r[int] = {mutable v: ~[]}; r.v = f(); }
diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs
@@ -1,9 +1,9 @@
-fn f[T](x: &T[]) -> T { ret x.(0); }
+fn f[T](x: &[T]) -> T { ret x.(0); }
 
-fn g(act: fn(&int[]) -> int ) -> int { ret act(~[1, 2, 3]); }
+fn g(act: fn(&[int]) -> int ) -> int { ret act(~[1, 2, 3]); }
 
 fn main() {
     assert (g(f) == 1);
-    let f1: fn(&str[]) -> str  = f;
+    let f1: fn(&[str]) -> str  = f;
     assert (f1(~["x", "y", "z"]) == "x");
-}
+}
diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/run-pass/infer-fn-tail-expr.rs
@@ -1,5 +1,5 @@
 // issue #680
 
-fn f() -> int[] { ~[] }
+fn f() -> [int] { ~[] }
 
-fn main() { }
+fn main() { }
diff --git a/src/test/run-pass/interior-vec.rs b/src/test/run-pass/interior-vec.rs
@@ -3,11 +3,11 @@
 import rusti::ivec_len;
 
 native "rust-intrinsic" mod rusti {
-    fn ivec_len[T](v: &T[]) -> uint;
+    fn ivec_len[T](v: &[T]) -> uint;
 }
 
 fn main() {
-    let v: int[] = ~[];
+    let v: [int] = ~[];
     assert (ivec_len(v) == 0u); // zero-length
     let x = ~[1, 2];
     assert (ivec_len(x) == 2u); // on stack
diff --git a/src/test/run-pass/issue-687.rs b/src/test/run-pass/issue-687.rs
@@ -1,20 +1,20 @@
 use std;
 import std::ivec;
 
-tag msg { closed; received(u8[]); }
+tag msg { closed; received([u8]); }
 
-fn producer(c: chan[u8[]]) {
+fn producer(c: chan[[u8]]) {
     c <| ~[1u8, 2u8, 3u8, 4u8];
-    let empty: u8[] = ~[];
+    let empty: [u8] = ~[];
     c <| empty;
 }
 
-fn packager(cb: chan[chan[u8[]]], msg: chan[msg]) {
-    let p: port[u8[]] = port();
+fn packager(cb: chan[chan[[u8]]], msg: chan[msg]) {
+    let p: port[[u8]] = port();
     cb <| chan(p);
     while true {
         log "waiting for bytes";
-        let data: u8[];
+        let data: [u8];
         p |> data;
         log "got bytes";
         if ivec::len[u8](data) == 0u {
@@ -33,10 +33,10 @@ fn packager(cb: chan[chan[u8[]]], msg: chan[msg]) {
 
 fn main() {
     let p: port[msg] = port();
-    let recv_reader: port[chan[u8[]]] = port();
+    let recv_reader: port[chan[[u8]]] = port();
     let pack = spawn packager(chan(recv_reader), chan(p));
 
-    let source_chan: chan[u8[]];
+    let source_chan: chan[[u8]];
     recv_reader |> source_chan;
     let prod: task = spawn producer(source_chan);
 
@@ -52,4 +52,4 @@ fn main() {
           }
         }
     }
-}
+}
diff --git a/src/test/run-pass/ivec-add.rs b/src/test/run-pass/ivec-add.rs
@@ -1,6 +1,6 @@
-fn double[T](a: &T) -> T[] { ret ~[a] + ~[a]; }
+fn double[T](a: &T) -> [T] { ret ~[a] + ~[a]; }
 
-fn double_int(a: int) -> int[] { ret ~[a] + ~[a]; }
+fn double_int(a: int) -> [int] { ret ~[a] + ~[a]; }
 
 fn main() {
     let d = double(1);
diff --git a/src/test/run-pass/ivec-pass-by-value.rs b/src/test/run-pass/ivec-pass-by-value.rs
@@ -1,3 +1,3 @@
-fn f(a: int[]) { }
+fn f(a: [int]) { }
 fn main() { f(~[1, 2, 3, 4, 5]); }
 
diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs
@@ -16,11 +16,11 @@ fn test_rec() {
 }
 
 fn test_vec() {
-    let po: port[int[]] = port();
-    let ch: chan[int[]] = chan(po);
-    let v0: int[] = ~[0, 1, 2];
+    let po: port[[int]] = port();
+    let ch: chan[[int]] = chan(po);
+    let v0: [int] = ~[0, 1, 2];
     ch <| v0;
-    let v1: int[];
+    let v1: [int];
     po |> v1;
     assert (v1.(0) == 0);
     assert (v1.(1) == 1);
@@ -72,4 +72,4 @@ fn test_chan() {
     assert (i == 10);
 }
 
-fn main() { test_rec(); test_vec(); test_str(); test_tag(); test_chan(); }
+fn main() { test_rec(); test_vec(); test_str(); test_tag(); test_chan(); }
diff --git a/src/test/stdtest/ivec.rs b/src/test/stdtest/ivec.rs
@@ -19,7 +19,7 @@ fn add(x: &uint, y: &uint) -> uint { ret x + y; }
 
 #[test]
 fn test_reserve_and_on_heap() {
-    let v: int[] = ~[1, 2];
+    let v: [int] = ~[1, 2];
     assert (!ivec::on_heap(v));
     ivec::reserve(v, 8u);
     assert (ivec::on_heap(v));
diff --git a/src/test/stdtest/sort_ivec.rs b/src/test/stdtest/sort_ivec.rs
@@ -1,7 +1,7 @@
 
 use std;
 
-fn check_sort(v1: &int[], v2: &int[]) {
+fn check_sort(v1: &[int], v2: &[int]) {
     let len = std::ivec::len[int](v1);
     fn lteq(a: &int, b: &int) -> bool { ret a <= b; }
     let f = lteq;
@@ -18,11 +18,11 @@ fn test() {
         check_sort(v1, v2);
     }
     { let v1 = ~[1, 1, 1]; let v2 = ~[1, 1, 1]; check_sort(v1, v2); }
-    { let v1: int[] = ~[]; let v2: int[] = ~[]; check_sort(v1, v2); }
+    { let v1: [int] = ~[]; let v2: [int] = ~[]; check_sort(v1, v2); }
     { let v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); }
     {
         let v1 = ~[9, 3, 3, 3, 9];
         let v2 = ~[3, 3, 3, 9, 9];
         check_sort(v1, v2);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ fn main(args: vec[str]) {`
`25`	`25`	`run_tests(config);`
`26`	`26`	`}`
`27`	`27`
`28`		`-fn parse_config(args: &str[]) -> config {`
	`28`	`+fn parse_config(args: &[str]) -> config {`
`29`	`29`	`let opts =`
`30`	`30`	`~[getopts::reqopt("compile-lib-path"),`
`31`	`31`	`getopts::reqopt("run-lib-path"), getopts::reqopt("rustc-path"),`
`@@ -117,7 +117,7 @@ fn test_opts(config: &config) -> test::test_opts {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`type tests_and_conv_fn =`
`120`		`- {tests: test::test_desc[], to_task: fn(&fn() ) -> task };`
	`120`	`+ {tests: [test::test_desc], to_task: fn(&fn() ) -> task };`
`121`	`121`
`122`	`122`	`fn make_tests(cx: &cx) -> tests_and_conv_fn {`
`123`	`123`	`log #fmt("making tests from %s", cx.config.src_base);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type reqchan = chan[request];`
`27`	`27`	`type handle = {task: option::t[task], chan: reqchan};`
`28`	`28`
`29`	`29`	`tag request {`
`30`		`- exec(str, str, str[], chan[response]);`
	`30`	`+ exec(str, str, [str], chan[response]);`
`31`	`31`	`stop;`
`32`	`32`	`}`
`33`	`33`
`@@ -189,7 +189,7 @@ fn clone_str(s: &str) -> str {`
`189`	`189`	`new`
`190`	`190`	`}`
`191`	`191`
`192`		`-fn clone_ivecstr(v: &str[]) -> str[] {`
	`192`	`+fn clone_ivecstr(v: &[str]) -> [str] {`
`193`	`193`	`let r = ~[];`
`194`	`194`	`for t: str in ivec::slice(v, 0u, ivec::len(v)) {`
`195`	`195`	`r += ~[clone_str(t)];`