test(pyargus): better test for expr_gen

.github/workflows/ci.yaml

@@ -83,8 +83,6 @@ jobs:
           flake8
           ruff check .
           mypy .
-      - name: Python Tests
-        run: pytest pyargus
 
   docs:
     name: Documentation

pyargus/argus/test_utils/expr_gen.py

@@ -10,9 +10,9 @@ class Transformer(lark.Transformer):
     def INT(self, tok: lark.Token) -> lark.Token:  # noqa: N802
         """Convert the value of `tok` from string to int, while maintaining line number & column.
 
-        Performs wrapping conversion for 64-bit integers
+        Performs wrapping conversion for 32-bit integers
         """
-        return tok.update(value=int(tok) // 2**64)
+        return tok.update(value=int(float(tok) // 2**32))
 
 
 ARGUS_EXPR_GRAMMAR = lark.Lark(
@@ -21,14 +21,15 @@ ARGUS_EXPR_GRAMMAR = lark.Lark(
 TRUE: "true" | "TRUE"
 FALSE: "false" | "FALSE"
 BOOLEAN: TRUE | FALSE
+INT: /[0-9]+/
 
 KEYWORD: "X" | "G" | "F" | "U" | BOOLEAN
 
-ESCAPED_STRING: "\"" /(\w|[\t ]){1,20}/ "\""
-NUM_IDENT: ESCAPED_STRING
+ESCAPED_STRING: /(\w|[\t ]){1,20}/
+NUM_IDENT: "\"num_" ESCAPED_STRING "\""
          | "num_" CNAME
-BOOL_IDENT: ESCAPED_STRING
-         | "bool_" CNAME
+BOOL_IDENT: "\"bool_" ESCAPED_STRING "\""
+          | "bool_" CNAME
 
 num_expr: num_expr "*" num_expr
         | num_expr "/" num_expr
@@ -66,7 +67,6 @@ phi: bool_expr
 
 %import common.CNAME
 %import common.NUMBER
-%import common.INT
 %import common.WS
 %import common.WS_INLINE
 %ignore WS

pyargus/tests/test_expr.py

@@ -1,14 +1,16 @@
 import logging
 
+import hypothesis.strategies as st
 from hypothesis import HealthCheck, given, settings
 
 import argus
 from argus.test_utils.expr_gen import argus_expr
 
 
-@given(spec=argus_expr())
+@given(data=st.data())
 @settings(suppress_health_check=[HealthCheck.too_slow])
-def test_correct_expr(spec: str) -> None:
+def test_correct_expr(data: st.DataObject) -> None:
+    spec = data.draw(argus_expr())
     try:
         _ = argus.parse_expr(spec)
     except ValueError as e: