mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 17:20:29 +02:00
Code Activity

change remaining %nil -> #nil

Browse source 
* doc/ref/vm.texi:
* libguile/boolean.h:
* libguile/pairs.h:
* module/language/elisp/README:
* test-suite/tests/elisp-compiler.test:
* test-suite/tests/load.test: Change remaining mentions of %nil to #nil.
This commit is contained in:
Andy Wingo 2010-04-09 14:44:28 +02:00
parent 474060a23c
commit 92a61010bd
6 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/vm.texi
View file

@ -823,7 +823,7 @@ Push @code{#t} onto the stack.
@end deffn @end deffn
@deffn Instruction make-nil @deffn Instruction make-nil
Push @code{%nil} onto the stack. Push @code{#nil} onto the stack.
@end deffn @end deffn
@deffn Instruction make-eol @deffn Instruction make-eol

7
libguile/boolean.h
View file

@ -35,13 +35,13 @@
/* /*
* Use these macros if it's important (for correctness) * Use these macros if it's important (for correctness)
* that %nil MUST be considered true * that #nil MUST be considered true
*/ */
#define scm_is_false_and_not_nil(x) (scm_is_eq ((x), SCM_BOOL_F)) #define scm_is_false_and_not_nil(x) (scm_is_eq ((x), SCM_BOOL_F))
#define scm_is_true_or_nil(x) (!scm_is_eq ((x), SCM_BOOL_F)) #define scm_is_true_or_nil(x) (!scm_is_eq ((x), SCM_BOOL_F))
/* /*
* Use these macros if %nil will never be tested, * Use these macros if #nil will never be tested,
* for increased efficiency. * for increased efficiency.
*/ */
#define scm_is_false_assume_not_nil(x) (scm_is_eq ((x), SCM_BOOL_F)) #define scm_is_false_assume_not_nil(x) (scm_is_eq ((x), SCM_BOOL_F))
@ -56,7 +56,8 @@
(SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F)) (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F))
#define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x)) #define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x))
/* %nil is false. */ /*
#nil is false. */
#define scm_is_false(x) (scm_is_false_or_nil (x)) #define scm_is_false(x) (scm_is_false_or_nil (x))
#define scm_is_true(x) (!scm_is_false (x)) #define scm_is_true(x) (!scm_is_false (x))

7
libguile/pairs.h
View file

@ -36,12 +36,13 @@
/* /*
* Use scm_is_null_and_not_nil if it's important (for correctness) * Use scm_is_null_and_not_nil if it's important (for correctness)
* that %nil must NOT be considered null. * that #nil must NOT be considered null.
*/ */
#define scm_is_null_and_not_nil(x) (scm_is_eq ((x), SCM_EOL)) #define scm_is_null_and_not_nil(x) (scm_is_eq ((x), SCM_EOL))
/* /*
* Use scm_is_null_assume_not_nil if %nil will never be tested, * Use scm_is_null_assume_not_nil if
#nil will never be tested,
* for increased efficiency. * for increased efficiency.
*/ */
#define scm_is_null_assume_not_nil(x) (scm_is_eq ((x), SCM_EOL)) #define scm_is_null_assume_not_nil(x) (scm_is_eq ((x), SCM_EOL))
@ -60,7 +61,7 @@
#define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x)) #define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x))
/* %nil is null. */ /* #nil is null. */
#define scm_is_null(x) (scm_is_null_or_nil(x)) #define scm_is_null(x) (scm_is_null_or_nil(x))
#define SCM_CAR(x) (SCM_VALIDATE_PAIR (x, SCM_CELL_OBJECT_0 (x))) #define SCM_CAR(x) (SCM_VALIDATE_PAIR (x, SCM_CELL_OBJECT_0 (x)))

2
module/language/elisp/README
View file

@ -31,7 +31,7 @@ Especially still missing:
* anonymous macros * anonymous macros
Other ideas and things to think about: Other ideas and things to think about:
* %nil vs. #f/'() handling in Guile * #nil vs. #f/'() handling in Guile
Compiler options implemented: Compiler options implemented:
* #:disable-void-check ['all / '(sym1 sym2 sym3)] to disable the check * #:disable-void-check ['all / '(sym1 sym2 sym3)] to disable the check

4
test-suite/tests/elisp-compiler.test
View file

@ -1,6 +1,6 @@
;;;; elisp-compiler.test --- Test the compiler for Elisp. ;;;; elisp-compiler.test --- Test the compiler for Elisp. -*- scheme -*-
;;;; ;;;;
;;;; Copyright (C) 2009 Free Software Foundation, Inc. ;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
;;;; Daniel Kraft ;;;; Daniel Kraft
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or

18
test-suite/tests/load.test
View file

@ -1,7 +1,7 @@
;;;; load.test --- test LOAD and path searching functions -*- scheme -*- ;;;; load.test --- test LOAD and path searching functions -*- scheme -*-
;;;; Jim Blandy <jimb@red-bean.com> --- September 1999 ;;;; Jim Blandy <jimb@red-bean.com> --- September 1999
;;;; ;;;;
;;;; Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc. ;;;; Copyright (C) 1999, 2001, 2006, 2010 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -115,13 +115,13 @@
(try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm") (try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm")
(try-search-with-extensions path "ugly.ss" extensions #f) (try-search-with-extensions path "ugly.ss" extensions #f)
(if (defined? '%nil) ;; Check that search-path accepts Elisp nil-terminated lists for
;; Check that search-path accepts Elisp nil-terminated lists for ;; PATH and EXTENSIONS.
;; PATH and EXTENSIONS. (with-test-prefix "elisp-nil"
(with-test-prefix "elisp-nil" (set-cdr! (last-pair path)
(set-cdr! (last-pair path) %nil) #nil)
(set-cdr! (last-pair extensions) %nil) (set-cdr! (last-pair extensions) #nil)
(try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm") (try-search-with-extensions path "ugly.scm" extensions "dir3/ugly.scm")
(try-search-with-extensions path "ugly.ss" extensions #f))) (try-search-with-extensions path "ugly.ss" extensions #f))
(delete-tree temp-dir) (delete-tree temp-dir)