diff options
Diffstat (limited to 'libguile/pairs.c')
-rw-r--r-- | libguile/pairs.c | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/libguile/pairs.c b/libguile/pairs.c index 92f9cfa38..64222b424 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -1,21 +1,21 @@ -/* Copyright (C) 1995, 1996, 2000, 2001, 2004-2006, 2008-2013, - * 2017, 2018 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-1996,2000-2001,2004-2006,2008-2013,2017-2019 + 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/>. */ @@ -23,12 +23,12 @@ # include <config.h> #endif -#include "libguile/_scm.h" -#include "libguile/validate.h" +#include <verify.h> -#include "libguile/pairs.h" +#include "boolean.h" +#include "gsubr.h" -#include "verify.h" +#include "pairs.h" @@ -41,7 +41,7 @@ * which is defined in terms of the SCM_MATCHES_BITS_IN_COMMON macro. * * See the comments preceeding the definitions of SCM_BOOL_F and - * SCM_MATCHES_BITS_IN_COMMON in tags.h for more information. + * SCM_MATCHES_BITS_IN_COMMON in scm.h for more information. */ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ (SCM_ELISP_NIL_BITS, SCM_EOL_BITS)); @@ -49,8 +49,8 @@ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ #if (SCM_DEBUG_PAIR_ACCESSES == 1) -#include "libguile/ports.h" -#include "libguile/strings.h" +#include "ports.h" +#include "strings.h" void scm_error_pair_access (SCM non_pair) { @@ -120,7 +120,7 @@ SCM_DEFINE (scm_set_cdr_x, "set-cdr!", 2, 0, 0, /* The compiler should unroll this. */ #define CHASE_PAIRS(tree, FUNC_NAME, pattern) \ - scm_t_uint32 pattern_var = pattern; \ + uint32_t pattern_var = pattern; \ do \ { \ if (!scm_is_pair (tree)) \ @@ -334,15 +334,9 @@ SCM_DEFINE (scm_caaaar, "caaaar", 1, 0, 0, (SCM x), "") void scm_init_pairs () { -#include "libguile/pairs.x" +#include "pairs.x" scm_c_define_gsubr ("cons", 2, 0, 0, scm_cons); scm_c_define_gsubr ("car", 1, 0, 0, scm_car); scm_c_define_gsubr ("cdr", 1, 0, 0, scm_cdr); } - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |