user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forward inner error in struct and tuple field access

Browse source
This commit is contained in:
Oliver Schneider 2015-11-27 17:40:18 +01:00
parent 2e48b593ca
commit 667567ab2c
1 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/librustc/middle/const_eval.rs
View file

@ -1177,46 +1177,40 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &ty::ctxt<'tcx>,
},
hir::ExprTupField(ref base, index) => {
let base_hint = ty_hint.erase_hint();
if let Ok(c) = eval_const_expr_partial(tcx, base, base_hint, fn_args) {
if let Tuple(tup_id) = c {
if let hir::ExprTup(ref fields) = tcx.map.expect_expr(tup_id).node {
if index.node < fields.len() {
return eval_const_expr_partial(tcx, &fields[index.node], base_hint, fn_args)
} else {
signal!(e, TupleIndexOutOfBounds);
}
let c = try!(eval_const_expr_partial(tcx, base, base_hint, fn_args));
if let Tuple(tup_id) = c {
if let hir::ExprTup(ref fields) = tcx.map.expect_expr(tup_id).node {
if index.node < fields.len() {
return eval_const_expr_partial(tcx, &fields[index.node], base_hint, fn_args)
} else {
unreachable!()
signal!(e, TupleIndexOutOfBounds);
}
} else {
signal!(base, ExpectedConstTuple);
unreachable!()
}
} else {
signal!(base, NonConstPath)
signal!(base, ExpectedConstTuple);
}
}
hir::ExprField(ref base, field_name) => {
let base_hint = ty_hint.erase_hint();
// Get the base expression if it is a struct and it is constant
if let Ok(c) = eval_const_expr_partial(tcx, base, base_hint, fn_args) {
if let Struct(struct_id) = c {
if let hir::ExprStruct(_, ref fields, _) = tcx.map.expect_expr(struct_id).node {
// Check that the given field exists and evaluate it
// if the idents are compared run-pass/issue-19244 fails
if let Some(f) = fields.iter().find(|f| f.name.node
== field_name.node) {
return eval_const_expr_partial(tcx, &*f.expr, base_hint, fn_args)
} else {
signal!(e, MissingStructField);
}
let c = try!(eval_const_expr_partial(tcx, base, base_hint, fn_args));
if let Struct(struct_id) = c {
if let hir::ExprStruct(_, ref fields, _) = tcx.map.expect_expr(struct_id).node {
// Check that the given field exists and evaluate it
// if the idents are compared run-pass/issue-19244 fails
if let Some(f) = fields.iter().find(|f| f.name.node
== field_name.node) {
return eval_const_expr_partial(tcx, &*f.expr, base_hint, fn_args)
} else {
unreachable!()
signal!(e, MissingStructField);
}
} else {
signal!(base, ExpectedConstStruct);
unreachable!()
}
} else {
signal!(base, NonConstPath);
signal!(base, ExpectedConstStruct);
}
}
_ => signal!(e, MiscCatchAll)