Move select macro into another file, so it can be including in multiple tests.

[rust.git] / src / test / run-pass / pipe-select-macro.rs

diff --git a/src/test/run-pass/pipe-select-macro.rs b/src/test/run-pass/pipe-select-macro.rs
index 421e6306371ed09cff6ef39a5ac565bf821b7d1f..9559d815def5c40b456cfef262e25d9c293bca1d 100644 (file)
--- a/src/test/run-pass/pipe-select-macro.rs
+++ b/src/test/run-pass/pipe-select-macro.rs
@@ -22,63 +22,8 @@
     }
 }
 
-
-// select!
-macro_rules! select_if {
-
-    {
-        $index:expr,
-        $count:expr
-    } => {
-        fail
-    };
-
-    {
-        $index:expr,
-        $count:expr,
-        $port:path => [
-            $(type_this $message:path$(($(x $x: ident),+))dont_type_this*
-              -> $next:ident => { $e:expr }),+
-        ]
-        $(, $ports:path => [
-            $(type_this $messages:path$(($(x $xs: ident),+))dont_type_this*
-              -> $nexts:ident => { $es:expr }),+
-        ] )*
-    } => {
-        if $index == $count {
-            match move pipes::try_recv($port) {
-              $(some($message($($($x,)+)* next)) => {
-                // FIXME (#2329) we really want move out of enum here.
-                let $next = unsafe { let x <- *ptr::addr_of(next); x };
-                $e
-              })+
-              _ => fail
-            }
-        } else {
-            select_if!{
-                $index,
-                $count + 1
-                $(, $ports => [
-                    $(type_this $messages$(($(x $xs),+))dont_type_this*
-                      -> $nexts => { $es }),+
-                ])*
-            }
-        }
-    };
-}
-
-macro_rules! select {
-    {
-        $( $port:path => {
-            $($message:path$(($($x: ident),+))dont_type_this*
-              -> $next:ident $e:expr),+
-        } )+
-    } => {
-        let index = pipes::selecti([$(($port).header()),+]/_);
-        select_if!{index, 0 $(, $port => [
-            $(type_this $message$(($(x $x),+))dont_type_this* -> $next => { $e }),+
-        ])+}
-    }
+fn macros() {
+    include!("select-macro.rs");
 }
 
 // Code
@@ -97,7 +42,7 @@ fn test(+foo: foo::client::foo, +bar: bar::client::bar) {
             },
 
             do_baz(b) -> _next {
-                if b { debug!("true") } else { debug!("false") }
+                if *b { debug!("true") } else { debug!("false") }
             }
         }
     }