bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

save-analysis: API-ify struct lits

Browse source
This commit is contained in:
Nick Cameron 2015-06-09 09:51:54 +12:00
parent 04b32cecac
commit 788fdddf37
2 changed files with 65 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/librustc_trans/save/dump_csv.rs
View file

@ -708,7 +708,7 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
&val);
// super-traits
for super_bound in &trait_refs {
for super_bound in trait_refs.iter() {
let trait_ref = match *super_bound {
ast::TraitTyParamBound(ref trait_ref, _) => {
trait_ref
@ -882,44 +882,35 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
self.write_sub_paths_truncated(path, false);
let ty = &ty::expr_ty_adjusted(&self.analysis.ty_cx, ex).sty;
let struct_def = match *ty {
ty::TyStruct(def_id, _) => {
let sub_span = self.span.span_for_last_ident(path.span);
self.fmt.ref_str(recorder::TypeRef,
path.span,
sub_span,
def_id,
self.cur_scope);
Some(def_id)
}
_ => None
let struct_lit_data = self.save_ctxt.get_expr_data(ex);
let struct_def = if let super::Data::TypeRefData(struct_lit_data) = struct_lit_data {
self.fmt.ref_str(recorder::TypeRef,
ex.span,
Some(struct_lit_data.span),
struct_lit_data.ref_id,
struct_lit_data.scope);
struct_lit_data.ref_id
} else {
self.sess.span_bug(ex.span, "expected TypeRefData");
};
for field in fields {
match struct_def {
Some(struct_def) => {
let fields = ty::lookup_struct_fields(&self.analysis.ty_cx, struct_def);
for f in &fields {
if generated_code(field.ident.span) {
continue;
}
if f.name == field.ident.node.name {
// We don't really need a sub-span here, but no harm done
let sub_span = self.span.span_for_last_ident(field.ident.span);
self.fmt.ref_str(recorder::VarRef,
field.ident.span,
sub_span,
f.id,
self.cur_scope);
}
}
}
None => {}
if generated_code(field.ident.span) {
continue;
}
let field_data = self.save_ctxt.get_field_ref_data(field,
struct_def,
self.cur_scope);
self.fmt.ref_str(recorder::VarRef,
field.ident.span,
Some(field_data.span),
field_data.ref_id,
field_data.scope);
self.visit_expr(&field.expr)
}
visit::walk_expr_opt(self, base)
}

43
src/librustc_trans/save/mod.rs
View file

@ -349,6 +349,23 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
&format!("Expected struct type, found {:?}", ty)),
}
}
ast::ExprStruct(ref path, _, _) => {
let ty = &ty::expr_ty_adjusted(&self.analysis.ty_cx, expr).sty;
match *ty {
ty::ty_struct(def_id, _) => {
let sub_span = self.span_utils.span_for_last_ident(path.span);
Data::TypeRefData(TypeRefData {
span: sub_span.unwrap(),
scope: self.analysis.ty_cx.map.get_parent(expr.id),
ref_id: def_id,
})
}
_ => {
self.sess.span_bug(expr.span,
&format!("expected ty_struct, found {:?}", ty));
}
}
}
_ => {
// FIXME
unimplemented!();
@ -356,6 +373,30 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
}
}
pub fn get_field_ref_data(&self,
field_ref: &ast::Field,
struct_id: DefId,
parent: NodeId)
-> VariableRefData {
let fields = ty::lookup_struct_fields(&self.analysis.ty_cx, struct_id);
let field_name = get_ident(field_ref.ident.node).to_string();
for f in &fields {
if f.name == field_ref.ident.node.name {
// We don't really need a sub-span here, but no harm done
let sub_span = self.span_utils.span_for_last_ident(field_ref.ident.span);
return VariableRefData {
name: field_name,
span: sub_span.unwrap(),
scope: parent,
ref_id: f.id,
};
}
}
self.sess.span_bug(field_ref.span,
&format!("Couldn't find field {}", field_name));
}
pub fn get_data_for_id(&self, _id: &NodeId) -> Data {
// FIXME
unimplemented!();
@ -400,7 +441,7 @@ impl<'v> Visitor<'v> for PathCollector {
self.collected_paths.push((p.id,
path.clone(),
ast::MutMutable,
recorder::StructRef));
recorder::TypeRef));
}
ast::PatEnum(ref path, _) |
ast::PatQPath(_, ref path) => {