Changeset 37616 in project

Timestamp:

05/25/19 10:28:50 (7 months ago)

Author:

sjamaan

Message:

Matchable: use unquoted record identifiers when matching records

Location:

release/5/matchable/trunk

Files:

• matchable.scm (modified) (1 diff)
• tests/run.scm (modified) (3 diffs)

release/5/matchable/trunk/matchable.scm

@@ -30 +30 @@
   (define-syntax is-a?
     (syntax-rules ()
-      ((_ obj type) (record-instance? obj (quote type)))))
+      ((_ obj type) (record-instance? obj type))))
 
   (include "match.scm")

release/5/matchable/trunk/tests/run.scm

@@ -1 +1 @@
 #;(include "../matchable.scm")
 
-(import scheme (chicken base) (chicken memory representation)
-        matchable test)
+(import scheme (chicken base) matchable test)
 
 (test-begin "match")
@@ -103 +102 @@
           x)))
 
-#+(not alexpander)
 (test-group "records"
+  (module boxes (box make-box)
+    (import scheme (chicken base))
+    (define-record box value))
+
+  (import boxes)
+
   (define-record point x y)
   (define-record-type my-box (make-my-box x) box? (x get-my-box-x))
 
-  (test "record"
+  (test "toplevel record using raw name"
+        '(123 456)
+        (match (make-point 123 456) (($ 'point x y) (list x y))))
+  
+  (test "toplevel record using identifier"
         '(123 456)
         (match (make-point 123 456) (($ point x y) (list x y))))
 
+  (test-error "module-namespaced record using invalid raw name fails"
+              (match (make-box 123) (($ 'foo#box x) (list x))))
+
+  (test "module-namespaced record using raw name"
+        '(123)
+        (match (make-box 123) (($ 'boxes#box x) (list x))))
+
+  (test "module-namespaced record using identifier"
+        '(456)
+        (match (make-box 456) (($ box x) (list x))))
+  
   (test "record with different predicate name"
         'ok
@@ -123 +142 @@
 
   (test-error "record with @ pattern should fail"
-        (match (make-point 123 456) ((@ point (x a) (y b)) 'ok)))
+              (match (make-point 123 456) ((@ point (x a) (y b)) 'ok)))