summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog5
-rw-r--r--libguile/eval.c2
-rw-r--r--test-suite/ChangeLog5
-rw-r--r--test-suite/tests/chars.test3
4 files changed, 12 insertions, 3 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index f3922fac5..708fb57a1 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,10 @@
2003-06-05 Dirk Herrmann <D.Herrmann@tu-bs.de>
+ * eval.c: Partially undid my patch from 2003-05-31. This patch
+ caused the segfault referenced in the previous changelog entry.
+
+2003-06-05 Dirk Herrmann <D.Herrmann@tu-bs.de>
+
* tags.h: Fixed comment about the immediate type code layout.
* eval.c: Fixed handling of non-special instructions. Without
diff --git a/libguile/eval.c b/libguile/eval.c
index 48a76e731..e84ac23f9 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -2448,7 +2448,7 @@ dispatch:
/* new syntactic forms go here. */
case SCM_BIT7 (SCM_MAKISYM (0)):
proc = SCM_CAR (x);
- if (!SCM_IFLAGP (proc))
+ if (!SCM_ISYMP (proc))
goto evapply;
switch (SCM_ISYMNUM (proc))
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index af8cfda4a..dcd6850b0 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,5 +1,10 @@
2003-06-05 Dirk Herrmann <D.Herrmann@tu-bs.de>
+ * tests/chars.test: Fixed test comment. The bug that this test
+ detects was actually introduced by my patch from 2003-05-31.
+
+2003-06-05 Dirk Herrmann <D.Herrmann@tu-bs.de>
+
* tests/chars.test: Added test, attempting to apply a character.
This test will only pass if the other changes that are submitted
together with this patch are also applied.
diff --git a/test-suite/tests/chars.test b/test-suite/tests/chars.test
index 7b86dea19..934694f0c 100644
--- a/test-suite/tests/chars.test
+++ b/test-suite/tests/chars.test
@@ -29,8 +29,7 @@
(with-test-prefix "evaluator"
- ;; Guile prior to 2003-06-05 segfaulted on the following test, because
- ;; within the evaluator there was no distinction between the
+ ;; The following test makes sure that the evaluator distinguishes between
;; evaluator-internal instruction codes and characters.
(pass-if-exception "evaluating chars"
exception:wrong-type-to-apply