[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-168-g7beae9f

[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=7beae9f15ac49f144a15d3ebfe80c2f29e43b3ff

The branch, master has been updated
       via  7beae9f15ac49f144a15d3ebfe80c2f29e43b3ff (commit)
       via  870d7a2b4f397a4619553b0f9798b6e8b3ed173e (commit)
      from  445f31fc06d338f0cafda188d0287f935c2edc3c (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 7beae9f15ac49f144a15d3ebfe80c2f29e43b3ff
Author: Michael Gran <address@hidden>
Date:   Sun Jan 17 13:41:14 2010 -0800

    object->assembly shouldn't presume existence of %nil
    
    The %nil constant only exists if SCM_ENABLE_ELISP is defined.
    
    * module/language/assembly (object->assembly): check for existence of %nil

commit 870d7a2b4f397a4619553b0f9798b6e8b3ed173e
Author: Michael Gran <address@hidden>
Date:   Sun Jan 17 13:40:18 2010 -0800

    reader options macros incorrect when SCM_ENABLE_ELISP undefined
    
    When compiled with SCM_ENABLE_ELISP undefined, the reader options
    macros SCM_R6RS_ESCAPES_P and SCM_SQUARE_BRACKETS_P point past
    the end of the scm_read_opts struct.
    
    *libguile/private-options.h (SCM_R6RS_ESCAPES_P) [!SCM_ENABLE_ELISP]: 
modified
     (SCM_SQUARE_BRACKETS_P) [!SCM_ENABLE_ELISP]: modified
     (SCM_N_READ_OPTIONS): modified

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

Summary of changes:
 libguile/private-options.h   |    9 ++++++---
 module/language/assembly.scm |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libguile/private-options.h b/libguile/private-options.h
index f027b72..2e9728d 100644
--- a/libguile/private-options.h
+++ b/libguile/private-options.h
@@ -94,14 +94,17 @@ SCM_API scm_t_option scm_read_opts[];
 #if SCM_ENABLE_ELISP
 #define SCM_ELISP_VECTORS_P    scm_read_opts[4].val
 #define SCM_ESCAPED_PARENS_P   scm_read_opts[5].val
-#endif
 #define SCM_R6RS_ESCAPES_P     scm_read_opts[6].val
 #define SCM_SQUARE_BRACKETS_P  scm_read_opts[7].val
+#else
+#define SCM_R6RS_ESCAPES_P     scm_read_opts[4].val
+#define SCM_SQUARE_BRACKETS_P  scm_read_opts[5].val
+#endif
 
 #if SCM_ENABLE_ELISP
-#define SCM_N_READ_OPTIONS 7
+#define SCM_N_READ_OPTIONS 8
 #else
-#define SCM_N_READ_OPTIONS 5
+#define SCM_N_READ_OPTIONS 6
 #endif
 
 #endif  /* PRIVATE_OPTIONS */ 
diff --git a/module/language/assembly.scm b/module/language/assembly.scm
index 95604b2..908bd90 100644
--- a/module/language/assembly.scm
+++ b/module/language/assembly.scm
@@ -106,7 +106,7 @@
 (define (object->assembly x)
   (cond ((eq? x #t) `(make-true))
        ((eq? x #f) `(make-false))
-        ((eq? x %nil) `(make-nil))
+        ((and (defined? '%nil) (eq? x %nil)) `(make-nil))
        ((null? x) `(make-eol))
        ((and (integer? x) (exact? x))
         (cond ((and (<= -128 x) (< x 128))


hooks/post-receive
-- 
GNU Guile