Mercurial > hg > xemacs-beta

diff lisp/cl-extra.el @ 5772:cd4f5f1f1f4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add #'write-sequence, on the model of #'write-char, API from Common Lisp. src/ChangeLog addition: 2013-12-17 Aidan Kehoe <kehoea@parhasard.net> * lisp.h: * lisp.h (PARSE_KEYWORDS_8): Correct this in cases where we can have noticeably fewer arguments than KEYWORDS_OFFSET, check whether nargs > pk_offset. Declare check_sequence_range in this header. * print.c: * print.c (Fwrite_sequence) New: Write a sequence to a stream, in the same way #'write-char and #'terpri do. API from Common Lisp, not GNU, so while there is some char-int confoundance, it's more limited than usual with GNU APIs. * print.c (syms_of_print): Make it available. * sequence.c (check_sequence_range): Export this to other files. lisp/ChangeLog addition: 2013-12-17 Aidan Kehoe <kehoea@parhasard.net> * cl-extra.el: * cl-extra.el (write-string): New. * cl-extra.el (write-line): New. Add these here, implemented in terms of #'write-sequence in print.c. tests/ChangeLog addition: 2013-12-17 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: Up max-lisp-eval-depth when compiling this file, some of what we're doing in testing #'write-sequence is demanding. * automated/lisp-tests.el (make-circular-list): New argument VALUE, the car of the conses to create. * automated/lisp-tests.el: Test #'write-sequence, #'write-string, #'write-line with function, buffer and marker STREAMs; test argument types, keyword argument ranges and values.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 17 Dec 2013 19:29:10 +0200
parents e9c3fe82127d
children 750fab17b299
line wrap: on
line diff
--- a/lisp/cl-extra.el	Sun Dec 15 17:01:58 2013 +0000
+++ b/lisp/cl-extra.el	Tue Dec 17 19:29:10 2013 +0200
@@ -618,6 +618,38 @@
 ;; files to do the same, multiple times.
 (eval-when-compile (or (cl-compiling-file) (load "cl-macs")))
 
+;; XEmacs, functions from Common Lisp.
+(defun* write-string (string &optional output-stream &key (start 0) end)
+  "Output STRING to stream OUTPUT-STREAM.
+
+OUTPUT-STREAM defaults to the value of `standard-output', which see.
+
+Keywords :start and :end, if given, specify indices of a subsequence
+of STRING to output.  They default to 0 and nil, meaning write the
+entire string.
+
+Returns STRING (not the subsequence of STRING that has been written to
+OUTPUT-STREAM)."
+  (check-type string string)
+  (write-sequence string output-stream :start start :end end))
+
+(defun* write-line (string &optional output-stream &key (start 0) end)
+  "Output STRING, followed by a newline, to OUTPUT-STREAM.
+
+STRING must be a string.  OUTPUT-STREAM defaults to the value of
+`standard-output' (which see).
+
+Keywords :start and :end, if given, specify indices of a subsequence
+of STRING to output.  They default to 0 and nil, meaning write the
+entire string.
+
+Returns STRING (note, not the subsequence of STRING that has been written to
+OUTPUT-STREAM)."
+  (check-type string string)
+  (prog1
+      (write-sequence string output-stream :start start :end end)
+    (terpri output-stream)))
+
 ;; Implementation limits.
 
 ;; XEmacs; call cl-float-limits at dump time.