shell-lite 0.4.3__tar.gz → 0.4.5__tar.gz

{shell_lite-0.4.3/shell_lite.egg-info → shell_lite-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.4.3
+Version: 0.4.5
 Summary: A lightweight, English-like scripting language.
 Author-email: Shrey Naithani <contact@shelllite.tech>
 License: MIT

{shell_lite-0.4.3 → shell_lite-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shell-lite"
-version = "0.04.3"
+version = "0.04.5"
 description = "A lightweight, English-like scripting language."
 readme = "README.md"
 requires-python = ">=3.8"

shell_lite-0.4.3/shell_lite/interpreter_final.py → shell_lite-0.4.5/shell_lite/interpreter.py

@@ -1,8 +1,9 @@
 from typing import Any, Dict, List, Callable
 from .ast_nodes import *
-from .lexer_new import Token, Lexer
-from .parser_new import Parser
+from .lexer import Token, Lexer
+from .parser import Parser
 import importlib
+import types
 import operator
 import re
 import os
@@ -128,7 +129,7 @@ class WebBuilder:
             pass
 class Interpreter:
     def __init__(self):
-        print('DEBUG: VERSION 2 LOADED')
+        # print('DEBUG: ShellLite v0.04.5')
         self.global_env = Environment()
         self.global_env.set('str', str)
         self.global_env.set('int', int)
@@ -278,6 +279,12 @@ class Interpreter:
     def _builtin_push(self, lst, item):
         lst.append(item)
         return None
+    def _builtin_upper(self, s):
+        return str(s).upper()
+    def _builtin_sum_range(self, start, end):
+        return sum(range(int(start), int(end)))
+    def _builtin_range_list(self, start, end):
+        return list(range(int(start), int(end)))
     def _init_std_modules(self):
         self.std_modules = {
             'math': {
@@ -770,7 +777,12 @@ class Interpreter:
         if node.path in self.std_modules:
             self.current_env.set(node.path, self.std_modules[node.path])
             return
+        
+        # 1. Check File System (ShellLite modules)
         import os 
+        import importlib
+        target_path = None
+        
         if os.path.exists(node.path):
              target_path = node.path
         else:
@@ -783,32 +795,45 @@ class Interpreter:
                      global_path_ext = global_path + ".shl"
                      if os.path.exists(global_path_ext):
                          target_path = global_path_ext
-                     else:
-                         raise FileNotFoundError(f"Could not find imported file: {node.path} (searched local and global modules)")
+
+        # 2. If found on FS, load as ShellLite
+        if target_path:
+            if os.path.isdir(target_path):
+                 main_shl = os.path.join(target_path, "main.shl")
+                 pkg_shl = os.path.join(target_path, f"{os.path.basename(target_path)}.shl")
+                 if os.path.exists(main_shl):
+                     target_path = main_shl
+                 elif os.path.exists(pkg_shl):
+                     target_path = pkg_shl
                  else:
-                     raise FileNotFoundError(f"Could not find imported file: {node.path} (searched local and global modules)")
-        if os.path.isdir(target_path):
-             main_shl = os.path.join(target_path, "main.shl")
-             pkg_shl = os.path.join(target_path, f"{os.path.basename(target_path)}.shl")
-             if os.path.exists(main_shl):
-                 target_path = main_shl
-             elif os.path.exists(pkg_shl):
-                 target_path = pkg_shl
-             else:
-                  raise FileNotFoundError(f"Package '{node.path}' is a folder but has no 'main.shl' or '{os.path.basename(target_path)}.shl'.")
+                      raise FileNotFoundError(f"Package '{node.path}' is a folder but has no 'main.shl' or '{os.path.basename(target_path)}.shl'.")
+            
+            try:
+                with open(target_path, 'r', encoding='utf-8') as f:
+                    code = f.read()
+            except FileNotFoundError:
+                raise FileNotFoundError(f"Could not find imported file: {node.path}")
+                
+            from .lexer import Lexer
+            from .parser import Parser
+            lexer = Lexer(code)
+            tokens = lexer.tokenize()
+            parser = Parser(tokens)
+            statements = parser.parse()
+            for stmt in statements:
+                self.visit(stmt)
+            return
+
+        # 3. BRIDGE: Try importing as a raw Python module
         try:
-            with open(target_path, 'r', encoding='utf-8') as f:
-                code = f.read()
-        except FileNotFoundError:
-            raise FileNotFoundError(f"Could not find imported file: {node.path}")
-        from .lexer import Lexer
-        from .parser import Parser
-        lexer = Lexer(code)
-        tokens = lexer.tokenize()
-        parser = Parser(tokens)
-        statements = parser.parse()
-        for stmt in statements:
-            self.visit(stmt)
+            py_module = importlib.import_module(node.path)
+            self.current_env.set(node.path, py_module)
+            return
+        except ImportError:
+            pass # Fall through to error
+            
+        raise FileNotFoundError(f"Could not find module '{node.path}'. Searched:\n - ShellLite Local/Global\n - Python Site-Packages (The Bridge)")
+
     def _get_class_properties(self, class_def: ClassDef) -> List[tuple[str, Optional[Node]]]:
         if not hasattr(class_def, 'properties'): return []
         # Support both old string list and new tuple list for backward compat if needed, though we updated AST
@@ -1534,7 +1559,7 @@ class Interpreter:
                             self.wfile.write(str(e).encode())
                     except: pass
         server = HTTPServer(('0.0.0.0', port_val), ShellLiteHandler)
-        print(f"\n  ShellLite Server v0.04.3 is running!")
+        print(f"\n  ShellLite Server v0.04.5 is running!")
         print(f"  \u001b[1;36m➜\u001b[0m  Local:   \u001b[1;4;36mhttp://localhost:{port_val}/\u001b[0m\n")
         try: server.serve_forever()
         except KeyboardInterrupt: 

shell_lite-0.4.3/shell_lite/lexer_new.py → shell_lite-0.4.5/shell_lite/lexer.py

@@ -165,7 +165,8 @@ class Lexer:
                         'while': 'WHILE', 'until': 'UNTIL',
                         'repeat': 'REPEAT', 'forever': 'FOREVER',
                         'stop': 'STOP', 'skip': 'SKIP', 'exit': 'EXIT',
-                        'each': 'FOR',
+                        'each': 'EACH',
+                        'check': 'CHECK',
                         'unless': 'UNLESS', 'when': 'WHEN', 'otherwise': 'OTHERWISE',
                         'then': 'THEN', 'do': 'DO',
                         'print': 'PRINT', 'say': 'SAY', 'show': 'SAY',

{shell_lite-0.4.3 → shell_lite-0.4.5}/shell_lite/main.py

@@ -5,9 +5,9 @@ import urllib.request
 import zipfile
 import io
 import subprocess
-from .lexer_new import Lexer
-from .parser_new import Parser
-from .interpreter_new import Interpreter
+from .lexer import Lexer
+from .parser import Parser
+from .interpreter import Interpreter
 from .ast_nodes import *
 import json
 def execute_source(source: str, interpreter: Interpreter):
@@ -58,10 +58,9 @@ def run_file(filename: str):
         print(f"Error: File '{filename}' not found.")
         return
     import sys
-    if 'shell_lite.interpreter' in sys.modules:
-        print(f"DEBUG: shell_lite.interpreter file: {sys.modules['shell_lite.interpreter'].__file__}")
-    from .interpreter_final import Interpreter
-    print(f"DEBUG: Interpreter class: {Interpreter}")
+
+    # Debug prints removed for production
+    from .interpreter import Interpreter
     
     with open(filename, 'r', encoding='utf-8') as f:
         source = f.read()
@@ -72,7 +71,7 @@ def run_repl():
     print("\n" + "="*40)
     print("  ShellLite REPL - English Syntax")
     print("="*40)
-    print("Version: v0.04.3 | Made by Shrey Naithani")
+    print("Version: v0.04.5 | Made by Shrey Naithani")
     print("Commands: Type 'exit' to quit, 'help' for examples.")
     print("Note: Terminal commands (like 'shl install') must be run in CMD/PowerShell, not here.")
 
@@ -203,7 +202,7 @@ def install_globally():
         ps_cmd = f'$oldPath = [Environment]::GetEnvironmentVariable("Path", "User"); if ($oldPath -notlike "*ShellLite*") {{ [Environment]::SetEnvironmentVariable("Path", "$oldPath;{install_dir}", "User") }}'
         subprocess.run(["powershell", "-Command", ps_cmd], capture_output=True)
         
-        print(f"\n[SUCCESS] ShellLite (v0.04.3) is installed!")
+        print(f"\n[SUCCESS] ShellLite (v0.04.5) is installed!")
         print(f"Location: {install_dir}")
         print("\nIMPORTANT STEP REQUIRED:")
         print("1. Close ALL open terminal windows (CMD, PowerShell, VS Code).")

shell_lite-0.4.3/shell_lite/parser_new.py → shell_lite-0.4.5/shell_lite/parser.py

@@ -1,5 +1,5 @@
 from typing import List, Optional
-from .lexer_new import Token, Lexer
+from .lexer import Token, Lexer
 from .ast_nodes import *
 import re
 class Parser:
@@ -80,10 +80,20 @@ class Parser:
             return self.parse_make()
         elif self.check('INPUT'):
             next_t = self.peek(1)
-            if next_t.type in ('ID', 'TYPE', 'STRING', 'NAME', 'VALUE', 'CLASS', 'STYLE', 'ONCLICK', 'SRC', 'HREF', 'ACTION', 'METHOD'):
+            if next_t.type in ('ID', 'TYPE', 'STRING', 'NAME', 'VALUE', 'CLASS', 'STYLE', 'ONCLICK', 'SRC', 'HREF', 'ACTION', 'METHOD', 'PLACEHOLDER'):
                 input_token = self.consume()
                 return self.parse_id_start_statement(passed_name_token=input_token)
             return self.parse_expression_stmt()
+        elif self.check('BUTTON'):
+            return self.parse_id_start_statement(passed_name_token=self.consume('BUTTON'))
+        elif self.check('COLUMN'):
+            return self.parse_id_start_statement(passed_name_token=self.consume('COLUMN'))
+        elif self.check('ROW'):
+            return self.parse_id_start_statement(passed_name_token=self.consume('ROW'))
+        elif self.check('IMAGE'):
+            return self.parse_id_start_statement(passed_name_token=self.consume('IMAGE'))
+        elif self.check('SIZE'):
+            return self.parse_id_start_statement(passed_name_token=self.consume('SIZE'))
         elif self.check('ID'):
             return self.parse_id_start_statement()
         elif self.check('SPAWN'):
@@ -173,6 +183,9 @@ class Parser:
             # Standalone ask statement? e.g. ask "Questions?"
             # Or ask is expression. If statement, maybe just expression statement.
             return self.parse_expression_statement()
+        elif self.check('CHECK'):
+            self.consume('CHECK')
+            return self.parse_if()
         elif self.check('SET'):
             return self.parse_set()
         else:
@@ -940,8 +953,8 @@ class Parser:
         return node
     def parse_start_server(self) -> Node:
         token = self.consume('START')
-        if self.check('SERVER'):
-            self.consume('SERVER')
+        if self.check('SERVER') or self.check('WEBSITE') or (self.check('ID') and self.peek().value == 'website'):
+            self.consume()
         port = Number(8080)
         if self.check('ON'):
             self.consume('ON')
@@ -1667,6 +1680,7 @@ class Parser:
             node.line = start_token.line
             return node
         start_token = self.consume('FOR')
+        if self.check('EACH'): self.consume('EACH')
         if self.check('ID') and self.peek(1).type == 'IN':
             var_name = self.consume('ID').value
             self.consume('IN')

{shell_lite-0.4.3 → shell_lite-0.4.5/shell_lite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.4.3
+Version: 0.4.5
 Summary: A lightweight, English-like scripting language.
 Author-email: Shrey Naithani <contact@shelllite.tech>
 License: MIT

{shell_lite-0.4.3 → shell_lite-0.4.5}/shell_lite.egg-info/SOURCES.txt

@@ -5,20 +5,10 @@ shell_lite/__init__.py
 shell_lite/ast_nodes.py
 shell_lite/cli.py
 shell_lite/compiler.py
-shell_lite/fix_nulls.py
-shell_lite/formatter.py
 shell_lite/interpreter.py
-shell_lite/interpreter_backup.py
-shell_lite/interpreter_final.py
-shell_lite/interpreter_new.py
-shell_lite/js_compiler.py
 shell_lite/lexer.py
-shell_lite/lexer_new.py
 shell_lite/main.py
-shell_lite/minimal_interpreter.py
 shell_lite/parser.py
-shell_lite/parser_new.py
-shell_lite/patch_parser.py
 shell_lite/runtime.py
 shell_lite.egg-info/PKG-INFO
 shell_lite.egg-info/SOURCES.txt

shell_lite-0.4.3/shell_lite/fix_nulls.py

@@ -1,29 +0,0 @@
-
-import sys
-import glob
-import os
-
-files = [
-    r'c:\Users\shrey\OneDrive\Desktop\oka\shell-lite\shell_lite\parser.py',
-    r'c:\Users\shrey\OneDrive\Desktop\oka\shell-lite\shell_lite\lexer.py',
-    r'c:\Users\shrey\OneDrive\Desktop\oka\shell-lite\shell_lite\interpreter.py',
-    r'c:\Users\shrey\OneDrive\Desktop\oka\shell-lite\shell_lite\main.py',
-    r'c:\Users\shrey\OneDrive\Desktop\oka\shell-lite\shell_lite\ast_nodes.py',
-    r'c:\Users\shrey\OneDrive\Desktop\oka\tests_suite\repro_issues.shl'
-]
-
-for path in files:
-    try:
-        with open(path, 'rb') as f:
-            content = f.read()
-
-        if b'\x00' in content:
-            print(f"Null bytes found in {path}! Fixing...")
-            new_content = content.replace(b'\x00', b'')
-            with open(path, 'wb') as f:
-                f.write(new_content)
-            print(f"Fixed {path}.")
-        else:
-            print(f"No null bytes in {path}.")
-    except Exception as e:
-        print(f"Error checking {path}: {e}")

shell_lite-0.4.3/shell_lite/formatter.py

@@ -1,75 +0,0 @@
-from typing import List
-from .lexer import Lexer, Token
-class Formatter:
-    def __init__(self, source_code: str):
-        self.source_code = source_code
-        self.indent_size = 4
-    def format(self) -> str:
-        lexer = Lexer(self.source_code)
-        try:
-            tokens = lexer.tokenize()
-        except Exception:
-            raise
-        formatted_lines = []
-        current_indent = 0
-        current_line_tokens: List[Token] = []
-        def flush_line():
-            nonlocal current_line_tokens
-            if not current_line_tokens:
-                pass
-            line_str = self._format_line_tokens(current_line_tokens, current_indent)
-            formatted_lines.append(line_str)
-            current_line_tokens.clear()
-        for token in tokens:
-            if token.type == 'EOF':
-                if current_line_tokens:
-                    flush_line()
-                break
-            elif token.type == 'INDENT':
-                current_indent += 1
-            elif token.type == 'DEDENT':
-                current_indent -= 1
-                if current_indent < 0: current_indent = 0
-            elif token.type == 'NEWLINE':
-                flush_line()
-                pass
-            else:
-                current_line_tokens.append(token)
-        return '\n'.join(formatted_lines)
-    def _format_line_tokens(self, tokens: List[Token], indent_level: int) -> str:
-        if not tokens:
-            return ''
-        line_parts = []
-        line_parts.append(' ' * (indent_level * self.indent_size))
-        for i, token in enumerate(tokens):
-            val = token.value
-            type = token.type
-            if type == 'STRING':
-                if '"' in val and "'" not in val:
-                    val = f"'{val}'"
-                else:
-                    val = val.replace('"', '\\"')
-                    val = f'"{val}"'
-            elif type == 'REGEX':
-                val = f"/{val}/"
-            if i > 0:
-                prev = tokens[i-1]
-                need_space = True 
-                if prev.type in ('LPAREN', 'LBRACKET', 'LBRACE', 'DOT', 'AT'):
-                    need_space = False
-                if type in ('RPAREN', 'RBRACKET', 'RBRACE', 'DOT', 'COMMA', 'COLON'):
-                    need_space = False
-                if type == 'LPAREN':
-                    if prev.type == 'ID':
-                        need_space = False
-                    elif prev.type in ('RPAREN', 'RBRACKET', 'STRING'):
-                         need_space = False
-                    else:
-                        pass
-                if type == 'LBRACKET':
-                    if prev.type in ('ID', 'STRING', 'RPAREN', 'RBRACKET'):
-                        need_space = False
-                if need_space:
-                    line_parts.append(' ')
-            line_parts.append(val)
-        return "".join(line_parts).rstrip()