aboutsummaryrefslogtreecommitdiff
path: root/src/comp/front
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-11-10 18:19:27 -0800
committerPatrick Walton <[email protected]>2010-11-10 18:20:02 -0800
commitc3bc88a3251bc966eb128edbf4803e0a88cc06ff (patch)
tree174f0f7120b059ddec4de355e2e179a8c4aab152 /src/comp/front
parentRedo the scheme for block context chaining and termination, to simplify and s... (diff)
downloadrust-c3bc88a3251bc966eb128edbf4803e0a88cc06ff.tar.xz
rust-c3bc88a3251bc966eb128edbf4803e0a88cc06ff.zip
rustc: Add an annotation to function and type items so that the typechecker can store types with them
Diffstat (limited to 'src/comp/front')
-rw-r--r--src/comp/front/ast.rs4
-rw-r--r--src/comp/front/parser.rs6
2 files changed, 5 insertions, 5 deletions
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));
}