From c3bc88a3251bc966eb128edbf4803e0a88cc06ff Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Wed, 10 Nov 2010 18:19:27 -0800 Subject: rustc: Add an annotation to function and type items so that the typechecker can store types with them --- src/comp/front/ast.rs | 4 ++-- src/comp/front/parser.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/comp/front') diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 830856e0..f70c6ac3 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -149,9 +149,9 @@ type _mod = rec(vec[@item] items, type item = spanned[item_]; tag item_ { - item_fn(ident, _fn, def_id); + item_fn(ident, _fn, def_id, ann); item_mod(ident, _mod, def_id); - item_ty(ident, @ty, def_id); + item_ty(ident, @ty, def_id, ann); } diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 7ce5703f..19c72a34 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -868,13 +868,13 @@ impure fn parse_block(parser p) -> ast.block { } case (ast.decl_item(?it)) { alt (it.node) { - case (ast.item_fn(?i, _, _)) { + case (ast.item_fn(?i, _, _, _)) { index.insert(i, u-1u); } case (ast.item_mod(?i, _, _)) { index.insert(i, u-1u); } - case (ast.item_ty(?i, _, _)) { + case (ast.item_ty(?i, _, _, _)) { index.insert(i, u-1u); } } @@ -915,7 +915,7 @@ impure fn parse_fn(parser p) -> tup(ast.ident, @ast.item) { output = output, body = body); - auto item = ast.item_fn(id, f, p.next_def_id()); + auto item = ast.item_fn(id, f, p.next_def_id(), ast.ann_none); ret tup(id, @spanned(lo, body.span, item)); } -- cgit v1.2.3