openc3-cosmos-script-engine-cstol 1.2.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09b27bfb1b01bd2a21ff41078e7d25e2112d9024d9dfb2ab4663a2bd1b419780'
-  data.tar.gz: 8fd1660731f16948ea44cd2539408b100f34018534d8e7df47bb045d18ff2984
+  metadata.gz: d0dfd6b3382cbfb7f4b73349047d0694aeab39e52ac67c0606b55a14afb2c814
+  data.tar.gz: 59d7c0c79e2f1d8cfc9a17466d6deb3d6d60cfa0912f255074f5307509026f1b
 SHA512:
-  metadata.gz: ee0cf899dd95e9c5aa305a9e228bef5cbaad1d41d357cc76a7eba36b51cdaf16777bf43ac7f7fbea875853319b9b34bedd73c798779a8746056079c047e6e844
-  data.tar.gz: 4d3600530bec3d984aeb07529ba87d67314254a4233c6bb7bec010a78ac6fce08d5e5c49193af70a50f182e8b95c23b3a5928eeb2e7f44698b0bab34c3f19336
+  metadata.gz: 97127866fe1b94549e7ea10513f047228df0dcbdff6ed03353ed7f50b9587e89244d00ea771c056138faef11c998eb9292dc95bd2a7c6428da7fabcb47d72fa2
+  data.tar.gz: c222c13292265034cca2f091e04da0e1f32bfefdb5f6e39118ddb4845287aac8edca27feee42fbcd4aeb5bf706c2d86e12d0468da386dcf09037f4bde7dcb1f4

data/lib/cstol_script_engine.py

@@ -123,6 +123,14 @@ class CstolVariables:
         """
         return self.local_variables.get(name.upper(), None)
 
+    def has_local_variable(self, name):
+        """
+        Returns True if the local variable has been set (case insensitive).
+        Note this is different from get_local_variable returning None because
+        a variable can be legitimately set to None.
+        """
+        return name.upper() in self.local_variables
+
     def set_special_variable(self, name, value):
         """
         Sets a special variable, which is a variable that starts with '$$'.
@@ -442,10 +450,10 @@ class CstolScriptEngine(ScriptEngine):
             # Use regex to extract the numeric part (including scientific notation)
             # This pattern matches:
             # - Optional sign (+/-)
-            # - Digits, optional decimal point and more digits
+            # - Digits with an optional decimal point, or a leading-dot fraction
             # - Optional scientific notation (e/E followed by optional sign and digits)
             # - Ignores any alphabetic characters that follow
-            matches = re.match(r"^([+-]?\d*\.?\d+(?:[eE][+-]?\d+)?)", token)
+            matches = re.match(r"^([+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?)", token)
             if matches is not None:
                 final_tokens.append(str(matches.group(1)))
                 previous_number = True
@@ -765,9 +773,13 @@ class CstolScriptEngine(ScriptEngine):
                         success = False
                         fail_message = f"not equal to {vs_value}"
             else:
-                # No VS - Just a print check
+                # No VS but could be a relational or logical expression
                 source = " ".join(expr)
                 value = self.evaluate_expression(expr)
+                # Relational/logical expressions evaluate to a bool and must be True
+                if value is False:
+                    success = False
+                    fail_message = "expression is false"
 
             formatted_value = self.apply_format(format_spec, value)
 
@@ -922,7 +934,18 @@ class CstolScriptEngine(ScriptEngine):
             raise ValueError(
                 f"Expected '=' after variable name in DECLARE command at line {line_no}"
             )
-        default_value = self.evaluate_tokens([tokens[4]])[0]
+        default_end = 6 if tokens[4] in ("+", "-") else 5
+        default_tokens = tokens[4:default_end]
+        scientific_default = "".join(tokens[4 : default_end + 2])
+        if re.fullmatch(
+            r"[+-]?(?:\d+(?:\.\d*)?|\.\d+)[eE][+-]\d+(?:[A-Za-z]+)?", scientific_default
+        ):
+            default_tokens = [scientific_default]
+        default_value = self.evaluate_expression(default_tokens)
+        if mode == "INPUT" and self.variables.has_local_variable(variable_name):
+            # INPUT variables are passed in by the PROC argument list, so the
+            # default value is only applied when an argument wasn't given
+            return
         self.variables.set_local_variable(variable_name, default_value)
 
     def handle_display(self, tokens, line_no):
@@ -1170,13 +1193,42 @@ class CstolScriptEngine(ScriptEngine):
                 if token == ",":
                     continue
                 elif token.startswith("$"):
-                    self.variables.set_local_variable(token, os.getenv(f"CSTOL_ARG_{index}"))
+                    value = os.getenv(f"CSTOL_ARG_{index}")
+                    if value is not None:
+                        # START stores the type alongside the value so the local
+                        # variable gets the type the caller passed rather than a string
+                        value = self.convert_arg(value, os.getenv(f"CSTOL_ARG_{index}_TYPE"))
+                        self.variables.set_local_variable(token, value)
                     index += 1
                 else:
                     raise ValueError(
                         f"Invalid variable '{token}' in PROC command at line {line_no}"
                     )
 
+    @staticmethod
+    def convert_arg(value, type_name):
+        """
+        Converts a CSTOL_ARG environment variable string back into the type it
+        had when START was called. Returns the string unchanged if the type is
+        unknown or the value can't be converted.
+        """
+        try:
+            match type_name:
+                case "int":
+                    return int(value)
+                case "float":
+                    return float(value)
+                case "complex":
+                    return complex(value)
+                case "bool":
+                    return value == "True"
+                case "NoneType":
+                    return None
+                case _:
+                    return value
+        except ValueError:
+            return value
+
     def handle_return(self, tokens, lines, line_no):
         if len(tokens) > 1 and tokens[1].upper() == "ALL":
             raise StopScriptError
@@ -1216,15 +1268,14 @@ class CstolScriptEngine(ScriptEngine):
             # Remove quotes
             proc_name = proc_name[1:-1]
 
-        args = []
         if len(tokens) > 2:
             # Handle argument list
             expressions = self.extract_expressions(tokens[2:], ",")
             results = self.evaluate_expressions(expressions)
-            args = [str(result) for result in results]
-            for index, arg in enumerate(args):
-                # Set the environment variable for the argument
-                os.environ[f"CSTOL_ARG_{index}"] = arg
+            for index, result in enumerate(results):
+                # Set the environment variables for the argument and its type
+                os.environ[f"CSTOL_ARG_{index}"] = str(result)
+                os.environ[f"CSTOL_ARG_{index}_TYPE"] = type(result).__name__
         start(proc_name, bind_variables=False)
 
     def handle_switch(self, tokens, line_no):

metadata

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