mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #11657 : huonw/rust/less-lang-duplication, r=cmr

Browse Source 
We can use a secondary macro to calculate the count from the information
we're already having to pass to the lang items macro.
This commit is contained in:
bors 2014-01-20 02:31:42 -08:00
commit e83e5769ee
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/librustc/middle/lang_items.rs
View File

@ -33,12 +33,27 @@ use std::hashmap::HashMap;
use std::iter::Enumerate;
use std::vec;
// Get the last "argument" (has to be done recursively to avoid phoney local ambiguity error)
macro_rules! last {
( $first:expr, $( $remainder:expr, )+ ) => ( last!( $( $remainder, )+ ) );
( $first:expr, ) => ( $first )
}
// The actual lang items defined come at the end of this file in one handy table.
// So you probably just want to nip down to the end.
macro_rules! lets_do_this {
// secondary rule to allow us to use `$num` as both an expression
// and a pattern.
(
There are $num_lang_items:expr lang items.
$( $num:pat, $variant:ident, $name:expr, $method:ident; )*
$( $num:tt, $variant:ident, $name:expr, $method:ident; )*
) => {
lets_do_this!(count = 1 + last!($($num,)*),
$($num, $variant, $name, $method; )*)
};
(
count = $num_lang_items:expr, $( $num:pat, $variant:ident, $name:expr, $method:ident; )*
) => {
pub enum LangItem {
@ -207,8 +222,6 @@ pub fn collect_language_items(crate: &ast::Crate,
}
lets_do_this! {
There are 40 lang items.
// ID, Variant name, Name, Method name;
0, FreezeTraitLangItem, "freeze", freeze_trait;
1, SendTraitLangItem, "send", send_trait;
@ -261,4 +274,3 @@ lets_do_this! {
38, ExchangeHeapLangItem, "exchange_heap", exchange_heap;
39, GcLangItem, "gc", gc;
}