shell-lite 0.6.3__tar.gz → 0.6.3.2__tar.gz

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.6.3
+Version: 0.6.3.2
 Summary: ShellLite is a programming language designed to be as readable as plain English. Code like you Think!
 Author-email: contact@shelllite.tech
 License: GPLv3 with classpath exception

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/README.md

@@ -65,14 +65,12 @@ while attempts < max_attempts
 say in red "\nGame Over! The number was " + str(secret)
 ```
 
-## Compilation (WIP)
+## Compilation
 
-ShellLite can be compiled to various targets for deployment:
+ShellLite can be compiled for deploymebt
 
 ```bash
-shl compile script.shl --target c      # Transpile to C
-shl compile script.shl --target js     # Transpile to JavaScript
-shl compile script.shl --target wasm   # Build for WebAssembly
+shl compile script.shl
 ```
 
 ## Research & Documentation
@@ -83,6 +81,8 @@ For a deep dive into the underlying parsing theory, please refer to the papers o
 
 Detailed language guides can be found in the `docs/` directory. (TO BE RE WRITTEN)
 
+### Official Discord:- [Discord](https://discord.gg/WgqrgvuGfs)
+
 ## License
 
 GNU GPL V3 With Class Exception License - See [LICENSE](LICENSE) for details.

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shell-lite"
-version = "0.6.3"
+version = "0.6.3.2"
 description = "ShellLite is a programming language designed to be as readable as plain English. Code like you Think!"
 readme = "README_PYPI.md"
 requires-python = ">=3.8"

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/compiler/ast_compiler.py

@@ -242,7 +242,12 @@ class ASTCompiler(BaseVisitor):
             return ast.Compare(left=self.visit(node.args[1]), ops=[ast.In()], comparators=[self.visit(node.args[0])])
 
         args = [self.visit(a) for a in node.args]
-        keywords = [ast.keyword(arg=k, value=self.visit(v)) for k, v in (node.kwargs or [])]
+        keywords = []
+        for k, v in (node.kwargs or []):
+            arg_name = k
+            if k in ("class", "for", "def", "if", "else", "while", "return", "import", "from", "try", "except", "lambda", "with", "as", "is", "in", "and", "or", "not", "pass", "raise", "yield", "async", "await", "break", "continue"):
+                arg_name = k + "_"
+            keywords.append(ast.keyword(arg=arg_name, value=self.visit(v)))
 
         if node.body:
             body_func_name = self.get_tmp() + "_body"

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/compiler/builtins.py

@@ -23,7 +23,7 @@ BUILTINS: Dict[str, BuiltinMapping] = {
     # Core IO
     "print": BuiltinMapping("print", 0, None, "print"),
     "say": BuiltinMapping("say", 0, None, "print"),
-    "ask": BuiltinMapping("ask", 0, 1, "input"),
+    "ask": BuiltinMapping("ask", 0, 1, "shl_ask"),
     # Type Conversion
     "str": BuiltinMapping("str", 1, 1, "str"),
     "int": BuiltinMapping("int", 1, 1, "int"),
@@ -42,14 +42,14 @@ BUILTINS: Dict[str, BuiltinMapping] = {
     "upper": BuiltinMapping("upper", 1, 1, "str.upper"),
     "lower": BuiltinMapping("lower", 1, 1, "str.lower"),
     "sort": BuiltinMapping("sort", 1, 1, "sorted"),
-    "count": BuiltinMapping("count", 1, 2),
-    "split": BuiltinMapping("split", 1, 2),
+    "count": BuiltinMapping("count", 1, 2, "shl_count"),
+    "split": BuiltinMapping("split", 1, 2, "shl_split"),
     "add": BuiltinMapping("add", 2, 2),
     "remove": BuiltinMapping("remove", 2, 2),
     "pop": BuiltinMapping("pop", 1, 2),
-    "contains": BuiltinMapping("contains", 2, 2),
-    "empty": BuiltinMapping("empty", 1, 1),
-    "xor": BuiltinMapping("xor", 2, 2),
+    "contains": BuiltinMapping("contains", 2, 2, "shl_contains"),
+    "empty": BuiltinMapping("empty", 1, 1, "shl_empty"),
+    "xor": BuiltinMapping("xor", 2, 2, "shl_xor"),
     # JSON
     "json_parse": BuiltinMapping("json_parse", 1, 1, "py_json.loads"),
     "json_stringify": BuiltinMapping("json_stringify", 1, 2, "py_json.dumps"),

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/compiler/linker.py

@@ -57,7 +57,24 @@ class StaticLinker:
                     continue
 
                 mod_name = os.path.splitext(os.path.basename(fp))[0]
-                current_module_ast.append(PythonImport(f".{mod_name}", alias))
+                try:
+                    rel_dir = os.path.relpath(os.path.dirname(fp), os.path.dirname(abs_p))
+                    if rel_dir == ".":
+                        dots = "."
+                        pkg_path = ""
+                    elif rel_dir.startswith(".."):
+                        parts = rel_dir.split(os.sep)
+                        dots = "." * (parts.count("..") + 1)
+                        remaining = [p for p in parts if p != ".."]
+                        pkg_path = ".".join(remaining) + "." if remaining else ""
+                    else:
+                        dots = "."
+                        pkg_path = rel_dir.replace(os.sep, ".") + "."
+                except ValueError:
+                    dots = "."
+                    pkg_path = ""
+
+                current_module_ast.append(PythonImport(f"{dots}{pkg_path}{mod_name}", alias))
 
                 if fp not in self.module_asts:
                     with open(fp, "r", encoding="utf-8") as f:

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/compiler/runtime_lib.py

@@ -122,6 +122,37 @@ def channel_receive(q):
     return q.get()
 
 
+def shl_split(s, sep=None):
+    if sep:
+        return str(s).split(str(sep))
+    return str(s).split()
+
+
+def shl_count(obj, item=None):
+    if item is not None:
+        return obj.count(item)
+    return len(obj)
+
+
+def shl_contains(obj, item):
+    return item in obj
+
+
+def shl_empty(obj):
+    return len(obj) == 0
+
+
+def shl_xor(a, b):
+    return a ^ b
+
+
+def shl_ask(prompt=""):
+    try:
+        return builtins.input(prompt)
+    except EOFError:
+        return None
+
+
 def shl_execute(cmd_str):
     require_exec(str(cmd_str))
     args = shlex.split(str(cmd_str))
@@ -162,7 +193,7 @@ def render(obj):
 
 def __make_tag(tag_name):
     def tag_handler(*args, body=None, **kwargs):
-        attrs = "".join(f' {k.replace("_", "-")}="{v}"' for k, v in kwargs.items())
+        attrs = "".join(f' {k.rstrip("_").replace("_", "-")}="{v}"' for k, v in kwargs.items())
         __emit_html(f"<{tag_name}{attrs}>")
         for a in args:
             __emit_html(str(a))
@@ -376,9 +407,10 @@ _static_routes: Dict[str, str] = {}
 
 class ShellLiteHTTPHandler(BaseHTTPRequestHandler):
     def do_GET(self):
+        clean_path = self.path.split("?")[0].split("#")[0]
         for pfx, fld in _static_routes.items():
-            if self.path.startswith(pfx):
-                rel_path = self.path[len(pfx) :].lstrip("/")
+            if clean_path.startswith(pfx):
+                rel_path = clean_path[len(pfx) :].lstrip("/")
                 full_path = os.path.abspath(os.path.join(fld, rel_path))
                 if not full_path.startswith(os.path.abspath(fld)):
                     self.send_response(403)
@@ -395,9 +427,20 @@ class ShellLiteHTTPHandler(BaseHTTPRequestHandler):
                         self.wfile.write(f.read())
                     return
 
-        if self.path in _web_handlers:
+        # Check dynamic routes
+        handler = _web_handlers.get(self.path)
+        if not handler:
+            # Try matching parameterized routes
+            for route, h in _web_handlers.items():
+                if ":" in route:
+                    pattern = "^" + re.sub(r':[^/]+', r'([^/]+)', route) + "$"
+                    if re.match(pattern, self.path):
+                        handler = h
+                        break
+
+        if handler:
             try:
-                res = _web_handlers[self.path]()
+                res = handler()
                 self.send_response(200)
                 self.send_header("Content-type", "text/html")
                 self.end_headers()

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/compiler/semantic_analyzer.py

@@ -343,7 +343,7 @@ class SemanticAnalyzer(BaseTransformer):
     def visit_Assign(self, node: Assign) -> Type:
         vt = self.visit(node.value)
         existing = self.current_scope.resolve(node.name)
-        if existing and existing.is_global and self.current_scope != self.global_scope:
+        if existing and (existing.is_global or existing.is_property) and self.current_scope != self.global_scope:
             node.symbol_ref = existing
             return vt
 
@@ -356,7 +356,7 @@ class SemanticAnalyzer(BaseTransformer):
     def visit_TypedAssign(self, node: TypedAssign) -> Type:
         vt = self.visit(node.value)
         existing = self.current_scope.resolve(node.name)
-        if existing and existing.is_global and self.current_scope != self.global_scope:
+        if existing and (existing.is_global or existing.is_property) and self.current_scope != self.global_scope:
             node.symbol_ref = existing
             return vt
 

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/interpreter.py

@@ -277,13 +277,16 @@ def make_jit_tag_fn(name, interpreter):
                 attrs.update(arg)
             elif isinstance(arg, LambdaFunction):
                 t = JITTag(name, attrs)
-                if interpreter.web_builder:
+                is_top = not interpreter.web_builder
+                if not is_top:
                     interpreter.web_builder[-1].add(t)
                 interpreter.web_builder.append(t)
                 try:
                     arg()
                 finally:
                     interpreter.web_builder.pop()
+                if is_top:
+                    rt.__emit_html(str(t))
                 return t
             elif isinstance(arg, str) and "=" in arg and " " not in arg:
                 k, v = arg.split("=", 1)
@@ -295,6 +298,8 @@ def make_jit_tag_fn(name, interpreter):
             t.add(c)
         if interpreter.web_builder:
             interpreter.web_builder[-1].add(t)
+        else:
+            rt.__emit_html(str(t))
         return t
 
     return fn
@@ -439,7 +444,12 @@ def std_csv_export(data, path):
 
 
 class Interpreter:
-    def __init__(self):
+    def __init__(self, search_paths: Optional[List[str]] = None):
+        stdlib_path = os.path.join(os.path.dirname(__file__), "stdlib")
+        if search_paths is not None:
+            self.search_paths = search_paths + [stdlib_path]
+        else:
+            self.search_paths = [os.getcwd(), stdlib_path]
         self.policy = get_policy()
         self.safe_mode = self.policy.safe_mode
         self._thread_local = threading.local()
@@ -528,7 +538,7 @@ class Interpreter:
             "convert": rt.convert,
             "clear_dict": lambda d: d.clear(),
         }
-        self.web_builder = []
+        self.web_builder: List[Any] = []
         for t in [
             "div",
             "p",
@@ -603,7 +613,7 @@ class Interpreter:
             path += ".shl"
 
         if search_paths is None:
-            search_paths = [os.getcwd(), os.path.join(os.path.dirname(__file__), "stdlib")]
+            search_paths = getattr(self, "search_paths", [os.getcwd(), os.path.join(os.path.dirname(__file__), "stdlib")])
 
         for p in search_paths:
             full_path = os.path.join(p, path)
@@ -613,6 +623,8 @@ class Interpreter:
         raise FileNotFoundError(f"Module {path} not found")
 
     def _load_module_nodes(self, path: str, search_paths: Optional[List[str]] = None) -> List[Node]:
+        if search_paths is None:
+            search_paths = getattr(self, "search_paths", [os.getcwd(), os.path.join(os.path.dirname(__file__), "stdlib")])
         abs_path = self._resolve_module_path(path, search_paths)
         stdlib_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "stdlib"))
         if abs_path.startswith(stdlib_root):

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/lsp_server.py

@@ -320,7 +320,7 @@ class LSPServer:
                         "renameProvider": True,
                         "referencesProvider": True,
                     },
-                    "serverInfo": {"name": "ShellLite Enhanced LSP", "version": "0.6.3"},
+                    "serverInfo": {"name": "ShellLite Enhanced LSP", "version": "0.6.3.2"},
                 },
             )
         elif method == "textDocument/didOpen":

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/main.py

@@ -82,7 +82,7 @@ def run_repl():
     interpreter = Interpreter()
     print("\n" + "=" * 40)
     print("=" * 40)
-    print("Version: v0.6.3")
+    print("Version: v0.6.3.2")
     print("Commands: Type 'exit' to quit, 'help' for examples.")
     print("Note: Terminal commands (like 'shl install') must be run outside the REPL.")
     try:
@@ -214,7 +214,7 @@ def install_globally():
                     with open(rc, "a", encoding="utf-8") as f:
                         f.write(f"\n# Added by ShellLite Installer\n{export_line}\n")
 
-        print("\n[SUCCESS] ShellLite (v0.6.3) is installed!")
+        print("\n[SUCCESS] ShellLite (v0.6.3.2) is installed!")
         print(f"Location: {install_dir}")
         print("\nIMPORTANT STEP REQUIRED:")
         print("1. Close ALL open terminal windows.")
@@ -231,7 +231,7 @@ def search_package(query: Optional[str] = None):
     print("\n" + "=" * 50)
     print(f"  Searching for: {query if query else 'all'}")
     print("=" * 50)
-    print("Notice: The package registry is being rebuilt for v0.6.3")
+    print("Notice: The package registry is being rebuilt for v0.6.3.2")
     print("In the meantime, you can find packages at: https://github.com/topics/shell-lite")
     print("=" * 50 + "\n")
 
@@ -446,11 +446,19 @@ def install_package(package_name: str, branch: str = "main", _visited=None):
         print(f"Extraction failed for {package_name}: {e}")
 
 
-def compile_file(filename: str, target: str = "python"):
+def compile_file(
+    filename: str,
+    target: str = "python",
+    project_name: Optional[str] = None,
+    project_dir: Optional[str] = None,
+):
     if not os.path.exists(filename):
         print(f"Error: File '{filename}' not found.")
         return
 
+    if project_dir is None:
+        project_dir = os.path.dirname(os.path.abspath(filename))
+
     if target.lower() == "llvm":
         try:
             from .llvm_backend.builder import build_llvm  # type: ignore[import-untyped, import-not-found]
@@ -497,8 +505,8 @@ def compile_file(filename: str, target: str = "python"):
         compiler = ASTCompiler()
 
         # Determine output directory
-        base_name = os.path.splitext(os.path.basename(filename))[0]
-        out_dir = os.path.join(os.getcwd(), f"{base_name}_build")
+        base_name = project_name or os.path.splitext(os.path.basename(filename))[0]
+        out_dir = os.path.join(project_dir, f"{base_name}_build")
         if os.path.exists(out_dir):
             shutil.rmtree(out_dir)
         os.makedirs(out_dir)
@@ -640,7 +648,7 @@ def format_file(filename: str):
     if not os.path.exists(filename):
         print(f"Error: File '{filename}' not found.")
         return
-    print("Notice: The formatting feature is being rebuilt for v0.6.3 and is temporarily unavailable.")
+    print("Notice: The formatting feature is being rebuilt for v0.6.3.2 and is temporarily unavailable.")
     return
 
 
@@ -768,7 +776,7 @@ def main():
         elif cmd == "help" or cmd == "--help" or cmd == "-h":
             show_help()
         elif cmd == "--version" or cmd == "-v":
-            print("ShellLite v0.6.3")
+            print("ShellLite v0.6.3.2")
         elif cmd == "get":
             if len(sys.argv) > 2:
                 package_name = sys.argv[2]

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite/parser.py

@@ -373,6 +373,12 @@ class Parser:
             ast_node.end_col = last_tok.column + len(str(last_tok.value))
         return ast_node
 
+    def collect_descendant_tokens(self, nodes: List[GeoNode], out: List[Token]):
+        for child in nodes:
+            out.extend(child.tokens)
+            if child.children:
+                self.collect_descendant_tokens(child.children, out)
+
     def bind_node(self, node: GeoNode) -> Optional[Node]:
         # Find first non-noise token for dispatch
         effective_head = node.head_token
@@ -805,9 +811,7 @@ class Parser:
 
         expr_tokens = tokens[assign_idx + 1 :]
         if node.children:
-            for child in node.children:
-                expr_tokens.extend(child.tokens)
-        # print(f"DEBUG bind_assignment: expr_tokens={[t.value for t in expr_tokens]}")
+            self.collect_descendant_tokens(node.children, expr_tokens)
         value = self.parse_expr_iterative(expr_tokens, node.children)
         if value is None:
             raise SyntaxError(f"Missing value in assignment at line {node.line}")

{shell_lite-0.6.3 → shell_lite-0.6.3.2}/shell_lite.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shell-lite
-Version: 0.6.3
+Version: 0.6.3.2
 Summary: ShellLite is a programming language designed to be as readable as plain English. Code like you Think!
 Author-email: contact@shelllite.tech
 License: GPLv3 with classpath exception