diff options
author | Andy Wingo <wingo@pobox.com> | 2010-04-09 14:17:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-04-09 14:17:04 +0200 |
commit | 54e53aa4301bcb8aaff0a5dfd4af044ee693f235 (patch) | |
tree | 591f0328ad8d305629a909da6145a5b0262c20dd | |
parent | 7c4aad9cc7143ea7c1a7ce3c143ca0581cace5b5 (diff) | |
download | guile-54e53aa4301bcb8aaff0a5dfd4af044ee693f235.tar.gz |
%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.
-rw-r--r-- | module/language/assembly.scm | 4 | ||||
-rw-r--r-- | module/language/elisp/compile-tree-il.scm | 4 | ||||
-rw-r--r-- | module/language/glil/decompile-assembly.scm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/module/language/assembly.scm b/module/language/assembly.scm index 908bd9083..946caea8b 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)) - ((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 9778d1a59..47b49d69d 100644 --- 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 9e3a00b58..a50b640ec 100644 --- 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) |