diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2021-08-19 11:47:12 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2021-08-19 11:47:12 -0700 |
| commit | f374abcd23a63f628a9ec7b84e2d797d3fc28342 (patch) | |
| tree | 811149d630ffaefaa8be464465f660ba9287fc98 /stdlib/match.tl | |
| parent | 46be04f43613e08af5015485ff19bb79af1d3feb (diff) | |
| download | txr-f374abcd23a63f628a9ec7b84e2d797d3fc28342.tar.gz txr-f374abcd23a63f628a9ec7b84e2d797d3fc28342.tar.bz2 txr-f374abcd23a63f628a9ec7b84e2d797d3fc28342.zip | |
matcher: rename error-throwing macros.
* stdlib/match.tl (must-match): Renamed to just match.
It's just when-match without the "when".
(must-match-case): Renamed to match-ecase, consistent
with the case -> ecase naming scheme.
* lisplib.c (match_set_entries): Names updated here.
* tests/011/patmatch.tl: Test cases updated.
* txr.1: Names updated here.
* stdlib/doc-syms.tl: Updated.
Diffstat (limited to 'stdlib/match.tl')
| -rw-r--r-- | stdlib/match.tl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stdlib/match.tl b/stdlib/match.tl index 81f8d8a7..30389ce1 100644 --- a/stdlib/match.tl +++ b/stdlib/match.tl @@ -645,12 +645,12 @@ ,result ,else))))) -(defmacro must-match (pat obj . body) +(defmacro match (pat obj . body) (with-gensyms (val) ^(let ((,val ,obj)) (if-match ,pat ,val (progn ,*body) - (throwf 'match-error "~s: ~s failed to match object ~s" 'must-match ',pat ,val))))) + (throwf 'match-error "~s: ~s failed to match object ~s" 'match ',pat ,val))))) (defmacro while-match (:form *match-form* :env e pat obj . body) (let ((cm (compile-match pat : (get-var-list e)))) @@ -683,11 +683,11 @@ (or ,*clause-code) ,result-temp)))) -(defmacro must-match-case (obj . clauses) +(defmacro match-ecase (obj . clauses) (with-gensyms (else) ^(match-case ,obj ,*clauses - ((var ,else) (throwf 'match-error "~s: failed to match object ~s" 'must-match-case ,else))))) + ((var ,else) (throwf 'match-error "~s: failed to match object ~s" 'match-ecase ,else))))) (defmacro while-match-case (:form *match-form* :env e obj . clauses) (unless [all clauses [andf proper-listp [chain len plusp]]] |