%nil -> #nil

* module/language/assembly.scm (object->assembly, assembly->object):
* module/language/elisp/compile-tree-il.scm (compile-pair):
* module/language/glil/decompile-assembly.scm (decompile-load-program):
  Change instances of %nil to #nil.

diff --git a/module/language/assembly.scm b/module/language/assembly.scm
index 908bd90..946caea 100644 (file)
--- 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))
-        ((and (defined? '%nil) (eq? x %nil)) `(make-nil))
+        ((eq? x #nil) `(make-nil))
        ((null? x) `(make-eol))
        ((and (integer? x) (exact? x))
         (cond ((and (<= -128 x) (< x 128))
@@ -136,7 +136,7 @@
   (pmatch code
     ((make-true) #t)
     ((make-false) #f) ;; FIXME: Same as the `else' case!
-    ((make-nil) %nil)
+    ((make-nil) #nil)
     ((make-eol) '())
     ((make-int8 ,n)
      (if (< n 128) n (- n 256)))

diff --git a/module/language/elisp/compile-tree-il.scm b/module/language/elisp/compile-tree-il.scm
index 9778d1a..47b49d6 100644 (file)
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -1,6 +1,6 @@
 ;;; Guile Emacs Lisp
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -750,7 +750,7 @@
     ;                     (if condition
     ;                       (begin body
     ;                              (iterate))
-    ;                       %nil))))
+    ;                       #nil))))
     ;   (iterate))
     ;
     ; As letrec is not directly accessible from elisp, while is implemented here

diff --git a/module/language/glil/decompile-assembly.scm b/module/language/glil/decompile-assembly.scm
index 9e3a00b..a50b640 100644 (file)
--- a/module/language/glil/decompile-assembly.scm
+++ b/module/language/glil/decompile-assembly.scm
@@ -123,7 +123,7 @@
           ((make-false)
            (lp (cdr in) (cons #f stack) out (1+ pos)))
           ((make-nil)
-           (lp (cdr in) (cons %nil stack) out (1+ pos)))
+           (lp (cdr in) (cons #nil stack) out (1+ pos)))
           ((load-program ,labels ,sublen ,meta . ,body)
            (lp (cdr in)
                (cons (decompile-load-program (decompile-meta meta)