1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00

Placate a number of `syntax-check' verifications.

- "filesystem" -> "file system"
  - remove doubled words
  - use EXIT_* macros instead of literal numbers
  - update `syntax-check' exclusion files
This commit is contained in:
Ludovic Courtès 2012-01-05 23:38:10 +01:00
parent a3989357b3
commit b3da54d181
29 changed files with 57 additions and 32 deletions

1
.x-sc_bindtextdomain Normal file
View file

@ -0,0 +1 @@
*

View file

@ -4,3 +4,4 @@
^emacs/ ^emacs/
^NEWS ^NEWS
^doc/ ^doc/
^test-suite/tests/ports.test

View file

@ -1,4 +1,5 @@
doc/* doc/*
lib/flock.c lib/flock.c
lib/fcntl.in.h
libguile/filesys.c libguile/filesys.c
libguile/ChangeLog-2008 libguile/ChangeLog-2008

View file

@ -0,0 +1,7 @@
^AUTHORS
^gc-benchmarks/larceny/
^module/ice-9/format.scm
^module/ice-9/match.upstream.scm
^module/sxml/upstream
compile.scm
ChangeLog

View file

@ -0,0 +1,5 @@
libguile/*
srfi/*
test-suite/*
guile-readline/*
lib/*

View file

@ -2,3 +2,4 @@ configure.ac
NEWS NEWS
doc/ref/api-init.texi doc/ref/api-init.texi
libguile/ChangeLog* libguile/ChangeLog*
m4/*

View file

@ -0,0 +1,2 @@
libguile/win32-socket.c
lib/stat.c

3
.x-sc_prohibit_strcmp Normal file
View file

@ -0,0 +1,3 @@
m4/*
lib/*
test-suite/*

View file

@ -1,6 +1,6 @@
-*-text-*- -*-text-*-
Guile Hacking Guide Guile Hacking Guide
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2008 Free software Foundation, Inc. Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2008, 2012 Free software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the of this document as received, in any medium, provided that the
@ -222,7 +222,7 @@ When deprecating a definition, always follow this procedure:
manage without the deprecated definition. manage without the deprecated definition.
4. Add an entry that the definition has been deprecated in NEWS and 4. Add an entry that the definition has been deprecated in NEWS and
explain what do do instead. explain what to do instead.
5. In file TODO, there is a list of releases with reminders about what 5. In file TODO, there is a list of releases with reminders about what
to do at each release. Add a reminder about the removal of the to do at each release. Add a reminder about the removal of the

8
NEWS
View file

@ -1,5 +1,5 @@
Guile NEWS --- history of user-visible changes. Guile NEWS --- history of user-visible changes.
Copyright (C) 1996-2011 Free Software Foundation, Inc. Copyright (C) 1996-2012 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.
Please send Guile bug reports to bug-guile@gnu.org. Please send Guile bug reports to bug-guile@gnu.org.
@ -1386,7 +1386,7 @@ Arguments", and "Case-lambda" in the manual.
Instead of accessing a procedure's arity as a property, use the new Instead of accessing a procedure's arity as a property, use the new
`procedure-minimum-arity' function, which gives the most permissive `procedure-minimum-arity' function, which gives the most permissive
arity that the the function has, in the same format as the old arity arity that the function has, in the same format as the old arity
accessor. accessor.
** `lambda*' and `define*' are now available in the default environment ** `lambda*' and `define*' are now available in the default environment
@ -2156,7 +2156,7 @@ allocated to primitive procedures, each with its own calling convention.
Now there is only one, the gsubr. This may affect user code if you were Now there is only one, the gsubr. This may affect user code if you were
defining a procedure using scm_c_make_subr rather scm_c_make_gsubr. The defining a procedure using scm_c_make_subr rather scm_c_make_gsubr. The
solution is to switch to use scm_c_make_gsubr. This solution works well solution is to switch to use scm_c_make_gsubr. This solution works well
both with the old 1.8 and and with the current 1.9 branch. both with the old 1.8 and with the current 1.9 branch.
Guile's old evaluator used to have special cases for applying "gsubrs", Guile's old evaluator used to have special cases for applying "gsubrs",
primitive procedures with specified numbers of required, optional, and primitive procedures with specified numbers of required, optional, and
@ -6193,7 +6193,7 @@ incrementally add to the innermost environment, without checking
whether the restrictions specified in RnRS were met. This lead to the whether the restrictions specified in RnRS were met. This lead to the
correct behaviour when these restriction actually were met, but didn't correct behaviour when these restriction actually were met, but didn't
catch all illegal uses. Such an illegal use could lead to crashes of catch all illegal uses. Such an illegal use could lead to crashes of
the Guile interpreter or or other unwanted results. An example of the Guile interpreter or other unwanted results. An example of
incorrect internal defines that made Guile behave erratically: incorrect internal defines that made Guile behave erratically:
(let () (let ()

View file

@ -7132,7 +7132,7 @@ with the strings in the list @var{ls}.
@deffn {Scheme Procedure} string-concatenate-reverse/shared ls [final_string [end]] @deffn {Scheme Procedure} string-concatenate-reverse/shared ls [final_string [end]]
@deffnx {C Function} scm_string_concatenate_reverse_shared (ls, final_string, end) @deffnx {C Function} scm_string_concatenate_reverse_shared (ls, final_string, end)
Like @code{string-concatenate-reverse}, but the result may Like @code{string-concatenate-reverse}, but the result may
share memory with the the strings in the @var{ls} arguments. share memory with the strings in the @var{ls} arguments.
@end deffn @end deffn
string-map string-map

View file

@ -1560,7 +1560,7 @@ same type, and have corresponding elements which are either
@c FIXME: array-for-each doesn't say what happens if the sources have @c FIXME: array-for-each doesn't say what happens if the sources have
@c different index ranges. The code currently iterates over the @c different index ranges. The code currently iterates over the
@c indices of the first and expects the others to cover those. That @c indices of the first and expects the others to cover those. That
@c at least vaguely matches array-map!, but is is meant to be a @c at least vaguely matches array-map!, but is it meant to be a
@c documented feature? @c documented feature?
@deffn {Scheme Procedure} array-map! dst proc src1 @dots{} srcN @deffn {Scheme Procedure} array-map! dst proc src1 @dots{} srcN

View file

@ -1181,7 +1181,7 @@ procedures and does not rely on R6RS support.
Some of the procedures described in this chapter accept a file name as an Some of the procedures described in this chapter accept a file name as an
argument. Valid values for such a file name include strings that name a file argument. Valid values for such a file name include strings that name a file
using the native notation of filesystem paths on an implementation's using the native notation of file system paths on an implementation's
underlying operating system, and may include implementation-dependent underlying operating system, and may include implementation-dependent
values as well. values as well.

View file

@ -1,7 +1,7 @@
@c -*-texinfo-*- @c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual. @c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011 @c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010,
@c Free Software Foundation, Inc. @c 2011, 2012 Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions. @c See the file guile.texi for copying conditions.
@node Procedures @node Procedures
@ -838,7 +838,7 @@ demonstrably improves performance in a crucial way.
In general, only small procedures should be considered for inlining, as In general, only small procedures should be considered for inlining, as
making large procedures inlinable will probably result in an increase in making large procedures inlinable will probably result in an increase in
code size. Additionally, the elimination of the call overhead rarely code size. Additionally, the elimination of the call overhead rarely
matters for for large procedures. matters for large procedures.
@deffn {Scheme Syntax} define-inlinable (name parameter ...) body ... @deffn {Scheme Syntax} define-inlinable (name parameter ...) body ...
Define @var{name} as a procedure with parameters @var{parameter}s and Define @var{name} as a procedure with parameters @var{parameter}s and

View file

@ -21,7 +21,7 @@
[[add refs for all conditions signalled]] [[add refs for all conditions signalled]]
@ifinfo @ifinfo
Copyright 1999, 2006 Free Software Foundation, Inc. Copyright 1999, 2006, 2012 Free Software Foundation, Inc.
@end ifinfo @end ifinfo
@titlepage @titlepage
@ -204,7 +204,7 @@ can implement any module system you like, as long as its efforts produce
an environment object the interpreter can consult. an environment object the interpreter can consult.
Finally, environments may prove a convenient way for Guile to access the Finally, environments may prove a convenient way for Guile to access the
features of other systems. For example, one might export the The GIMP's features of other systems. For example, one might export The GIMP's
Procedural Database to Guile as a custom environment type; this Procedural Database to Guile as a custom environment type; this
environment could create Scheme procedure objects corresponding to GIMP environment could create Scheme procedure objects corresponding to GIMP
procedures, as the user referenced them. procedures, as the user referenced them.

View file

@ -85,7 +85,7 @@
- SCM_STRING_CHARS uses scm_i_string_writable_chars and immediately - SCM_STRING_CHARS uses scm_i_string_writable_chars and immediately
calls scm_i_stop_writing, hoping for the best. SCM_STRING_LENGTH calls scm_i_stop_writing, hoping for the best. SCM_STRING_LENGTH
is the same as scm_i_string_length. SCM_STRING_CHARS will throw is the same as scm_i_string_length. SCM_STRING_CHARS will throw
an error for for strings that are not null-terminated. There is an error for strings that are not null-terminated. There is
no wide version of this interface. no wide version of this interface.
*/ */

