diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2021-04-25 00:53:08 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2021-04-25 00:53:08 -0700 |
| commit | b8237da593d63f83dcf642322b3b2e2f4d72ae8b (patch) | |
| tree | 9cf97d1211f28d5b3f7345993213ad679f0e4641 /share | |
| parent | 7c3505120e36ff9df3eae624c140b63d48d31bac (diff) | |
| download | txr-b8237da593d63f83dcf642322b3b2e2f4d72ae8b.tar.gz txr-b8237da593d63f83dcf642322b3b2e2f4d72ae8b.tar.bz2 txr-b8237da593d63f83dcf642322b3b2e2f4d72ae8b.zip | |
matcher: first round of quasi tests and bugfix.
* share/txr/stdlib/match.tl (expand-quasi-match): The return
value of search-str isn't a length but an absolute position.
We not only fix a bug, but lose a useless calculation.
* tests/011/patmatch.tl: New test cases for quasiliteral
patterns, starting with the most rudimentary.
Last one broke, due to the above issue.
Diffstat (limited to 'share')
| -rw-r--r-- | share/txr/stdlib/match.tl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/share/txr/stdlib/match.tl b/share/txr/stdlib/match.tl index 64f53357..0c10dfb1 100644 --- a/share/txr/stdlib/match.tl +++ b/share/txr/stdlib/match.tl @@ -907,9 +907,8 @@ ;; `@{var}txt` (new binding) (((@(eq 'sys:var) @sym) @(stringp @txt) . @rest) (with-gensyms (len end npos) - (list* ^@(require @(with ,len (search-str ,str ,txt ,pos)) - ,len) - ^@(with ,end (+ ,pos ,len)) + (list* ^@(require @(with ,end (search-str ,str ,txt ,pos)) + ,end) ^@(with ,npos (+ ,end ,(len txt))) ^@(with ,sym (sub-str ,str ,pos ,end)) (quasi-match vlist (cdr rest) (cons sym vars) @@ -918,11 +917,10 @@ (((@(eq 'sys:var) @sym) (@(eq 'sys:var) @(bound-p vlist vars @bsym) . @mods) . @rest) - (with-gensyms (txt len end npos) + (with-gensyms (txt end npos) (list* ^@(with ,txt (sys:quasi ,(cadr args))) - ^@(require @(with ,len (search-str ,str ,txt ,pos)) - ,len) - ^@(with ,end (+ ,pos ,len)) + ^@(require @(with ,end (search-str ,str ,txt ,pos)) + ,end) ^@(with ,npos (+ ,end (len ,txt))) ^@(with ,sym (sub-str ,str ,pos ,end)) (quasi-match vlist (cdr rest) (cons sym vars) |