FIX: -- to reverse line

Author: ken-lauer

.github/actions/bmad-setup/action.yml

@@ -0,0 +1,15 @@
+name: "bmad setup"
+description: "Clone the latest bmad"
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v5
+      with:
+        repository: bmad-sim/bmad-ecosystem
+        fetch-depth: 1
+        path: bmad-eco
+
+    - name: Set ACC_ROOT_DIR
+      shell: bash -l {0}
+      run: |
+        echo "ACC_ROOT_DIR=$GITHUB_WORKSPACE/bmad-eco" >> $GITHUB_ENV

.github/workflows/test.yml

@@ -37,6 +37,8 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: ./.github/actions/bmad-setup # -> sets ACC_ROOT_DIR
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
         with:

src/latform/parser.py

@@ -106,6 +106,21 @@ def _nab_comments(items) -> Comments:
     return res
 
 
+def _line_elements_from_block(block: Block) -> Seq:
+    if block.opener != "(":
+        raise ValueError(f"Unexpected block opener: {block.opener}")
+
+    eles = Seq.from_delimited_block(block, delimiter=COMMA)
+    assert isinstance(eles, Seq)
+    for idx, ele in enumerate(list(eles.items)):
+        match ele:
+            case Seq(items=["-", "-", name]):
+                assert isinstance(ele, Seq)
+                eles.items[idx].items = [Delimiter("--"), name]
+
+    return eles
+
+
 def parse_items(items: list[TokenizerItem]):
     if not items:
         raise ValueError("No items provided")
@@ -151,14 +166,14 @@ def parse_items(items: list[TokenizerItem]):
             return ElementList(
                 comments=comments,
                 name=name,
-                elements=Seq.from_delimited_block(elements_block, delimiter=COMMA),
+                elements=_line_elements_from_block(elements_block),
             )
 
         case [Token() as name, ":", Token("line"), "=", Block(opener="(") as elements_block]:
             return Line(
                 comments=comments,
                 name=name,
-                elements=Seq.from_delimited_block(elements_block, delimiter=COMMA),
+                elements=_line_elements_from_block(elements_block),
             )
 
         case [
@@ -167,12 +182,12 @@ def parse_items(items: list[TokenizerItem]):
             Token("line"),
             Block(opener="[") as multipass,
             "=",
-            Block(opener="(") as eles,
+            Block(opener="(") as elements_block,
         ] if _is_multipass_marker(multipass):
             return Line(
                 comments=comments,
                 name=name,
-                elements=Seq.from_delimited_block(eles, delimiter=COMMA),
+                elements=_line_elements_from_block(elements_block),
                 multipass=True,
             )
 
@@ -182,15 +197,15 @@ def parse_items(items: list[TokenizerItem]):
             ":",
             Token("line"),
             "=",
-            Block(opener="(") as eles,
+            Block(opener="(") as elements_block,
         ]:
             return Line(
                 comments=comments,
                 name=CallName(
                     name=Seq.from_item(name),
                     args=Seq.from_item(line_args),
                 ),
-                elements=Seq.from_delimited_block(eles, delimiter=COMMA),
+                elements=_line_elements_from_block(elements_block),
             )
 
         case [Token() as name, ":", Token() as element_type, *rest]:

src/latform/tests/conftest.py

@@ -1,9 +1,17 @@
 from __future__ import annotations
 
+import os
 import pathlib
 
 TEST_ROOT = pathlib.Path(__file__).resolve().parent
 LATTICE_ROOT = TEST_ROOT / "files"
 LATTICE_FILES = [
     LATTICE_ROOT / "fodo.bmad",
 ]
+
+ACC_ROOT_DIR = (
+    pathlib.Path(os.environ.get("ACC_ROOT_DIR", "")) if "ACC_ROOT_DIR" in os.environ else None
+)
+
+if ACC_ROOT_DIR is not None:
+    LATTICE_FILES.extend([ACC_ROOT_DIR / "bmad-doc/lattices/figure_8/figure_8.bmad"])

src/latform/tests/test_output.py

@@ -318,6 +318,16 @@ def test_format_element(item, expected):
             "ele: key, foo = call::/path/to/file",
             id="call_expr",
         ),
+        pytest.param(
+            "ele: line = (a, b, c)",
+            "ele: line = (a, b, c)",
+            id="simple_line",
+        ),
+        pytest.param(
+            "ele: line = (a, b, c, --d, e, f)",
+            "ele: line = (a, b, c, --d, e, f)",
+            id="line_with_reverse",
+        ),
     ],
 )
 def test_format_element_from_source(code: str, expected: str) -> None:

src/latform/tests/test_parse.py

@@ -8,7 +8,6 @@
     EQUALS,
     LBRACE,
     LPAREN,
-    MINUS,
     OPEN_TO_CLOSE,
     RBRACE,
     RPAREN,
@@ -1361,8 +1360,7 @@ def roundtrip_code(code: str) -> None:
                             T("p1"),
                             Seq(
                                 items=[
-                                    MINUS,
-                                    MINUS,
+                                    Delimiter("--"),
                                     T("L3"),
                                 ],
                                 delimiter=SPACE,