style(semantics): move macro impls to specific modules
This commit is contained in:
Anand Balakrishnan
parent
b517043d0e
commit
55b7cdd075
5 changed files with 127 additions and 122 deletions
|
|
@ -24,6 +24,9 @@ pub enum Error {
|
||||||
|
|
||||||
#[error("name not in signal trace")]
|
#[error("name not in signal trace")]
|
||||||
SignalNotPresent,
|
SignalNotPresent,
|
||||||
|
|
||||||
|
#[error("incorrect signal type")]
|
||||||
|
InvalidSignalType,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type ArgusError = Error;
|
pub type ArgusError = Error;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
[package]
|
[package]
|
||||||
name = "argus-semantics"
|
name = "argus-semantics"
|
||||||
version = "0.0.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
argus-core = { version = "0.1.0", path = "../argus-core" }
|
argus-core = { version = "0.1.0", path = "../argus-core" }
|
||||||
itertools = "0.10.5"
|
itertools = "0.10.5"
|
||||||
paste = "1.0.12"
|
paste = "1.0.12"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
argus-core = { path = "../argus-core", features = ["arbitrary"] }
|
||||||
|
proptest = "1.1.0"
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,53 @@
|
||||||
use argus_core::expr::NumExpr;
|
use argus_core::expr::NumExpr;
|
||||||
use argus_core::signals::{AnySignal, ConstantSignal};
|
use argus_core::signals::{AnySignal, ConstantSignal};
|
||||||
|
|
||||||
use crate::utils::signal_num_op_impl;
|
|
||||||
use crate::Trace;
|
use crate::Trace;
|
||||||
|
|
||||||
|
macro_rules! signal_num_op_impl {
|
||||||
|
// Unary numeric opeartions
|
||||||
|
(- $signal:ident) => {{
|
||||||
|
use argus_core::prelude::*;
|
||||||
|
use AnySignal::*;
|
||||||
|
match $signal {
|
||||||
|
Bool(_) | ConstBool(_) => panic!("cannot perform unary operation (-) on Boolean signals"),
|
||||||
|
Int(signal) => AnySignal::from(-(&signal)),
|
||||||
|
ConstInt(signal) => AnySignal::from(-(&signal)),
|
||||||
|
UInt(_) | ConstUInt(_) => panic!("cannot perform unary operation (-) on unsigned integer signals"),
|
||||||
|
Float(signal) => AnySignal::from(-(&signal)),
|
||||||
|
ConstFloat(signal) => AnySignal::from(-(&signal)),
|
||||||
|
}
|
||||||
|
}};
|
||||||
|
|
||||||
|
($lhs:ident $op:tt $rhs:ident, [$( $type:ident ),*]) => {
|
||||||
|
paste::paste!{
|
||||||
|
{
|
||||||
|
use argus_core::prelude::*;
|
||||||
|
use AnySignal::*;
|
||||||
|
match ($lhs, $rhs) {
|
||||||
|
(Bool(_), _) | (ConstBool(_), _) | (_, Bool(_)) | (_, ConstBool(_)) => panic!("cannot perform numeric operation {} for boolean arguments", stringify!($op)),
|
||||||
|
$(
|
||||||
|
([<$type >](lhs), [< $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
([<$type >](lhs), [< Const $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
([<Const $type >](lhs), [< $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
([<Const $type >](lhs), [< Const $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
)*
|
||||||
|
_ => panic!("mismatched argument types for {} operation", stringify!($op)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Binary numeric opeartions
|
||||||
|
($lhs:ident $op:tt $rhs:ident) => {
|
||||||
|
signal_num_op_impl!(
|
||||||
|
$lhs $op $rhs,
|
||||||
|
[Int, UInt, Float]
|
||||||
|
)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) use signal_num_op_impl;
|
||||||
|
|
||||||
/// Helper struct to evaluate a [`NumExpr`] given a trace.
|
/// Helper struct to evaluate a [`NumExpr`] given a trace.
|
||||||
pub struct NumExprEval;
|
pub struct NumExprEval;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,82 @@ use argus_core::expr::BoolExpr;
|
||||||
use argus_core::prelude::*;
|
use argus_core::prelude::*;
|
||||||
|
|
||||||
use crate::eval::NumExprEval;
|
use crate::eval::NumExprEval;
|
||||||
use crate::utils::{signal_bool_op_impl, signal_cmp_op_impl};
|
|
||||||
use crate::{Semantics, Trace};
|
use crate::{Semantics, Trace};
|
||||||
|
|
||||||
|
macro_rules! signal_cmp_op_impl {
|
||||||
|
($lhs:ident, $rhs:ident, $op:ident, [$( $type:ident ),*]) => {
|
||||||
|
paste::paste!{
|
||||||
|
{
|
||||||
|
use argus_core::signals::traits::SignalPartialOrd;
|
||||||
|
use argus_core::prelude::*;
|
||||||
|
use AnySignal::*;
|
||||||
|
match ($lhs, $rhs) {
|
||||||
|
(Bool(_), _) | (ConstBool(_), _) | (_, Bool(_)) | (_, ConstBool(_)) => panic!("cannot perform comparison operation ({}) for boolean arguments", stringify!($op)),
|
||||||
|
$(
|
||||||
|
([<$type >](lhs), [< $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
||||||
|
([<$type >](lhs), [< Const $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
||||||
|
([<Const $type >](lhs), [< $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
||||||
|
([<Const $type >](lhs), [< Const $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
||||||
|
)*
|
||||||
|
_ => panic!("mismatched argument types for comparison operation ({})", stringify!($op)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
($lhs:ident < $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_lt, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
|
||||||
|
($lhs:ident <= $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_le, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
|
||||||
|
($lhs:ident > $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_gt, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
($lhs:ident >= $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_ge, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
|
||||||
|
($lhs:ident == $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_eq, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
|
||||||
|
($lhs:ident != $rhs:ident) => {
|
||||||
|
signal_cmp_op_impl!($lhs, $rhs, signal_ne, [Int, UInt, Float])
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! signal_bool_op_impl {
|
||||||
|
// Unary bool opeartions
|
||||||
|
(! $signal:ident) => {{
|
||||||
|
use argus_core::prelude::*;
|
||||||
|
use AnySignal::*;
|
||||||
|
match $signal {
|
||||||
|
Bool(sig) => AnySignal::from(!(&sig)),
|
||||||
|
ConstBool(sig) => AnySignal::from(!(&sig)),
|
||||||
|
_ => panic!("cannot perform unary operation (!) on numeric signals"),
|
||||||
|
}
|
||||||
|
}};
|
||||||
|
|
||||||
|
($lhs:ident $op:tt $rhs:ident) => {
|
||||||
|
paste::paste! {
|
||||||
|
{
|
||||||
|
use argus_core::prelude::*;
|
||||||
|
use AnySignal::*;
|
||||||
|
match ($lhs, $rhs) {
|
||||||
|
(Bool(lhs), Bool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
(Bool(lhs), ConstBool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
(ConstBool(lhs), Bool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
(ConstBool(lhs), ConstBool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
||||||
|
_ => panic!("mismatched argument types for {} operation", stringify!($op)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/// Boolean semantics of Argus expressions
|
/// Boolean semantics of Argus expressions
|
||||||
pub struct BooleanSemantics;
|
pub struct BooleanSemantics;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,118 +1 @@
|
||||||
macro_rules! signal_num_op_impl {
|
|
||||||
// Unary numeric opeartions
|
|
||||||
(- $signal:ident) => {{
|
|
||||||
use argus_core::prelude::*;
|
|
||||||
use AnySignal::*;
|
|
||||||
match $signal {
|
|
||||||
Bool(_) | ConstBool(_) => panic!("cannot perform unary operation (-) on Boolean signals"),
|
|
||||||
Int(signal) => AnySignal::from(-(&signal)),
|
|
||||||
ConstInt(signal) => AnySignal::from(-(&signal)),
|
|
||||||
UInt(_) | ConstUInt(_) => panic!("cannot perform unary operation (-) on unsigned integer signals"),
|
|
||||||
Float(signal) => AnySignal::from(-(&signal)),
|
|
||||||
ConstFloat(signal) => AnySignal::from(-(&signal)),
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
|
|
||||||
($lhs:ident $op:tt $rhs:ident, [$( $type:ident ),*]) => {
|
|
||||||
paste::paste!{
|
|
||||||
{
|
|
||||||
use argus_core::prelude::*;
|
|
||||||
use AnySignal::*;
|
|
||||||
match ($lhs, $rhs) {
|
|
||||||
(Bool(_), _) | (ConstBool(_), _) | (_, Bool(_)) | (_, ConstBool(_)) => panic!("cannot perform numeric operation {} for boolean arguments", stringify!($op)),
|
|
||||||
$(
|
|
||||||
([<$type >](lhs), [< $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
([<$type >](lhs), [< Const $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
([<Const $type >](lhs), [< $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
([<Const $type >](lhs), [< Const $type >](rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
)*
|
|
||||||
_ => panic!("mismatched argument types for {} operation", stringify!($op)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Binary numeric opeartions
|
|
||||||
($lhs:ident $op:tt $rhs:ident) => {
|
|
||||||
signal_num_op_impl!(
|
|
||||||
$lhs $op $rhs,
|
|
||||||
[Int, UInt, Float]
|
|
||||||
)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! signal_cmp_op_impl {
|
|
||||||
($lhs:ident, $rhs:ident, $op:ident, [$( $type:ident ),*]) => {
|
|
||||||
paste::paste!{
|
|
||||||
{
|
|
||||||
use argus_core::signals::traits::SignalPartialOrd;
|
|
||||||
use argus_core::prelude::*;
|
|
||||||
use AnySignal::*;
|
|
||||||
match ($lhs, $rhs) {
|
|
||||||
(Bool(_), _) | (ConstBool(_), _) | (_, Bool(_)) | (_, ConstBool(_)) => panic!("cannot perform comparison operation ({}) for boolean arguments", stringify!($op)),
|
|
||||||
$(
|
|
||||||
([<$type >](lhs), [< $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
|
||||||
([<$type >](lhs), [< Const $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
|
||||||
([<Const $type >](lhs), [< $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
|
||||||
([<Const $type >](lhs), [< Const $type >](rhs)) => lhs.$op(&rhs).map(AnySignal::from),
|
|
||||||
)*
|
|
||||||
_ => panic!("mismatched argument types for comparison operation ({})", stringify!($op)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
($lhs:ident < $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_lt, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
|
|
||||||
($lhs:ident <= $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_le, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
|
|
||||||
($lhs:ident > $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_gt, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
($lhs:ident >= $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_ge, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
|
|
||||||
($lhs:ident == $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_eq, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
|
|
||||||
($lhs:ident != $rhs:ident) => {
|
|
||||||
signal_cmp_op_impl!($lhs, $rhs, signal_ne, [Int, UInt, Float])
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! signal_bool_op_impl {
|
|
||||||
// Unary bool opeartions
|
|
||||||
(! $signal:ident) => {{
|
|
||||||
use argus_core::prelude::*;
|
|
||||||
use AnySignal::*;
|
|
||||||
match $signal {
|
|
||||||
Bool(sig) => AnySignal::from(!(&sig)),
|
|
||||||
ConstBool(sig) => AnySignal::from(!(&sig)),
|
|
||||||
_ => panic!("cannot perform unary operation (!) on numeric signals"),
|
|
||||||
}
|
|
||||||
}};
|
|
||||||
|
|
||||||
($lhs:ident $op:tt $rhs:ident) => {
|
|
||||||
paste::paste! {
|
|
||||||
{
|
|
||||||
use argus_core::prelude::*;
|
|
||||||
use AnySignal::*;
|
|
||||||
match ($lhs, $rhs) {
|
|
||||||
(Bool(lhs), Bool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
(Bool(lhs), ConstBool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
(ConstBool(lhs), Bool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
(ConstBool(lhs), ConstBool(rhs)) => AnySignal::from(&lhs $op &rhs),
|
|
||||||
_ => panic!("mismatched argument types for {} operation", stringify!($op)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) use {signal_bool_op_impl, signal_cmp_op_impl, signal_num_op_impl};
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue