diff --git a/collects/srfi/13.ss b/collects/srfi/13.ss index f5c3ed6aa2..5b4c3161e0 100644 --- a/collects/srfi/13.ss +++ b/collects/srfi/13.ss @@ -1,13 +1,10 @@ ;; module loader for SRFI-13 -(module |13| mzscheme - (require (lib "string.ss" "srfi" "13")) - (provide (all-from (lib "string.ss" "srfi" "13")))) - -#; ; re-provides built-ins now (module |13| mzscheme (require (lib "string.ss" "srfi" "13")) (provide (all-from-except (lib "string.ss" "srfi" "13") - s:string-upcase s:string-downcase s:string-titlecase) - (rename s:string-upcase string-upcase) - (rename s:string-downcase string-downcase) - (rename s:string-titlecase string-titlecase))) + s:string-upcase s:string-downcase s:string-titlecase) + (rename s:string-upcase string-upcase) + (rename s:string-downcase string-downcase) + (rename s:string-titlecase string-titlecase))) + + diff --git a/collects/srfi/13/string.ss b/collects/srfi/13/string.ss index 2320b8c596..c99c79c5e0 100644 --- a/collects/srfi/13/string.ss +++ b/collects/srfi/13/string.ss @@ -99,9 +99,7 @@ string-compare string-compare-ci string= string< string> string<= string>= string<> string-ci= string-ci< string-ci> string-ci<= string-ci>= string-ci<> - ;; use built-in versions - ;; s:string-downcase s:string-upcase s:string-titlecase - string-downcase string-upcase string-titlecase + s:string-downcase s:string-upcase s:string-titlecase string-downcase! string-upcase! string-titlecase! string-take string-take-right string-drop string-drop-right @@ -947,7 +945,6 @@ ;; Capitalize every contiguous alpha sequence: capitalise ;; first char, lowercase rest. - #; ; use built-in version (define (s:string-upcase s . maybe-start+end) (let-string-start+end (start end) 'string-upcase s maybe-start+end (%string-map char-upcase s start end))) @@ -956,7 +953,6 @@ (let-string-start+end (start end) 'string-upcase! s maybe-start+end (%string-map! char-upcase s start end))) - #; ; use built-in version (define (s:string-downcase s . maybe-start+end) (let-string-start+end (start end) 'string-downcase s maybe-start+end (%string-map char-downcase s start end))) @@ -984,7 +980,6 @@ (let-string-start+end (start end) 'string-titlecase! s maybe-start+end (%string-titlecase! s start end))) - #; ; use built-in version (define (s:string-titlecase s . maybe-start+end) (let-string-start+end (start end) 'string-titlecase! s maybe-start+end (let ((ans (substring s start end)))