diff options
-rw-r--r-- | libguile/Makefile.am | 4 | ||||
-rw-r--r-- | libguile/alist.c | 3 | ||||
-rw-r--r-- | libguile/async.c | 3 | ||||
-rw-r--r-- | libguile/backtrace.c | 3 | ||||
-rw-r--r-- | libguile/boolean.c | 1 | ||||
-rw-r--r-- | libguile/dynl.c | 1 | ||||
-rw-r--r-- | libguile/eval.c | 1 | ||||
-rw-r--r-- | libguile/filesys.c | 3 | ||||
-rw-r--r-- | libguile/fluids.c | 1 | ||||
-rw-r--r-- | libguile/init.c | 2 | ||||
-rw-r--r-- | libguile/lang.c | 51 | ||||
-rw-r--r-- | libguile/lang.h | 43 | ||||
-rw-r--r-- | libguile/list.c | 3 | ||||
-rw-r--r-- | libguile/load.c | 1 | ||||
-rw-r--r-- | libguile/options.c | 3 | ||||
-rw-r--r-- | libguile/pairs.h | 6 | ||||
-rw-r--r-- | libguile/posix.c | 1 | ||||
-rw-r--r-- | libguile/print.c | 1 | ||||
-rw-r--r-- | libguile/promises.c | 3 | ||||
-rw-r--r-- | libguile/sort.c | 3 | ||||
-rw-r--r-- | libguile/throw.c | 1 | ||||
-rw-r--r-- | libguile/trees.c | 3 | ||||
-rw-r--r-- | libguile/vectors.c | 3 | ||||
-rw-r--r-- | libguile/vm.c | 1 | ||||
-rw-r--r-- | libguile/weaks.c | 3 | ||||
-rw-r--r-- | module/ice-9/deprecated.scm | 2 | ||||
-rw-r--r-- | srfi/srfi-1.c | 3 |
27 files changed, 20 insertions, 133 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 59a364738..a841c9fe3 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -151,7 +151,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ instructions.c \ ioext.c \ keywords.c \ - lang.c \ list.c \ load.c \ macros.c \ @@ -250,7 +249,6 @@ DOT_X_FILES = \ init.x \ ioext.x \ keywords.x \ - lang.x \ list.x \ load.x \ macros.x \ @@ -350,7 +348,6 @@ DOT_DOC_FILES = \ init.doc \ ioext.doc \ keywords.doc \ - lang.doc \ list.doc \ load.doc \ macros.doc \ @@ -516,7 +513,6 @@ modinclude_HEADERS = \ ioext.h \ iselect.h \ keywords.h \ - lang.h \ list.h \ load.h \ macros.h \ diff --git a/libguile/alist.c b/libguile/alist.c index 919bd224e..fd2ccde21 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2004, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001, 2004, 2006, 2008, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -25,7 +25,6 @@ #include "libguile/_scm.h" #include "libguile/eq.h" #include "libguile/list.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/pairs.h" diff --git a/libguile/async.c b/libguile/async.c index ddb2a215f..e448dc1d5 100644 --- a/libguile/async.c +++ b/libguile/async.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -30,7 +30,6 @@ #include "libguile/throw.h" #include "libguile/root.h" #include "libguile/smob.h" -#include "libguile/lang.h" #include "libguile/dynwind.h" #include "libguile/deprecation.h" diff --git a/libguile/backtrace.c b/libguile/backtrace.c index f8b259f6b..bfd8d973a 100644 --- a/libguile/backtrace.c +++ b/libguile/backtrace.c @@ -1,5 +1,5 @@ /* Printing of backtraces and error messages - * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009 Free Software Foundation + * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009, 2010 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -45,7 +45,6 @@ #include "libguile/frames.h" #include "libguile/validate.h" -#include "libguile/lang.h" #include "libguile/backtrace.h" #include "libguile/filesys.h" #include "libguile/private-options.h" diff --git a/libguile/boolean.c b/libguile/boolean.c index 7d58582a2..452b8adda 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -26,7 +26,6 @@ #include "libguile/validate.h" #include "libguile/boolean.h" -#include "libguile/lang.h" #include "libguile/tags.h" #include "verify.h" diff --git a/libguile/dynl.c b/libguile/dynl.c index 449acc0db..b76e85c79 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -55,7 +55,6 @@ maybe_drag_in_eprintf () #include "libguile/ports.h" #include "libguile/strings.h" #include "libguile/deprecation.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/dynwind.h" #include "libguile/foreign.h" diff --git a/libguile/eval.c b/libguile/eval.c index 707144b4a..f775d31b1 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -42,7 +42,6 @@ #include "libguile/goops.h" #include "libguile/hash.h" #include "libguile/hashtab.h" -#include "libguile/lang.h" #include "libguile/list.h" #include "libguile/macros.h" #include "libguile/memoize.h" diff --git a/libguile/filesys.c b/libguile/filesys.c index 37b45deff..5ca1233f2 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -43,7 +43,6 @@ #include "libguile/iselect.h" #include "libguile/strings.h" #include "libguile/vectors.h" -#include "libguile/lang.h" #include "libguile/dynwind.h" #include "libguile/validate.h" diff --git a/libguile/fluids.c b/libguile/fluids.c index 17d67e934..9aa1eb2f0 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -31,7 +31,6 @@ #include "libguile/eval.h" #include "libguile/ports.h" #include "libguile/deprecation.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/bdw-gc.h" diff --git a/libguile/init.c b/libguile/init.c index f5e8e6418..0d4f8c227 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -74,7 +74,6 @@ #include "libguile/iselect.h" #include "libguile/ioext.h" #include "libguile/keywords.h" -#include "libguile/lang.h" #include "libguile/list.h" #include "libguile/load.h" #include "libguile/macros.h" @@ -557,7 +556,6 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_simpos (); scm_init_dynamic_linking (); /* Requires smob_prehistory */ scm_bootstrap_i18n (); - scm_init_lang (); scm_init_script (); scm_init_goops (); diff --git a/libguile/lang.c b/libguile/lang.c deleted file mode 100644 index 9a87bb481..000000000 --- a/libguile/lang.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 1999, 2000, 2001, 2006, 2008, 2010 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - - - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include "libguile/_scm.h" - -#include "libguile/eval.h" -#include "libguile/macros.h" -#include "libguile/root.h" - -#include "libguile/validate.h" -#include "libguile/lang.h" - - - -/* {Multi-language support} - */ - -void -scm_init_lang () -{ -#include "libguile/lang.x" - - scm_c_define ("%nil", SCM_ELISP_NIL); -} - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ diff --git a/libguile/lang.h b/libguile/lang.h deleted file mode 100644 index d0482eeb2..000000000 --- a/libguile/lang.h +++ /dev/null @@ -1,43 +0,0 @@ -/* classes: h_files */ - -#ifndef SCM_LANG_H -#define SCM_LANG_H - -/* Copyright (C) 1998, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - - - -#include "libguile/__scm.h" - - - -#define SCM_NILP(x) (scm_is_eq ((x), SCM_ELISP_NIL)) - -SCM_INTERNAL void scm_init_lang (void); - -#define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x)) - - -#endif /* SCM_LANG_H */ - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ diff --git a/libguile/list.c b/libguile/list.c index ba4b249eb..23ef40407 100644 --- a/libguile/list.c +++ b/libguile/list.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,2000,2001,2003,2004,2008,2009 +/* Copyright (C) 1995,1996,1997,2000,2001,2003,2004,2008,2009,2010 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -25,7 +25,6 @@ #include "libguile/_scm.h" #include "libguile/eq.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/list.h" diff --git a/libguile/load.c b/libguile/load.c index eeb35439e..0e4894ec8 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -38,7 +38,6 @@ #include "libguile/root.h" #include "libguile/strings.h" #include "libguile/modules.h" -#include "libguile/lang.h" #include "libguile/chars.h" #include "libguile/srfi-13.h" diff --git a/libguile/options.c b/libguile/options.c index ba2e95e4c..6e4c1872b 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009 Free Software Foundation +/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -24,7 +24,6 @@ #include "libguile/_scm.h" #include "libguile/mallocs.h" #include "libguile/strings.h" -#include "libguile/lang.h" #include "libguile/options.h" diff --git a/libguile/pairs.h b/libguile/pairs.h index 861f9a048..a5b6fcd93 100644 --- a/libguile/pairs.h +++ b/libguile/pairs.h @@ -54,6 +54,12 @@ #define scm_is_null_or_nil(x) \ (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_EOL)) + +/* Older spellings for these nil predicates. */ +#define SCM_NILP(x) (scm_is_eq ((x), SCM_ELISP_NIL)) +#define SCM_NULL_OR_NIL_P(x) (scm_is_null_or_nil (x)) + + /* %nil is null. */ #define scm_is_null(x) (scm_is_null_or_nil(x)) diff --git a/libguile/posix.c b/libguile/posix.c index 73921a2c9..3244e6e45 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -37,7 +37,6 @@ #include "libguile/srfi-14.h" #include "libguile/vectors.h" #include "libguile/values.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/posix.h" diff --git a/libguile/print.c b/libguile/print.c index ca38d42d5..e46927768 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -44,7 +44,6 @@ #include "libguile/strings.h" #include "libguile/strports.h" #include "libguile/vectors.h" -#include "libguile/lang.h" #include "libguile/numbers.h" #include "libguile/vm.h" diff --git a/libguile/promises.c b/libguile/promises.c index fc34cc8f5..45a76a9e5 100644 --- a/libguile/promises.c +++ b/libguile/promises.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -41,7 +41,6 @@ #include "libguile/goops.h" #include "libguile/hash.h" #include "libguile/hashtab.h" -#include "libguile/lang.h" #include "libguile/list.h" #include "libguile/macros.h" #include "libguile/memoize.h" diff --git a/libguile/sort.c b/libguile/sort.c index 763978f52..5fdbb177c 100644 --- a/libguile/sort.c +++ b/libguile/sort.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -43,7 +43,6 @@ #include "libguile/array-map.h" #include "libguile/feature.h" #include "libguile/vectors.h" -#include "libguile/lang.h" #include "libguile/async.h" #include "libguile/dynwind.h" diff --git a/libguile/throw.c b/libguile/throw.c index 595e3beac..3e95fb3e0 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -36,7 +36,6 @@ #include "libguile/stacks.h" #include "libguile/fluids.h" #include "libguile/ports.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/vm.h" #include "libguile/throw.h" diff --git a/libguile/trees.c b/libguile/trees.c index cbfd4277e..76bb68640 100644 --- a/libguile/trees.c +++ b/libguile/trees.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -25,7 +25,6 @@ #include "libguile/_scm.h" #include "libguile/eq.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/list.h" diff --git a/libguile/vectors.c b/libguile/vectors.c index 6ac5acb30..321b49993 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -26,7 +26,6 @@ #include "libguile/eq.h" #include "libguile/root.h" #include "libguile/strings.h" -#include "libguile/lang.h" #include "libguile/validate.h" #include "libguile/vectors.h" diff --git a/libguile/vm.c b/libguile/vm.c index f5e66aef6..54a143eaf 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -33,7 +33,6 @@ #include "instructions.h" #include "objcodes.h" #include "programs.h" -#include "lang.h" /* NULL_OR_NIL_P */ #include "vm.h" /* I sometimes use this for debugging. */ diff --git a/libguile/weaks.c b/libguile/weaks.c index 913166ffd..1d5fcf469 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -26,7 +26,6 @@ #include "libguile/_scm.h" #include "libguile/vectors.h" -#include "libguile/lang.h" #include "libguile/hashtab.h" #include "libguile/validate.h" diff --git a/module/ice-9/deprecated.scm b/module/ice-9/deprecated.scm index 82cd72635..081f3f853 100644 --- a/module/ice-9/deprecated.scm +++ b/module/ice-9/deprecated.scm @@ -258,3 +258,5 @@ (issue-deprecation-warning "`closure?' is deprecated. Use `procedure?' instead.") (procedure? x)) + +(define %nil #nil) diff --git a/srfi/srfi-1.c b/srfi/srfi-1.c index a0e9803e3..537c2b328 100644 --- a/srfi/srfi-1.c +++ b/srfi/srfi-1.c @@ -1,6 +1,6 @@ /* srfi-1.c --- SRFI-1 procedures for Guile * - * Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2005, 2006, 2008, 2009 + * Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2005, 2006, 2008, 2009, 2010 * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or @@ -24,7 +24,6 @@ #endif #include <libguile.h> -#include <libguile/lang.h> #include "srfi-1.h" |