lispython 0.3.0__tar.gz → 0.3.1__tar.gz

{lispython-0.3.0 → lispython-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lispython
-Version: 0.3.0
+Version: 0.3.1
 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
@@ -67,9 +67,12 @@ lpy -m unittest
 # Todo
 ## Environment
 - [ ] Test on more python versions
-- [ ] Some IDE plugins like hy-mode and jedhy for better editing experience.
+- [ ] REPL should track history and arrow key navigation
+- [ ] REPL multi-line input support
+- [ ] Better compileation 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
+- [ ] `type_comment` never considered. Later, it should be covered
+- [ ] Any missing AST nodes in the version 3.12+

{lispython-0.3.0 → lispython-0.3.1}/README.md

@@ -46,9 +46,12 @@ lpy -m unittest
 # Todo
 ## Environment
 - [ ] Test on more python versions
-- [ ] Some IDE plugins like hy-mode and jedhy for better editing experience.
+- [ ] REPL should track history and arrow key navigation
+- [ ] REPL multi-line input support
+- [ ] Better compileation 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
+- [ ] `type_comment` never considered. Later, it should be covered
+- [ ] Any missing AST nodes in the version 3.12+

{lispython-0.3.0 → lispython-0.3.1}/pyproject.toml

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

{lispython-0.3.0 → lispython-0.3.1}/src/lispy/core/meta_functions.py

@@ -34,6 +34,18 @@ def require_transform(sexp):
         [macro_names] = optional
     else:
         macro_names = None
+    module_name_str = str(module_name).replace("-", "_")
+    is_relative = module_name_str.startswith(".")
+    import_call = (
+        Paren(
+            Symbol("importlib.import-module"),
+            module_name_str,
+            Keyword(Symbol("package")),
+            Symbol("__package__"),
+        )
+        if is_relative
+        else Paren(Symbol("importlib.import-module"), module_name_str)
+    )
     return Paren(
         Symbol("do"),
         Paren(Symbol("import"), Symbol("importlib")),
@@ -41,13 +53,7 @@ def require_transform(sexp):
             Symbol("="),
             Symbol("___imported-macros"),
             Paren(
-                Symbol("getattr"),
-                Paren(
-                    Symbol("importlib.import-module"),
-                    str(module_name).replace("-", "_"),
-                ),
-                String('"__macro_namespace"'),
-                Brace(),
+                Symbol("getattr"), import_call, String('"__macro_namespace"'), Brace()
             ),
         ),
         Paren(
@@ -111,11 +117,11 @@ def require_transform(sexp):
 if __name__ == "__main__":
     import os.path as osp
 
-    from lispy.tools import l2py_f
+    from lispy.tools import l2py_s
 
     path = osp.abspath(__file__)
     with open(path, "r") as f:
         org = f.read()
-    translated = l2py_f(org)
+    translated = l2py_s(org)
     with open(osp.join(osp.dirname(path), "core", "meta_functions.py"), "w") as f:
         f.write(translated)

{lispython-0.3.0 → lispython-0.3.1}/src/lispy/core/parser.py

@@ -7,8 +7,12 @@ from lispy.core.utils import augassignop_dict
 
 
 def tokenize(src):
-    # Remove commas except those following { or ( with optional whitespace
-    src = re.sub(r"([{(]\s*),|,", lambda m: m.group(0) if m.group(1) else " ", src)
+    # Remove commas except those following { or ( with optional whitespace, but preserve commas in strings
+    src = re.sub(
+        r'(\w*"""(?:[^\\"]|\\.)*"""|\w*\'\'\'(?:[^\\\']|\\.)*\'\'\'|\w*"(?:[^\\"]|\\.)*"|[{(]\s*,)|,',
+        lambda m: m.group(1) if m.group(1) else " ",
+        src,
+    )
     lines = src.split("\n")
     tokens = deque([])
     int_simple = r"\d+[\dA-Za-z]*(?:_[\dA-Za-z]+)*"

{lispython-0.3.0 → lispython-0.3.1}/src/lispy/core_meta_functions.lpy

@@ -21,11 +21,15 @@
   (if optional
       (= [macro-names] optional)
       (= macro-names None))
+  (= module-name-str (.replace (str module-name) "-" "_"))
+  (= is-relative (.startswith module-name-str "."))
+  (= import-call (ife is-relative
+                      `(importlib.import-module ~module-name-str :package __package__)
+                      `(importlib.import-module ~module-name-str)))
   (return
     `(do (import importlib)
          (= ___imported-macros
-            (getattr (importlib.import-module
-                       ~(.replace (str module-name) "-" "_"))
+            (getattr ~import-call
                      "__macro_namespace"
                      {}))
          ~(conde (not macro-names)
@@ -47,14 +51,14 @@
 
 (when (== __name__ "__main__")
   (import os.path as osp)
-  (from lispy.tools [l2py-f])
+  (from lispy.tools [l2py-s])
 
   (= path (osp.abspath __file__))
 
   (with [(open path "r") as f]
     (= org (f.read)))
 
-  (= translated (l2py-f org))
+  (= translated (l2py-s org))
 
   (with [(open (-> path
                    (osp.dirname)

{lispython-0.3.0 → lispython-0.3.1}/src/lispy/tools.lpy

@@ -20,14 +20,16 @@
 (from lispy.core.parser [parse])
 (from lispy.core.macro [macroexpand-then-compile])
 
-(def detect-package-name []
-  "Detect package name from current directory by checking for __init__.py"
-  (= cwd (os.getcwd))
-  (if (not (osp.exists (osp.join cwd "__init__.py")))
+(def detect-package-name [:path None]
+  "Detect package name from directory by checking for __init__.py"
+  (= dir-path (ife (is path None)
+                   (os.getcwd)
+                   (osp.dirname (osp.abspath path))))
+  (if (not (osp.exists (osp.join dir-path "__init__.py")))
       (return ""))
   ;; Walk up to find package root
   (= parts [])
-  (= current cwd)
+  (= current dir-path)
   (while (osp.exists (osp.join current "__init__.py"))
     (parts.insert 0 (osp.basename current))
     (= parent (osp.dirname current))
@@ -88,11 +90,11 @@
                         :dest "include_meta"
                         :action "store_true")
 
-(def l2py-s [src :include-meta False :fresh-scope False]
+(def l2py-s [src :include-meta False :fresh-scope False :package ""]
   "Translate lispy source string to Python source string"
   (if fresh-scope
       (= scope {"__builtins__" __builtins__
-                "__package__" ""
+                "__package__" package
                 "__macro_namespace" {}})
       (= scope SCOPE))
   (= pysrc (src-to-python src :include-meta include_meta :scope scope))
@@ -118,7 +120,8 @@
 
   (with [(open file-path "rb") as f]
     (= src (.decode (f.read) "utf-8")))
-  (return (+ (l2py-s src :include-meta include_meta :fresh-scope True) "\n")))
+  (= pkg (detect-package-name :path file-path))
+  (return (+ (l2py-s src :include-meta include_meta :fresh-scope True :package pkg) "\n")))
 
 (def l2py []
   "CLI entry point: parse args and translate file"

{lispython-0.3.0 → lispython-0.3.1}/uv.lock

@@ -238,7 +238,7 @@ wheels = [
 
 [[package]]
 name = "lispython"
-version = "0.2.1"
+version = "0.3.0"
 source = { editable = "." }
 
 [package.optional-dependencies]