summaryrefslogtreecommitdiff
path: root/libguile/eval.c
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>1996-10-27 02:38:39 +0000
committerGary Houston <ghouston@arglist.com>1996-10-27 02:38:39 +0000
commit523f52665864ee9a07d3b74e4d5f4374b21aee41 (patch)
treefcb0cd1cacd486d22f3a57f9a9debb4f862a6153 /libguile/eval.c
parent3065a62a4c3e44ec424cfa0f13f74479d07bf83f (diff)
downloadguile-523f52665864ee9a07d3b74e4d5f4374b21aee41.tar.gz
* load.c: change s_try_load and s_try_load_path to s_primitive_load
and s_primitive_load_path. * eval.c, load.c, error.c (scm_wta): use scm_misc_error. * error.h: don't declare error symbols. prototype for scm_misc_error. * stackchk.c (scm_stack_overflow_key): defined here instead of in error.c. * error.c: use SCM_SYMBOL to set up error keys. scm_misc_error: new procedure.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r--libguile/eval.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index 6bb13543d..32fd95b28 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -235,13 +235,11 @@ scm_lookupcar (vloc, genv)
var = SCM_CAR (var);
errout:
/* scm_everr (vloc, genv,...) */
- scm_error (scm_misc_error_key,
- NULL,
- SCM_NULLP (env)
- ? "Unbound variable: %S"
- : "Damaged environment: %S",
- scm_listify (var, SCM_UNDEFINED),
- SCM_BOOL_F);
+ scm_misc_error (NULL,
+ SCM_NULLP (env)
+ ? "Unbound variable: %S"
+ : "Damaged environment: %S",
+ scm_listify (var, SCM_UNDEFINED));
}
#endif
SCM_SETCAR (vloc, var + 1);
@@ -397,11 +395,9 @@ scm_m_vref (xorig, env)
if (SCM_NIMP(x) && UDSCM_VARIABLEP (SCM_CAR (x)))
{
/* scm_everr (SCM_UNDEFINED, env,..., "global variable reference") */
- scm_error (scm_misc_error_key,
- NULL,
- "Bad variable: %S",
- scm_listify (SCM_CAR (SCM_CDR (x)), SCM_UNDEFINED),
- SCM_BOOL_F);
+ scm_misc_error (NULL,
+ "Bad variable: %S",
+ scm_listify (SCM_CAR (SCM_CDR (x)), SCM_UNDEFINED));
}
ASSYNT (SCM_NIMP(x) && DEFSCM_VARIABLEP (SCM_CAR (x)),
xorig, s_variable, s_vref);
@@ -1735,11 +1731,9 @@ dispatch:
proc = x;
badfun:
/* scm_everr (x, env,...) */
- scm_error (scm_misc_error_key,
- NULL,
- "Wrong type to apply: %S",
- scm_listify (proc, SCM_UNDEFINED),
- SCM_BOOL_F);
+ scm_misc_error (NULL,
+ "Wrong type to apply: %S",
+ scm_listify (proc, SCM_UNDEFINED));
case scm_tc7_vector:
case scm_tc7_wvect:
case scm_tc7_bvect: