Author: yamakenz
Date: Thu Jul 12 18:40:44 2007
New Revision: 4720
Modified:
sigscheme-trunk/NEWS
sigscheme-trunk/README
sigscheme-trunk/doc/spec.txt
sigscheme-trunk/lib/Makefile.am
sigscheme-trunk/lib/srfi-95.scm
Log:
* lib/srfi-95.scm
- (array?, identity): New procedure
- Adapt to SigScheme
* lib/Makefile.am
- (dist_scmlib_DATA): Add srfi-95.scm
* doc/spec.txt
* README
* NEWS
- Describe about SRFI-95
Modified: sigscheme-trunk/NEWS
==============================================================================
--- sigscheme-trunk/NEWS (original)
+++ sigscheme-trunk/NEWS Thu Jul 12 18:40:44 2007
@@ -7,6 +7,8 @@
- SRFI-55 require-extension
+ - SRFI-95 Sorting and Merging
+
- New syntax let-optionals* compatible with Gauche for optional argument
processing
Modified: sigscheme-trunk/README
==============================================================================
--- sigscheme-trunk/README (original)
+++ sigscheme-trunk/README Thu Jul 12 18:40:44 2007
@@ -40,6 +40,7 @@
- SRFI-48 : Intermediate Format Strings
- SRFI-55 : require-extension
- SRFI-60 : Integer as Bits (partial)
+ - SRFI-95 : Sorting and Merging
- R6RS: R6RS characters (partial and preliminary)
- Multibyte character encodings support
- Partial SIOD compatibility
Modified: sigscheme-trunk/doc/spec.txt
==============================================================================
--- sigscheme-trunk/doc/spec.txt (original)
+++ sigscheme-trunk/doc/spec.txt Thu Jul 12 18:40:44 2007
@@ -633,6 +633,14 @@
* *procedure:* list->integer list
* *procedure:* booleans->integer bool1 ...
+SRFI-95 Sorting and Merging
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Fully supported.
+
+It is just the reference implementation of SRFI-95 (sort.scm of SLIB).
+
+
R6RS characters
~~~~~~~~~~~~~~~
Modified: sigscheme-trunk/lib/Makefile.am
==============================================================================
--- sigscheme-trunk/lib/Makefile.am (original)
+++ sigscheme-trunk/lib/Makefile.am Thu Jul 12 18:40:44 2007
@@ -1,6 +1,6 @@
EXTRA_DIST = slib.scm
-dist_scmlib_DATA = sigscheme-init.scm srfi-1.scm srfi-55.scm
+dist_scmlib_DATA = sigscheme-init.scm srfi-1.scm srfi-55.scm srfi-95.scm
# Install into master package's pkgdatadir if --with-master-pkg is specified
# e.g.)
Modified: sigscheme-trunk/lib/srfi-95.scm
==============================================================================
--- sigscheme-trunk/lib/srfi-95.scm (original)
+++ sigscheme-trunk/lib/srfi-95.scm Thu Jul 12 18:40:44 2007
@@ -15,7 +15,26 @@
;;; per element.
;;; jaffer: 2007-01-29: Final SRFI-95.
-(require 'array)
+;;; Copyright (c) 2007 SigScheme Project <uim-en AT googlegroups.com>
+
+;; ChangeLog
+;;
+;; 2007-07-13 yamaken - Imported from SLIB CVS HEAD (revision 1.14)
+;;
http://cvs.savannah.gnu.org/viewvc/*checkout*/slib/slib/sort.scm?revision=1.14
+;; and adapted to SigScheme
+
+
+;;(require 'array)
+
+;; For SigScheme
+(define array?
+ (if (symbol-bound? 'array?)
+ (symbol-value 'array)
+ (lambda (x) #f)))
+(define identity
+ (if (symbol-bound? 'identity)
+ (symbol-value 'identity)
+ (lambda (x) x)))
;;; (sorted? sequence less?)
;;; is true when sequence is a list (x0 x1 ... xm) or a vector #(x0 ... xm)