[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-152-g898a0b5

[Michael Gran]

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=898a0b5a2ec6141fc408bef3d93e040870386de8

The branch, master has been updated
       via  898a0b5a2ec6141fc408bef3d93e040870386de8 (commit)
      from  2e85d145fc44b49bceaec3ab95da43688f8db0f4 (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 898a0b5a2ec6141fc408bef3d93e040870386de8
Author: Michael Gran <address@hidden>
Date:   Wed Jan 13 07:02:07 2010 -0800

    Disable \u and \U escapes when r6rs-hex-escapes enabled
    
    When the reader option 'r6rs-hex-escapes is enabled, the \uNNNN and
    \UNNNNNN string escape sequences should be disabled.
    
    * libguile/read.c (scm_read_string): added checks for SCM_R6RS_ESCAPES_P

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

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

diff --git a/libguile/read.c b/libguile/read.c
index 9e66cce..c209669 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -524,11 +524,17 @@ scm_read_string (int chr, SCM port)
                 SCM_READ_HEX_ESCAPE (2, '\0');
               break;
             case 'u':
-              SCM_READ_HEX_ESCAPE (4, '\0');
-              break;
+              if (!SCM_R6RS_ESCAPES_P)
+                {
+                  SCM_READ_HEX_ESCAPE (4, '\0');
+                  break;
+                }
             case 'U':
-              SCM_READ_HEX_ESCAPE (6, '\0');
-              break;
+              if (!SCM_R6RS_ESCAPES_P)
+                {
+                  SCM_READ_HEX_ESCAPE (6, '\0');
+                  break;
+                }
             default:
             bad_escaped:
               scm_i_input_error (FUNC_NAME, port,


hooks/post-receive
-- 
GNU Guile