From 0b4a373f69bf7e4684f03d622ee0c1f3be8e8df5 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sat, 31 Jul 2021 13:07:06 -0700 Subject: oop: fix infelicity in new* and lnew* macros. * stdlib/struct.tl (sys:new-expander): If the argument of new* or lnew* is dwim, then treat that as an expression, rather than as a boa-style construction. * tests/012/oop.tl: Tests for new* focusing on this issue. * txr.1: Documented. --- tests/012/oop.tl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/012/oop.tl b/tests/012/oop.tl index ac93790f..e9c256b8 100644 --- a/tests/012/oop.tl +++ b/tests/012/oop.tl @@ -77,3 +77,17 @@ (prinl d) (prinl (list b.sa b.sb b.sc b.x b.y)) (prinl (list d.sa d.sb d.sc d.x d.y))) + +(defstruct (ab a : b) () a b) + +(mtest + (new* (find-struct-type 'ab) a 1) :error + (new* ((find-struct-type 'ab)) a 1) #S(ab a 1 b nil) + (new* [find-struct-type 'ab] a 1) #S(ab a 1 b nil) + (new* ([find-struct-type 'ab] 1 2)) #S(ab a 1 b 2) + (new* ((find-struct-type 'ab) 1 2)) #S(ab a 1 b 2) + (new* ([find-struct-type 'ab] 1) b 2) #S(ab a 1 b 2) + (let ((type (find-struct-type 'ab))) + (new* type a 3 b 4)) #S(ab a 3 b 4) + (let ((type (find-struct-type 'ab))) + (new* (type 3 4))) #S(ab a 3 b 4)) -- cgit v1.2.3