bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't evaluate discriminator value constants when parsing.

Browse source 
Remove disr_val from ast::variant_ and always use ty::variant_info
when the value is needed.  Move what was done during parsing into
other passes, primary typeck.rs.  This move also correctly type checks
the disr. value expression; thus, fixing rustc --pretty=typed when
disr. values are used.
This commit is contained in:
Kevin Atkinson 2012-01-16 02:36:47 -07:00 • committed by Marijn Haverbeke
parent edf11ebf02
commit e1c50c4410
10 changed files with 106 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/comp/syntax/fold.rs
View file

@ -432,21 +432,12 @@ fn noop_fold_variant(v: variant_, fld: ast_fold) -> variant_ {
}
let fold_variant_arg = bind fold_variant_arg_(_, fld);
let args = vec::map(v.args, fold_variant_arg);
let (de, dv) = alt v.disr_expr {
some(e) {
let de = fld.fold_expr(e);
// FIXME (#1417): see parser.rs
let dv = alt syntax::ast_util::eval_const_expr(e) {
ast_util::const_int(val) {
val as int
}
};
(some(de), dv)
}
none. { (none, v.disr_val) }
let de = alt v.disr_expr {
some(e) {some(fld.fold_expr(e))}
none. {none}
};
ret {name: v.name, args: args, id: v.id,
disr_val: dv, disr_expr: de};
disr_expr: de};
}
fn noop_fold_ident(&&i: ident, _fld: ast_fold) -> ident { ret i; }