lispython 0.4.2__tar.gz → 0.4.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.4.2
+Version: 0.4.5
 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
@@ -8,6 +8,7 @@ Author-email: Jetack <jetack23@gmail.com>
 License: MIT
 License-File: LICENSE.md
 Requires-Python: >=3.11
+Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pygls>=1.0.0
 Provides-Extra: dev
 Requires-Dist: pre-commit>=3.6.0; extra == 'dev'

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

@@ -1,12 +1,15 @@
 [project]
 name = "lispython"
-version = "0.4.2"
+version = "0.4.5"
 description = "Lisp-like Syntax for Python with Lisp-like Macros"
 authors = [{ name = "Jetack", email = "jetack23@gmail.com" }]
 license = { text = "MIT" }
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = ["pygls>=1.0.0"]
+dependencies = [
+    "prompt-toolkit>=3.0.52",
+    "pygls>=1.0.0",
+]
 
 [project.urls]
 Homepage = "https://jetack.github.io/lispython"

{lispython-0.4.2 → lispython-0.4.5}/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.5}/src/lispy/core/macro.py

@@ -8,6 +8,22 @@ from lispy.core.nodes import *
 
 __macro_namespace: Dict[str, Callable[[Node], ast.AST]] = {}
 
+_ast_literal_eval = __import__("ast").literal_eval
+
+
+def _unwrap_literal(node):
+    if isinstance(node, Constant):
+        try:
+            return _ast_literal_eval(node.value)
+        except (ValueError, SyntaxError):
+            return node
+    elif isinstance(node, String):
+        try:
+            return _ast_literal_eval(node.value)
+        except (ValueError, SyntaxError):
+            return node
+    return node
+
 
 def define_macro(sexp, scope, include_meta=True):
     transformed = defmacro_transform(sexp)
@@ -69,7 +85,9 @@ def macroexpand_1_and_check(sexp, scope=globals(), in_quasi=False, include_meta=
         elif str(op) == "require" and not in_quasi:
             sexp = require_macro(sexp, scope, include_meta=include_meta)
         elif str(op) in scope.setdefault("__macro_namespace", {}) and not in_quasi and isinstance(sexp, Paren):
-            sexp = scope["__macro_namespace"][str(op)](*operands)
+            sexp = scope["__macro_namespace"][str(op)](*[_unwrap_literal(o) for o in operands])
+            if not isinstance(sexp, Node):
+                sexp = data_to_generator_expression(sexp)
             expanded = True
         else:
             expanded_list, expanded_feedbacks = zip(

{lispython-0.4.2 → lispython-0.4.5}/src/lispy/core/nodes.py

@@ -44,7 +44,11 @@ class Node:
 
 
 def data_to_generator_expression(data):
-    if isinstance(data, str):
+    if isinstance(data, bool) or data is None:
+        return Constant(str(data))
+    elif isinstance(data, (int, float, complex)):
+        return Constant(str(data))
+    elif isinstance(data, str):
         return String('"' + data + '"')
     elif isinstance(data, list):
         return Bracket(*data)

{lispython-0.4.2 → lispython-0.4.5}/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.2 → lispython-0.4.5}/src/lispy/tools.lpy

@@ -136,10 +136,69 @@
   (= file (osp.join (os.getcwd) (sub more-args 0)))
   (print (l2py-f file :include-meta args.include_meta :no-lispy args.no_lispy)))
 
-(def read-multiline-input [prompt_str]
+(def _make-open-handler [o c]
+  (def handler [event]
+    (= buf event.app.current-buffer)
+    (buf.insert-text (+ o c))
+    (buf.cursor-left))
+  (return handler))
+
+(def _make-close-handler [c]
+  (def handler [event]
+    (= buf event.app.current-buffer)
+    (if (== buf.document.current-char c)
+        (buf.cursor-right)
+        (buf.insert-text c)))
+  (return handler))
+
+(def _make-quote-handler [q]
+  (def handler [event]
+    (= buf event.app.current-buffer)
+    (if (== buf.document.current-char q)
+        (buf.cursor-right)
+        (do
+          (buf.insert-text (+ q q))
+          (buf.cursor-left))))
+  (return handler))
+
+(def make-repl-session []
+  (from prompt-toolkit [PromptSession])
+  (from prompt-toolkit.history [FileHistory])
+  (from prompt-toolkit.key-binding [KeyBindings])
+  (from prompt-toolkit.keys [Keys])
+
+  (= kb (KeyBindings))
+  (= _pairs {"(" ")" "[" "]" "{" "}" "'" "'" "\"" "\""})
+
+  (for [o c] in (_pairs.items)
+    ((kb.add o) (_make-open-handler o c)))
+
+  (for c in (_pairs.values)
+    ((kb.add c) (_make-close-handler c)))
+
+  (for q in ["'" "\""]
+    ((kb.add q) (_make-quote-handler q)))
+
+  ;; Backspace deletes both chars of an empty pair
+  (= _bp _pairs)
+  (def handle-backspace [event]
+    (= buf event.app.current-buffer)
+    (= doc buf.document)
+    (= before doc.char-before-cursor)
+    (= after doc.current-char)
+    (if (and (in before _bp) (== (sub _bp before) after))
+        (do (buf.delete) (buf.delete-before-cursor))
+        (buf.delete-before-cursor)))
+  ((kb.add Keys.Backspace) handle-backspace)
+
+  (= histfile (osp.join (osp.expanduser "~") ".lpy_history"))
+  (return (PromptSession :history (FileHistory histfile)
+                         :key-bindings kb)))
+
+(def read-multiline-input [session prompt_str]
   (= paren-depth 0)
   (= in-string False)
-  (= line (input prompt_str))
+  (= line (session.prompt prompt_str))
   (= src line)
   (while True
     (for c in line
@@ -150,15 +209,15 @@
 
             (== c "\"")
             (= in-string True)
-            
+
             (in c "([{")
             (+= paren-depth 1)
-            
+
             (in c ")]}")
             (-= paren-depth 1)))
     (if (== paren-depth 0)
         (break))
-    (= line (input "...   "))
+    (= line (session.prompt "...   "))
     (+= src (+ "\n" line)))
   (return src))
 
@@ -184,13 +243,15 @@
   (= cwd (os.getcwd))
   (if (not (in cwd sys.path))
       (sys.path.insert 0 cwd))
+
+  (= session (make-repl-session))
   (= scope SCOPE)
   (eval-and-print "(require lispy.macros *)
 (from pprint [pprint])" scope)
   (while True
     (try
       (do
-        (= src (read-multiline-input "repl> "))
+        (= src (read-multiline-input session "repl> "))
         (eval-and-print src scope translate))
       (except [SystemExit]
         (print "SystemExit caught. Exiting REPL.")

lispython-0.4.5/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.5/tests/test_literal_unwrap.py

@@ -0,0 +1,73 @@
+from lispy.tools import src_to_python_org
+
+PREAMBLE = "(require lispy.macros *)\n"
+
+
+class TestLiteralUnwrapInMacro:
+    def test_number_is_int(self):
+        src = PREAMBLE + """
+(defmacro repeat-n [n *body]
+  (= stmts [])
+  (for _ in (range n)
+    (stmts.extend body))
+  (return `(do ~@stmts)))
+
+(repeat-n 3 (print "hello"))
+"""
+        result = src_to_python_org(src)
+        assert result.count("print('hello')") == 3
+
+    def test_string_is_str(self):
+        src = PREAMBLE + """
+(defmacro greet [name]
+  (= upper (.upper name))
+  (return `(print ~upper)))
+
+(greet "world")
+"""
+        result = src_to_python_org(src)
+        assert "WORLD" in result
+
+    def test_bool_is_bool(self):
+        src = PREAMBLE + """
+(defmacro if-flag [flag *body]
+  (if flag
+      (return `(do ~@body))
+      (return `(pass))))
+
+(if-flag True (print "yes"))
+"""
+        result = src_to_python_org(src)
+        assert "print('yes')" in result
+
+    def test_none_is_none(self):
+        src = PREAMBLE + """
+(defmacro maybe-wrap [val]
+  (if (is val None)
+      (return `(print "nothing"))
+      (return `(print ~val))))
+
+(maybe-wrap None)
+"""
+        result = src_to_python_org(src)
+        assert "nothing" in result
+
+    def test_symbol_stays_as_node(self):
+        src = PREAMBLE + """
+(defmacro my-inc [x]
+  (return `(+ ~x 1)))
+
+(my-inc y)
+"""
+        result = src_to_python_org(src)
+        assert "y + 1" in result
+
+    def test_expression_stays_as_node(self):
+        src = PREAMBLE + """
+(defmacro my-twice [expr]
+  (return `(+ ~expr ~expr)))
+
+(my-twice (+ a b))
+"""
+        result = src_to_python_org(src)
+        assert "a + b + (a + b)" in result

{lispython-0.4.2 → lispython-0.4.5}/uv.lock

@@ -260,9 +260,10 @@ wheels = [
 
 [[package]]
 name = "lispython"
-version = "0.4.2"
+version = "0.4.5"
 source = { editable = "." }
 dependencies = [
+    { name = "prompt-toolkit" },
     { name = "pygls" },
 ]
 
@@ -285,6 +286,7 @@ requires-dist = [
     { name = "mkdocs-macros-plugin", marker = "extra == 'docs'", specifier = ">=1.3.7" },
     { name = "mkdocs-material", marker = "extra == 'docs'", specifier = ">=9.6.14" },
     { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.6.0" },
+    { name = "prompt-toolkit", specifier = ">=3.0.52" },
     { name = "pygls", specifier = ">=1.0.0" },
     { name = "pytest", marker = "extra == 'dev'", specifier = ">=8.0.0" },
     { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.8.0" },
@@ -576,6 +578,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5d/19/fd3ef348460c80af7bb4669ea7926651d1f95c23ff2df18b9d24bab4f3fa/pre_commit-4.5.1-py2.py3-none-any.whl", hash = "sha256:3b3afd891e97337708c1674210f8eba659b52a38ea5f822ff142d10786221f77", size = 226437, upload-time = "2025-12-16T21:14:32.409Z" },
 ]
 
+[[package]]
+name = "prompt-toolkit"
+version = "3.0.52"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "wcwidth" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a1/96/06e01a7b38dce6fe1db213e061a4602dd6032a8a97ef6c1a862537732421/prompt_toolkit-3.0.52.tar.gz", hash = "sha256:28cde192929c8e7321de85de1ddbe736f1375148b02f2e17edd840042b1be855", size = 434198, upload-time = "2025-08-27T15:24:02.057Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/84/03/0d3ce49e2505ae70cf43bc5bb3033955d2fc9f932163e84dc0779cc47f48/prompt_toolkit-3.0.52-py3-none-any.whl", hash = "sha256:9aac639a3bbd33284347de5ad8d68ecc044b91a762dc39b7c21095fcd6a19955", size = 391431, upload-time = "2025-08-27T15:23:59.498Z" },
+]
+
 [[package]]
 name = "pygls"
 version = "2.1.1"
@@ -864,6 +878,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/33/e8/e40370e6d74ddba47f002a32919d91310d6074130fe4e17dabcafc15cbf1/watchdog-6.0.0-py3-none-win_ia64.whl", hash = "sha256:a1914259fa9e1454315171103c6a30961236f508b9b623eae470268bbcc6a22f", size = 79067, upload-time = "2024-11-01T14:07:11.845Z" },
 ]
 
+[[package]]
+name = "wcwidth"
+version = "0.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/35/a2/8e3becb46433538a38726c948d3399905a4c7cabd0df578ede5dc51f0ec2/wcwidth-0.6.0.tar.gz", hash = "sha256:cdc4e4262d6ef9a1a57e018384cbeb1208d8abbc64176027e2c2455c81313159", size = 159684, upload-time = "2026-02-06T19:19:40.919Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/68/5a/199c59e0a824a3db2b89c5d2dade7ab5f9624dbf6448dc291b46d5ec94d3/wcwidth-0.6.0-py3-none-any.whl", hash = "sha256:1a3a1e510b553315f8e146c54764f4fb6264ffad731b3d78088cdb1478ffbdad", size = 94189, upload-time = "2026-02-06T19:19:39.646Z" },
+]
+
 [[package]]
 name = "zipp"
 version = "3.23.0"

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