From 6ad1c8e044ff4447b130ea023ba0ff5880567677 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Thu, 19 Dec 2013 14:41:59 +0800 Subject: Generalize item_span into node_span, which works on more types. Signed-off-by: Edward Z. Yang --- src/libsyntax/ast_map.rs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs index 961d8170fd3..63e8251b22c 100644 --- a/src/libsyntax/ast_map.rs +++ b/src/libsyntax/ast_map.rs @@ -490,14 +490,23 @@ pub fn node_item_query(items: map, id: NodeId, query: |@item| -> Result, } } -pub fn item_span(items: map, +pub fn node_span(items: map, id: ast::NodeId) -> Span { match items.find(&id) { Some(&node_item(item, _)) => item.span, - r => { - fail!(format!("item_span: expected item with id {} but found {:?}", - id, r)) - } + Some(&node_foreign_item(foreign_item, _, _, _)) => foreign_item.span, + Some(&node_trait_method(@required(ref type_method), _, _)) => type_method.span, + Some(&node_trait_method(@provided(ref method), _, _)) => method.span, + Some(&node_method(method, _, _)) => method.span, + Some(&node_variant(variant, _, _)) => variant.span, + Some(&node_expr(expr)) => expr.span, + Some(&node_stmt(stmt)) => stmt.span, + Some(&node_arg(pat)) => pat.span, + Some(&node_local(_)) => fail!("node_span: cannot get span from node_local"), + Some(&node_block(block)) => block.span, + Some(&node_struct_ctor(_, item, _)) => item.span, + Some(&node_callee_scope(expr)) => expr.span, + None => fail!("node_span: could not find id {}", id), } } -- cgit 1.4.1-3-g733a5