lispython 0.4.1__tar.gz → 0.4.3__tar.gz

{lispython-0.4.1 → lispython-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.4.1
+Version: 0.4.3
 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
@@ -103,9 +103,6 @@ Use [`lpy-mode`](https://github.com/jetack/lpy-mode) for syntax highlighting and
 - [ ] REPL should track history and arrow key navigation
 - [ ] REPL multi-line input support
 - [ ] Better compilation error messages
-### Macro System
-- [ ] `as->` macro for syntactic sugar
-- [ ] `gensym` for avoiding name collision
 ### Python AST
 - [ ] `type_comment` never considered. Later, it should be covered
 - [ ] Any missing AST nodes in the version 3.12+

{lispython-0.4.1 → lispython-0.4.3}/README.md

@@ -81,9 +81,6 @@ Use [`lpy-mode`](https://github.com/jetack/lpy-mode) for syntax highlighting and
 - [ ] REPL should track history and arrow key navigation
 - [ ] REPL multi-line input support
 - [ ] Better compilation error messages
-### Macro System
-- [ ] `as->` macro for syntactic sugar
-- [ ] `gensym` for avoiding name collision
 ### Python AST
 - [ ] `type_comment` never considered. Later, it should be covered
 - [ ] Any missing AST nodes in the version 3.12+

{lispython-0.4.1 → lispython-0.4.3}/docs/macros.md

@@ -56,6 +56,25 @@ Just change `def` in function definition to `defmacro`. And macros usually retur
 ```
 You can find more in `src/lispython/macros/sugar.lpy`.
 
+### `as->`
+Unlike `->` (thread first) and `->>` (thread last), `as->` lets you name the threaded value and place it anywhere in each form:
+```python
+(as-> 0 x
+  (+ x 10)     ;; x = 10
+  (* 2 x)      ;; x = 20
+  (str x))     ;; x = "20"
+```
+
+This expands to:
+```python
+x = 0
+x = x + 10
+x = 2 * x
+x = str(x)
+```
+
+Useful when the threaded value doesn't always go in the first or last position.
+
 ## gensym
 `gensym` generates unique symbols to avoid variable name collisions in macros. It is automatically available inside `defmacro` bodies.
 

{lispython-0.4.1 → lispython-0.4.3}/pyproject.toml

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

{lispython-0.4.1 → lispython-0.4.3}/src/lispy/core/builtins.py

@@ -1,4 +1,4 @@
-from lispy.core.nodes import Symbol
+from lispy.core.nodes import Expression, Symbol, Wrapper
 
 _gensym_counter = 0
 
@@ -17,3 +17,13 @@ def gensym(prefix="gensym"):
 def reset_gensym_counter():
     global _gensym_counter
     _gensym_counter = 0
+
+
+def replace_symbol(node, old, new):
+    if isinstance(node, Symbol) and node.value == old.value:
+        return new
+    if isinstance(node, Expression):
+        node.list = [replace_symbol(child, old, new) for child in node.list]
+    elif isinstance(node, Wrapper):
+        node.value = replace_symbol(node.value, old, new)
+    return node

{lispython-0.4.1 → lispython-0.4.3}/src/lispy/macros/sugar.lpy

@@ -28,6 +28,17 @@
           (return `(->> ~f ~@rest)))
       (return `(-> (~f ~x) ~@rest))))
 
+(defmacro as-> [expr name *forms]
+  (if (== 0 (len forms))
+      (return expr))
+  (= sym (gensym (str name)))
+  (= stmts [])
+  (stmts.append `(= ~sym ~expr))
+  (for f in forms
+    (stmts.append `(= ~sym ~(replace-symbol f name sym))))
+  (stmts.append sym)
+  (return `(do ~@stmts)))
+
 (defmacro fn [*body]
   (return `(lambda ~@body)))
 

lispython-0.4.3/tests/test_as_thread.py

@@ -0,0 +1,49 @@
+from lispy.core.builtins import reset_gensym_counter
+from lispy.tools import src_to_python_org
+
+PREAMBLE = "(require lispy.macros *)\n"
+
+
+class TestAsThread:
+    def setup_method(self):
+        reset_gensym_counter()
+
+    def test_no_forms(self):
+        assert src_to_python_org(PREAMBLE + "(as-> 42 x)") == "42"
+
+    def test_single_form(self):
+        result = src_to_python_org(PREAMBLE + "(as-> 0 x (+ x 1))")
+        assert "__x_0 = 0" in result
+        assert "__x_0 = __x_0 + 1" in result
+
+    def test_multiple_forms(self):
+        result = src_to_python_org(
+            PREAMBLE + "(as-> 0 x (+ x 10) (* 2 x) (str x))"
+        )
+        assert "__x_0 = 0" in result
+        assert "__x_0 = __x_0 + 10" in result
+        assert "__x_0 = 2 * __x_0" in result
+        assert "__x_0 = str(__x_0)" in result
+
+    def test_method_call(self):
+        result = src_to_python_org(
+            PREAMBLE + '(as-> "hello" s (.upper s))'
+        )
+        assert "__s_0 = 'hello'" in result
+        assert "__s_0 = __s_0.upper()" in result
+
+    def test_flexible_placement(self):
+        result = src_to_python_org(
+            PREAMBLE + "(as-> 1 x (+ 10 x) (- x 5))"
+        )
+        assert "__x_0 = 10 + __x_0" in result
+        assert "__x_0 = __x_0 - 5" in result
+
+    def test_does_not_shadow_outer_variable(self):
+        result = src_to_python_org(
+            PREAMBLE + "(= x 100)\n(as-> 0 x (+ x 10))\n(print x)"
+        )
+        assert "x = 100" in result
+        assert "print(x)" in result
+        assert "__x_0 = 0" in result
+        assert "__x_0 = __x_0 + 10" in result

{lispython-0.4.1 → lispython-0.4.3}/uv.lock

@@ -260,7 +260,7 @@ wheels = [
 
 [[package]]
 name = "lispython"
-version = "0.4.1"
+version = "0.4.3"
 source = { editable = "." }
 dependencies = [
     { name = "pygls" },