summaryrefslogtreecommitdiff
path: root/libguile/eval.c
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2003-11-08 08:11:14 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2003-11-08 08:11:14 +0000
commitced8edb0f9545e7e37ec62cf7ab6c0c1c66fe1db (patch)
tree4aca6e37b765f5e260f08e5b4ff1646bd65937f5 /libguile/eval.c
parenta5fda890f5b9eb07240355924ccaf78ba842bcaf (diff)
downloadguile-ced8edb0f9545e7e37ec62cf7ab6c0c1c66fe1db.tar.gz
* libguile/eval.c (s_missing_body_expression): New static identifier.
(s_body): Removed. (scm_m_expand_body): Fixed core dump when passing a body with defines, but without expressions (see additions to syntax.test). Use ASSERT_SYNTAX to signal syntax errors. * test-suite/tests/syntax.test (exception:missing-body-expr): New. Renamed section 'define' to 'top-level define' and added a new section 'internal define' with some tests.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r--libguile/eval.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index e86b8e9d0..266066ef7 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -114,6 +114,12 @@ static const char s_expression[] = "Missing or extra expression in";
* context, a 'Missing expression' error is signalled. */
static const char s_missing_expression[] = "Missing expression in";
+/* A body may hold an arbitrary number of internal defines, followed by a
+ * non-empty sequence of expressions. If a body with an empty sequence of
+ * expressions is detected, a 'Missing body expression' error is signalled.
+ */
+static const char s_missing_body_expression[] = "Missing body expression in";
+
/* If a form is detected that holds more expressions than are allowed in that
* context, an 'Extra expression' error is signalled. */
static const char s_extra_expression[] = "Extra expression in";
@@ -408,7 +414,6 @@ SCM_REC_MUTEX (source_mutex);
static const char s_test[] = "bad test";
-static const char s_body[] = "bad body";
static const char s_bindings[] = "bad bindings";
static const char s_duplicate_bindings[] = "duplicate bindings";
static const char s_variable[] = "bad variable";
@@ -1826,7 +1831,6 @@ SCM
scm_m_expand_body (SCM xorig, SCM env)
{
SCM x = SCM_CDR (xorig), defs = SCM_EOL;
- char *what = SCM_ISYMCHARS (SCM_CAR (xorig)) + 2;
while (SCM_NIMP (x))
{
@@ -1861,6 +1865,10 @@ scm_m_expand_body (SCM xorig, SCM env)
}
}
+ /* FIXME: xorig is already partially memoized and does not hold information
+ * about the file location. */
+ ASSERT_SYNTAX (SCM_CONSP (x), s_missing_body_expression, xorig);
+
if (!SCM_NULLP (defs))
{
SCM rvars, inits, body, letrec;
@@ -1873,7 +1881,6 @@ scm_m_expand_body (SCM xorig, SCM env)
}
else
{
- SCM_ASSYNT (SCM_CONSP (x), s_body, what);
SCM_SETCAR (xorig, SCM_CAR (x));
SCM_SETCDR (xorig, SCM_CDR (x));
}