[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-59-g10744b7

[Mark H Weaver]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=10744b7c5007ccac19ea9654be6e749fe6a60992

The branch, stable-2.0 has been updated
       via  10744b7c5007ccac19ea9654be6e749fe6a60992 (commit)
       via  fa746547fc0cd15f5edbb690477d37a23de4f183 (commit)
      from  fb210d8d165ea234a72f0f4dd25239ad21f64991 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10744b7c5007ccac19ea9654be6e749fe6a60992
Author: Mark H Weaver <address@hidden>
Date:   Tue Oct 30 22:58:19 2012 -0400

    Fix formatting of comments in scm_read_array.
    
    * libguile/read.c (scm_read_array): Fix formatting of comments.

commit fa746547fc0cd15f5edbb690477d37a23de4f183
Author: Mark H Weaver <address@hidden>
Date:   Tue Oct 30 22:53:22 2012 -0400

    scm_read_shebang: handle non-ascii characters properly.
    
    * libguile/read.c (scm_read_shebang): Abort scan for reader directive
      if a character other than [-a-z0-9] is encountered.

-----------------------------------------------------------------------

Summary of changes:
 libguile/read.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libguile/read.c b/libguile/read.c
index ebd1119..222891b 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1134,8 +1134,7 @@ read_decimal_integer (SCM port, int c, ssize_t *resp)
    vectors.  Also, the conflict between '#f' and '#f32' and '#f64' is
    handled here.
 
-   C is the first character read after the '#'.
-*/
+   C is the first character read after the '#'. */
 static SCM
 scm_read_array (int c, SCM port, scm_t_read_opts *opts, long line, int column)
 {
@@ -1147,13 +1146,11 @@ scm_read_array (int c, SCM port, scm_t_read_opts *opts, 
long line, int column)
 
   /* XXX - shortcut for ordinary vectors.  Shouldn't be necessary but
      the array code can not deal with zero-length dimensions yet, and
-     we want to allow zero-length vectors, of course.
-  */
+     we want to allow zero-length vectors, of course. */
   if (c == '(')
     return scm_read_vector (c, port, opts, line, column);
 
-  /* Disambiguate between '#f' and uniform floating point vectors.
-   */
+  /* Disambiguate between '#f' and uniform floating point vectors. */
   if (c == 'f')
     {
       c = scm_getc (port);
@@ -1391,6 +1388,11 @@ scm_read_shebang (scm_t_wchar chr, SCM port, 
scm_t_read_opts *opts)
 
           return SCM_UNSPECIFIED;
         }
+      else
+        {
+          scm_ungetc (c, port);
+          break;
+        }
     }
   while (i > 0)
     scm_ungetc (name[--i], port);


hooks/post-receive
-- 
GNU Guile