diff options
| author | Rose Hogenson <rhogenson@posteo.net> | 2022-07-22 12:00:46 -0700 |
|---|---|---|
| committer | Rose Hogenson <rhogenson@posteo.net> | 2022-07-22 12:00:46 -0700 |
| commit | 9f8ae9d1de7988299fccb9a6e2673bf147c6d9eb (patch) | |
| tree | 3ea426b72ad1c9588a11396eebf735e86256acdd | |
| parent | e615308b928585013461482f879f536527c5acc2 (diff) | |
| download | chromatopelma-9f8ae9d1de7988299fccb9a6e2673bf147c6d9eb.tar.zst | |
Fix a bug in matching record types.
Running the record matcher has a side-effect (raising *no-match*), so we
call it ahead of time to ensure a consistent order of evaluation.
| -rw-r--r-- | csc/match-test.csc | 8 | ||||
| -rw-r--r-- | csc/match.csc | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/csc/match-test.csc b/csc/match-test.csc index d4da153..bcd0d35 100644 --- a/csc/match-test.csc +++ b/csc/match-test.csc @@ -101,3 +101,11 @@ 2 (match (make-test-record-type 1 2 3) ((% %test-record-type a b c) b)))) + + +(test match-record-type-any + (assert-equal + #t + (match '(1 2 3) + ((% %test-record-type . _) #f) + ((! '(1 2 3)) #t)))) diff --git a/csc/match.csc b/csc/match.csc index 116204f..96ec4d3 100644 --- a/csc/match.csc +++ b/csc/match.csc @@ -51,7 +51,8 @@ (match-pattern (car y) pattern result result* ...) (raise *no-match*)))) ((match-pattern x (% record-matcher . patterns) result result* ...) - (match-pattern (map cdr (cdr (record-matcher x))) patterns result result* ...)) + (let ((x* (record-matcher x))) + (match-pattern (map cdr (cdr (record-matcher x))) patterns result result* ...))) ((match-pattern x (pattern . rest) result result* ...) (let ((y x)) (if (pair? y) |