diff --git a/libguile/debug.c b/libguile/debug.c index ab085f40f..dd65de45c 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -59,6 +59,39 @@ +/* + * Debugging options. + */ + +scm_t_option scm_debug_opts[] = { + { SCM_OPTION_BOOLEAN, "backwards", 0, + "Display backtrace in anti-chronological order." }, + { SCM_OPTION_INTEGER, "width", 79, "Maximal width of backtrace." }, + { SCM_OPTION_INTEGER, "depth", 20, "Maximal length of printed backtrace." }, + { SCM_OPTION_BOOLEAN, "backtrace", 1, "Show backtrace on error." }, + /* This default stack limit will be overridden by init_stack_limit(), + if we have getrlimit() and the stack limit is not INFINITY. But it is still + important, as some systems have both the soft and the hard limits set to + INFINITY; in that case we fall back to this value. + + The situation is aggravated by certain compilers, which can consume + "beaucoup de stack", as they say in France. + + See http://thread.gmane.org/gmane.lisp.guile.devel/8599/focus=8662 for + more discussion. This setting is 640 KB on 32-bit arches (should be enough + for anyone!) or a whoppin' 1280 KB on 64-bit arches. + */ + { SCM_OPTION_INTEGER, "stack", 160000, "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 }, +}; + + /* {Run time control of the debugging evaluator} */ diff --git a/libguile/eval.c b/libguile/eval.c index 21cb5508b..293612ed8 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -435,35 +435,6 @@ eval (SCM x, SCM env) } } -scm_t_option scm_debug_opts[] = { - { SCM_OPTION_BOOLEAN, "backwards", 0, - "Display backtrace in anti-chronological order." }, - { SCM_OPTION_INTEGER, "width", 79, "Maximal width of backtrace." }, - { SCM_OPTION_INTEGER, "depth", 20, "Maximal length of printed backtrace." }, - { SCM_OPTION_BOOLEAN, "backtrace", 0, "Show backtrace on error." }, - /* This default stack limit will be overridden by debug.c:init_stack_limit(), - if we have getrlimit() and the stack limit is not INFINITY. But it is still - important, as some systems have both the soft and the hard limits set to - INFINITY; in that case we fall back to this value. - - The situation is aggravated by certain compilers, which can consume - "beaucoup de stack", as they say in France. - - See http://thread.gmane.org/gmane.lisp.guile.devel/8599/focus=8662 for - more discussion. This setting is 640 KB on 32-bit arches (should be enough - for anyone!) or a whoppin' 1280 KB on 64-bit arches. - */ - { SCM_OPTION_INTEGER, "stack", 160000, "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 }, -}; - - /* Simple procedure calls diff --git a/libguile/private-options.h b/libguile/private-options.h index 543c4dad0..2c27214ea 100644 --- a/libguile/private-options.h +++ b/libguile/private-options.h @@ -28,7 +28,7 @@ /* debugging. */ -SCM_API scm_t_option scm_debug_opts[]; +SCM_INTERNAL scm_t_option scm_debug_opts[]; #define SCM_BACKWARDS_P scm_debug_opts[0].val #define SCM_BACKTRACE_WIDTH scm_debug_opts[1].val @@ -43,7 +43,7 @@ SCM_API scm_t_option scm_debug_opts[]; /* printing */ -SCM_API scm_t_option scm_print_opts[]; +SCM_INTERNAL scm_t_option scm_print_opts[]; #define SCM_PRINT_HIGHLIGHT_PREFIX (SCM_PACK (scm_print_opts[0].val)) #define SCM_PRINT_HIGHLIGHT_SUFFIX (SCM_PACK (scm_print_opts[1].val)) @@ -55,7 +55,7 @@ SCM_API scm_t_option scm_print_opts[]; /* read */ -SCM_API scm_t_option scm_read_opts[]; +SCM_INTERNAL scm_t_option scm_read_opts[]; #define SCM_COPY_SOURCE_P scm_read_opts[0].val #define SCM_RECORD_POSITIONS_P scm_read_opts[1].val