fprime-gds 4.0.2a3__py3-none-any.whl → 4.0.2a5__py3-none-any.whl

fprime_gds/common/fpy/parser.py

@@ -71,7 +71,7 @@ class AstBoolean(Ast):
     value: TypingLiteral[True] | TypingLiteral[False]
 
 
-AstLiteral = AstString | AstNumber | AstBoolean
+AstLiteral = Union[AstString, AstNumber, AstBoolean]
 
 
 @dataclass
@@ -92,43 +92,29 @@ class AstFuncCall(Ast):
     args: list["AstExpr"] | None
 
 
-@dataclass
-class AstInfixOp(Ast):
-    value: str
-
-
 @dataclass()
 class AstPass(Ast):
     pass
 
-
-@dataclass
-class AstComparison(Ast):
-    lhs: "AstExpr"
-    op: AstInfixOp
-    rhs: "AstExpr"
-
-
 @dataclass
-class AstNot(Ast):
-    value: "AstExpr"
+class AstBinaryOp(Ast):
+    lhs: AstExpr
+    op: str
+    rhs: AstExpr
 
 
 @dataclass
-class AstAnd(Ast):
-    values: list["AstExpr"]
+class AstUnaryOp(Ast):
+    op: str
+    val: AstExpr
 
 
-@dataclass
-class AstOr(Ast):
-    values: list["AstExpr"]
-
-
-AstTest = AstOr | AstAnd | AstNot | AstComparison
-
+AstOp = Union[AstBinaryOp, AstUnaryOp]
 
-AstReference = AstGetAttr | AstGetItem | AstVar
-AstExpr = Union[AstFuncCall, AstTest, AstLiteral, AstReference]
+AstReference = Union[AstGetAttr, AstGetItem, AstVar]
+AstExpr = Union[
+    AstFuncCall, AstLiteral, AstReference, AstOp
+]
 
 
 @dataclass
@@ -165,9 +151,14 @@ class AstBody(Ast):
     stmts: list[AstStmt]
 
 
+@dataclass
+class AstScopedBody(Ast):
+    stmts: list[AstStmt]
+
+
 for cls in Ast.__subclasses__():
     cls.__hash__ = Ast.__hash__
-    # cls.__repr__ = Ast.__repr__
+    cls.__repr__ = Ast.__repr__
 
 
 @v_args(meta=False, inline=False)
@@ -204,7 +195,7 @@ def handle_str(meta, s: str):
 
 @v_args(meta=True, inline=True)
 class FpyTransformer(Transformer):
-    input = no_inline(AstBody)
+    input = no_inline(AstScopedBody)
     pass_stmt = AstPass
 
     assign = AstAssign
@@ -213,11 +204,8 @@ class FpyTransformer(Transformer):
     elifs = no_inline(AstElifs)
     elif_ = AstElif
     body = no_inline(AstBody)
-    or_test = no_inline(AstOr)
-    and_test = no_inline(AstAnd)
-    not_test = AstNot
-    comparison = AstComparison
-    comp_op = AstInfixOp
+    binary_op = AstBinaryOp
+    unary_op = AstUnaryOp
 
     func_call = AstFuncCall
     arguments = no_inline_or_meta(list)
@@ -237,3 +225,10 @@ class FpyTransformer(Transformer):
     STRING = handle_str
     CONST_TRUE = lambda a, b: True
     CONST_FALSE = lambda a, b: False
+    ADD_OP: str
+    SUB_OP: str
+    DIV_OP: str
+    MUL_OP: str
+    FLOOR_DIV_OP: str
+    MOD_OP: str
+    POW_OP: str

fprime_gds/common/fpy/test_helpers.py