View file

@ -1,4 +1,6 @@
/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. /* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
* 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
* Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -25,6 +27,7 @@
#include "libguile/bdw-gc.h" #include "libguile/bdw-gc.h"
#include "libguile/_scm.h" #include "libguile/_scm.h"
#include <stdlib.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -862,7 +865,7 @@ scm_init_guile ()
else else
{ {
fprintf (stderr, "Failed to get stack base for current thread.\n"); fprintf (stderr, "Failed to get stack base for current thread.\n");
exit (1); exit (EXIT_FAILURE);
} }
} }

View file

@ -1,6 +1,7 @@
;;; -*- mode: scheme; coding: utf-8; -*- ;;; -*- mode: scheme; coding: utf-8; -*-
;;;; Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 ;;;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
;;;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
;;;; Free Software Foundation, Inc. ;;;; Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
@ -3013,7 +3014,7 @@ module '(ice-9 q) '(make-q q-length))}."
;; 0 by printing a newline, but we then advance it by printing ;; 0 by printing a newline, but we then advance it by printing
;; the prompt. However the port-column of the output port ;; the prompt. However the port-column of the output port
;; does not typically correspond with the actual column on the ;; does not typically correspond with the actual column on the
;; screen, because the input is is echoed back! Since the ;; screen, because the input is echoed back! Since the
;; input is line-buffered and thus ends with a newline, the ;; input is line-buffered and thus ends with a newline, the
;; output will really start on column zero. So, here we zero ;; output will really start on column zero. So, here we zero
;; it out. See bug 9664. ;; it out. See bug 9664.
@ -3504,7 +3505,7 @@ module '(ice-9 q) '(make-q q-length))}."
;;; {`load'.} ;;; {`load'.}
;;; ;;;
;;; Load is tricky when combined with relative paths, compilation, and ;;; Load is tricky when combined with relative paths, compilation, and
;;; the filesystem. If a path is relative, what is it relative to? The ;;; the file system. If a path is relative, what is it relative to? The
;;; path of the source file at the time it was compiled? The path of ;;; path of the source file at the time it was compiled? The path of
;;; the compiled file? What if both or either were installed? And how ;;; the compiled file? What if both or either were installed? And how
;;; do you get that information? Tricky, I say. ;;; do you get that information? Tricky, I say.

View file

@ -1265,7 +1265,7 @@
;; ;;
;; The only wrinkle is when we want a macro to expand to code in another ;; The only wrinkle is when we want a macro to expand to code in another
;; module, as is the case for the r6rs `library' form -- the body expressions ;; module, as is the case for the r6rs `library' form -- the body expressions
;; should be scoped relative the the new module, the one defined by the macro. ;; should be scoped relative the new module, the one defined by the macro.
;; For that, use `(@@ mod-name body)'. ;; For that, use `(@@ mod-name body)'.
;; ;;
;; Part of the macro output will be from the site of the macro use and part ;; Part of the macro output will be from the site of the macro use and part

View file

@ -17,7 +17,7 @@
;;;; "test.scm" Test correctness of scheme implementations. ;;;; "test.scm" Test correctness of scheme implementations.
;;; Author: Aubrey Jaffer ;;; Author: Aubrey Jaffer
;;; Modified: Mikael Djurfeldt (Removed tests which Guile deliberately ;;; Modified: Mikael Djurfeldt (Removed tests which Guile deliberately
;;; won't pass. Made the the tests (test-cont), (test-sc4), and ;;; won't pass. Made the tests (test-cont), (test-sc4), and
;;; (test-delay) start to run automatically. ;;; (test-delay) start to run automatically.
;;; This includes examples from ;;; This includes examples from

View file

@ -81,7 +81,7 @@
(progn ,@(cdr cur)) (progn ,@(cdr cur))
,rest)))))))) ,rest))))))))
;;; The and and or forms can also be easily defined with macros. ;;; The `and' and `or' forms can also be easily defined with macros.
(built-in-macro and (built-in-macro and
(case-lambda (case-lambda

View file

@ -239,7 +239,7 @@
c) c)
(list body))) (list body)))
(else (else
;; Otherwise for plain letrec, evaluate the the "complex" ;; Otherwise for plain letrec, evaluate the "complex"
;; bindings, in a `let' to indicate that order doesn't ;; bindings, in a `let' to indicate that order doesn't
;; matter, and bind to their variables. ;; matter, and bind to their variables.
(list (list

View file

@ -652,7 +652,7 @@ has just one element then that's the return value."
(define map! map) (define map! map)
(define (filter-map proc list1 . rest) (define (filter-map proc list1 . rest)
"Apply PROC to to the elements of LIST1... and return a list of the "Apply PROC to the elements of LIST1... and return a list of the
results as per SRFI-1 `map', except that any #f results are omitted from results as per SRFI-1 `map', except that any #f results are omitted from
the list returned." the list returned."
(check-arg procedure? proc filter-map) (check-arg procedure? proc filter-map)

View file

@ -93,7 +93,7 @@
;;; This function is among the trickiest I've ever written. I tried many ;;; This function is among the trickiest I've ever written. I tried many
;;; variants. In the end, simple is best, of course. ;;; variants. In the end, simple is best, of course.
;;; ;;;
;;; After turning this around a number of times, it seems that the the ;;; After turning this around a number of times, it seems that the
;;; desired behavior is that .go files should exist in a path, for ;;; desired behavior is that .go files should exist in a path, for
;;; searching. That is orthogonal to this function. For writing .go ;;; searching. That is orthogonal to this function. For writing .go
;;; files, either you know where they should go, in which case you tell ;;; files, either you know where they should go, in which case you tell

View file

@ -119,7 +119,7 @@
;;;; ;;;;
;;;; * (pass-if-exception name exception body) will pass if the execution of ;;;; * (pass-if-exception name exception body) will pass if the execution of
;;;; body causes the given exception to be thrown. If no exception is ;;;; body causes the given exception to be thrown. If no exception is
;;;; thrown, the test fails. If some other exception is thrown, is is an ;;;; thrown, the test fails. If some other exception is thrown, it is an
;;;; error. ;;;; error.
;;;; * (expect-fail-exception name exception body) will pass unexpectedly if ;;;; * (expect-fail-exception name exception body) will pass unexpectedly if
;;;; the execution of body causes the given exception to be thrown. If no ;;;; the execution of body causes the given exception to be thrown. If no

View file

@ -35,7 +35,7 @@
;;;; Author: Aubrey Jaffer ;;;; Author: Aubrey Jaffer
;;;; Modified: Mikael Djurfeldt ;;;; Modified: Mikael Djurfeldt
;;;; Removed tests which Guile deliberately ;;;; Removed tests which Guile deliberately
;;;; won't pass. Made the the tests (test-cont), (test-sc4), and ;;;; won't pass. Made the tests (test-cont), (test-sc4), and
;;;; (test-delay) start to run automatically. ;;;; (test-delay) start to run automatically.
;;;; Modified: Jim Blandy ;;;; Modified: Jim Blandy
;;;; adapted to new Guile test suite framework ;;;; adapted to new Guile test suite framework

View file

@ -36,7 +36,7 @@
; Test engine ; Test engine
; =========== ; ===========
; ;
; We use an extended version of the the checker of SRFI-42 (with ; We use an extended version of the checker of SRFI-42 (with
; Felix' reduction on codesize) for running a batch of tests for ; Felix' reduction on codesize) for running a batch of tests for
; the various procedures of 'compare.scm'. Moreover, we use the ; the various procedures of 'compare.scm'. Moreover, we use the
; comprehensions of SRFI-42 to generate examples systematically. ; comprehensions of SRFI-42 to generate examples systematically.

View file

@ -75,7 +75,7 @@
(let ((drift-fraction (/ max-diff average))) (let ((drift-fraction (/ max-diff average)))
(or (< drift-fraction max-allowed-drift) (or (< drift-fraction max-allowed-drift)
;; don't stop the the test suite for what statistically is ;; don't stop the test suite for what statistically is
;; bound to happen. ;; bound to happen.
(throw 'unresolved (pk average drift-fraction)))))))) (throw 'unresolved (pk average drift-fraction))))))))