diff options
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 |