lispython 0.4.2__tar.gz → 0.4.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.4.2
+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

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

@@ -1,6 +1,6 @@
 [project]
 name = "lispython"
-version = "0.4.2"
+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.2 → 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.2 → lispython-0.4.3}/src/lispy/macros/sugar.lpy

@@ -31,11 +31,12 @@
 (defmacro as-> [expr name *forms]
   (if (== 0 (len forms))
       (return expr))
+  (= sym (gensym (str name)))
   (= stmts [])
-  (stmts.append `(= ~name ~expr))
+  (stmts.append `(= ~sym ~expr))
   (for f in forms
-    (stmts.append `(= ~name ~f)))
-  (stmts.append name)
+    (stmts.append `(= ~sym ~(replace-symbol f name sym))))
+  (stmts.append sym)
   (return `(do ~@stmts)))
 
 (defmacro fn [*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.2 → lispython-0.4.3}/uv.lock

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

lispython-0.4.2/tests/test_as_thread.py

@@ -1,36 +0,0 @@
-from lispy.tools import src_to_python_org
-
-PREAMBLE = "(require lispy.macros *)\n"
-
-
-class TestAsThread:
-    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" in result
-        assert "x = x + 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" in result
-        assert "x = x + 10" in result
-        assert "x = 2 * x" in result
-        assert "x = str(x)" in result
-
-    def test_method_call(self):
-        result = src_to_python_org(
-            PREAMBLE + '(as-> "hello" s (.upper s))'
-        )
-        assert "s = 'hello'" in result
-        assert "s = s.upper()" in result
-
-    def test_flexible_placement(self):
-        result = src_to_python_org(
-            PREAMBLE + "(as-> 1 x (+ 10 x) (- x 5))"
-        )
-        assert "x = 10 + x" in result
-        assert "x = x - 5" in result