solpl 2.2.0__tar.gz → 2.2.5__tar.gz

{solpl-2.2.0/solpl.egg-info → solpl-2.2.5}/PKG-INFO

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

{solpl-2.2.0 → solpl-2.2.5}/interpreter/sol.py

@@ -18,6 +18,7 @@ class SolInterpreter:
         self.struct_blueprints = {} 
         self.lines = []
         self.threads = []
+        self._server_started = False 
 
     @property
     def scope_stack(self):
@@ -27,27 +28,36 @@ class SolInterpreter:
 
     def _compute(self, expr):
         expr = str(expr).strip()
-        
+
+        # Handle string concatenation first
         if "+" in expr and any(c.isalpha() or c in ['"', "'"] for c in expr):
             parts = expr.split("+")
             result = ""
             for p in parts:
-                val = str(self._resolve(p.strip()))
-                result += val
+                val = self._resolve(p.strip())
+                result += str(val) if val is not None else ""
             return result
 
+        # Handle math operations safely
         ops = ['+', '-', '*', ':']
         for op in ops:
             if op in expr:
                 try:
                     left, right = expr.split(op, 1)
-                    val1 = float(self._resolve(left))
-                    val2 = float(self._resolve(right))
+                    r1 = self._resolve(left)
+                    r2 = self._resolve(right)
+                    
+                    # SAFETY FIX: Skip if values are not numeric
+                    if r1 is None or r2 is None:
+                        continue
+                        
+                    val1 = float(r1)
+                    val2 = float(r2)
                     if op == '+': return val1 + val2
                     if op == '-': return val1 - val2
                     if op == '*': return val1 * val2
                     if op == ':': return val1 / val2
-                except ValueError:
+                except (ValueError, TypeError):
                     continue
         return self._resolve(expr)
 
@@ -63,6 +73,9 @@ class SolInterpreter:
     def _resolve(self, val):
         val = str(val).strip()
 
+        if (val.startswith('"') and val.endswith('"')) or (val.startswith("'") and val.endswith("'")):
+            return val[1:-1]
+
         if val.startswith("_fetch(") and val.endswith(")"):
             url_expr = val[7:-1].strip()
             url = str(self._compute(url_expr))
@@ -93,7 +106,7 @@ 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: return val.replace('"', '').replace("'", "")
+        except: return None 
 
     def _async_worker(self, expr, action):
         result = self._compute(expr)
@@ -111,12 +124,15 @@ class SolInterpreter:
     def _native_fetch(self, url):
         try:
             with urllib.request.urlopen(url, timeout=5) as response:
-                # Fix: Added errors='replace' to handle non-UTF-8 bytes safely
                 return response.read().decode('utf-8', errors='replace')
         except Exception as e:
             return f"Error fetching URL: {str(e)}"
 
     def _native_listen(self, port, handler_name):
+        if self._server_started:
+            return
+        self._server_started = True
+        
         interpreter_instance = self
         class SolHTTPHandler(http.server.BaseHTTPRequestHandler):
             def do_GET(self):
@@ -240,7 +256,6 @@ class SolInterpreter:
             if len(parts) == 3 and parts[1] == "_input":
                 prompt_string = str(self._compute(parts[0]))
                 target_variable = parts[2]
-                
                 t = threading.Thread(target=self._async_input_worker, args=(prompt_string, target_variable))
                 t.start()
                 self.threads.append(t)
@@ -270,8 +285,10 @@ class SolInterpreter:
             else:
                 var_name = line.split("->")[1].strip()
                 prompt = f"[INPUT REQUIRED FOR %s]: " % var_name
-            
-            user_val = input(prompt + " ")
+
+            sys.stdout.write(prompt + " ")
+            sys.stdout.flush()
+            user_val = sys.stdin.readline().strip()
             try:
                 if '.' in user_val: user_val = float(user_val)
                 else: user_val = int(user_val)
@@ -296,8 +313,12 @@ class SolInterpreter:
             port = self._compute(port_expr)
             self._native_listen(port, handler_expr)
         elif "_out" in line:
-            val = line.split("->")[1].strip()
-            print(self._compute(val))
+            val_raw = line.split("->")[1].strip()
+            val = self._compute(val_raw)
+            if val is not None:
+                print(val)
+            else:
+                print(f"Error: Undefined variable or invalid data: {val_raw}")
 
         elif "mylist<" in line and ">" in line:
             var_name = line.split("<")[1].split(">")[0]

{solpl-2.2.0 → solpl-2.2.5}/pyproject.toml

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

{solpl-2.2.0 → solpl-2.2.5/solpl.egg-info}/PKG-INFO

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