solpl 2.7.0__tar.gz → 3.0.0__tar.gz

{solpl-2.7.0/solpl.egg-info → solpl-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.7.0
+Version: 3.0.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.7.0 → solpl-3.0.0}/interpreter/sol.py

@@ -41,7 +41,6 @@ class SolInterpreter:
         return False
 
     def _split_on_op(self, string, op):
-        """Split on first occurrence of op outside quotes. Returns (left, right) or (None, None)."""
         in_quote = False
         quote_char = None
         for i, char in enumerate(string):
@@ -106,7 +105,6 @@ class SolInterpreter:
             start_idx = expr.rfind('(', 0, end_idx)
             if start_idx == -1:
                 break
-            # Skip function calls
             if start_idx > 0 and (expr[start_idx - 1].isalnum() or expr[start_idx - 1] == '_'):
                 idx = end_idx + 1
                 continue
@@ -115,7 +113,7 @@ class SolInterpreter:
             expr = expr[:start_idx] + str(inner_result) + expr[end_idx + 1:]
             idx = 0
         
-        # Handle string concatenation with +
+        # String concatenation with +
         plus_parts = self._split_outside_quotes(expr, '+')
         if len(plus_parts) > 1:
             is_string_concat = False
@@ -131,7 +129,7 @@ class SolInterpreter:
                     result += str(val) if val is not None else ""
                 return result
         
-        # Check for equality (=) - comparison operator
+        # Equality comparison (=)
         left, right = self._split_on_op(expr, '=')
         if left is not None:
             r1 = self._resolve(left.strip())
@@ -139,7 +137,7 @@ class SolInterpreter:
             if r1 is not None and r2 is not None:
                 return 1 if r1 == r2 else 0
         
-        # Level 1: + and -
+        # + and -
         for op in ['+', '-']:
             idx = self._find_last_op(expr, op)
             if idx != -1:
@@ -154,7 +152,7 @@ class SolInterpreter:
                 if op == '+': return val1 + val2
                 if op == '-': return val1 - val2
         
-        # Level 2: * and :
+        # * and :
         last_idx = -1
         last_op = None
         for op in ['*', ':']:
@@ -215,9 +213,14 @@ class SolInterpreter:
                 if isinstance(container, list): return container[idx]
             except (ValueError, IndexError, KeyError): pass
         if "." in val:
-            obj_name, prop = val.split(".", 1)
-            obj = self._lookup(obj_name)
-            if isinstance(obj, dict): return obj.get(prop, 0)
+            parts = val.split(".")
+            obj = self._lookup(parts[0])
+            for part in parts[1:]:
+                if isinstance(obj, dict):
+                    obj = obj.get(part, 0)
+                else:
+                    return 0
+            return obj
 
         for scope in reversed(self.scope_stack):
             if val in scope: return scope[val]
@@ -253,15 +256,12 @@ class SolInterpreter:
         self.threads.append(t)
 
     def _evaluate_condition(self, cond):
-        # Equality comparison uses =
         left, right = self._split_on_op(cond, "=")
         if left is not None:
-            return self._compute(cond)  # _compute handles =
-        # Less than
+            return self._compute(cond)
         left, right = self._split_on_op(cond, "<")
         if left is not None:
             return self._compute(left.strip()) < self._compute(right.strip())
-        # Greater than
         left, right = self._split_on_op(cond, ">")
         if left is not None:
             return self._compute(left.strip()) > self._compute(right.strip())
@@ -279,6 +279,36 @@ class SolInterpreter:
             pc += 1
         return pc
 
+    def _import_file(self, filename):
+        if not os.path.exists(filename):
+            print(f"Error: Module '{filename}' not found.")
+            return
+
+        with open(filename, "r") as f:
+            code = f.read()
+            module_name = os.path.splitext(os.path.basename(filename))[0]
+
+            lines = []
+            for l in code.split('\n'):
+                l = l.strip()
+                if not l: continue
+                if l.startswith(';'):
+                    continue
+                if l.startswith('//'):
+                    continue
+                if ';' in l:
+                    l = l.split(';', 1)[0].strip()
+                if l:
+                    lines.append(l)
+
+            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")):
+                    parts = line.split("(")
+                    name = parts[0].strip()
+                    params_str = parts[1].replace(")", "").strip()
+                    params = [p.strip() for p in params_str.split(",")] if params_str else []
+                    self.functions[f"{module_name}.{name}"] = {"start_pc": pc + 1, "params": params, "source_lines": lines}
+
     def execute(self, code):
         raw_lines = code.split('\n')
         self.lines = []
@@ -325,7 +355,7 @@ class SolInterpreter:
                 fields[key] = self._resolve(val)
             pc += 1
         self.struct_blueprints[struct_name] = fields
-        self._assign(struct_name, fields.copy())
+        self.variables[struct_name] = fields.copy()
         return pc
 
     def _call_function(self, name, args):
@@ -436,9 +466,17 @@ class SolInterpreter:
         if "->" in line:
             var, val = [x.strip() for x in line.split("->", 1)]
             if "." in var:
-                obj, prop = var.split(".", 1)
-                target = self._lookup(obj)
-                if isinstance(target, dict): target[prop] = self._compute(val)
+                parts = var.split(".")
+                target = self._lookup(parts[0])
+                if isinstance(target, dict):
+                    for part in parts[1:-1]:
+                        if isinstance(target, dict) and part in target:
+                            target = target[part]
+                        else:
+                            target = None
+                            break
+                    if target is not None and isinstance(target, dict):
+                        target[parts[-1]] = self._compute(val)
             else:
                 computed = self._compute(val)
                 self._assign(var, computed)

{solpl-2.7.0 → solpl-3.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "solpl"
-version = "2.7.0"
+version = "3.0.0"
 authors = [
     { name = "stefand-0", email = "stefand-0@users.noreply.github.com" }
 ]

{solpl-2.7.0 → solpl-3.0.0/solpl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solpl
-Version: 2.7.0
+Version: 3.0.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