diff options
Diffstat (limited to 'libguile/memoize.c')
-rw-r--r-- | libguile/memoize.c | 94 |
1 files changed, 49 insertions, 45 deletions
diff --git a/libguile/memoize.c b/libguile/memoize.c index 58abeb110..d9e614f62 100644 --- a/libguile/memoize.c +++ b/libguile/memoize.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - * 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 - * 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 - */ +/* Copyright 1995-2015,2018 + Free Software Foundation, Inc. + + This file is part of Guile. + + Guile 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. + + Guile 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 Guile. If not, see + <https://www.gnu.org/licenses/>. */ @@ -24,21 +23,32 @@ # include <config.h> #endif -#include "libguile/__scm.h" -#include "libguile/_scm.h" -#include "libguile/continuations.h" -#include "libguile/eq.h" -#include "libguile/expand.h" -#include "libguile/list.h" -#include "libguile/macros.h" -#include "libguile/memoize.h" -#include "libguile/modules.h" -#include "libguile/srcprop.h" -#include "libguile/ports.h" -#include "libguile/print.h" -#include "libguile/strings.h" -#include "libguile/throw.h" -#include "libguile/validate.h" +#include <string.h> +#include <stdio.h> + +#include "alist.h" +#include "boolean.h" +#include "continuations.h" +#include "dynstack.h" +#include "eq.h" +#include "expand.h" +#include "gsubr.h" +#include "list.h" +#include "macros.h" +#include "modules.h" +#include "numbers.h" +#include "pairs.h" +#include "ports.h" +#include "print.h" +#include "srcprop.h" +#include "strings.h" +#include "symbols.h" +#include "threads.h" +#include "throw.h" +#include "variable.h" +#include "vectors.h" + +#include "memoize.h" @@ -88,7 +98,7 @@ do_unwind (void) static SCM do_push_fluid (SCM fluid, SCM val) { - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; scm_dynstack_push_fluid (&thread->dynstack, fluid, val, thread->dynamic_state); return SCM_UNSPECIFIED; @@ -97,7 +107,7 @@ do_push_fluid (SCM fluid, SCM val) static SCM do_pop_fluid (void) { - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; scm_dynstack_unwind_fluid (&thread->dynstack, thread->dynamic_state); return SCM_UNSPECIFIED; } @@ -105,7 +115,7 @@ do_pop_fluid (void) static SCM do_push_dynamic_state (SCM state) { - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; scm_dynstack_push_dynamic_state (&thread->dynstack, state, thread->dynamic_state); return SCM_UNSPECIFIED; @@ -114,7 +124,7 @@ do_push_dynamic_state (SCM state) static SCM do_pop_dynamic_state (void) { - scm_i_thread *thread = SCM_I_CURRENT_THREAD; + scm_thread *thread = SCM_I_CURRENT_THREAD; scm_dynstack_unwind_dynamic_state (&thread->dynstack, thread->dynamic_state); return SCM_UNSPECIFIED; @@ -891,7 +901,7 @@ SCM_DEFINE (scm_sys_resolve_variable, "%resolve-variable", 2, 0, 0, void scm_init_memoize () { -#include "libguile/memoize.x" +#include "memoize.x" wind = scm_c_make_gsubr ("wind", 2, 0, 0, do_wind); unwind = scm_c_make_gsubr ("unwind", 0, 0, 0, do_unwind); @@ -904,9 +914,3 @@ scm_init_memoize () list_of_guile = scm_list_1 (scm_from_latin1_symbol ("guile")); } - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |