---

yaml
---
r: 22736
b: refs/heads/master
c: f65d602
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6535da84176bb1a72871a89740b0def9221cc351
+refs/heads/master: f65d6026ef84d16e5b27ab4c852df46044091e2d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/run-pass/pipe-bank-proto.rs

@@ -32,20 +32,86 @@ proto! bank {
     }
 }
 
-fn macros() {
-    #macro[
-        [#move[x],
-         unsafe { let y <- *ptr::addr_of(x); y }]
-    ];
+macro_rules! move {
+    { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }
 }
 
+fn switch<T: send, U>(+endp: pipes::recv_packet<T>,
+                      f: fn(+option<T>) -> U) -> U {
+    f(pipes::try_recv(endp))
+}
+
+fn move<T>(-x: T) -> T { x }
+
+macro_rules! follow {
+    { 
+        $($message:path($($x: ident),+) => $next:ident $e:expr)+
+    } => (
+        |m| alt move(m) {
+          $(some($message($($x,)* next)) {
+            let $next = move!{next};
+            $e })+
+          _ { fail }
+        }
+    );
+
+    { 
+        $($message:path => $next:ident $e:expr)+
+    } => (
+        |m| alt move(m) {
+            $(some($message(next)) {
+                let $next = move!{next};
+                $e })+
+                _ { fail }
+        } 
+    )
+}
+
+/*
+fn client_follow(+bank: bank::client::login) {
+    import bank::*;
+
+    let bank = client::login(bank, ~"theincredibleholk", ~"1234");
+    let bank = switch(bank, follow! {
+        ok => connected { connected }
+        invalid => _next { fail ~"bank closed the connected" }
+    });
+
+    /* // potential alternate syntax
+    let bank = recv_alt! {
+        bank => {
+            | ok -> connected { connected }
+            | invalid -> _next { fail }
+        }
+        bank2 => {
+            | foo -> _n { fail }
+        }
+    }
+    */
+
+    let bank = client::deposit(bank, 100.00);
+    let bank = client::withdrawal(bank, 50.00);
+    alt try_recv(bank) {
+      some(money(m, _)) {
+        io::println(~"Yay! I got money!");
+      }
+      some(insufficient_funds(_)) {
+        fail ~"someone stole my money"
+      }
+      none {
+        fail ~"bank closed the connection"
+      }
+    }    
+}
+*/
+
 fn bank_client(+bank: bank::client::login) {
     import bank::*;
 
     let bank = client::login(bank, ~"theincredibleholk", ~"1234");
     let bank = alt try_recv(bank) {
       some(ok(connected)) {
-        #move(connected)
+        move!{connected}
       }
       some(invalid(_)) { fail ~"login unsuccessful" }
       none { fail ~"bank closed the connection" }