ENH: caret, more negation rules

Author: ken-lauer

src/latform/const.py

@@ -10,6 +10,7 @@
 STATEMENT_NAME_EQUALS = Delimiter("=", role=Role.statement_definition)
 
 AMPERSAND = Delimiter("&")
+CARET = Delimiter("^")
 COLON = Delimiter(":")
 COMMA = Delimiter(",")
 DQUOTE = Delimiter('"')

src/latform/output.py

@@ -101,6 +101,8 @@ def _needs_space_before(parts: list[Token], idx: int) -> tuple[bool, str]:
         return False, "no space around /"
     if prev == "*" or cur == "*":
         return False, "no space around *"
+    if cur == "^":
+        return False, "no space around caret"
     if cur == "-":
         if prev in close_brackets:
             return True, "space before minus:- after closing bracket"

src/latform/parser.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import os
 import pathlib
 import sys
 from dataclasses import dataclass, field
@@ -19,6 +18,7 @@
     Parameter,
     Simple,
     Statement,
+    get_call_filename,
 )
 from .token import Comments
 from .tokenizer import tokenize
@@ -384,18 +384,15 @@ def parse(self):
             self.by_filename[parent_fn] = statements
             for st in statements:
                 if isinstance(st, Simple) and st.statement == "call":
-                    attr = st.get_named_attribute("filename", partial_match=True)
-
-                    sub_filename = (
-                        attr.value if isinstance(attr.value, Token) else attr.value.to_token()
-                    ).remove_quotes()
-                    fn = parent_fn.parent / os.path.expandvars(sub_filename)
+                    sub_filename, fn = get_call_filename(
+                        st, caller_filename=parent_fn, expand_vars=True
+                    )
                     self.local_file_to_source_filename[sub_filename] = fn
                     self.stack.append(fn)
             parent_fn = pathlib.Path(filename)
         return self.by_filename
 
-    def reformat(self, options: FormatOptions) -> None:
+    def reformat(self, options: FormatOptions, *, dest: pathlib.Path | None = None) -> None:
         from .output import format_statements
 
         for fn, statements in self.by_filename.items():

src/latform/statements.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import os.path
+import pathlib
 from dataclasses import dataclass, field
 from typing import ClassVar
 
@@ -232,3 +234,27 @@ def to_output_nodes(self):
                 *comma_delimit(self.attributes),
             ]
         return [self.name, STATEMENT_NAME_COLON, *comma_delimit([self.keyword, *self.attributes])]
+
+
+def get_call_filename(
+    st: Simple,
+    *,
+    caller_filename: pathlib.Path | None + None,
+    expand_vars: bool = True,
+) -> tuple[str, pathlib.Path]:
+    if not isinstance(st, Simple):
+        raise ValueError(f"Unexpected type: {type(st).__name__}")
+
+    if st.statement != "call":
+        raise ValueError(f"Statement is not 'call': {st.statement}")
+
+    attr = st.get_named_attribute("filename", partial_match=True)
+
+    sub_filename = (
+        attr.value if isinstance(attr.value, Token) else attr.value.to_token()
+    ).remove_quotes()
+    expanded = os.path.expandvars(sub_filename) if expand_vars else sub_filename
+
+    if not caller_filename:
+        return sub_filename, pathlib.Path(expanded)
+    return sub_filename, caller_filename.parent / expanded

src/latform/tests/test_output.py

@@ -374,6 +374,21 @@ def test_format_element_from_source(code: str, expected: str) -> None:
             "b01w[rho]/b01w[L]",
             id="array_indexing_division",
         ),
+        pytest.param(
+            "b01w[   rho  ]   ^3",
+            "b01w[rho]^3",
+            id="exp_after_bracket",
+        ),
+        pytest.param(
+            "sqrt(foo)   ^3",
+            "sqrt(foo)^3",
+            id="exp_after_func",
+        ),
+        pytest.param(
+            "1.3e4 ^ 4",
+            "1.3e4^4",
+            id="exp_after_sci_not",
+        ),
         pytest.param(
             "ename[frequencies(1)%amp]",
             "ename[frequencies(1)%amp]",

src/latform/token.py

@@ -69,6 +69,9 @@ def __eq__(self, other) -> bool:
 
         return case_insensitive_equality
 
+    def __ne__(self, other) -> bool:
+        return not (self == other)
+
     @property
     def is_quoted_string(self) -> bool:
         return (self.startswith(_SQUOTE) and self.endswith(_SQUOTE)) or (

src/latform/tokenizer.py

@@ -19,7 +19,7 @@ class _StatementTokenBlock:
     lineno: int
     items: list[Token | Delimiter] = field(default_factory=list)
 
-    def stack(self):
+    def stack(self) -> Block:
         root = Block()
         stack = [root]
         delim_state = DelimiterState()