diff --git a/scsh/rx/re-high.scm b/scsh/rx/re-high.scm index 28c08de..3aa9af3 100644 --- a/scsh/rx/re-high.scm +++ b/scsh/rx/re-high.scm @@ -46,10 +46,9 @@ (define (regexp-search re str . maybe-start) (let* ((tsm (re-tsm re)) - (svec (make-vector (+ 1 tsm) #f)) - (evec (make-vector (+ 1 tsm) #f)) + (mvec (make-vector (+ 1 tsm) #f)) (cre (compile-regexp re))) - (cre-search cre svec evec str (:optional maybe-start 0)))) + (cre-search cre mvec str (:optional maybe-start 0)))) (define (regexp-search? re str . maybe-start) diff --git a/scsh/rx/re-low.scm b/scsh/rx/re-low.scm index a138ae7..7ed5dc3 100644 --- a/scsh/rx/re-low.scm +++ b/scsh/rx/re-low.scm @@ -70,7 +70,7 @@ ;;; cre-search returns match info; cre-search? is just a predicate. ;; ### we do not look at START yet -(define (cre-search cre start-vec end-vec str start) +(define (cre-search cre match-vec str start) (let ((re-str (cre:string cre))) ;; RE-STR = #F => empty match. (if (not re-str) #f @@ -85,7 +85,7 @@ (make-regexp-match str (translate-submatches ret (cre:tvec cre) - start-vec)))))))) + match-vec)))))))) (define (translate-submatches matches trans-vec match-vec) (let ((n-virtual-submatches (vector-length trans-vec)))