solpl 2.3.0__tar.gz → 2.3.6__tar.gz

{solpl-2.3.0/solpl.egg-info → solpl-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.3.0
+Version: 2.3.6
 Summary: Sol Programming Language Interpreter
 Requires-Python: >=3.7
 License-File: LICENSE

{solpl-2.3.0 → solpl-2.3.6}/interpreter/sol.py

@@ -32,7 +32,8 @@ class SolInterpreter:
 
         with open(filename, "r") as f:
             code = f.read()
-            module_name = filename.replace(".sol", "")
+            base_name = os.path.basename(filename)
+            module_name = base_name.replace(".sol", "")
             lines = [l.strip() for l in code.split('\n') if l.strip()]
             for pc, line in enumerate(lines):
                 if "(" in line and ")" in line and "main" not in line and "end" not in line and "->" not in line and ">>" not in line and "?" not in line and not line.startswith(("if ", "while ", "for ", "elseif", "else")):
@@ -144,15 +145,19 @@ class SolInterpreter:
         self.threads.append(t)
 
     def _evaluate_condition(self, cond):
+        def get_val(expr):
+            val = self._compute(expr.strip())
+            return val if val is not None else 0
+
         if "=" in cond:
             left, right = cond.split("=")
-            return self._compute(left.strip()) == self._compute(right.strip())
+            return get_val(left) == get_val(right)
         elif "<" in cond:
             left, right = cond.split("<")
-            return self._compute(left.strip()) < self._compute(right.strip())
+            return get_val(left) < get_val(right)
         elif ">" in cond:
             left, right = cond.split(">")
-            return self._compute(left.strip()) > self._compute(right.strip())
+            return get_val(left) > get_val(right)
         return False
 
     def _get_block_end(self, start_pc):

{solpl-2.3.0 → solpl-2.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solpl"
-version = "2.3.0"
+version = "2.3.6"
 description = "Sol Programming Language Interpreter"
 requires-python = ">=3.7"
 

{solpl-2.3.0 → solpl-2.3.6/solpl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.3.0
+Version: 2.3.6
 Summary: Sol Programming Language Interpreter
 Requires-Python: >=3.7
 License-File: LICENSE