diff --git a/lib/chibi/string.scm b/lib/chibi/string.scm index ed07a890..cd497a62 100644 --- a/lib/chibi/string.scm +++ b/lib/chibi/string.scm @@ -199,7 +199,7 @@ (define (string-suffix? suffix str) (string-cursor=? (string-cursor-prev suffix (string-cursor-start suffix)) - (string-cursor-backward + (string-cursor-back str (string-mismatch-right suffix str) (- (string-size str) (string-size suffix))))) @@ -327,10 +327,10 @@ cursor (string-cursor-forward str (string-cursor-next str cursor) (- n 1)))) -(define (string-cursor-backward str cursor n) +(define (string-cursor-back str cursor n) (if (zero? n) cursor - (string-cursor-backward str (string-cursor-prev str cursor) (- n 1)))) + (string-cursor-back str (string-cursor-prev str cursor) (- n 1)))) ;;> \procedure{(string-cursor \procedure{(string-cursor>? i j)} diff --git a/lib/chibi/string.sld b/lib/chibi/string.sld index 0177e771..dce5e5bc 100644 --- a/lib/chibi/string.sld +++ b/lib/chibi/string.sld @@ -10,7 +10,7 @@ string-cursor? string-cursor>=? string-cursor=? string-cursor-next string-cursor-prev substring-cursor string-cursor->index string-index->cursor - string-cursor-forward string-cursor-backward + string-cursor-forward string-cursor-back string-null? string-every string-any string-join string-split string-count string-trim string-trim-left string-trim-right diff --git a/lib/srfi/130.scm b/lib/srfi/130.scm index 13b983a3..96532197 100644 --- a/lib/srfi/130.scm +++ b/lib/srfi/130.scm @@ -87,12 +87,12 @@ (define (string-take str n) (substring str 0 n)) (define (string-take-right str n) - (let ((start (string-cursor-backward str (string-cursor-end str) n))) + (let ((start (string-cursor-back str (string-cursor-end str) n))) (substring-cursor str start))) (define (string-drop str n) (substring str n)) (define (string-drop-right str n) - (let ((end (string-cursor-backward str (string-cursor-end str) n))) + (let ((end (string-cursor-back str (string-cursor-end str) n))) (substring-cursor str (string-cursor-start str) end))) (define (string-pad str len . o) diff --git a/lib/srfi/130.sld b/lib/srfi/130.sld index 60349b51..fcfd2d6d 100644 --- a/lib/srfi/130.sld +++ b/lib/srfi/130.sld @@ -4,7 +4,7 @@ string-cursor? string-cursor-start string-cursor-end string-cursor-next string-cursor-prev - string-cursor-forward string-cursor-backward + string-cursor-forward string-cursor-back string-cursor=? string-cursor? string-cursor<=? string-cursor>=?