bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rustc: Add def ids to variants

Browse source
This commit is contained in:
Patrick Walton 2010-11-30 12:32:20 -08:00
parent 25b973df1b
commit 567a45cc70
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/comp/front/ast.rs
View file

@ -30,6 +30,7 @@ tag def {
def_const(def_id); def_const(def_id);
def_arg(def_id); def_arg(def_id);
def_local(def_id); def_local(def_id);
def_variant(def_id);
def_ty(def_id); def_ty(def_id);
def_ty_arg(def_id); def_ty_arg(def_id);
} }
@ -173,7 +174,7 @@ type _fn = rec(vec[arg] inputs,
type _mod = rec(vec[@item] items, type _mod = rec(vec[@item] items,
hashmap[ident,uint] index); hashmap[ident,uint] index);
type variant = rec(str name, vec[@ty] args); type variant = rec(str name, vec[@ty] args, def_id id);
type item = spanned[item_]; type item = spanned[item_];
tag item_ { tag item_ {

3
src/comp/front/parser.rs
View file

@ -1260,7 +1260,8 @@ impure fn parse_item_tag(parser p) -> tup(ast.ident, @ast.item) {
expect(p, token.SEMI); expect(p, token.SEMI);
variants += vec(rec(name=name, args=args)); auto id = p.next_def_id();
variants += vec(rec(name=name, args=args, id=id));
} }
case (token.RBRACE) { /* empty */ } case (token.RBRACE) { /* empty */ }
case (_) { case (_) {

2
src/comp/middle/fold.rs
View file

@ -594,7 +594,7 @@ fn fold_item[ENV](&ENV env, ast_fold[ENV] fld, @item i) -> @item {
for (@ast.ty t in v.args) { for (@ast.ty t in v.args) {
new_args += vec(fold_ty[ENV](env_, fld, t)); new_args += vec(fold_ty[ENV](env_, fld, t));
} }
new_variants += rec(name=v.name, args=new_args); new_variants += rec(name=v.name, args=new_args, id=v.id);
} }
ret fld.fold_item_tag(env_, i.span, ident, new_variants, ret fld.fold_item_tag(env_, i.span, ident, new_variants,
ty_params, id); ty_params, id);