diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 6831049ce..a73ef26cb 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,12 @@ +Sat Sep 27 20:19:20 1997 Jim Blandy + + * boot-9.scm (separate-fields-discarding-char, + separate-fields-after-char, separate-fields-before-char): Call + continuation function, RET, as advertised: with each separated + field a separate argument. + + * Makefile.in: Regenerated with automake 1.2a. + Sat Sep 20 14:23:53 1997 Mikael Djurfeldt * slib.scm (slib:load): Export. diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index 3a59cd264..f1925ef07 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.1p from Makefile.am +# Makefile.in generated automatically by automake 1.2a from Makefile.am -# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. SHELL = /bin/sh @@ -51,10 +57,6 @@ PRE_UNINSTALL = true POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CPP = @CPP@ @@ -65,8 +67,10 @@ GUILE_VERSION = @GUILE_VERSION@ LD = @LD@ LIBLOBJS = @LIBLOBJS@ LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +NM = @NM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ THREAD_LIBS = @THREAD_LIBS@ @@ -192,7 +196,7 @@ uninstall: uninstall-subpkgdataDATA all: Makefile $(DATA) install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: $(mkinstalldirs) $(subpkgdatadir) diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index a4426d99b..2a2cb0047 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -3796,7 +3796,7 @@ ((string-rindex str ch) => (lambda (w) (loop (cons (make-shared-substring str (+ 1 w)) fields) (make-shared-substring str 0 w)))) - (else (ret (cons str fields)))))) + (else (apply ret str fields))))) (define-public (separate-fields-after-char ch str ret) (reverse @@ -3806,7 +3806,7 @@ ((string-index str ch) => (lambda (w) (loop (cons (make-shared-substring str 0 (+ 1 w)) fields) (make-shared-substring str (+ 1 w))))) - (else (ret (cons str fields))))))) + (else (apply ret str fields)))))) (define-public (separate-fields-before-char ch str ret) (let loop ((fields '()) @@ -3815,7 +3815,7 @@ ((string-rindex str ch) => (lambda (w) (loop (cons (make-shared-substring str w) fields) (make-shared-substring str 0 w)))) - (else (ret (cons str fields)))))) + (else (apply ret str fields))))) ;;; {String Fun: String Prefix Predicates}