From ad226f250e4c06c6b7432d887a2461345b02ec74 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 12 Jun 1999 12:45:23 +0000 Subject: [PATCH] *** empty log message *** --- NEWS | 25 ++++++++++++++++++++++++- ice-9/ChangeLog | 8 ++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 178be5031..1ee506d77 100644 --- a/NEWS +++ b/NEWS @@ -46,13 +46,36 @@ in backtraces. * Changes to Scheme functions and syntax -** New function provided? +** New function `provided?' - Function: provided? FEATURE Return true iff FEATURE is supported by this installation of Guile. FEATURE must be a symbol naming a feature; the global variable `*features*' is a list of available features. +** Changes to the module (ice-9 expect): + +*** The expect-strings macro now matches `$' in a regular expression + only at a line-break or end-of-file by default. Previously it would + match the end of the string accumulated so far. Note that the new + behaviour requires reading ahead from the input port by one character, + which may block. The old behaviour can be obtained by setting the + variable `expect-strings-exec-flags' to 0. + +*** The expect-strings macro now uses a variable `expect-strings-exec-flags' + for the regexp-exec flags. If `regexp/noteol' is included, then `$' + in a regular expression will still match before a line-break or + end-of-file. The default is `regexp/noteol'. + +*** The expect-strings macro now uses a variable + `expect-strings-compile-flags' for the flags to be supplied to + `make-regexp'. The default is `regexp/newline', which was previously + hard-coded. + +*** The expect macro now supplies two arguments to a match procedure: + the current accumulated string and the input port. Previously + only the string was supplied. + ** New module (ice-9 format), implementing the Common Lisp `format' function. This code, and the documentation for it that appears here, was diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 6e87b3ace..3f14cf620 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -21,21 +21,21 @@ 1999-03-20 Gary Houston -* * expect.scm (expect): call the match proc with the port instead. + * expect.scm (expect): call the match proc with the port instead. (expect-strings): use peek-char to get the next char. this has the advantage of getting the handling of $ "correct", but the disadvantage of needing to get (and maybe block for) an extra character from the port when it may not be needed. hence: -* (expect-strings-exec-flags): new variable/parameter, supplies + (expect-strings-exec-flags): new variable/parameter, supplies flags for regexp-exec. if this includes regexp/noteol, then automatic regexp/noteol handling (requiring an extra peeked char) is enabled. default is regexp/noteol. -* (expect-strings-compile-flags): new variable/parameter, supplies + (expect-strings-compile-flags): new variable/parameter, supplies flags for make-regexp. default is regexp/newline. 1999-03-15 Gary Houston -* * expect.scm (expect): call the match proc with an extra char, + * expect.scm (expect): call the match proc with an extra char, peeked from the stream. (expect-strings): build a match proc which takes the extra char. (expect-regexec): take an extra arg "eof-next?" and use it