Merge pull request hylang#2407 from Kodiologist/match-dot

Fix `match` patterns with a dotted constructor

docs/api.rst

@@ -1255,9 +1255,7 @@ base names, such that ``hy.core.macros.foo`` can be called as just ``foo``.
   1.0. Currently, trying to use ``pragma`` is an error.
 
 .. hy:automodule:: hy.core.macros
-   :members:
    :macros:
-   :tags:
 
 Placeholder macros
 ~~~~~~~~~~~~~~~~~~

hy/core/result_macros.py

@@ -1084,7 +1084,8 @@ def compile_with_expression(compiler, expr, root, args, body):
         | pexpr(keepsym("|"), many(_pattern))
         | braces(many(LITERAL + _pattern), maybe(pvalue("unpack-mapping", SYM)))
         | pexpr(
-            notsym(".", "|", "unpack-mapping", "unpack-iterable"),
+            pexpr(keepsym("."), oneplus(SYM))
+            | notsym(".", "|", "unpack-mapping", "unpack-iterable"),
             many(parse_if(lambda x: not isinstance(x, Keyword), _pattern)),
             many(KEYWORD + _pattern),
         )
@@ -1219,11 +1220,15 @@ def compile_pattern(compiler, pattern):
             )
         )
     elif isinstance(value, Expression):
-        root, args, kwargs = value
+        head, args, kwargs = value
         keywords, values = zip(*kwargs) if kwargs else ([], [])
         return asty.MatchClass(
             value,
-            cls=compiler.scope.access(asty.Name(root, id=mangle(root), ctx=ast.Load())),
+            cls=compiler.compile(
+              # `head` could be a symbol or a dotted form.
+                (head[:1] + head[1]).replace(head)
+                if type(head) is Expression
+                else head).expr,
             patterns=[compile_pattern(compiler, v) for v in args],
             kwd_attrs=[kwd.name for kwd in keywords],
             kwd_patterns=[compile_pattern(compiler, value) for value in values],

tests/native_tests/match.hy

@@ -5,6 +5,10 @@
         dataclasses [dataclass]
         hy.errors [HySyntaxError])
 
+(defclass [dataclass] Point []
+    (#^int x)
+    (#^int y))
+
 (defn test-pattern-matching []
   (assert (is (match 0
                      0 :if False False
@@ -78,10 +82,6 @@
        0)
     0))
 
-  (defclass [dataclass] Point []
-    (#^int x)
-    (#^int y))
-
   (assert (= 0 (match (Point 1 0) (Point 1 :y var) var)))
   (assert (is None (match (Point 0 0) (Point 1 :y var) var)))
 
@@ -130,6 +130,12 @@
     (hy.eval '(match 1
                      1 :if True :as x x))))
 
+(defn test-dotted-constructor []
+  ; https://github.com/hylang/hy/issues/2404
+  (defclass C [Point]
+    (setv C Point))
+  (assert (= (match (Point 1 2) (C.C 1 2) "ok") "ok")))
+
 (defn test-matching-side-effects []
   (setv x 0)
   (defn foo []
@@ -165,10 +171,6 @@
     (assert (= [x y] [5 6])))
   (assert (= [x y] [3 4])))
 
-(defclass [dataclass] Point []
-  (#^int x)
-  (#^int y))
-
 (defn test-let-match-pattern []
   (setv [x y] [1 2]
         p (Point 5 6))