Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

regexp-search can terminate early if a match is found and all remaining possible matches start to the right of it

Browse source
This commit is contained in:
Alex Shinn 2015-03-22 22:45:36 +09:00
parent 87761001aa
commit d08ce6e925
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/chibi/regexp.scm
View file

@ -295,6 +295,9 @@
sr1 sr1
sr2)) sr2))
(define (searcher-start-match sr)
(regexp-match-ref (searcher-matches sr) 0))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; A posse is a group of searchers. ;; A posse is a group of searchers.
@ -312,6 +315,8 @@
(hash-table-walk posse (lambda (key val) (hash-table-delete! posse key)))) (hash-table-walk posse (lambda (key val) (hash-table-delete! posse key))))
(define (posse-for-each proc posse) (define (posse-for-each proc posse)
(hash-table-walk posse (lambda (key val) (proc val)))) (hash-table-walk posse (lambda (key val) (proc val))))
(define (posse-every pred posse)
(hash-table-fold posse (lambda (key val acc) (and acc (pred val))) #t))
(define (posse->list posse) (define (posse->list posse)
(hash-table-values posse)) (hash-table-values posse))
@ -422,7 +427,14 @@
(posse-clear! epsilons))) (posse-clear! epsilons)))
(cond (cond
((or (string-cursor>=? i end) ((or (string-cursor>=? i end)
(and (or (not search?) (searcher? (cdr accept))) (and search?
(searcher? (cdr accept))
(let ((accept-start (searcher-start-match (cdr accept))))
(posse-every
(lambda (searcher)
(> (searcher-start-match searcher) accept-start))
searchers1)))
(and (not search?)
(posse-empty? searchers1))) (posse-empty? searchers1)))
;; Terminate when the string is done or there are no more ;; Terminate when the string is done or there are no more
;; searchers. If we terminate prematurely and are not ;; searchers. If we terminate prematurely and are not