From ec48df3cd8f6d561c5fa919dc5a3ffee25876401 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 21 Sep 2016 06:38:56 -0700 Subject: Fix broken sys:rslot place. This is used in the awk macro. Breaking test case is an update modification of f, like (push 3 f); a broken call to sys:rslotset is generated with a too few arguments. * share/txr/stdlib/struct.tl (defplace sys:rslot): Fix name clash between gensym and parameter. Add the meth-slot-sym parameter into the sys:rslotset call where it is missing as a required parameter. --- share/txr/stdlib/struct.tl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/txr/stdlib/struct.tl b/share/txr/stdlib/struct.tl index 0f3d79eb..6bf665fb 100644 --- a/share/txr/stdlib/struct.tl +++ b/share/txr/stdlib/struct.tl @@ -269,13 +269,13 @@ (defplace (sys:rslot struct sym meth-sym) body (getter setter - (with-gensyms (struct-sym slot-sym meth-sym) + (with-gensyms (struct-sym slot-sym meth-slot-sym) ^(slet ((,struct-sym ,struct) (,slot-sym ,sym) - (,meth-sym ,meth-sym)) + (,meth-slot-sym ,meth-sym)) (macrolet ((,getter () ^(slot ,',struct-sym ,',slot-sym)) - (,setter (val) ^(sys:rslotset ,',struct-sym - ,',slot-sym ,val))) + (,setter (val) ^(sys:rslotset ,',struct-sym ,',slot-sym + ,',meth-slot-sym ,val))) ,body)))) (ssetter ^(macrolet ((,ssetter (val) ^(progn -- cgit v1.2.3