diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2021-07-31 13:07:06 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2021-07-31 13:07:06 -0700 |
| commit | 0b4a373f69bf7e4684f03d622ee0c1f3be8e8df5 (patch) | |
| tree | 75bfd519115bf59c59cd7638c382ef3672b40ac5 /stdlib/struct.tl | |
| parent | b6983a3098d26727b9ca81a37c58cc01cef51341 (diff) | |
| download | txr-0b4a373f69bf7e4684f03d622ee0c1f3be8e8df5.tar.gz txr-0b4a373f69bf7e4684f03d622ee0c1f3be8e8df5.tar.bz2 txr-0b4a373f69bf7e4684f03d622ee0c1f3be8e8df5.zip | |
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.
Diffstat (limited to 'stdlib/struct.tl')
| -rw-r--r-- | stdlib/struct.tl | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/stdlib/struct.tl b/stdlib/struct.tl index 9108ab02..e156c3db 100644 --- a/stdlib/struct.tl +++ b/stdlib/struct.tl @@ -285,15 +285,18 @@ (let ((qpairs (mappend (aret ^(',@1 ,@2)) (tuples 2 pairs)))) (tree-case spec ((texpr . args) - (let ((type (sys:new-type op form texpr))) - (caseq op - ((new new*) (if qpairs - ^(make-struct ,type (list ,*qpairs) ,*args) - ^(struct-from-args ,type ,*args))) - ((lnew lnew*) ^(make-lazy-struct ,type - (lambda () - (cons (list ,*qpairs) - (list ,*args)))))))) + (if (and (eq texpr 'dwim) + (meq op 'new* 'lnew*)) + : + (let ((type (sys:new-type op form texpr))) + (caseq op + ((new new*) (if qpairs + ^(make-struct ,type (list ,*qpairs) ,*args) + ^(struct-from-args ,type ,*args))) + ((lnew lnew*) ^(make-lazy-struct ,type + (lambda () + (cons (list ,*qpairs) + (list ,*args))))))))) (texpr (let ((type (sys:new-type op form texpr))) (caseq op |