-
Notifications
You must be signed in to change notification settings - Fork 717
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #899 - bkchr:manual_debug_impl, r=fitzgen
Implements Debug trait for types which do not support derive Debug For types that do not support derive Debug be implemented automatically by rust, we know can generate implementations of the Debug trait. This code generation is hidden behind the '--force-derive-debug' command-line flag. Should solve: #875 Sorry for the extra noise in lib.rs, codegen/mod.rs etc, that was rustfmt.
- Loading branch information
Showing
14 changed files
with
1,640 additions
and
877 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,225 @@ | ||
use ir::comp::{BitfieldUnit, CompKind, Field, FieldData, FieldMethods}; | ||
use ir::context::BindgenContext; | ||
use ir::derive::CanTriviallyDeriveDebug; | ||
use ir::item::{HasTypeParamInArray, IsOpaque, Item, ItemCanonicalName}; | ||
use ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT}; | ||
use syntax::ast; | ||
use syntax::codemap::DUMMY_SP; | ||
use syntax::parse::token::Token; | ||
|
||
use syntax::tokenstream::TokenTree; | ||
|
||
pub fn gen_debug_impl( | ||
ctx: &BindgenContext, | ||
fields: &[Field], | ||
item: &Item, | ||
kind: CompKind, | ||
) -> Vec<ast::ImplItem> { | ||
let struct_name = item.canonical_name(ctx); | ||
let mut format_string = format!("{} {{{{ ", struct_name); | ||
let mut tokens: Vec<TokenTree> = Vec::new(); | ||
|
||
if item.is_opaque(ctx, &()) { | ||
format_string.push_str("opaque"); | ||
} else { | ||
match kind { | ||
CompKind::Union => { | ||
format_string.push_str("union"); | ||
} | ||
CompKind::Struct => { | ||
let processed_fields = fields.iter().filter_map(|f| match f { | ||
&Field::DataMember(ref fd) => fd.impl_debug(ctx, ()), | ||
&Field::Bitfields(ref bu) => bu.impl_debug(ctx, ()), | ||
}); | ||
|
||
|
||
for (i, (fstring, token)) in processed_fields.enumerate() { | ||
if i > 0 { | ||
format_string.push_str(", "); | ||
} | ||
if !token.is_empty() { | ||
tokens.push(TokenTree::Token(DUMMY_SP, Token::Comma)); | ||
tokens.extend(token); | ||
} | ||
format_string.push_str(&fstring); | ||
} | ||
} | ||
} | ||
} | ||
|
||
format_string.push_str(" }}"); | ||
|
||
let impl_ = quote_item!(ctx.ext_cx(), | ||
impl X { | ||
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { | ||
write!(f, $format_string $tokens) | ||
} | ||
}); | ||
|
||
match impl_.unwrap().node { | ||
ast::ItemKind::Impl(_, _, _, _, _, ref items) => items.clone(), | ||
_ => unreachable!(), | ||
} | ||
} | ||
|
||
/// A trait for the things which we can codegen tokens that contribute towards a | ||
/// generated `impl Debug`. | ||
pub trait ImplDebug<'a> { | ||
/// Any extra parameter required by this a particular `ImplDebug` implementation. | ||
type Extra; | ||
|
||
/// Generate a format string snippet to be included in the larger `impl Debug` | ||
/// format string, and the code to get the format string's interpolation values. | ||
fn impl_debug( | ||
&self, | ||
ctx: &BindgenContext, | ||
extra: Self::Extra, | ||
) -> Option<(String, Vec<TokenTree>)>; | ||
} | ||
|
||
impl<'a> ImplDebug<'a> for FieldData { | ||
type Extra = (); | ||
|
||
fn impl_debug( | ||
&self, | ||
ctx: &BindgenContext, | ||
_: Self::Extra, | ||
) -> Option<(String, Vec<TokenTree>)> { | ||
if let Some(name) = self.name() { | ||
ctx.resolve_item(self.ty()).impl_debug(ctx, name) | ||
} else { | ||
None | ||
} | ||
} | ||
} | ||
|
||
impl<'a> ImplDebug<'a> for BitfieldUnit { | ||
type Extra = (); | ||
|
||
fn impl_debug( | ||
&self, | ||
ctx: &BindgenContext, | ||
_: Self::Extra, | ||
) -> Option<(String, Vec<TokenTree>)> { | ||
let mut format_string = String::new(); | ||
let mut tokens = Vec::new(); | ||
for (i, bu) in self.bitfields().iter().enumerate() { | ||
if i > 0 { | ||
format_string.push_str(", "); | ||
tokens.push(TokenTree::Token(DUMMY_SP, Token::Comma)); | ||
} | ||
format_string.push_str(&format!("{} : {{:?}}", bu.name())); | ||
let name_ident = ctx.rust_ident_raw(bu.name()); | ||
tokens.extend(quote_tokens!(ctx.ext_cx(), self.$name_ident())); | ||
} | ||
|
||
Some((format_string, tokens)) | ||
} | ||
} | ||
|
||
impl<'a> ImplDebug<'a> for Item { | ||
type Extra = &'a str; | ||
|
||
fn impl_debug( | ||
&self, | ||
ctx: &BindgenContext, | ||
name: Self::Extra, | ||
) -> Option<(String, Vec<TokenTree>)> { | ||
let name_ident = ctx.rust_ident_raw(name); | ||
|
||
let ty = match self.as_type() { | ||
Some(ty) => ty, | ||
None => { | ||
return None; | ||
} | ||
}; | ||
|
||
fn debug_print( | ||
ctx: &BindgenContext, | ||
name: &str, | ||
name_ident: ast::Ident, | ||
) -> Option<(String, Vec<TokenTree>)> { | ||
Some(( | ||
format!("{}: {{:?}}", name), | ||
quote_tokens!(ctx.ext_cx(), self.$name_ident), | ||
)) | ||
} | ||
|
||
match *ty.kind() { | ||
// Handle the simple cases. | ||
TypeKind::Void | | ||
TypeKind::NullPtr | | ||
TypeKind::Int(..) | | ||
TypeKind::Float(..) | | ||
TypeKind::Complex(..) | | ||
TypeKind::Function(..) | | ||
TypeKind::Enum(..) | | ||
TypeKind::Reference(..) | | ||
TypeKind::BlockPointer | | ||
TypeKind::UnresolvedTypeRef(..) | | ||
TypeKind::ObjCInterface(..) | | ||
TypeKind::ObjCId | | ||
TypeKind::Comp(..) | | ||
TypeKind::ObjCSel => debug_print(ctx, name, name_ident), | ||
|
||
TypeKind::TemplateInstantiation(ref inst) => { | ||
if inst.is_opaque(ctx, self) { | ||
Some((format!("{}: opaque", name), vec![])) | ||
} else { | ||
debug_print(ctx, name, name_ident) | ||
} | ||
} | ||
|
||
// The generic is not required to implement Debug, so we can not debug print that type | ||
TypeKind::Named => { | ||
Some((format!("{}: Non-debuggable generic", name), vec![])) | ||
} | ||
|
||
TypeKind::Array(_, len) => { | ||
// Generics are not required to implement Debug | ||
if self.has_type_param_in_array(ctx) { | ||
Some(( | ||
format!("{}: Array with length {}", name, len), | ||
vec![], | ||
)) | ||
} else if len < RUST_DERIVE_IN_ARRAY_LIMIT { | ||
// The simple case | ||
debug_print(ctx, name, name_ident) | ||
} else { | ||
// Let's implement our own print function | ||
Some(( | ||
format!("{}: [{{}}]", name), | ||
quote_tokens!( | ||
ctx.ext_cx(), | ||
self.$name_ident | ||
.iter() | ||
.enumerate() | ||
.map(|(i, v)| format!("{}{:?}", if i > 0 { ", " } else { "" }, v)) | ||
.collect::<String>()), | ||
)) | ||
} | ||
} | ||
|
||
TypeKind::ResolvedTypeRef(t) | | ||
TypeKind::TemplateAlias(t, _) | | ||
TypeKind::Alias(t) => { | ||
// We follow the aliases | ||
ctx.resolve_item(t).impl_debug(ctx, name) | ||
} | ||
|
||
TypeKind::Pointer(inner) => { | ||
let inner_type = ctx.resolve_type(inner).canonical_type(ctx); | ||
match *inner_type.kind() { | ||
TypeKind::Function(ref sig) | ||
if !sig.can_trivially_derive_debug() => | ||
{ | ||
Some((format!("{}: FunctionPointer", name), vec![])) | ||
} | ||
_ => debug_print(ctx, name, name_ident), | ||
} | ||
} | ||
|
||
TypeKind::Opaque => None, | ||
} | ||
} | ||
} |
Oops, something went wrong.