From dce8b7c20eaf1fbf1e7199eb04684a92c217d4d9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 6 Feb 2019 20:38:14 -0800 Subject: Switch demo2 and demo3 from roman numerals to hex. --- demo2.tl | 4 +++- demo3.tl | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/demo2.tl b/demo2.tl index 25bea85..f45baa6 100755 --- a/demo2.tl +++ b/demo2.tl @@ -21,7 +21,9 @@ ; Button number (bn) and button number text (bnt): (defun bn (n) (nth (pred n) '(11 22 33 44 55))) -(defun bnt (n) (format nil (if (eq numar 'a) "~d" "~x") (bn n))) +(defun bnt (n) + (let ((h-or-d (relate '(dec hex) '("~d" "~x")))) + (fmt [h-or-d numar] (bn n)))) (defun togglenumar () (upd numar toggle) diff --git a/demo3.tl b/demo3.tl index d2ec257..8aa89d8 100755 --- a/demo3.tl +++ b/demo3.tl @@ -13,6 +13,5 @@ (defun relabel (button number) (let* ((old (gtk_button_get_label button)) - (isdigits (<= 0 (- (chr-int [old 0]) (chr-int #\0)) 9)) - (new (format nil (if isdigits "~@R" "~d") number))) + (new (format nil (if (chr-isdigit [old 0]) "#x~x" "~d") number))) (xlabel button new))) -- cgit v1.2.3