mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-20 10:40:19 +02:00
Code Activity

Merge branch 'stable-2.0'

Browse source 
Conflicts:
	libguile/read.c
	test-suite/tests/web-response.test
This commit is contained in:
Mark H Weaver 2014-01-21 03:57:04 -05:00
commit ba578eb044
12 changed files with 120 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -168,6 +168,7 @@ For fixes or providing information which led to a fix:
Rainer Tammer
Samuel Thibault
Richard Todd
Sree Harsha Totakura
Tom Tromey
Issac Trotts
Greg Troxel

6
doc/ref/api-macros.texi
View file

@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011, 2012, 2013
@c Free Software Foundation, Inc.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011,
@c 2012, 2013, 2014 Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@node Macros
@ -393,7 +393,7 @@ templates. For example:
When writing macros that generate macro definitions, it is convenient to
use a different ellipsis identifier at each level. Guile allows the
desired ellipsis identifier to be specified as the first operand to
@code{syntax-rules}, as per R7RS. For example:
@code{syntax-rules}, as specified by SRFI-46 and R7RS. For example:
@example
(define-syntax define-quotation-macros

17
doc/ref/libguile-linking.texi
View file

@ -71,24 +71,23 @@ Here is @file{simple-guile.c}, source code for a @code{main} and an
interpreter.
@example
/* simple-guile.c --- how to start up the Guile
interpreter from C code. */
/* simple-guile.c --- Start Guile from C. */
/* Get declarations for all the scm_ functions. */
#include <libguile.h>
static void
inner_main (void *closure, int argc, char **argv)
@{
/* module initializations would go here */
/* preparation */
scm_shell (argc, argv);
/* after exit */
@}
int
main (int argc, char **argv)
@{
scm_boot_guile (argc, argv, inner_main, 0);
return 0; /* never reached */
return 0; /* never reached, see inner_main */
@}
@end example
@ -97,7 +96,9 @@ Guile, passing it @code{inner_main}. Once @code{scm_boot_guile} is
ready, it invokes @code{inner_main}, which calls @code{scm_shell} to
process the command-line arguments in the usual way.
Here is a Makefile which you can use to compile the above program. It
@subsection Building the Example with Make
Here is a Makefile which you can use to compile the example program. It
uses @code{pkg-config} to learn about the necessary compiler and
linker flags.
@example
@ -117,8 +118,10 @@ simple-guile.o: simple-guile.c
$@{CC@} -c $@{CFLAGS@} simple-guile.c
@end example
@subsection Building the Example with Autoconf
If you are using the GNU Autoconf package to make your application more
portable, Autoconf will settle many of the details in the Makefile above
portable, Autoconf will settle many of the details in the Makefile
automatically, making it much simpler and more portable; we recommend
using Autoconf with Guile. Here is a @file{configure.ac} file for
@code{simple-guile} that uses the standard @code{PKG_CHECK_MODULES}

21
doc/ref/srfi-modules.texi
View file

@ -48,12 +48,14 @@ get the relevant SRFI documents from the SRFI home page
* SRFI-41:: Streams.
* SRFI-42:: Eager comprehensions
* SRFI-45:: Primitives for expressing iterative lazy algorithms
* SRFI-46:: Basic syntax-rules Extensions.
* SRFI-55:: Requiring Features.
* SRFI-60:: Integers as bits.
* SRFI-61:: A more general `cond' clause
* SRFI-62:: S-expression comments.
* SRFI-67:: Compare procedures
* SRFI-69:: Basic hash tables.
* SRFI-87:: => in case clauses.
* SRFI-88:: Keyword objects.
* SRFI-98:: Accessing environment variables.
* SRFI-105:: Curly-infix expressions.
@ -154,9 +156,11 @@ srfi-16
srfi-23
srfi-30
srfi-39
srfi-46
srfi-55
srfi-61
srfi-62
srfi-87
srfi-105
@end example
@ -4649,6 +4653,15 @@ apply @code{force} to arguments of deconstructors (e.g., @code{car},
wrap procedure bodies with @code{(lazy ...)}.
@end itemize
@node SRFI-46
@subsection SRFI-46 Basic syntax-rules Extensions
@cindex SRFI-46
Guile's core @code{syntax-rules} supports the extensions specified by
SRFI-46/R7RS. Tail patterns have been supported since at least Guile
2.0, and custom ellipsis identifiers have been supported since Guile
2.0.10. @xref{Syntax Rules}.
@node SRFI-55
@subsection SRFI-55 - Requiring Features
@cindex SRFI-55
@ -5033,6 +5046,14 @@ Answer a hash value appropriate for equality predicate @code{equal?},
@code{hash} is a backwards-compatible replacement for Guile's built-in
@code{hash}.
@node SRFI-87
@subsection SRFI-87 => in case clauses
@cindex SRFI-87
Starting from version 2.0.6, Guile's core @code{case} syntax supports
@code{=>} in clauses, as specified by SRFI-87/R7RS.
@xref{Conditionals}.
@node SRFI-88
@subsection SRFI-88 Keyword Objects
@cindex SRFI-88

10
libguile/r6rs-ports.c
View file

@ -334,9 +334,11 @@ cbip_fill_input (SCM port)
if (c_port->read_pos >= c_port->read_end)
{
/* Invoke the user's `read!' procedure. */
unsigned c_octets;
size_t c_octets, c_requested;
SCM bv, read_proc, octets;
c_requested = c_port->read_buf_size;
/* Use the bytevector associated with PORT as the buffer passed to the
`read!' procedure, thereby avoiding additional allocations. */
bv = SCM_CBIP_BYTEVECTOR (port);
@ -350,8 +352,10 @@ cbip_fill_input (SCM port)
== SCM_BYTEVECTOR_LENGTH (bv));
octets = scm_call_3 (read_proc, bv, SCM_INUM0,
SCM_I_MAKINUM (CBIP_BUFFER_SIZE));
c_octets = scm_to_uint (octets);
scm_from_size_t (c_requested));
c_octets = scm_to_size_t (octets);
if (SCM_UNLIKELY (c_octets > c_requested))
scm_out_of_range (FUNC_NAME, octets);
c_port->read_pos = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv);
c_port->read_end = (unsigned char *) c_port->read_pos + c_octets;

32
libguile/read.c
View file

@ -2022,8 +2022,6 @@ scm_get_hash_procedure (int c)
}
}
#define SCM_ENCODING_SEARCH_SIZE (500)
static int
is_encoding_char (char c)
{
@ -2033,9 +2031,20 @@ is_encoding_char (char c)
return strchr ("_-.:/,+=()", c) != NULL;
}
/* Search the first few hundred characters of a file for an Emacs-like coding
declaration. Returns either NULL or a string whose storage has been
allocated with `scm_gc_malloc ()'. */
/* Maximum size of an encoding name. This is a bit more than the
longest name listed at
<http://www.iana.org/assignments/character-sets> ("ISO-2022-JP-2", 13
characters.) */
#define ENCODING_NAME_MAX_SIZE 20
/* Number of bytes at the beginning or end of a file that are scanned
for a "coding:" declaration. */
#define SCM_ENCODING_SEARCH_SIZE (500 + ENCODING_NAME_MAX_SIZE)
/* Search the SCM_ENCODING_SEARCH_SIZE bytes of a file for an Emacs-like
coding declaration. Returns either NULL or a string whose storage
has been allocated with `scm_gc_malloc'. */
char *
scm_i_scan_for_encoding (SCM port)
{
@ -2094,8 +2103,8 @@ scm_i_scan_for_encoding (SCM port)
if ((pos = strstr(pos, "coding")) == NULL)
return NULL;
pos += strlen("coding");
if (pos - header >= SCM_ENCODING_SEARCH_SIZE ||
pos += strlen ("coding");
if (pos - header >= SCM_ENCODING_SEARCH_SIZE ||
(*pos == ':' || *pos == '='))
{
pos ++;
@ -2104,10 +2113,17 @@ scm_i_scan_for_encoding (SCM port)
}
/* skip spaces */
while (pos - header <= SCM_ENCODING_SEARCH_SIZE &&
while (pos - header <= SCM_ENCODING_SEARCH_SIZE &&
(*pos == ' ' || *pos == '\t'))
pos ++;
if (pos - header >= SCM_ENCODING_SEARCH_SIZE - ENCODING_NAME_MAX_SIZE)
/* We found the "coding:" string, but there is probably not enough
room to store an encoding name in its entirety, so ignore it.
This makes sure we do not end up returning a truncated encoding
name. */
return NULL;
/* grab the next token */
encoding_start = pos;
i = 0;

2
module/ice-9/boot-9.scm
View file

@ -4218,9 +4218,11 @@ when none is available, reading FILE-NAME with READER."
srfi-23 ;; `error` procedure
srfi-30 ;; nested multi-line comments
srfi-39 ;; parameterize
srfi-46 ;; basic syntax-rules extensions
srfi-55 ;; require-extension
srfi-61 ;; general cond clause
srfi-62 ;; s-expression comments
srfi-87 ;; => in case clauses
srfi-105 ;; curly infix expressions
))

27
module/web/response.scm
View file

@ -1,6 +1,6 @@
;;; HTTP response objects
;; Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
;; Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public
@ -246,16 +246,21 @@ closes PORT, unless KEEP-ALIVE? is true."
bytes-read len))
(define (read! bv start count)
(let ((ret (get-bytevector-n! port bv start count)))
(if (eof-object? ret)
(if (= bytes-read len)
0
(fail))
(begin
(set! bytes-read (+ bytes-read ret))
(if (> bytes-read len)
(fail)
ret)))))
;; Read at most LEN bytes in total. HTTP/1.1 doesn't say what to do
;; when a server provides more than the Content-Length, but it seems
;; wise to just stop reading at LEN.
(let ((count (min count (- len bytes-read))))
(let loop ((ret (get-bytevector-n! port bv start count)))
(cond ((eof-object? ret)
(if (= bytes-read len)
0 ; EOF
(fail)))
((and (zero? ret) (> count 0))
;; Do not return zero since zero means EOF, so try again.
(loop (get-bytevector-n! port bv start count)))
(else
(set! bytes-read (+ bytes-read ret))
ret)))))
(define close
(and (not keep-alive?)

10
test-suite/tests/coding.test
View file

@ -1,6 +1,6 @@
;;;; coding.test --- test suite for coding declarations. -*- mode: scheme -*-
;;;;
;;;; Copyright (C) 2011, 2013 Free Software Foundation, Inc.
;;;; Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -101,4 +101,10 @@
(pass-if-equal "second line, whitespace, nl"
"ISO-8859-1"
(scan-coding "\n; coding: iso-8859-1 \n")))
(scan-coding "\n; coding: iso-8859-1 \n"))
(pass-if-equal "http://bugs.gnu.org/16463"
;; On Guile <= 2.0.9, this would return "ISO-8".
"ISO-8859-1"
(scan-coding (string-append (make-string 485 #\space)
"; coding: ISO-8859-1"))))

