summaryrefslogtreecommitdiff
path: root/libguile/backtrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/backtrace.c')
-rw-r--r--libguile/backtrace.c103
1 files changed, 46 insertions, 57 deletions
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 495a68bad..4a19d4b8a 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -1,22 +1,23 @@
/* Printing of backtraces and error messages
- * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009,
- * 2010, 2011, 2014 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
- * 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 1996-2001,2003-2004,2006,2009-2011,2014,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>
@@ -24,30 +25,37 @@
#include <stdio.h>
#include <ctype.h>
-
-#include "libguile/_scm.h"
-
#include <unistd.h>
+
#ifdef HAVE_IO_H
#include <io.h>
#endif
-#include "libguile/deprecation.h"
-#include "libguile/stacks.h"
-#include "libguile/srcprop.h"
-#include "libguile/struct.h"
-#include "libguile/strports.h"
-#include "libguile/throw.h"
-#include "libguile/fluids.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/dynwind.h"
-#include "libguile/frames.h"
-
-#include "libguile/validate.h"
-#include "libguile/backtrace.h"
-#include "libguile/filesys.h"
-#include "libguile/private-options.h"
+#include "boolean.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eval.h"
+#include "filesys.h"
+#include "fluids.h"
+#include "frames.h"
+#include "gsubr.h"
+#include "keywords.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "posix.h"
+#include "private-options.h"
+#include "srcprop.h"
+#include "stacks.h"
+#include "strings.h"
+#include "strports.h"
+#include "struct.h"
+#include "symbols.h"
+#include "throw.h"
+#include "variable.h"
+
+#include "backtrace.h"
/* {Error reporting and backtraces}
*
@@ -170,19 +178,6 @@ SCM_DEFINE (scm_display_error, "display-error", 6, 0, 0,
{
SCM_VALIDATE_OUTPUT_PORT (2, port);
-#if SCM_ENABLE_DEPRECATED
- if (SCM_STACKP (frame))
- {
- scm_c_issue_deprecation_warning
- ("Passing a stack as the first argument to `scm_display_error' is "
- "deprecated. Pass a frame instead.");
- if (SCM_STACK_LENGTH (frame))
- frame = scm_stack_ref (frame, SCM_INUM0);
- else
- frame = SCM_BOOL_F;
- }
-#endif
-
scm_i_display_error (frame, port, subr, message, args, rest);
return SCM_UNSPECIFIED;
@@ -332,11 +327,5 @@ void
scm_init_backtrace ()
{
scm_c_define_gsubr ("print-exception", 4, 0, 0, boot_print_exception);
-#include "libguile/backtrace.x"
+#include "backtrace.x"
}
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/