guile/guile-core/libguile error.c error.h

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/09/20 04:18:26

Modified files:
        guile-core/libguile: error.c error.h 

Log message:
        * error.c, error.h: Made error keys globally accessible.
        Applications might want to test for these or use them in a direct
        call to scm_error.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/error.c.diff?cvsroot=OldCVS&tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/error.h.diff?cvsroot=OldCVS&tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/error.c
diff -u guile/guile-core/libguile/error.c:1.65 
guile/guile-core/libguile/error.c:1.66
--- guile/guile-core/libguile/error.c:1.65      Fri Aug 31 10:42:31 2001
+++ guile/guile-core/libguile/error.c   Thu Sep 20 04:18:26 2001
@@ -162,7 +162,7 @@
 }
 #undef FUNC_NAME
 
-SCM_SYMBOL (scm_system_error_key, "system-error");
+SCM_GLOBAL_SYMBOL (scm_system_error_key, "system-error");
 void
 scm_syserror (const char *subr)
 {
@@ -185,7 +185,7 @@
             scm_cons (SCM_MAKINUM (eno), SCM_EOL));
 }
 
-SCM_SYMBOL (scm_num_overflow_key, "numerical-overflow");
+SCM_GLOBAL_SYMBOL (scm_num_overflow_key, "numerical-overflow");
 void
 scm_num_overflow (const char *subr)
 {
@@ -196,7 +196,7 @@
             SCM_BOOL_F);
 }
 
-SCM_SYMBOL (scm_out_of_range_key, "out-of-range");
+SCM_GLOBAL_SYMBOL (scm_out_of_range_key, "out-of-range");
 void
 scm_out_of_range (const char *subr, SCM bad_value)
 {
@@ -218,7 +218,7 @@
 }
 
 
-SCM_SYMBOL (scm_args_number_key, "wrong-number-of-args");
+SCM_GLOBAL_SYMBOL (scm_args_number_key, "wrong-number-of-args");
 void
 scm_wrong_num_args (SCM proc)
 {
@@ -241,7 +241,7 @@
 }
 
 
-SCM_SYMBOL (scm_arg_type_key, "wrong-type-arg");
+SCM_GLOBAL_SYMBOL (scm_arg_type_key, "wrong-type-arg");
 void
 scm_wrong_type_arg (const char *subr, int pos, SCM bad_value)
 {
@@ -273,7 +273,7 @@
 }
 
 
-SCM_SYMBOL (scm_memory_alloc_key, "memory-allocation-error");
+SCM_GLOBAL_SYMBOL (scm_memory_alloc_key, "memory-allocation-error");
 void
 scm_memory_error (const char *subr)
 {
@@ -284,7 +284,7 @@
             SCM_BOOL_F);
 }
 
-SCM_SYMBOL (scm_misc_error_key, "misc-error");
+SCM_GLOBAL_SYMBOL (scm_misc_error_key, "misc-error");
 void
 scm_misc_error (const char *subr, const char *message, SCM args)
 {
Index: guile/guile-core/libguile/error.h
diff -u guile/guile-core/libguile/error.h:1.31 
guile/guile-core/libguile/error.h:1.32
--- guile/guile-core/libguile/error.h:1.31      Fri Aug 31 10:42:31 2001
+++ guile/guile-core/libguile/error.h   Thu Sep 20 04:18:26 2001
@@ -51,6 +51,14 @@
 
 extern int scm_ints_disabled;
 
+extern SCM scm_system_error_key;
+extern SCM scm_num_overflow_key;
+extern SCM scm_out_of_range_key;
+extern SCM scm_args_number_key;
+extern SCM scm_arg_type_key;
+extern SCM scm_memory_alloc_key;
+extern SCM scm_misc_error_key;
+
 
 
 extern void scm_error (SCM key, const char *subr, const char *message,