solpl 2.3.5__tar.gz → 2.3.7__tar.gz

{solpl-2.3.5/solpl.egg-info → solpl-2.3.7}/PKG-INFO

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

{solpl-2.3.5 → solpl-2.3.7}/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")):
@@ -44,7 +45,8 @@ class SolInterpreter:
 
     def _compute(self, expr):
         expr = str(expr).strip()
-        if "+" in expr and any(c.isalpha() or c in ['"', "'"] for c in expr):
+        is_literal = (expr.startswith('"') and expr.endswith('"')) or (expr.startswith("'") and expr.endswith("'"))
+        if "+" in expr and not is_literal and any(c.isalpha() or c in ['"', "'"] for c in expr):
             parts = expr.split("+")
             result = ""
             for p in parts:
@@ -147,7 +149,9 @@ class SolInterpreter:
         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("==", 1)
+            return get_val(left) == get_val(right)
         if "=" in cond:
             left, right = cond.split("=")
             return get_val(left) == get_val(right)

{solpl-2.3.5 → solpl-2.3.7}/pyproject.toml

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

{solpl-2.3.5 → solpl-2.3.7/solpl.egg-info}/PKG-INFO

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