lispython 0.4.6__tar.gz → 0.4.7__tar.gz

{lispython-0.4.6 → lispython-0.4.7}/.gitignore

@@ -332,4 +332,6 @@ GEMINI.md
 .worktrees/
 
 # Agent-generated docs (not mkdocs content)
-docs/superpowers/
+docs/superpowers/.stacks
+.agents
+.claude

{lispython-0.4.6 → lispython-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.4.6
+Version: 0.4.7
 Summary: Lisp-like Syntax for Python with Lisp-like Macros
 Project-URL: Homepage, https://jetack.github.io/lispython
 Project-URL: Repository, https://github.com/jetack/lispython

{lispython-0.4.6 → lispython-0.4.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lispython"
-version = "0.4.6"
+version = "0.4.7"
 description = "Lisp-like Syntax for Python with Lisp-like Macros"
 authors = [{ name = "Jetack", email = "jetack23@gmail.com" }]
 license = { text = "MIT" }

{lispython-0.4.6 → lispython-0.4.7}/src/lispy/core/compiler/expr.py

@@ -107,7 +107,8 @@ def ifexp_p(sexp):
 
 
 def ifexp_compile(sexp):
-    [_, test, body, orelse] = sexp.list
+    [_, test, body, *rest] = sexp.list
+    orelse = rest[0] if rest else Constant("None", **sexp.position_info)
     return ast.IfExp(
         test=expr_compile(test),
         body=expr_compile(body),

{lispython-0.4.6 → lispython-0.4.7}/src/lispy/core/macro.py

@@ -40,14 +40,19 @@ def define_macro(sexp, scope, include_meta=True):
 
 def require_macro(sexp, scope, include_meta=True):
     transformed = require_transform(sexp)
-    eval(
-        compile(
-            ast.Interactive(body=macroexpand_then_compile([transformed], include_meta=include_meta)),
-            "macro-requiring",
-            "single",
-        ),
-        scope,
-    )
+    try:
+        eval(
+            compile(
+                ast.Interactive(body=macroexpand_then_compile([transformed], include_meta=include_meta)),
+                "macro-requiring",
+                "single",
+            ),
+            scope,
+        )
+    except (ModuleNotFoundError, ImportError):
+        import sys
+        module_name = str(sexp.list[1])
+        print(f"l2py: warning: could not load macros from '{module_name}' (module not found)", file=sys.stderr)
     return transformed if include_meta else None
 
 

{lispython-0.4.6 → lispython-0.4.7}/src/lispy/core/nodes.py

@@ -369,7 +369,7 @@ class Symbol(Literal):
 
     @property
     def name(self):
-        return self.value.replace("-", "_")
+        return self.value.replace("->", "_to_").replace("-", "_").replace("?", "_p")
 
     def __repr__(self):
         return "Sym(" + self.value + ")"

{lispython-0.4.6 → lispython-0.4.7}/src/lispy/macros/sugar.lpy

@@ -5,8 +5,8 @@
           (return `(if ~test ~then (cond ~@orelse))))))
 
 (defmacro conde [*body]
-  (if (< (len body) 4)
-      (return `(ife ~@body))
+  (if (<= (len body) 2)
+      (return (sub body -1))
       (do (= [test then *orelse] body)
           (return `(ife ~test ~then (conde ~@orelse))))))
 

{lispython-0.4.6 → lispython-0.4.7}/src/lispy/tools.lpy

@@ -25,17 +25,21 @@
 (from lispy.core.parser [parse])
 (from lispy.core.macro [macroexpand macroexpand-then-compile])
 
+(def has-init-file [dir-path]
+  (return (or (osp.exists (osp.join dir-path "__init__.py"))
+              (osp.exists (osp.join dir-path "__init__.lpy")))))
+
 (def detect-package-name [:path None]
-  "Detect package name from directory by checking for __init__.py"
+  "Detect package name from directory by checking for __init__.py or __init__.lpy"
   (= dir-path (ife (is path None)
                    (os.getcwd)
                    (osp.dirname (osp.abspath path))))
-  (if (not (osp.exists (osp.join dir-path "__init__.py")))
+  (if (not (has-init-file dir-path))
       (return ""))
   ;; Walk up to find package root
   (= parts [])
   (= current dir-path)
-  (while (osp.exists (osp.join current "__init__.py"))
+  (while (has-init-file current)
     (parts.insert 0 (osp.basename current))
     (= parent (osp.dirname current))
     (if (== parent current)
@@ -114,9 +118,12 @@
 
 (def l2py-f [file-path :include-meta False :no-lispy False :format True]
   "Translate lispy file to Python source string (standalone with sys.path setup)"
-  (= script-dir (osp.dirname (osp.abspath file-path)))
-  (if (not (in script-dir sys.path))
-      (sys.path.insert 0 script-dir))
+  ;; Detect package first so we add the right directory to sys.path
+  (= pkg (detect-package-name :path file-path))
+  (if (not pkg)
+      (do (= script-dir (osp.dirname (osp.abspath file-path)))
+          (if (not (in script-dir sys.path))
+              (sys.path.insert 0 script-dir))))
 
   ;; Clear cached macro modules to ensure fresh reload
   (= modules-to-remove [])
@@ -132,7 +139,6 @@
 
   (with [(open file-path "rb") as f]
     (= src (.decode (f.read) "utf-8")))
-  (= pkg (detect-package-name :path file-path))
   (return (+ (l2py-s src :include-meta include_meta :fresh-scope True :package pkg :no-lispy no_lispy :format format) "\n")))
 
 (def l2py []

{lispython-0.4.6 → lispython-0.4.7}/uv.lock

@@ -260,7 +260,7 @@ wheels = [
 
 [[package]]
 name = "lispython"
-version = "0.4.6"
+version = "0.4.7"
 source = { editable = "." }
 dependencies = [
     { name = "prompt-toolkit" },

lispython-0.4.6/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(mike set-default:*)",
-      "Bash(uv run python:*)",
-      "Bash(uv run pytest:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}