* private-options.h: idem.

* eval.i.c: copyright nitpicking.

* eval.c: distangle. move duplicate code to eval.i.c and include
twice.

* eval.i.c: new file.

* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h

* private-options.h: new file: contain hardcoded option
definitions.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index eb5d6e9..4a6749e 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * private-options.h: idem.
+
+       * eval.i.c: copyright nitpicking.
+
        * eval.c: distangle. move duplicate code to eval.i.c and include
        twice.
 

diff --git a/libguile/eval.c b/libguile/eval.c
index fba9f4a..b48eef7 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -2972,13 +2972,13 @@ scm_t_option scm_debug_opts[] = {
   { SCM_OPTION_BOOLEAN, "backtrace", 0, "Show backtrace on error." },
   { SCM_OPTION_BOOLEAN, "debug", 0, "Use the debugging evaluator." },
 
-
-  /*
-    FIXME.
-   */
-  { SCM_OPTION_INTEGER, "stack", 0, "Stack size limit (measured in words; 0 = no check)." },
-  { SCM_OPTION_SCM, "show-file-name", (unsigned long)SCM_BOOL_T, "Show file names and line numbers in backtraces when not `#f'.  A value of `base' displays only base names, while `#t' displays full names."},
-  { SCM_OPTION_BOOLEAN, "warn-deprecated", 0, "Warn when deprecated features are used." },
+  { SCM_OPTION_INTEGER, "stack", 20000, "Stack size limit (measured in words; 0 = no check)." },
+  { SCM_OPTION_SCM, "show-file-name", (unsigned long)SCM_BOOL_T,
+    "Show file names and line numbers "
+    "in backtraces when not `#f'.  A value of `base' "
+    "displays only base names, while `#t' displays full names."},
+  { SCM_OPTION_BOOLEAN, "warn-deprecated", 0,
+    "Warn when deprecated features are used." },
   { 0 }, 
 };
 

diff --git a/libguile/eval.i.c b/libguile/eval.i.c
index 898cca5..c1e1fb6 100644 (file)
--- a/libguile/eval.i.c
+++ b/libguile/eval.i.c
@@ -1,3 +1,23 @@
+/*
+ * eval.i.c - actual evaluator code for GUILE
+ *
+ * Copyright (C) 2002, 03, 04, 05, 06, 07 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 2.1 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
+ */
+
 #undef RETURN
 #undef ENTER_APPLY
 #undef PREP_APPLY

diff --git a/libguile/private-options.h b/libguile/private-options.h
index 6ec8353..eeaf0c1 100644 (file)
--- a/libguile/private-options.h
+++ b/libguile/private-options.h
@@ -4,7 +4,7 @@
  * We put this in a private header, since layout of data structures
  * is an implementation detail that we want to hide.
  * 
- * Copyright (C) 2002, 03, 04, 05, 06, 07 Free Software Foundation, Inc.
+ * Copyright (C) 2007 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