openc3-cosmos-script-engine-cstol 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0e4ae051329106a645f8cfafc4692be99ada07d577dc4bdef50b5f8a017c26
-  data.tar.gz: 4a8728bf65623019a3f525ed1bcb7527865d927fcbcf1a8b14dd62d1e63f2bb2
+  metadata.gz: 6ef43bd11a38493eccfc313dccee63034ead05937930eaed62e5c164bd4b68a4
+  data.tar.gz: e63152c3a168bf6da0b6d70b3e3aa9f05cb2c974c631cbd4e1ac5f36908618a6
 SHA512:
-  metadata.gz: e992d06108e1e8c401cb3be499f3fac0da9e3f4a0b94139099a486ffbe7906be2b508654ab4dab7c9a4f2c7dc40f1f8794ce0ca84be4c7bd9648ac3c5227fc8a
-  data.tar.gz: d4688f23af1f74ba8969981105cb841cf0064e175e48825f33a460a54ed6559c84f80c4e1cb1209fd8aa147ef60a0ede414b3d8367c138de6b55adf0333d9071
+  metadata.gz: eab9091c50b1867c2d4ac4b2794f72abb67bd48352ccbd01cfa14fb442be43314c1766e73ba418cef8445d6f596d7855b54306c6b5a58cddfcca900698450107
+  data.tar.gz: d23e20164925cafe6a9efee37d6348b2277a1996a53fe8d05f0b31dd6fa4612635a0e34c1ffdcf893af8a5c297b175ece81a747250459ce747a97e298a3e6ece

data/lib/cstol_script_engine.py

@@ -514,6 +514,29 @@ class CstolScriptEngine(ScriptEngine):
             expressions.append(expression)
         return expressions
 
+    def _split_wait_timeout(self, tokens):
+        """Split WAIT body tokens into (condition_tokens, timeout_tokens | None).
+
+        Scans from the end of the token list looking for the last ``OR``
+        that is immediately followed by ``FOR`` or ``UNTIL``. That ``OR``
+        marks the boundary between the boolean condition and the timeout
+        clause.
+
+        Returns
+        -------
+        (condition_tokens, timeout_tokens)
+            *timeout_tokens* includes the ``FOR``/``UNTIL`` keyword and the
+            value that follows.  If no ``OR FOR`` / ``OR UNTIL`` sequence is
+            found the full token list is returned as the condition and
+            *timeout_tokens* is ``None``.
+        """
+        # Walk backwards so we find the last OR FOR / OR UNTIL (before the timeout).
+        # Earlier OR tokens are boolean operators inside the condition.
+        for i in range(len(tokens) - 1, 0, -1):
+            if tokens[i - 1].upper() == "OR" and tokens[i].upper() in ("FOR", "UNTIL"):
+                return tokens[:i - 1], tokens[i:]
+        return tokens, None
+
     def split_vs_tokens_on_colon(self, tokens):
         """
         Split tokens on colons for VS clause processing, but preserve timestamps.
@@ -1088,11 +1111,11 @@ class CstolScriptEngine(ScriptEngine):
                 raise ValueError(f"Invalid timestamp format at line {line_no}")
         else:
             # Conditional expression wait
-            expressions = self.extract_expressions(tokens[1:], seperator="OR")
-            python_expression = self.build_python_expression(expressions[0])
-            if len(expressions) > 1:
+            condition_tokens, timeout_tokens = self._split_wait_timeout(tokens[1:])
+            python_expression = self.build_python_expression(condition_tokens)
+            if timeout_tokens is not None:
                 # Timeout given with "OR FOR" or "OR UNTIL"
-                seconds = self.evaluate_expression(expressions[1][1:]) # Drop assumed FOR or UNTIL token
+                seconds = self.evaluate_expression(timeout_tokens[1:]) # Drop FOR or UNTIL token
                 if isinstance(seconds, (int, float, complex)) and not isinstance(seconds, bool):
                     if seconds > self.ONE_YEAR_SECONDS:
                         now = datetime.datetime.now().timestamp()
@@ -1261,4 +1284,4 @@ class CstolScriptEngine(ScriptEngine):
                 case _:
                     raise ValueError(f"Unknown keyword '{keyword}' at line {line_no}")
 
-        return line_no + 1
+        return line_no + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openc3-cosmos-script-engine-cstol
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - OpenC3, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-26 00:00:00.000000000 Z
+date: 2026-08-12 00:00:00.000000000 Z
 dependencies: []
 description: "  This plugin provides a script engine to support CSTOL in Script Runner\n"
 email: