lispython 0.4.3__tar.gz → 0.4.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.4.3
+Version: 0.4.6
 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'
@@ -84,25 +85,36 @@ lpy -m pytest
 LisPython ships with a language server (`lpy-lsp`) that speaks LSP over stdio. It provides:
 
 - Diagnostics (parse / compile errors)
-- Hover documentation for special forms
+- Completions (special forms, builtins, file/workspace symbols)
+- Hover documentation for special forms and builtins
 - Document symbols
 - Go-to-definition, including across `.lpy` files in the workspace
 
+## nREPL Server
+LisPython includes an nREPL server for REPL-driven development:
+
+```bash
+lpy --nrepl         # start on a random port
+lpy --nrepl 7888    # start on a specific port
+```
+
+The server accepts newline-delimited JSON over TCP and supports:
+- `eval` — evaluate LisPython code, return value/stdout/error
+- `load-file` — load a `.lpy` file into the session
+- `macroexpand` — expand macros and return the result
+- `complete` — prefix and dot-completion from the live scope
+- `docs` — signature and docstring for a symbol
+- `annotate` — type tag (function/class/module/macro)
+
 ### Editor setup
-Point your editor's LSP client at the `lpy-lsp` command for files with the `.lpy` extension. The server speaks LSP over stdio.
 
-#### VSCode
-Install the [LisPython](https://marketplace.visualstudio.com/items?itemName=jetack.vscode-lispython) extension from the VSCode Marketplace.
+#### VS Code
+Install the [LisPython](https://marketplace.visualstudio.com/items?itemName=jetack.vscode-lispython) extension. It connects to both LSP and nREPL automatically.
 
 #### Emacs
-Use [`lpy-mode`](https://github.com/jetack/lpy-mode) for syntax highlighting and LSP integration. For completion, install [`lpy-autocomplete`](https://github.com/jetack/lpy-autocomplete).
+Use [`lpy-mode`](https://github.com/jetack/lpy-mode). It provides nREPL integration (eval, completion, eldoc, macroexpand) and LSP via eglot.
 
 ## Todo
-### Environment
-- [ ] Test on more python versions
-- [ ] REPL should track history and arrow key navigation
-- [ ] REPL multi-line input support
-- [ ] Better compilation error messages
 ### Python AST
 - [ ] `type_comment` never considered. Later, it should be covered
 - [ ] Any missing AST nodes in the version 3.12+

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

@@ -62,25 +62,36 @@ lpy -m pytest
 LisPython ships with a language server (`lpy-lsp`) that speaks LSP over stdio. It provides:
 
 - Diagnostics (parse / compile errors)
-- Hover documentation for special forms
+- Completions (special forms, builtins, file/workspace symbols)
+- Hover documentation for special forms and builtins
 - Document symbols
 - Go-to-definition, including across `.lpy` files in the workspace
 
+## nREPL Server
+LisPython includes an nREPL server for REPL-driven development:
+
+```bash
+lpy --nrepl         # start on a random port
+lpy --nrepl 7888    # start on a specific port
+```
+
+The server accepts newline-delimited JSON over TCP and supports:
+- `eval` — evaluate LisPython code, return value/stdout/error
+- `load-file` — load a `.lpy` file into the session
+- `macroexpand` — expand macros and return the result
+- `complete` — prefix and dot-completion from the live scope
+- `docs` — signature and docstring for a symbol
+- `annotate` — type tag (function/class/module/macro)
+
 ### Editor setup
-Point your editor's LSP client at the `lpy-lsp` command for files with the `.lpy` extension. The server speaks LSP over stdio.
 
-#### VSCode
-Install the [LisPython](https://marketplace.visualstudio.com/items?itemName=jetack.vscode-lispython) extension from the VSCode Marketplace.
+#### VS Code
+Install the [LisPython](https://marketplace.visualstudio.com/items?itemName=jetack.vscode-lispython) extension. It connects to both LSP and nREPL automatically.
 
 #### Emacs
-Use [`lpy-mode`](https://github.com/jetack/lpy-mode) for syntax highlighting and LSP integration. For completion, install [`lpy-autocomplete`](https://github.com/jetack/lpy-autocomplete).
+Use [`lpy-mode`](https://github.com/jetack/lpy-mode). It provides nREPL integration (eval, completion, eldoc, macroexpand) and LSP via eglot.
 
 ## Todo
-### Environment
-- [ ] Test on more python versions
-- [ ] REPL should track history and arrow key navigation
-- [ ] REPL multi-line input support
-- [ ] Better compilation error messages
 ### Python AST
 - [ ] `type_comment` never considered. Later, it should be covered
 - [ ] Any missing AST nodes in the version 3.12+

{lispython-0.4.3 → lispython-0.4.6}/docs/syntax/expressions.md

@@ -38,11 +38,11 @@ Python version
 expr1 == expr2 == expr3 == ...
 ```
 #### `>`
-Python version
+LisPy version
 ```python
 (> expr1 expr2 expr3 ...)
 ```
-LisPy version
+Python version
 ```python
 expr1 > expr2 > expr3 > ...
 ```

lispython-0.4.6/docs/usage/cli.md

@@ -0,0 +1,41 @@
+## REPL
+```shell
+lpy
+#or
+lpy -t #if you want to print python translation.
+```
+
+The REPL features Emacs-style keybindings (C-a, C-e, C-b, C-f, M-b, M-f, etc.), arrow key navigation, and persistent command history saved to `~/.lpy_history`.
+
+### Auto-closing pairs
+
+The REPL automatically inserts closing brackets and quotes when you type an opening one:
+
+| You type | REPL inserts | Cursor position |
+|----------|-------------|-----------------|
+| `(`      | `()`        | between `(` and `)` |
+| `[`      | `[]`        | between `[` and `]` |
+| `{`      | `{}`        | between `{` and `}` |
+| `'`      | `''`        | between the quotes |
+| `"`      | `""`        | between the quotes |
+
+- Typing a closing character (`)`, `]`, `}`) when the cursor is already before one will skip over it instead of inserting a duplicate.
+- Typing a quote (`'`, `"`) when the cursor is before the same quote will skip over it.
+- Pressing backspace between an empty pair deletes both characters.
+
+## Run from source
+```shell
+lpy {filename}.lpy
+```
+## Run translation
+```shell
+l2py {filename}.lpy
+```
+It just displays translation. (don't run it)
+## Run Tests (for development)
+```shell
+# in project root directory
+pytest
+#or
+lpy -m pytest
+```

{lispython-0.4.3 → lispython-0.4.6}/mkdocs.yml

@@ -1,6 +1,6 @@
 site_name: LisPython
 
-copyright: Copytright © 2023-2025 Jetack
+copyright: Copyright © 2023-2026 Jetack
 
 plugins:
   - macros:

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

@@ -1,12 +1,15 @@
 [project]
 name = "lispython"
-version = "0.4.3"
+version = "0.4.6"
 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.3 → lispython-0.4.6}/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.3 → lispython-0.4.6}/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.3 → lispython-0.4.6}/src/lispy/lsp/server.lpy

@@ -751,6 +751,85 @@
                     :range (make-range lineno 0 lineno 0))])))))
   (return None)))
 
+;; ---------------------------------------------------------------------------
+;; Completion
+;; ---------------------------------------------------------------------------
+
+(= _LPY-KEYWORDS
+   ["defn" "cond" "conde" "ife" "when" "unless"
+    "do" "deco" "require" "fn" "match" "case"
+    "async-def" "async-for" "async-with"
+    "yield-from" "except*"
+    "->" "->>" "as->"
+    "gensym" "pprint"])
+
+(deco (server.feature
+        lsp.TEXT_DOCUMENT_COMPLETION
+        (lsp.CompletionOptions :trigger-characters ["." "-"]))
+(def completion [ls params]
+  (= doc (.get-text-document ls.workspace params.text_document.uri))
+  (= pos params.position)
+  (= items [])
+  (= seen (set))
+
+  ;; 1. Special forms
+  (for name in SPECIAL-FORM-DOCS
+    (if (not (in name seen))
+        (do (seen.add name)
+            (items.append
+              (lsp.CompletionItem
+                :label name
+                :kind lsp.CompletionItemKind.Keyword
+                :detail "special form")))))
+
+  ;; 2. LisPython-specific keywords
+  (for name in _LPY-KEYWORDS
+    (if (not (in name seen))
+        (do (seen.add name)
+            (items.append
+              (lsp.CompletionItem
+                :label name
+                :kind lsp.CompletionItemKind.Keyword
+                :detail "keyword")))))
+
+  ;; 3. Python builtins
+  (for [name info] in (BUILTIN-INFO.items)
+    (if (not (in name seen))
+        (do (seen.add name)
+            (= kind (ife (isinstance (getattr builtins name None) type)
+                         lsp.CompletionItemKind.Class
+                         lsp.CompletionItemKind.Function))
+            (items.append
+              (lsp.CompletionItem
+                :label name
+                :kind kind
+                :detail (or (.get info "signature") ""))))))
+
+  ;; 4. Symbols from current file
+  (try
+    (= tree (parse doc.source))
+    (= defs (collect-definitions tree doc.uri))
+    (for name in defs
+      (if (not (in name seen))
+          (do (seen.add name)
+              (items.append
+                (lsp.CompletionItem
+                  :label name
+                  :kind lsp.CompletionItemKind.Variable)))))
+    (except [Exception] (pass)))
+
+  ;; 5. Workspace symbols
+  (for name in WORKSPACE-INDEX
+    (if (not (in name seen))
+        (do (seen.add name)
+            (items.append
+              (lsp.CompletionItem
+                :label name
+                :kind lsp.CompletionItemKind.Variable
+                :detail "workspace")))))
+
+  (return (lsp.CompletionList :is-incomplete False :items items))))
+
 (deco (server.feature lsp.TEXT_DOCUMENT_REFERENCES)
 (def references [ls params]
   (= doc (.get-text-document ls.workspace params.text_document.uri))