suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for regexp-match-positions* on input ports

Browse Source 
svn: r9600
This commit is contained in:
Eli Barzilay 2008-05-02 18:09:58 +00:00
parent 97715dc9fb
commit a995ba1304
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
collects/scheme/private/string.ss
View File

@ -188,30 +188,37 @@
(port-failure-k acc discarded/leftovers)))
;; String/port match, get positions
(let ([match ((if peek?
(let* ([match (if peek?
regexp-match-peek-positions
regexp-match-positions)
rx string start end)])
(if (not match)
regexp-match-positions)]
[m (match rx string start end)])
(if (not m)
(failure-k acc start end)
(let* ([mstart (caar match)]
[mend (cdar match)]
(let* ([mstart (caar m)]
[mend (cdar m)]
;; re-match if we get a zero-length match at the
;; beginning
[match (if (and (= mstart mend start)
(< start (or end len +inf.0)))
((if peek?
regexp-match-peek-positions
regexp-match-positions)
rx string (add1 start) end)
match)])
;; beginning, and we can continue
[m (if (and (= mstart mend start)
(cond [end (< start end)]
[len (< start len)]
[(input-port? string)
(not (eof-object?
(peek-byte string)))]
[else (error "internal error (str)")]))
(match rx string (add1 start) end)
m)])
;; fail if rematch failed
(if (not match)
(if (not m)
(failure-k acc start end)
(let ([mstart (caar match)]
[mend (cdar match)])
(let ([mstart (caar m)]
[mend (cdar m)])
;; or if we have a zero-length match at the end
(if (= mstart mend (or end len +inf.0))
(if (and (= mstart mend)
(cond [end (= mend end)]
[len (= mend len)]
[(input-port? string)
(eof-object? (peek-byte string))]
[else (error "internal error (str)")]))
(failure-k acc start end)
(if port-success-k
(port-success-k