diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 5b6f42ea945f..fc1717240d26 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -1256,11 +1256,11 @@ fn parse_assign_expr(&parser p) -> @ast::expr { ret @spanned(lo, rhs.span.hi, ast::expr_send(lhs, rhs, p.get_ann())); } - case (token::LARROW) { + case (token::RECV) { p.bump(); auto rhs = parse_expr(p); ret @spanned(lo, rhs.span.hi, - ast::expr_recv(lhs, rhs, p.get_ann())); + ast::expr_recv(rhs, lhs, p.get_ann())); } case (_) { /* fall through */ } } diff --git a/src/comp/pretty/pprust.rs b/src/comp/pretty/pprust.rs index 883b8b3b92d6..302172303577 100644 --- a/src/comp/pretty/pprust.rs +++ b/src/comp/pretty/pprust.rs @@ -617,10 +617,10 @@ fn print_expr(ps s, &@ast::expr expr) { print_expr(s, rhs); } case (ast::expr_recv(?lhs, ?rhs, _)) { - print_expr(s, lhs); - space(s.s); - wrd1(s, "<-"); print_expr(s, rhs); + space(s.s); + wrd1(s, "|>"); + print_expr(s, lhs); } case (ast::expr_field(?expr,?id,_)) { print_expr(s, expr); diff --git a/src/test/compile-fail/bad-recv.rs b/src/test/compile-fail/bad-recv.rs index cccb735da055..1532eed64e28 100644 --- a/src/test/compile-fail/bad-recv.rs +++ b/src/test/compile-fail/bad-recv.rs @@ -1,5 +1,5 @@ // error-pattern: mismatched types fn main() { - 10 <- 10; + 10 |> 10; } \ No newline at end of file diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs index f68000887880..7903001d1f06 100644 --- a/src/test/run-fail/linked-failure.rs +++ b/src/test/run-fail/linked-failure.rs @@ -13,5 +13,5 @@ fn main() { let port[int] p = port(); spawn child(); let int x; - x <- p; + p |> x; } diff --git a/src/test/run-fail/task-comm-14.rs b/src/test/run-fail/task-comm-14.rs index 2ef611a21945..c9e2c1019bbc 100644 --- a/src/test/run-fail/task-comm-14.rs +++ b/src/test/run-fail/task-comm-14.rs @@ -19,7 +19,7 @@ io fn main() { let int value = 0; while (i > 0) { log i; - value <- po; + po |> value; i = i - 1; } diff --git a/src/test/run-fail/trivial-message2.rs b/src/test/run-fail/trivial-message2.rs index 8b41e5f5a46c..87eaca143616 100644 --- a/src/test/run-fail/trivial-message2.rs +++ b/src/test/run-fail/trivial-message2.rs @@ -2,14 +2,14 @@ // xfail-stage1 // xfail-stage2 /* - This program should hang on the r <- po line. + This program should hang on the po |> r line. */ fn main() { let port[int] po = port(); let chan[int] ch = chan(po); - auto r; r <- po; + auto r; po |> r; ch <| 42; diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs index 617937738f44..7ce692a67f72 100644 --- a/src/test/run-pass/acyclic-unwind.rs +++ b/src/test/run-pass/acyclic-unwind.rs @@ -32,7 +32,7 @@ fn main() { let int i; // synchronize on event from child. - i <- p; + p |> i; log "parent exiting, killing child"; } diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs index 6f9d62674cfe..2b72f2a8567e 100644 --- a/src/test/run-pass/basic-1.rs +++ b/src/test/run-pass/basic-1.rs @@ -12,8 +12,8 @@ fn main() { spawn a(chan(p)); spawn b(chan(p)); let int n = 0; - n <- p; - n <- p; + p |> n; + p |> n; // log "Finished."; } diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs index 5da4945af660..1bbbb6d425f9 100644 --- a/src/test/run-pass/basic-2.rs +++ b/src/test/run-pass/basic-2.rs @@ -14,8 +14,8 @@ fn main() { spawn a(chan(p)); spawn b(chan(p)); let int n = 0; - n <- p; - n <- p; + p |> n; + p |> n; log "Finished."; } diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs index 832eae2fd5d7..4c542b532bbf 100644 --- a/src/test/run-pass/basic.rs +++ b/src/test/run-pass/basic.rs @@ -34,8 +34,8 @@ fn main() { let int x = 10; x = g(n,s); log x; - n <- p; - n <- p; + p |> n; + p |> n; // FIXME: use signal-channel for this. log "children finished, root finishing"; } diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs index e28b4f664e6a..819fd987351d 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/run-pass/comm.rs @@ -7,7 +7,7 @@ fn main() { let port[int] p = port(); spawn child(chan(p)); let int y; - y <- p; + p |> y; log "received"; log y; assert (y == 10); diff --git a/src/test/run-pass/decl-with-recv.rs b/src/test/run-pass/decl-with-recv.rs index 923024251b19..79d040cdb278 100644 --- a/src/test/run-pass/decl-with-recv.rs +++ b/src/test/run-pass/decl-with-recv.rs @@ -5,10 +5,10 @@ fn main() { let chan[int] ch = chan(po); ch <| 10; - let int i; i <- po; + let int i; po |> i; assert (i == 10); ch <| 11; - auto j; j <- po; + auto j; po |> j; assert (j == 11); } diff --git a/src/test/run-pass/destructor-ordering.rs b/src/test/run-pass/destructor-ordering.rs index 23c4737307cd..2362f60d7e28 100644 --- a/src/test/run-pass/destructor-ordering.rs +++ b/src/test/run-pass/destructor-ordering.rs @@ -25,7 +25,7 @@ io fn check_order(port[order_info] expected_p) { chan(expected_p) <| rec(order=-1, msg=""); let mutable int actual = 0; // FIXME #121: Workaround for while(true) bug. - auto expected; expected <- expected_p; + auto expected; expected_p |> expected; auto done = -1; // FIXME: Workaround for typechecking bug. while(expected.order != done) { if (expected.order != actual) { @@ -36,7 +36,7 @@ io fn check_order(port[order_info] expected_p) { fail; } actual += 1; - expected <- expected_p; + expected_p |> expected; } } diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs index 77ab43944d0b..60486694c046 100644 --- a/src/test/run-pass/lazychan.rs +++ b/src/test/run-pass/lazychan.rs @@ -9,13 +9,13 @@ fn main() { let int y; spawn child(c); - y <- p; + p |> y; log "received 1"; log y; assert (y == 10); spawn child(c); - y <- p; + p |> y; log "received 2"; log y; assert (y == 10); diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs index e4e5dbd062e7..65149aaa38f7 100644 --- a/src/test/run-pass/many.rs +++ b/src/test/run-pass/many.rs @@ -9,7 +9,7 @@ fn sub(chan[int] parent, int id) { } else { let port[int] p = port(); auto child = spawn sub(chan(p), id-1); - let int y; y <- p; + let int y; p |> y; parent <| y + 1; } } @@ -17,7 +17,7 @@ fn sub(chan[int] parent, int id) { fn main() { let port[int] p = port(); auto child = spawn sub(chan(p), 500); - let int y <- p; + let int p |> y; log "transmission complete"; log y; assert (y == 500); diff --git a/src/test/run-pass/obj-dtor.rs b/src/test/run-pass/obj-dtor.rs index 616278279dfa..e294e1f98729 100644 --- a/src/test/run-pass/obj-dtor.rs +++ b/src/test/run-pass/obj-dtor.rs @@ -29,7 +29,7 @@ fn main() { auto w = spawn do_work(chan(p)); let int i; log "parent waiting for shutdown"; - i <- p; + p |> i; log "received int"; assert (i == 10); log "int is OK, child-dtor ran as expected"; diff --git a/src/test/run-pass/preempt.rs b/src/test/run-pass/preempt.rs index 50520406be34..7c7e9f2bca17 100644 --- a/src/test/run-pass/preempt.rs +++ b/src/test/run-pass/preempt.rs @@ -19,7 +19,7 @@ fn main() { let task s = spawn starve_main(chan(alive)); let int i; log "main waiting for alive signal"; - i <- alive; + alive |> i; log "main got alive signal"; while (i < 50) { log "main iterated"; diff --git a/src/test/run-pass/rt-circular-buffer.rs b/src/test/run-pass/rt-circular-buffer.rs index 19705d2a60ef..ad556441c081 100644 --- a/src/test/run-pass/rt-circular-buffer.rs +++ b/src/test/run-pass/rt-circular-buffer.rs @@ -44,7 +44,7 @@ fn test_shrink1() { auto mychan = chan(myport); mychan <| 0i8; - auto x; x <- myport; + auto x; myport |> x; } fn test_shrink2() { @@ -58,7 +58,7 @@ fn test_shrink2() { } for each (uint i in uint::range(0u, 100u)) { - auto x; x <- myport; + auto x; myport |> x; } } @@ -73,7 +73,7 @@ fn test_rotate() { val3=i as u32); mychan <| val; - auto x; x <- myport; + auto x; myport |> x; assert (x.val1 == i as u32); assert (x.val2 == i as u32); assert (x.val3 == i as u32); @@ -95,7 +95,7 @@ fn test_rotate_grow() { } for each (uint i in uint::range(0u, 10u)) { - auto x; x <- myport; + auto x; myport |> x; assert (x.val1 == i as u32); assert (x.val2 == i as u32); assert (x.val3 == i as u32); diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index 5046e145cbc7..2adc449165ef 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -15,8 +15,8 @@ fn test05() { let port[int] po = port(); let chan[int] ch = chan(po); spawn test05_start(chan(po)); - let int value; value <- po; - value <- po; - value <- po; + let int value; po |> value; + po |> value; + po |> value; assert (value == 30); } diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index 47506999feab..0482a1ff96d0 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -4,14 +4,14 @@ fn start(chan[chan[str]] c) { let port[str] p = port(); c <| chan(p); - auto a; a <- p; - // auto b; b <- p; // Never read the second string. + auto a; p |> a; + // auto b; p |> b; // Never read the second string. } fn main() { let port[chan[str]] p = port(); auto child = spawn "start" start(chan(p)); - auto c; c <- p; + auto c; p |> c; c <| "A"; c <| "B"; yield; diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs index 24c6837b02c5..49c6382e5b38 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/run-pass/task-comm-11.rs @@ -9,5 +9,5 @@ fn start(chan[chan[str]] c) { fn main() { let port[chan[str]] p = port(); auto child = spawn "child" start(chan(p)); - auto c; c <- p; + auto c; p |> c; } diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs index 9e23108006c0..5532cfdd5804 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/run-pass/task-comm-15.rs @@ -17,5 +17,5 @@ fn main() { // the child's point of view the receiver may die. We should // drop messages on the floor in this case, and not crash! auto child = spawn thread "child" start(chan(p), 10); - auto c; c <- p; + auto c; p |> c; } diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index 9a533bca036f..dac966343aa2 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -12,7 +12,7 @@ fn test_rec() { ch <| r0; let r r1; - r1 <- po; + po |> r1; assert (r1.val0 == 0); assert (r1.val1 == 1u8); @@ -27,7 +27,7 @@ fn test_vec() { ch <| v0; let vec[int] v1; - v1 <- po; + po |> v1; assert (v1.(0) == 0); assert (v1.(1) == 1); @@ -42,7 +42,7 @@ fn test_str() { ch <| s0; let str s1; - s1 <- po; + po |> s1; assert (s1.(0) as u8 == 't' as u8); assert (s1.(1) as u8 == 'e' as u8); @@ -60,7 +60,7 @@ fn test_tup() { ch <| t0; let t t1; - t1 <- po; + po |> t1; assert (t0._0 == 0); assert (t0._1 == 1u8); @@ -83,11 +83,11 @@ fn test_tag() { let t t1; - t1 <- po; + po |> t1; assert (t1 == tag1); - t1 <- po; + po |> t1; assert (t1 == tag2(10)); - t1 <- po; + po |> t1; assert (t1 == tag3(10, 11u8, 'A')); } @@ -101,13 +101,13 @@ fn test_chan() { ch <| ch0; let chan[int] ch1; - ch1 <- po; + po |> ch1; // Does the transmitted channel still work? ch1 <| 10; let int i; - i <- po0; + po0 |> i; assert (i == 10); } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 374c598f473e..97293102fa8d 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -47,7 +47,7 @@ fn test00(bool is_multithreaded) { for (task t in tasks) { i = 0; while (i < number_of_messages) { - let int value; value <- po; + let int value; po |> value; sum += value; i = i + 1; } diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs index 3c4f3ab6ae04..2b2d4c02769e 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/run-pass/task-comm-4.rs @@ -13,20 +13,20 @@ fn test00() { c <| 3; c <| 4; - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); c <| 5; c <| 6; c <| 7; c <| 8; - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); - r <- p; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); + p |> r; sum += r; log (r); assert (sum == 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8); } \ No newline at end of file diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs index 324ce0eddc73..4bad2f7dad44 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/run-pass/task-comm-5.rs @@ -17,7 +17,7 @@ fn test00() { i = 0; while (i < number_of_messages) { - r <- p; sum += r; + p |> r; sum += r; i += 1; } diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs index 0f98ba5b00c7..c2ffd4226d86 100644 --- a/src/test/run-pass/task-comm-6.rs +++ b/src/test/run-pass/task-comm-6.rs @@ -25,10 +25,10 @@ fn test00() { i = 0; while (i < number_of_messages) { - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; i += 1; } diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs index e236f69e2f80..5602b7421969 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/run-pass/task-comm-7.rs @@ -30,10 +30,10 @@ fn test00() { let int i = 0; while (i < number_of_messages) { - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; i += 1; } diff --git a/src/test/run-pass/task-comm-8.rs b/src/test/run-pass/task-comm-8.rs index 74a3d0c1d492..c731456cbfed 100644 --- a/src/test/run-pass/task-comm-8.rs +++ b/src/test/run-pass/task-comm-8.rs @@ -30,10 +30,10 @@ fn test00() { let int i = 0; while (i < number_of_messages) { - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; - r <- p; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; + p |> r; sum += r; i += 1; } diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index be77c072b365..abe5ea810988 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -24,7 +24,7 @@ fn test00() { let int i = 0; while (i < number_of_messages) { - r <- p; sum += r; log (r); + p |> r; sum += r; log (r); i += 1; } diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs index 5d7408594753..75b56300826f 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/run-pass/task-comm-chan-nil.rs @@ -11,7 +11,7 @@ fn main() { ch <| (); let () n; - n <- po; + po |> n; assert (n == ()); } diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs index 6c51aba306a6..3a3d7d5942d8 100644 --- a/src/test/run-pass/task-comm.rs +++ b/src/test/run-pass/task-comm.rs @@ -48,7 +48,7 @@ fn test00(bool is_multithreaded) { for (task t in tasks) { i = 0; while (i < number_of_messages) { - let int value; value <- po; + let int value; po |> value; sum += value; i = i + 1; } @@ -66,7 +66,7 @@ fn test00(bool is_multithreaded) { fn test01() { let port[int] p = port(); log "Reading from a port that is never written to."; - let int value; value <- p; + let int value; p |> value; log value; } @@ -76,7 +76,7 @@ fn test02() { log "Writing to a local task channel."; c <| 42; log "Reading from a local task port."; - let int value; value <- p; + let int value; p |> value; log value; } @@ -126,9 +126,9 @@ fn test05() { let port[int] po = port(); let chan[int] ch = chan(po); spawn thread test05_start(ch); - let int value; value <- po; - value <- po; - value <- po; + let int value; po |> value; + po |> value; + po |> value; log value; } diff --git a/src/test/run-pass/trivial-message.rs b/src/test/run-pass/trivial-message.rs index 5391f919d01c..c2d677598241 100644 --- a/src/test/run-pass/trivial-message.rs +++ b/src/test/run-pass/trivial-message.rs @@ -9,7 +9,7 @@ fn main() { ch <| 42; - auto r; r <- po; + auto r; po |> r; log_err r; }