From 89d8ad4a9fb72df59d961a856b0d4173c7674c35 Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Mon, 5 Jul 2010 15:52:47 +0000 Subject: [PATCH] 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. --- code/extfmts.lisp | 6 +++--- code/fd-stream.lisp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/extfmts.lisp b/code/extfmts.lisp index 469c21a09..55d98a95e 100644 --- a/code/extfmts.lisp +++ b/code/extfmts.lisp @@ -5,7 +5,7 @@ ;;; domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extfmts.lisp,v 1.31 2010/07/03 16:44:37 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/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 diff --git a/code/fd-stream.lisp b/code/fd-stream.lisp index e394d4776..3f83874f0 100644 --- a/code/fd-stream.lisp +++ b/code/fd-stream.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.111 2010/07/05 03:11:08 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/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) ;;@@ -- GitLab