bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reimplement sum type switching.

Browse source
This commit is contained in:
Scott Olson 2016-03-13 06:30:28 -06:00
parent 80d12601ff
commit 6d37e7fc29
3 changed files with 36 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/interpreter.rs
View file

@ -174,6 +174,16 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
}
}
Switch { ref discr, ref targets, .. } => {
let (adt_ptr, adt_repr) = try!(self.eval_lvalue(discr));
let discr_repr = match adt_repr {
Repr::Sum { ref discr, .. } => discr,
_ => panic!("attmpted to switch on non-sum type"),
};
let discr_val = try!(self.memory.read_primval(adt_ptr, &discr_repr));
current_block = targets[discr_val.to_int() as usize];
}
// Call { ref func, ref args, ref destination, .. } => {
// use rustc::middle::cstore::CrateStore;
// let ptr = destination.as_ref().map(|&(ref lv, _)| self.lvalue_to_ptr(lv));
@ -203,16 +213,6 @@ impl<'a, 'tcx: 'a> Interpreter<'a, 'tcx> {
// }
// }
// Switch { ref discr, ref targets, .. } => {
// let discr_val = self.read_lvalue(discr);
// if let Value::Adt { variant, .. } = discr_val {
// current_block = targets[variant];
// } else {
// panic!("Switch on non-Adt value: {:?}", discr_val);
// }
// }
Drop { target, .. } => {
// TODO: Handle destructors and dynamic drop.
current_block = target;