CMUCL commit: src/code (extfmts.lisp fd-stream.lisp)

[Raymond Toy]

    Date: Monday, July 5, 2010 @ 11:52:48
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code

Modified: extfmts.lisp fd-stream.lisp

extfmts.lisp:
o Revert previous incompatible change to STRING-DECODE and
  STRING-ENCODE.  Change the keyword parameters back to optional
  parameters, and make the error parameter the last one.

fd-stream.lisp:
o Update use of STRING-ENCODE.


----------------+
 extfmts.lisp   |    6 +++---
 fd-stream.lisp |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


Index: src/code/extfmts.lisp
diff -u src/code/extfmts.lisp:1.31 src/code/extfmts.lisp:1.32
--- src/code/extfmts.lisp:1.31	Sat Jul  3 12:44:37 2010
+++ src/code/extfmts.lisp	Mon Jul  5 11:52:47 2010
@@ -5,7 +5,7 @@
 ;;; domain.
 ;;; 
 (ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.31 2010-07-03 16:44:37 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.32 2010-07-05 15:52:47 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -810,7 +810,7 @@
 			       (code-char b)))
 		       error))))
 
-(defun string-encode (string external-format &key (start 0) end error)
+(defun string-encode (string external-format &optional (start 0) end error)
   "Encode the given String using External-Format and return a new
   string.  The characters of the new string are the octets of the
   encoded result, with each octet converted to a character via
@@ -845,7 +845,7 @@
 			       error))
 	finally (return (values result (1+ pos))))))
 
-(defun string-decode (string external-format &key (start 0) end error)
+(defun string-decode (string external-format &optional (start 0) end error)
   "Decode String using the given External-Format and return the new
   string.  The input string is treated as if it were an array of
   octets, where the char-code of each character is the octet.  This is
Index: src/code/fd-stream.lisp
diff -u src/code/fd-stream.lisp:1.111 src/code/fd-stream.lisp:1.112
--- src/code/fd-stream.lisp:1.111	Sun Jul  4 23:11:08 2010
+++ src/code/fd-stream.lisp	Mon Jul  5 11:52:47 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.111 2010-07-05 03:11:08 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.112 2010-07-05 15:52:47 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1713,8 +1713,8 @@
 		     (decf posn
 			   (length (string-encode (fd-stream-string-buffer stream)
 						  (fd-stream-external-format stream)
-						  :start (fd-stream-string-index stream)
-						  :end (fd-stream-string-buffer-len stream))))
+						  (fd-stream-string-index stream)
+						  (fd-stream-string-buffer-len stream))))
 		     (decf posn (- (fd-stream-ibuf-tail stream)
 				   (fd-stream-ibuf-head stream))))
 		 (when (fd-stream-unread stream) ;;@@