feat: expose parser in argus

Author: anand-bala

argus-core/src/expr.rs

@@ -119,7 +119,8 @@ pub enum ExprRef<'a> {
 }
 
 /// An expression (either [`BoolExpr`] or [`NumExpr`])
-#[derive(Clone, Debug, derive_more::From, derive_more::TryInto)]
+#[derive(Clone, Debug)]
+#[enum_dispatch(AnyExpr)]
 pub enum Expr {
     /// A reference to a [`BoolExpr`]
     Bool(BoolExpr),

pyargus/Cargo.toml

@@ -18,3 +18,4 @@ log = "0.4.20"
 paste = "1.0.14"
 pyo3 = "0.19.2"
 pyo3-log = "0.8.3"
+ariadne = "0.3.0"

pyargus/argus/__init__.py

@@ -3,7 +3,7 @@
 from typing import List, Optional, Tuple, Type, Union
 
 from . import _argus
-from ._argus import dtype
+from ._argus import dtype, parse_expr
 from .exprs import ConstBool, ConstFloat, ConstInt, ConstUInt, VarBool, VarFloat, VarInt, VarUInt
 from .signals import BoolSignal, FloatSignal, IntSignal, Signal, UnsignedIntSignal
 
@@ -87,6 +87,7 @@ def signal(
 
 __all__ = [
     "dtype",
+    "parse_expr",
     "declare_var",
     "literal",
     "signal",

pyargus/argus/_argus.pyi

@@ -1,8 +1,12 @@
-from typing import ClassVar, Literal, Protocol, TypeAlias, final
+from typing import ClassVar, Literal, TypeAlias, final
 
 from typing_extensions import Self
 
-class NumExpr(Protocol):
+def parse_expr(expr_str: str) -> Expr: ...
+
+class Expr: ...
+
+class NumExpr(Expr):
     def __ge__(self, other: Self) -> NumExpr: ...
     def __gt__(self, other: Self) -> NumExpr: ...
     def __le__(self, other: Self) -> NumExpr: ...
@@ -64,7 +68,7 @@ class Div(NumExpr):
 class Abs(NumExpr):
     def __init__(self, arg: NumExpr) -> None: ...
 
-class BoolExpr(Protocol):
+class BoolExpr(Expr):
     def __and__(self, other: Self) -> BoolExpr: ...
     def __invert__(self) -> BoolExpr: ...
     def __or__(self, other: Self) -> BoolExpr: ...
@@ -192,5 +196,9 @@ class FloatSignal(Signal):
 @final
 class Trace: ...
 
-def eval_bool_semantics(expr: BoolExpr, trace: Trace) -> BoolSignal: ...
-def eval_robust_semantics(expr: BoolExpr, trace: Trace) -> BoolSignal: ...
+def eval_bool_semantics(
+    expr: BoolExpr, trace: Trace, *, interpolation_method: _InterpolationMethod = "linear"
+) -> BoolSignal: ...
+def eval_robust_semantics(
+    expr: BoolExpr, trace: Trace, *, interpolation_method: _InterpolationMethod = "linear"
+) -> BoolSignal: ...

pyargus/argus/exprs.py

@@ -10,6 +10,7 @@
     ConstUInt,
     Div,
     Eventually,
+    Expr,
     Mul,
     Negate,
     Next,
@@ -46,4 +47,7 @@
     "VarFloat",
     "VarInt",
     "VarUInt",
+    "Expr",
+    "BoolExpr",
+    "NumExpr",
 ]