cj-env-2: pmatch: use equal not eq, treat self-quoting values as quoted

pflanze · Aug 12, 2020 · b324db2 · b324db2
1 parent b74f91a
commit b324db2
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/cj-env-2.scm b/cj-env-2.scm
@@ -177,11 +177,15 @@
                          (set! have-else? #t)
                          `(else ,@rest))
                         (`(`pexpr . `rest)
-                         (mcase pexpr
-                                (`(quote `val)
-                                 `((eq? ,V ',val) ,@rest))
-                                (else
-                                 `((,pexpr ,V) ,@rest)))))
+                         `(,(mcase pexpr
+                                   (self-quoting?
+                                    `(equal? ,V ,pexpr))
+                                   (`(quote `val)
+                                    `(equal? ,V ',val))
+                                   (else
+                                    ;; predicate
+                                    `(,pexpr ,V)))
+                           ,@rest)))
                        cases)))
      `(let ((,V ,expr))
         (cond ,@cases*
@@ -191,11 +195,17 @@
 (TEST
  > (define (t v)
      (pmatch v
+       (123.4 'is-123_4)
        (number? 'num)
        ('foo 'is-foo)
+       ("bar" 'is-bar)
        (string? 'str)))
  > (t "foo")
  str
+ > (t "bar")
+ is-bar
+ > (t 123.4)
+ is-123_4
  > (t 'foo)
  is-foo
  > (t 123)