solpl 2.4.1__tar.gz → 2.5.0__tar.gz

{solpl-2.4.1/solpl.egg-info → solpl-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.4.1
+Version: 2.5.0
 Summary: A lightweight, multi-threaded interpreter for the Sol programming language
 Author-email: stefand-0 <stefand-0@users.noreply.github.com>
 License-Expression: Apache-2.0

{solpl-2.4.1 → solpl-2.5.0}/interpreter/sol.py

@@ -32,8 +32,7 @@ class SolInterpreter:
 
         with open(filename, "r") as f:
             code = f.read()
-            base_name = file.path.basename(filename)[0]
-            module_name = base_name.replace(".sol", "")
+            module_name = os.path.splitext(os.path.basename(filename))[0]
             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")):
@@ -46,7 +45,7 @@ class SolInterpreter:
     def _compute(self, expr):
         is_literal = (expr.startswith('"') and expr.endswith('"')) or (expr.startswith("'") and expr.endswith("'"))
         expr = str(expr).strip()
-        if "+" in expr and not is_literally and any(c.isalpha() or c in ['"', "'"] for c in expr):
+        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:
@@ -106,8 +105,8 @@ class SolInterpreter:
         existing_val = self._lookup(val)
         if existing_val is not None: return existing_val
         try: return float(val) if '.' in val else int(val)
-        except:
-            print(f"Error: Failed to solve expression: {val}")
+        except: 
+            print(f"Error: Failed to parse: {val}")
             return None 
 
     def _async_worker(self, expr, action):
@@ -181,7 +180,7 @@ class SolInterpreter:
         pc = 0
         while pc < len(self.lines):
             line = self.lines[pc]
-            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")):
+            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 "?" in line and not line.startswith(("if ", "while ", "for ", "elseif", "else")):
                 parts = line.split("(")
                 self.functions[parts[0].strip()] = {"start_pc": pc + 1, "params": [p.strip() for p in parts[1].replace(")", "").split(",")] if parts[1].replace(")", "").strip() else []}
             elif "{" in line: pc = self._parse_struct(pc)
@@ -347,5 +346,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-# do you really think I would go back and comment the code? i wrote the first version in a month.

{solpl-2.4.1 → solpl-2.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solpl"
-version = "2.4.1"
+version = "2.5.0"
 authors = [
     { name = "stefand-0", email = "stefand-0@users.noreply.github.com" }
 ]
@@ -18,7 +18,7 @@ classifiers = [
 ]
 
 [project.scripts]
-sol = "interpreter.sol:main"
+solpl = "interpreter.sol:main"
 
 [tool.setuptools.packages]
 find = { include = ["interpreter"] }

{solpl-2.4.1 → solpl-2.5.0/solpl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.4.1
+Version: 2.5.0
 Summary: A lightweight, multi-threaded interpreter for the Sol programming language
 Author-email: stefand-0 <stefand-0@users.noreply.github.com>
 License-Expression: Apache-2.0

solpl-2.5.0/solpl.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+solpl = interpreter.sol:main

solpl-2.4.1/solpl.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-sol = interpreter.sol:main