9
test-suite/tests/r6rs-ports.test
View file

@ -411,6 +411,15 @@
(not (or (port-has-port-position? port)
(port-has-set-port-position!? port)))))
(pass-if-exception "custom binary input port 'read!' returns too much"
exception:out-of-range
;; In Guile <= 2.0.9 this would segfault.
(let* ((read! (lambda (bv start count)
(+ count 4242)))
(port (make-custom-binary-input-port "the port" read!
#f #f #f)))
(get-bytevector-all port)))
(pass-if-equal "custom binary input port supports `port-position', \
not `set-port-position!'"
42

17
test-suite/tests/syntax.test
View file

@ -1,7 +1,7 @@
;;;; syntax.test --- test suite for Guile's syntactic forms -*- scheme -*-
;;;;
;;;; Copyright (C) 2001, 2003, 2004, 2005, 2006, 2009, 2010,
;;;; 2011, 2012, 2013 Free Software Foundation, Inc.
;;;; 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -1275,7 +1275,20 @@
'((((x y) …) ...)
(((x y) ...) …)))))))
(define-syntax bar (foo x y z))
(bar a b c))))
(bar a b c)))
;; This test is given in SRFI-46.
(pass-if-equal "custom ellipsis is handled hygienically"
'((1) 2 (3) (4))
(let-syntax
((f (syntax-rules ()
((f ?e)
(let-syntax
((g (syntax-rules --- ()
((g (??x ?e) (??y ---))
'((??x) ?e (??y) ---)))))
(g (1 2) (3 4)))))))
(f ---))))
(with-test-prefix "syntax-error"

6
test-suite/tests/web-response.test
View file

@ -1,6 +1,6 @@
;;;; web-response.test --- HTTP responses -*- mode: scheme; coding: utf-8; -*-
;;;;
;;;; Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
;;;; Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -39,7 +39,9 @@ Content-Encoding: gzip\r
Content-Length: 36\r
Content-Type: text/html; charset=utf-8\r
\r
abcdefghijklmnopqrstuvwxyz0123456789")
abcdefghijklmnopqrstuvwxyz0123456789
-> Here is trailing garbage that should be ignored because it is
beyond Content-Length.")
(define example-2
"HTTP/1.1 200 OK\r