@@ -0,0 +1,119 @@
+import ast
+from pathlib import Path
+import tempfile
+import traceback
+from fprime.common.models.serialize.type_base import BaseType
+from fprime.common.models.serialize.numerical_types import U32Type, U8Type
+from fprime_gds.common.fpy.bytecode.assembler import deserialize_directives
+from fprime_gds.common.fpy.model import DirectiveErrorCode, FpySequencerModel
+from fprime_gds.common.fpy.bytecode.directives import Directive
+from fprime_gds.common.fpy.codegen import compile, serialize_directives
+from fprime_gds.common.fpy.parser import parse
+from fprime_gds.common.loaders.ch_json_loader import ChJsonLoader
+from fprime_gds.common.loaders.cmd_json_loader import CmdJsonLoader
+from fprime_gds.common.loaders.event_json_loader import EventJsonLoader
+from fprime_gds.common.loaders.prm_json_loader import PrmJsonLoader
+from fprime_gds.common.testing_fw.api import IntegrationTestAPI
+
+default_dictionary = str(
+    Path(__file__).parent.parent.parent.parent.parent
+    / "test"
+    / "fprime_gds"
+    / "common"
+    / "fpy"
+    / "RefTopologyDictionary.json"
+)
+
+
+def compile_seq(fprime_test_api, seq: str) -> list[Directive]:
+    return compile(parse(seq), default_dictionary) #fprime_test_api.pipeline.dictionary_path)
+
+
+def lookup_type(fprime_test_api, type_name: str):
+    dictionary = default_dictionary #fprime_test_api.pipeline.dictionary_path
+    cmd_json_dict_loader = CmdJsonLoader(dictionary)
+    (cmd_id_dict, cmd_name_dict, versions) = cmd_json_dict_loader.construct_dicts(
+        dictionary
+    )
+
+    ch_json_dict_loader = ChJsonLoader(dictionary)
+    (ch_id_dict, ch_name_dict, versions) = ch_json_dict_loader.construct_dicts(
+        dictionary
+    )
+    prm_json_dict_loader = PrmJsonLoader(dictionary)
+    (prm_id_dict, prm_name_dict, versions) = prm_json_dict_loader.construct_dicts(
+        dictionary
+    )
+    event_json_dict_loader = EventJsonLoader(dictionary)
+    (event_id_dict, event_name_dict, versions) = event_json_dict_loader.construct_dicts(
+        dictionary
+    )
+    type_name_dict = cmd_json_dict_loader.parsed_types
+    type_name_dict.update(ch_json_dict_loader.parsed_types)
+    type_name_dict.update(prm_json_dict_loader.parsed_types)
+    type_name_dict.update(event_json_dict_loader.parsed_types)
+
+    return type_name_dict[type_name]
+
+
+def run_seq(
+    fprime_test_api: IntegrationTestAPI,
+    dirs: list[Directive],
+    tlm: dict[str, bytes] = None,
+):
+    for idx, d in enumerate(dirs):
+        print(idx, d)
+    if tlm is None:
+        tlm = {}
+    file = tempfile.NamedTemporaryFile(suffix=".bin", delete=False)
+
+    serialize_directives(dirs, Path(file.name))
+
+    # fprime_test_api.send_and_assert_command("Ref.cmdSeq.RUN", [file.name, "BLOCK"], timeout=4)
+    # return
+
+    dictionary = default_dictionary # fprime_test_api.pipeline.dictionary_path
+
+    deserialized_dirs = deserialize_directives(Path(file.name).read_bytes())
+
+    model = FpySequencerModel()
+    ch_json_dict_loader = ChJsonLoader(dictionary)
+    (ch_id_dict, ch_name_dict, versions) = ch_json_dict_loader.construct_dicts(
+        dictionary
+    )
+    tlm_db = {}
+    for chan_name, val in tlm.items():
+        ch_template = ch_name_dict[chan_name]
+        tlm_db[ch_template.get_id()] = val
+    ret = model.run(deserialized_dirs, tlm_db)
+    if ret != DirectiveErrorCode.NO_ERROR:
+        raise RuntimeError("Sequence returned", ret)
+
+
+def assert_compile_success(fprime_test_api, seq: str):
+    compile_seq(fprime_test_api, seq)
+
+
+def assert_run_success(fprime_test_api, seq: str, tlm: dict[str, bytes] = None):
+    seq = compile_seq(fprime_test_api, seq)
+
+    run_seq(fprime_test_api, seq, tlm)
+
+
+def assert_compile_failure(fprime_test_api, seq: str):
+    try:
+        compile_seq(fprime_test_api, seq)
+    except BaseException as e:
+        traceback.print_exc()
+        return
+    raise RuntimeError("compile_seq succeeded")
+
+
+def assert_run_failure(fprime_test_api, seq: str):
+    directives = compile_seq(fprime_test_api, seq)
+    try:
+        run_seq(fprime_test_api, directives)
+    except BaseException as e:
+        print(e)
+        return
+    raise RuntimeError("run_seq succeeded")