research/argus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(py): handle interval in the expression trampoline

Browse source
This commit is contained in:
Anand Balakrishnan 2023-05-09 12:08:11 -07:00
parent d13746f904
commit 86138fe213
No known key found for this signature in database
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pyargus/Cargo.toml
View file

@ -13,5 +13,5 @@ argus-semantics = { version = "0.1.0", path = "../argus-semantics" }
derive_more = "0.99.17" derive_more = "0.99.17"
log = "0.4.17" log = "0.4.17"
paste = "1.0.12" paste = "1.0.12"
pyo3 = "0.18.1" pyo3 = "0.18.3"
pyo3-log = "0.8.1" pyo3-log = "0.8.1"

25
pyargus/src/expr.rs
View file

@ -358,7 +358,13 @@ impl Always {
#[new] #[new]
fn new(arg: PyBoolExpr) -> (Self, PyBoolExpr) { fn new(arg: PyBoolExpr) -> (Self, PyBoolExpr) {
let arg = arg.0; let arg = arg.0;
(Self, PyBoolExpr(Box::new(BoolExpr::Always { arg }))) (
Self,
PyBoolExpr(Box::new(BoolExpr::Always {
arg,
interval: (..).into(),
})),
)
} }
} }
@ -370,7 +376,13 @@ impl Eventually {
#[new] #[new]
fn new(arg: PyBoolExpr) -> (Self, PyBoolExpr) { fn new(arg: PyBoolExpr) -> (Self, PyBoolExpr) {
let arg = arg.0; let arg = arg.0;
(Self, PyBoolExpr(Box::new(BoolExpr::Eventually { arg }))) (
Self,
PyBoolExpr(Box::new(BoolExpr::Eventually {
arg,
interval: (..).into(),
})),
)
} }
} }
@ -383,7 +395,14 @@ impl Until {
fn new(lhs: PyBoolExpr, rhs: PyBoolExpr) -> (Self, PyBoolExpr) { fn new(lhs: PyBoolExpr, rhs: PyBoolExpr) -> (Self, PyBoolExpr) {
let lhs = lhs.0; let lhs = lhs.0;
let rhs = rhs.0; let rhs = rhs.0;
(Self, PyBoolExpr(Box::new(BoolExpr::Until { lhs, rhs }))) (
Self,
PyBoolExpr(Box::new(BoolExpr::Until {
lhs,
rhs,
interval: (..).into(),
})),
)
} }
} }