From eb327c0155b982619c4b8d1e2f7e6487adb0834a Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 14 Jun 2021 22:25:36 -0700 Subject: pic: take advantage of recent format work. * share/txr/stdlib/pic.tl (expand-pic-num): format can now do everything internally that is required of a 0####.## type pattern; we don't have to generate the if logic with the gensym. --- share/txr/stdlib/pic.tl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/share/txr/stdlib/pic.tl b/share/txr/stdlib/pic.tl index 8d5ce59e..6c2c8048 100644 --- a/share/txr/stdlib/pic.tl +++ b/share/txr/stdlib/pic.tl @@ -38,13 +38,8 @@ (let ((code (if (or minus plus (not zero)) ^(fmt ,`~@(len fmt),@(if plus "+")@(if zero "0")@(len fra)f` ,val) - (with-gensyms (vg) - ^(let ((,vg ,val)) - (if (minusp ,vg) - (fmt ,`~@(len fmt),@(if zero "0")@(len fra)f` - ,vg) - (rest (fmt ,`~@(succ (len fmt)),+@(if zero "0")@(len fra)f` - ,vg)))))))) + ^(fmt ,`~@(len fmt),-0@(len fra)f` + ,val)))) (if exc (with-gensyms (str) ^(let ((,str ,code)) -- cgit v1.2.3