rdelim cleanups

* module/ice-9/rdelim.scm: Clean up export list.
  (read-line!, read-delimited!, read-delimited, read-line): Use
  define*.

module/ice-9/rdelim.scm

@@ -1,6 +1,6 @@
 ;;; installed-scm-file
 
-;;;; Copyright (C) 1997, 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
+;;;; Copyright (C) 1997, 1999, 2000, 2001, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -22,19 +22,20 @@
 ;;; similar to (scsh rdelim) but somewhat incompatible.
 
 (define-module (ice-9 rdelim)
-  :export (read-line read-line! read-delimited read-delimited!
+  #:export (read-line
-	   %read-delimited! %read-line write-line)  ; C
+            read-line!
-  )
+            read-delimited
+            read-delimited!
+            %read-delimited!
+            %read-line
+            write-line))
+
 
 (%init-rdelim-builtins)
 
-(define (read-line! string . maybe-port)
+(define* (read-line! string #:optional (port current-input-port))
   ;; corresponds to SCM_LINE_INCREMENTORS in libguile.
   (define scm-line-incrementors "\n")
-
-  (let* ((port (if (pair? maybe-port)
-		   (car maybe-port)
-		   (current-input-port))))
   (let* ((rv (%read-delimited! scm-line-incrementors
                                string
                                #t
@@ -45,22 +46,11 @@
                 (eof-object? terminator))
            terminator)
           ((not terminator) #f)
-	    (else nchars)))))
+          (else nchars))))
 
-(define (read-delimited! delims buf . args)
+(define* (read-delimited! delims buf #:optional
-  (let* ((num-args (length args))
+                          (port (current-input-port)) (handle-delim 'trim)
-	 (port (if (> num-args 0)
+                          (start 0) (end (string-length buf)))
-		   (car args)
-		   (current-input-port)))
-	 (handle-delim (if (> num-args 1)
-			   (cadr args)
-			   'trim))
-	 (start (if (> num-args 2)
-		    (caddr args)
-		    0))
-	 (end (if (> num-args 3)
-		  (cadddr args)
-		  (string-length buf))))
   (let* ((rv (%read-delimited! delims
                                buf
                                (not (eq? handle-delim 'peek))
@@ -85,17 +75,10 @@
               (+ nchars 1))
              ((split) (cons nchars terminator))
              (else (error "unexpected handle-delim value: " 
-			    handle-delim))))))))
+                          handle-delim)))))))
   
-(define (read-delimited delims . args)
+(define* (read-delimited delims #:optional (port (current-input-port))
-  (let* ((port (if (pair? args)
+                         (handle-delim 'trim))
-		   (let ((pt (car args)))
-		     (set! args (cdr args))
-		     pt)
-		   (current-input-port)))
-	 (handle-delim (if (pair? args)
-			   (car args)
-			   'trim)))
   (let loop ((substrings '())
              (total-chars 0)
              (buf-size 100))		; doubled each time through.
@@ -137,7 +120,7 @@
 
 
                (else (error "unexpected handle-delim value: "
-				handle-delim)))))))))
+                            handle-delim))))))))
 
 ;;; read-line [PORT [HANDLE-DELIM]] reads a newline-terminated string
 ;;; from PORT.  The return value depends on the value of HANDLE-DELIM,
@@ -149,14 +132,9 @@
 ;;; `split', the newline is split from the string and read-line
 ;;; returns a pair consisting of the truncated string and the newline.
 
-(define (read-line . args)
+(define* (read-line #:optional (port (current-input-port))
-  (let* ((port		(if (null? args)
+                    (handle-delim 'trim))
-			    (current-input-port)
+  (let* ((line/delim	(%read-line port))
-			    (car args)))
-	 (handle-delim	(if (> (length args) 1)
-			    (cadr args)
-			    'trim))
-	 (line/delim	(%read-line port))
 	 (line		(car line/delim))
 	 (delim		(cdr line/delim)))
     (case handle-delim