summaryrefslogtreecommitdiff
path: root/libguile/srcprop.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/srcprop.c')
-rw-r--r--libguile/srcprop.c79
1 files changed, 42 insertions, 37 deletions
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 14e56bd1c..b644a32a5 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -1,43 +1,51 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2006,
- * 2008, 2009, 2010, 2011, 2012 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-2002,2006,2008-2012,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/>. */
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <errno.h>
-#include "libguile/_scm.h"
-#include "libguile/async.h"
-#include "libguile/smob.h"
-#include "libguile/alist.h"
-#include "libguile/debug.h"
-#include "libguile/hashtab.h"
-#include "libguile/hash.h"
-#include "libguile/ports.h"
-#include "libguile/gc.h"
+#include "alist.h"
+#include "async.h"
+#include "debug.h"
+#include "gc.h"
+#include "gsubr.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "keywords.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
+#include "private-options.h"
+#include "smob.h"
+#include "symbols.h"
+#include "weak-table.h"
+
+#include "srcprop.h"
-#include "libguile/validate.h"
-#include "libguile/srcprop.h"
-#include "libguile/private-options.h"
/* {Source Properties}
@@ -195,6 +203,9 @@ SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0,
}
#undef FUNC_NAME
+#define SCM_VALIDATE_NIM(pos, scm) \
+ SCM_MAKE_VALIDATE_MSG (pos, scm, NIMP, "non-immediate")
+
/* Perhaps this procedure should look through an alist
and try to make a srcprops-object...? */
SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0,
@@ -352,12 +363,6 @@ scm_init_srcprop ()
scm_last_alist_filename = scm_cons (SCM_EOL,
scm_acons (SCM_EOL, SCM_EOL, SCM_EOL));
-#include "libguile/srcprop.x"
+#include "srcprop.x"
}
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/