Merge pull request #102 from Kodiologist/release

Release Hyrule 0.7.0

NEWS.rst

@@ -1,12 +1,17 @@
 .. default-role:: code
 
-Unreleased
+0.7.0 (released 2024-09-22; uses Hy ≥ 1)
 ======================================================
 
 New Features
 ------------------------------
 * New macros `meth` and `ameth`.
 
+Bug Fixes
+------------------------------
+* `match-fn-params` now raises an error for syntactically invalid
+  parameter lists.
+
 0.6.0 (released 2024-05-20; uses Hy 0.29.*)
 ======================================================
 

docs/conf.py

@@ -16,7 +16,7 @@
 copyright = '%s the authors' % time.strftime('%Y')
 html_title = f'Hyrule {hyrule.__version__} manual'
 
-hy_version = 'v0.29.0'
+hy_version = 'v1.0.0'
 
 exclude_patterns = ['_build']
 

hyrule/macrotools.hy

@@ -129,16 +129,16 @@
   "A subroutine for `defmacro-kwargs` and `match-params`."
   (import
     funcparserlib.parser [maybe many]
-    hy.model-patterns [SYM FORM sym brackets pexpr])
+    hy.model-patterns [SYM FORM sym brackets pexpr whole])
 
   (setv msym (>> SYM hy.mangle))
   (defn pvalue [root wanted]
     (>> (pexpr (+ (sym root) wanted)) (fn [x] (get x 0))))
   (setv [ps p-rest p-kwargs] (.parse
-    (+
+    (whole [
       (many (| msym (brackets msym FORM)))
       (maybe (pvalue "unpack-iterable" msym))
-      (maybe (pvalue "unpack-mapping" msym)))
+      (maybe (pvalue "unpack-mapping" msym))])
     params))
   (setv ps (dfor
     p ps

setup.py

@@ -25,7 +25,7 @@ def run(self):
 # both setup_requires and install_requires
 # since we need to compile .hy files during setup
 requires = [
-    'hy'
+    'hy >= 1'
 ]
 
 

tests/test_macrotools.hy

@@ -205,7 +205,12 @@
   (with [(pytest.raises TypeError :match "^unpacking is not allowed in `args`$")]
     (f '[1 2 3 #* [1 2]]))
   (with [(pytest.raises TypeError :match "^unpacking is not allowed in `args`$")]
-    (f '[1 2 3 #** {"qq" 1 "xx" 2}])))
+    (f '[1 2 3 #** {"qq" 1 "xx" 2}]))
+
+  ; A syntactically invalid parameter list
+  (with [(pytest.raises hy.I.funcparserlib/parser.NoParseError)]
+     (match-fn-params [1] '[a 3]))
+  (assert (= (match-fn-params [1] '[a]) (dict :a 1))))
 
 
 (defn test-slash-import []