Import Upstream version 3a1upstream/3a1

1 files changed, 32 insertions, 9 deletions

diff --git a/strcase.scm b/strcase.scm
index 30b58ad..71daba4 100644
--- a/strcase.scm
+++ b/strcase.scm
@@ -4,30 +4,30 @@
 ; This code is in the public domain.
 
 ; Modified by Aubrey Jaffer Nov 1992.
-; SYMBOL-APPEND added by A. Jaffer 2001.
+; SYMBOL-APPEND and StudlyCapsExpand added by A. Jaffer 2001.
 ; Authors of the original version were Ken Dickey and Aubrey Jaffer.
 
 ;string-upcase, string-downcase, string-capitalize
 ; are obvious string conversion procedures and are non destructive.
 ;string-upcase!, string-downcase!, string-capitalize!
 ; are destructive versions.
-
+;@
 (define (string-upcase! str)
   (do ((i (- (string-length str) 1) (- i 1)))
       ((< i 0) str)
     (string-set! str i (char-upcase (string-ref str i)))))
-
+;@
 (define (string-upcase str)
   (string-upcase! (string-copy str)))
-
+;@
 (define (string-downcase! str)
   (do ((i (- (string-length str) 1) (- i 1)))
       ((< i 0) str)
     (string-set! str i (char-downcase (string-ref str i)))))
-
+;@
 (define (string-downcase str)
   (string-downcase! (string-copy str)))
-
+;@
 (define (string-capitalize! str)	; "hello" -> "Hello"
   (let ((non-first-alpha #f)		; "hELLO" -> "Hello"
 	(str-len (string-length str)))	; "*hello" -> "*Hello"
@@ -41,15 +41,15 @@
 		  (set! non-first-alpha #t)
 		  (string-set! str i (char-upcase c))))
 	    (set! non-first-alpha #f))))))
-
+;@
 (define (string-capitalize str)
   (string-capitalize! (string-copy str)))
-
+;@
 (define string-ci->symbol
   (let ((s2cis (if (equal? "x" (symbol->string 'x))
 		   string-downcase string-upcase)))
     (lambda (str) (string->symbol (s2cis str)))))
-
+;@
 (define symbol-append
   (let ((s2cis (if (equal? "x" (symbol->string 'x))
 		   string-downcase string-upcase)))
@@ -64,3 +64,26 @@
 		       ((not obj) "")
 		       (else (slib:error 'wrong-type-to 'symbol-append obj))))
 	       args))))))
+;@
+(define (StudlyCapsExpand nstr . delimitr)
+  (set! delimitr
+	(cond ((null? delimitr) "-")
+	      ((char? (car delimitr)) (string (car delimitr)))
+	      (else (car delimitr))))
+  (do ((idx (+ -1 (string-length nstr)) (+ -1 idx)))
+      ((> 1 idx) nstr)
+    (cond ((and (> idx 1)
+		(char-upper-case? (string-ref nstr (+ -1 idx)))
+		(char-lower-case? (string-ref nstr idx)))
+	   (set! nstr
+		 (string-append (substring nstr 0 (+ -1 idx))
+				delimitr
+				(substring nstr (+ -1 idx)
+					   (string-length nstr)))))
+	  ((and (char-lower-case? (string-ref nstr (+ -1 idx)))
+		(char-upper-case? (string-ref nstr idx)))
+	   (set! nstr
+		 (string-append (substring nstr 0 idx)
+				delimitr
+				(substring nstr idx
+					   (string-length nstr))))))))