[COMMIT] Correct some nesting of GCPRO and UNGCPRO, thank you Mats' buildbot!
I had *built* the last version with the C++ compiler, but I hadn’t compiled
the Lisp with it, which revealed the problems the below addresses.
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1301904759 -3600
# Node ID 484b437fc7b427b77cea75392465b10d533a6d98
# Parent e99b473303e3fe0b4198ea47578c483bdde09712
Correct some nesting of GCPRO and UNGCPRO, thank you Mats' buildbot!
2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net>
* fns.c (FremoveX):
* fns.c (sublis):
Correct some nesting of GCPRO and UNGCPRO here, revealed by the
the C++ build compiling core Lisp. Thank you Mats' buildbot!
diff -r e99b473303e3 -r 484b437fc7b4 src/ChangeLog
--- a/src/ChangeLog Mon Apr 04 00:20:09 2011 +0100
+++ b/src/ChangeLog Mon Apr 04 09:12:39 2011 +0100
＠＠ -1,3 +1,10 ＠＠
+2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * fns.c (FremoveX):
+ * fns.c (sublis):
+ Correct some nesting of GCPRO and UNGCPRO here, revealed by the
+ the C++ build compiling core Lisp. Thank you Mats' buildbot!
+
2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h (GC_EXTERNAL_LIST_LOOP_3, GC_EXTERNAL_LIST_LOOP_4): New.
diff -r e99b473303e3 -r 484b437fc7b4 src/fns.c
--- a/src/fns.c Mon Apr 04 00:20:09 2011 +0100
+++ b/src/fns.c Mon Apr 04 09:12:39 2011 +0100
＠＠ -3658,6 +3658,7 ＠＠
if (EQ (tail, tailing))
{
XUNGCPRO (elt);
+ UNGCPRO;
if (NILP (result))
{
＠＠ -9147,7 +9148,7 ＠＠
if (!CONSP (tree))
{
- RETURN_UNGCPRO (tree);
+ return tree;
}
aa = sublis (alist, XCAR (tree), check_test, test_not_unboundp, test, key,
＠＠ -9157,10 +9158,10 ＠＠
if (EQ (aa, XCAR (tree)) && EQ (dd, XCDR (tree)))
{
- RETURN_UNGCPRO (tree);
- }
-
- RETURN_UNGCPRO (Fcons (aa, dd));
+ return tree;
+ }
+
+ return Fcons (aa, dd);
}
DEFUN ("sublis", Fsublis, 2, MANY, 0, /*
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches