X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/756414cf2c781aee4207de3961d7c7e678931a70..76da80e7881947ebcdb647e5ce4be029fece29f2:/libguile/init.c diff --git a/libguile/init.c b/libguile/init.c index cd98511e6..ca964afb3 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -1,52 +1,33 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA - * - * As a special exception, the Free Software Foundation gives permission - * for additional uses of the text contained in its release of GUILE. + * 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 2.1 of the License, or (at your option) any later version. * - * The exception is that, if you link the GUILE library with other files - * to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the GUILE library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the - * Free Software Foundation under the name GUILE. If you copy - * code from other Free Software Foundation releases into a copy of - * GUILE, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. + * 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. * - * If you write modifications of your own for GUILE, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. */ + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ /* Include the headers for just about everything. We call all their initialization functions. */ +#if HAVE_CONFIG_H +# include +#endif + #include #include #include +#include #include "libguile/_scm.h" @@ -58,9 +39,7 @@ #include "libguile/boolean.h" #include "libguile/chars.h" #include "libguile/continuations.h" -#ifdef DEBUG_EXTENSIONS #include "libguile/debug.h" -#endif #ifdef GUILE_DEBUG_MALLOC #include "libguile/debug-malloc.h" #endif @@ -84,6 +63,7 @@ #include "libguile/hash.h" #include "libguile/hashtab.h" #include "libguile/hooks.h" +#include "libguile/i18n.h" #include "libguile/iselect.h" #include "libguile/ioext.h" #include "libguile/keywords.h" @@ -124,7 +104,8 @@ #include "libguile/stacks.h" #include "libguile/stime.h" #include "libguile/strings.h" -#include "libguile/strop.h" +#include "libguile/srfi-13.h" +#include "libguile/srfi-14.h" #include "libguile/strorder.h" #include "libguile/strports.h" #include "libguile/struct.h" @@ -139,6 +120,9 @@ #include "libguile/weaks.h" #include "libguile/guardians.h" #include "libguile/extensions.h" +#include "libguile/srfi-4.h" +#include "libguile/discouraged.h" +#include "libguile/deprecated.h" #include "libguile/init.h" @@ -157,9 +141,7 @@ restart_stack (void *base) scm_dynwinds = SCM_EOL; SCM_DYNENV (scm_rootcont) = SCM_EOL; SCM_THROW_VALUE (scm_rootcont) = SCM_EOL; -#ifdef DEBUG_EXTENSIONS SCM_DFRAME (scm_rootcont) = scm_last_debug_frame = 0; -#endif SCM_BASE (scm_rootcont) = base; } @@ -174,7 +156,7 @@ start_stack (void *base) scm_exitval = SCM_BOOL_F; /* vestigial */ - scm_root->fluids = scm_make_initial_fluids (); + scm_root->fluids = scm_i_make_initial_fluids (); /* Create an object to hold the root continuation. */ @@ -218,16 +200,7 @@ check_config (void) if (HEAP_SEG_SIZE != j) fixconfig ("reduce", "size of HEAP_SEG_SIZE", 0); -#ifdef SCM_BIGDIG - if (2 * SCM_BITSPERDIG / SCM_CHAR_BIT > sizeof (long)) - fixconfig (remsg, "SCM_BIGDIG", 0); -#ifndef SCM_DIGSTOOBIG - if (SCM_DIGSPERLONG * sizeof (SCM_BIGDIG) > sizeof (long)) - fixconfig (addmsg, "SCM_DIGSTOOBIG", 0); -#endif -#endif - -#ifdef SCM_STACK_GROWS_UP +#if SCM_STACK_GROWS_UP if (((SCM_STACKITEM *) & j - stack_start_ptr) < 0) fixconfig (remsg, "SCM_STACK_GROWS_UP", 1); #else @@ -254,7 +227,7 @@ stream_body (void *data) { stream_body_data *body_data = (stream_body_data *) data; SCM port = scm_fdes_to_port (body_data->fdes, body_data->mode, - scm_makfrom0str (body_data->name)); + scm_from_locale_string (body_data->name)); SCM_REVEALED (port) = 1; return port; @@ -287,7 +260,7 @@ scm_standard_stream_to_port (int fdes, char *mode, char *name) body_data.name = name; port = scm_internal_catch (SCM_BOOL_T, stream_body, &body_data, stream_handler, NULL); - if (SCM_FALSEP (port)) + if (scm_is_false (port)) port = scm_void_port (mode); return port; } @@ -339,15 +312,16 @@ scm_load_startup_files () /* We want a path only containing directories from GUILE_LOAD_PATH, SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init file, so we do this before loading Ice-9. */ - SCM init_path = scm_sys_search_load_path (scm_makfrom0str ("init.scm")); + SCM init_path = + scm_sys_search_load_path (scm_from_locale_string ("init.scm")); /* Load Ice-9. */ if (!scm_ice_9_already_loaded) { - scm_primitive_load_path (scm_makfrom0str ("ice-9/boot-9.scm")); + scm_primitive_load_path (scm_from_locale_string ("ice-9/boot-9.scm")); /* Load the init.scm file. */ - if (SCM_NFALSEP (init_path)) + if (scm_is_true (init_path)) scm_primitive_load (init_path); } } @@ -443,16 +417,26 @@ scm_init_guile_1 (SCM_STACKITEM *base) abort (); } + if (sizeof (mpz_t) > (3 * sizeof (scm_t_bits))) + { + fprintf (stderr, + "GMP's mpz_t must fit into a double_cell," + "but doesn't seem to here.\n"); + } + scm_block_gc = 1; + scm_storage_prehistory (); scm_threads_prehistory (); scm_ports_prehistory (); scm_smob_prehistory (); - scm_tables_prehistory (); + scm_hashtab_prehistory (); /* requires storage_prehistory */ #ifdef GUILE_DEBUG_MALLOC scm_debug_malloc_prehistory (); #endif - if (scm_init_storage ()) /* requires threads and smob_prehistory */ + if (scm_init_storage ()) /* requires threads_prehistory, + smob_prehistory and + hashtab_prehistory */ abort (); scm_struct_prehistory (); /* requires storage */ @@ -460,7 +444,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_weaks_prehistory (); /* requires storage */ scm_init_subr_table (); scm_environments_prehistory (); /* requires storage */ - scm_modules_prehistory (); /* requires storage */ + scm_modules_prehistory (); /* requires storage and hash tables */ scm_init_variable (); /* all bindings need variables */ scm_init_continuations (); scm_init_root (); /* requires continuations */ @@ -495,6 +479,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_properties (); scm_init_hooks (); /* Requires smob_prehistory */ scm_init_gc (); /* Requires hooks, async */ + scm_init_i18n (); scm_init_ioext (); scm_init_keywords (); scm_init_list (); @@ -519,9 +504,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_socket (); #endif scm_init_sort (); -#ifdef DEBUG_EXTENSIONS scm_init_srcprop (); -#endif scm_init_stackchk (); scm_init_strings (); scm_init_struct (); /* Requires strings */ @@ -534,7 +517,8 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_read (); scm_init_stime (); scm_init_strorder (); - scm_init_strop (); + scm_init_srfi_13 (); + scm_init_srfi_14 (); scm_init_throw (); scm_init_vectors (); scm_init_version (); @@ -543,27 +527,30 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_vports (); scm_init_eval (); scm_init_evalext (); -#ifdef DEBUG_EXTENSIONS scm_init_debug (); /* Requires macro smobs */ -#endif scm_init_random (); -#ifdef HAVE_ARRAYS scm_init_ramap (); scm_init_unif (); -#endif scm_init_simpos (); scm_init_load_path (); scm_init_standard_ports (); /* Requires fports */ -#ifdef DYNAMIC_LINKING scm_init_dynamic_linking (); -#endif -#ifdef SCM_ENABLE_ELISP +#if SCM_ENABLE_ELISP scm_init_lang (); #endif /* SCM_ENABLE_ELISP */ scm_init_script (); + scm_init_srfi_4 (); scm_init_goops (); - + +#if SCM_ENABLE_DISCOURAGED == 1 + scm_i_init_discouraged (); +#endif + +#if SCM_ENABLE_DEPRECATED == 1 + scm_i_init_deprecated (); +#endif + scm_initialized_p = 1; scm_block_gc = 0; /* permit the gc to run */