guile/guile-scsh ChangeLog char-p.scm char-set....

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/08/01 12:12:53

Modified files:
        guile-scsh     : ChangeLog char-p.scm char-set.scm utilities.scm 

Log message:
        * utilities.scm (deprecated-proc): redefined using Guile's deprecation
        mechanism.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/ChangeLog.diff?cvsroot=OldCVS&tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/char-p.scm.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/char-set.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-scsh/utilities.scm.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: guile/guile-scsh/ChangeLog
diff -u guile/guile-scsh/ChangeLog:1.68 guile/guile-scsh/ChangeLog:1.69
--- guile/guile-scsh/ChangeLog:1.68     Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/ChangeLog  Wed Aug  1 12:12:53 2001
@@ -8,6 +8,9 @@
        char-symbol?): new from scsh-0.5.3.
        * init.scm, USAGE, Makefile.am, make-module-list: updated.
 
+       * utilities.scm (deprecated-proc): redefined using Guile's deprecation
+       mechanism.
+
 2001-07-30  Gary Houston  <address@hidden>
 
        * char-set.scm (char:newline, char:tab, char:page, char:return,
Index: guile/guile-scsh/char-p.scm
diff -u guile/guile-scsh/char-p.scm:1.1 guile/guile-scsh/char-p.scm:1.2
--- guile/guile-scsh/char-p.scm:1.1     Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/char-p.scm Wed Aug  1 12:12:53 2001
@@ -30,12 +30,13 @@
 (define (char-ascii?        c) (char-set-contains? char-set:ascii        c))
 
 ;; Obsolete scsh.
-(define (char-alphanumeric? c)
-  (issue-deprecation-warning
-   "char-alphanumeric? is deprecated.  Use char-letter+digit? instead")
-  (char-letter+digit? c))
+(begin-deprecated
+ (define (char-alphanumeric? c)
+   (issue-deprecation-warning
+    "char-alphanumeric? is deprecated.  Use char-letter+digit? instead")
+   (char-letter+digit? c))
 
-(define (char-control? c)
-  (issue-deprecation-warning
-   "char-control? is deprecated.  Use char-iso-control? instead")
-  (char-iso-control? c))
+ (define (char-control? c)
+   (issue-deprecation-warning
+    "char-control? is deprecated.  Use char-iso-control? instead")
+   (char-iso-control? c)))
Index: guile/guile-scsh/char-set.scm
diff -u guile/guile-scsh/char-set.scm:1.5 guile/guile-scsh/char-set.scm:1.6
--- guile/guile-scsh/char-set.scm:1.5   Wed Aug  1 10:22:58 2001
+++ guile/guile-scsh/char-set.scm       Wed Aug  1 12:12:53 2001
@@ -45,7 +45,6 @@
   :use-module (scsh jar-defrecord))
 
 (export char:newline char:tab char:page char:return char:space char:vtab
-       char-ascii?
 
        char-set?
        char-set-copy
@@ -116,10 +115,6 @@
   (do ((index lower (+ index 1)))
     ((>= index upper) str)
     (string-set! str index ch)))
-
-(define (char-ascii? char)
-  (let ((maybe-ascii (char->ascii char)))
-    (and (<= 0 maybe-ascii 127) maybe-ascii)))
 
 ;;;; Character Sets
 
Index: guile/guile-scsh/utilities.scm
diff -u guile/guile-scsh/utilities.scm:1.7 guile/guile-scsh/utilities.scm:1.8
--- guile/guile-scsh/utilities.scm:1.7  Sat Jul  7 08:35:28 2001
+++ guile/guile-scsh/utilities.scm      Wed Aug  1 12:12:53 2001
@@ -197,14 +197,15 @@
 
 
 (define (deprecated-proc proc name . maybe-preferred-msg)
-  (let ((warned? #f))
+  (begin-deprecated
     (lambda args
-      (cond ((not warned?)
-            (set! warned? #t)
-            (apply warn
-                   "Deprecated procedure (may not be supported in a future 
release)"
-                   name
-                   maybe-preferred-msg)))
+      (issue-deprecation-warning
+       (string-append
+       (symbol->string name)
+       " is deprecated. "
+       (if (pair? maybe-preferred-msg)
+           (car maybe-preferred-msg)
+           "")))
       (apply proc args))))