OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Fixing long lines.
This commit is contained in:
Eric Holk 2012-08-17 11:47:01 -07:00
parent 9260b02daa
commit 7bae3449ce
3 changed files with 67 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsyntax/ext/pipes/ast_builder.rs
View File

@ -69,7 +69,7 @@ trait ext_ctxt_ast_builder {
span: span,
+enum_definition: ast::enum_def,
+ty_params: ~[ast::ty_param]) -> @ast::item;
fn item_enum(name: ident, span: span,
fn item_enum(name: ident, span: span,
+enum_definition: ast::enum_def) -> @ast::item;
fn variant(name: ident, span: span, +tys: ~[@ast::ty]) -> ast::variant;
fn item_mod(name: ident, span: span, +items: ~[@ast::item]) -> @ast::item;

61
src/test/run-pass/pipe-select-macro.rs
View File

@ -22,63 +22,8 @@ proto! bar {
}
}
// 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") }
}
}
}

63
src/test/run-pass/select-macro.rs Normal file
View File

@ -0,0 +1,63 @@
// xfail-test - this isn't really a test.
{
// 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($($(ref $x,)+)* ref 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 }),+
])+}
}
}
}