---

yaml
---
r: 210826
b: refs/heads/try
c: cea73bf
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: b248ee8746c4c016dd3001e59086f2c2f868f07e
+refs/heads/try: cea73bfb1596f1e5e1f3a6faa9863d2983a3ccea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_trans/save/dump_csv.rs

@@ -55,7 +55,7 @@ use util::ppaux;
 
 
 pub struct DumpCsvVisitor<'l, 'tcx: 'l> {
-    save_ctxt: SaveContext<'l>,
+    save_ctxt: SaveContext<'l, 'tcx>,
     sess: &'l Session,
     analysis: &'l ty::CrateAnalysis<'tcx>,
 
@@ -74,7 +74,10 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
                output_file: Box<File>) -> DumpCsvVisitor<'l, 'tcx> {
         DumpCsvVisitor {
             sess: sess,
-            save_ctxt: SaveContext { sess: sess },
+            save_ctxt: SaveContext::new(sess, analysis, SpanUtils {
+                sess: sess,
+                err_count: Cell::new(0)
+            }),
             analysis: analysis,
             collected_paths: vec![],
             collecting: false,

branches/try/src/librustc_trans/save/mod.rs

@@ -15,27 +15,50 @@ use std::env;
 use std::fs::{self, File};
 use std::path::{Path, PathBuf};
 
-use syntax::{ast, attr, visit};
+use syntax::{attr, visit};
+use syntax::ast::{self, NodeId, DefId};
+use syntax::parse::token::keywords;
 use syntax::codemap::*;
 
+use self::span_utils::SpanUtils;
+
 mod span_utils;
 mod recorder;
 
 mod dump_csv;
 
-pub struct SaveContext<'l> {
+pub struct SaveContext<'l, 'tcx: 'l> {
     sess: &'l Session,
+    analysis: &'l ty::CrateAnalysis<'tcx>,
+    span_utils: SpanUtils<'l>,
 }
 
 pub struct CrateData {
     pub name: String,
     pub number: u32,
 }
 
-impl<'l> SaveContext<'l> {
-    pub fn new<'ll>(sess: &'ll Session) -> SaveContext<'ll> {
+pub enum Data {
+    FunctionData(FunctionData),
+}
+
+pub struct FunctionData {
+    pub id: NodeId,
+    pub qualname: String,
+    pub declaration: Option<DefId>,
+    pub span: Span,
+    pub scope: NodeId,
+}
+
+impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
+    pub fn new(sess: &'l Session,
+               analysis: &'l ty::CrateAnalysis<'tcx>,
+               span_utils: SpanUtils<'l>)
+               -> SaveContext<'l, 'tcx> {
         SaveContext {
-            sess: sess
+            sess: sess,
+            analysis: analysis,
+            span_utils: span_utils,
         }
     }
 
@@ -49,6 +72,30 @@ impl<'l> SaveContext<'l> {
 
         result
     }
+
+    pub fn get_item_data(&self, item: &ast::Item) -> Data {
+        match item.node {
+            ast::Item_::ItemFn(..) => {
+                let qualname = format!("::{}", self.analysis.ty_cx.map.path_to_string(item.id));
+                let sub_span = self.span_utils.sub_span_after_keyword(item.span, keywords::Fn);
+
+                Data::FunctionData(FunctionData {
+                    id: item.id,
+                    qualname: qualname,
+                    declaration: None,
+                    span: sub_span.unwrap(),
+                    scope: self.analysis.ty_cx.map.get_parent(item.id),
+                })
+            }
+            _ => {
+                unimplemented!();
+            }
+        }
+    }
+
+    pub fn get_data_for_id(&self, id: &NodeId) -> Data {
+        unimplemented!();        
+    }
 }
 
 #[allow(deprecated)]