mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement boolean binops.

Browse Source
This commit is contained in:
Scott Olson 2016-04-23 00:39:38 -06:00
parent 6f50289d43
commit 2db3597b56
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/primval.rs
View File

@ -14,10 +14,11 @@ pub enum PrimVal {
}
pub fn binary_op(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResult<PrimVal> {
use rustc::mir::repr::BinOp::*;
use self::PrimVal::*;
macro_rules! int_binops {
($v:ident, $l:ident, $r:ident) => ({
use rustc::mir::repr::BinOp::*;
use self::PrimVal::*;
match bin_op {
Add => $v($l + $r),
Sub => $v($l - $r),
@ -52,7 +53,6 @@ pub fn binary_op(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResul
}
}
use self::PrimVal::*;
let val = match (left, right) {
(I8(l), I8(r)) => int_binops!(I8, l, r),
(I16(l), I16(r)) => int_binops!(I16, l, r),
@ -63,6 +63,18 @@ pub fn binary_op(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResul
(U32(l), U32(r)) => int_binops!(U32, l, r),
(U64(l), U64(r)) => int_binops!(U64, l, r),
(Bool(l), Bool(r)) => {
Bool(match bin_op {
Eq => l == r,
Ne => l != r,
Lt => l < r,
Le => l <= r,
Gt => l > r,
Ge => l >= r,
_ => panic!("invalid binary operation on booleans: {:?}", bin_op),
})
}
(IntegerPtr(l), IntegerPtr(r)) => int_binops!(IntegerPtr, l, r),
(AbstractPtr(_), IntegerPtr(_)) | (IntegerPtr(_), AbstractPtr(_)) =>
@ -76,7 +88,6 @@ pub fn binary_op(bin_op: mir::BinOp, left: PrimVal, right: PrimVal) -> EvalResul
let l = l_ptr.offset;
let r = r_ptr.offset;
use rustc::mir::repr::BinOp::*;
match bin_op {
Eq => Bool(l == r),
Ne => Bool(l != r),

1
tests/run-pass/specialization.rs
View File

@ -18,6 +18,7 @@ fn specialization() -> (bool, bool) {
(i32::is_unit(), <()>::is_unit())
}
#[miri_run]
fn main() {
assert_eq!(specialization(), (false, true));
}