Author: iratqq
Date: Tue Feb  3 03:28:14 2009
New Revision: 5810

Modified:
   trunk/COPYING
   trunk/scm/util.scm

Log:
* scm/util.scm (call-with-output-string)
  (call-with-input-string, call-with-string-io):
  - From Gauche.
  (write-to-string, read-from-string):
  - New function.
* COPYING (Author):
  - Add copyright.


Modified: trunk/COPYING
==============================================================================
--- trunk/COPYING       (original)
+++ trunk/COPYING       Tue Feb  3 03:28:14 2009
@@ -148,3 +148,36 @@
 incompatible with the protocol description in the RFC file, it must be
 called by a name other than "ssh" or "Secure Shell".
-----------------------------------------------------------------------------
+
+scm/util.scm
+(call-with-output-string, call-with-input-string, call-with-string-io)
+is covered by:
+-----------------------------------------------------------------------------
+  Copyright (c) 2000-2008  Shiro Kawai  <[email protected]>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the authors nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: trunk/scm/util.scm
==============================================================================
--- trunk/scm/util.scm  (original)
+++ trunk/scm/util.scm  Tue Feb  3 03:28:14 2009
@@ -157,6 +157,36 @@
   (lambda args
     (string->symbol (string-append-map symbol->string args))))

+(define call-with-output-string
+  (lambda (proc)
+    (let ((out (open-output-string)))
+      (proc out)
+      (get-output-string out))))
+
+(define call-with-input-string
+  (lambda (str proc)
+    (let ((in (open-input-string str)))
+      (proc in))))
+
+(define call-with-string-io
+  (lambda (str proc)
+    (let ((out (open-output-string))
+          (in  (open-input-string str)))
+      (proc in out)
+      (get-output-string out))))
+
+(define write-to-string
+  (lambda (obj . args)
+    (call-with-output-string
+     (lambda (port) ((if (pair? args) (car args) write) obj port)))))
+
+(define read-from-string
+  (lambda (string)
+    (call-with-input-string
+     string
+     (lambda (port)
+       (read port)))))
+
 ;; only accepts single-arg functions
 ;; (define caddr (compose car cdr cdr))
 ;; FIXME: remove the closure overhead

Reply via email to