diff options
| -rw-r--r-- | cantedraw.asd | 1 | ||||
| -rw-r--r-- | main.lisp | 27 | ||||
| -rw-r--r-- | packages.lisp | 4 |
3 files changed, 26 insertions, 6 deletions
diff --git a/cantedraw.asd b/cantedraw.asd index 653afb4..c3dcc4e 100644 --- a/cantedraw.asd +++ b/cantedraw.asd @@ -1,4 +1,5 @@ (asdf:defsystem :cantedraw + :depends-on (:alexandria) :components ((:file "packages") (:file "lib.macros") (:file "lib.functions") @@ -32,7 +32,8 @@ (remove-if #'null))) (fn read-integers () (-> nil list) - (->> (read-input "Enter numbers: ") + (->> "Enter numbers: " + read-input parse-integers)) (fn read-until-integers () (-> nil list) @@ -43,8 +44,24 @@ (setq inp (read-integers))) inp)) +(fn is-valid-hand-index (n) (-> (fixnum) boolean) + (and (< n 5) + (>= n 0))) + +(fn read-until-valid-integers () (-> nil list) + (let ((inp (remove-duplicates (read-integers)))) + (while (not (every #'is-valid-hand-index inp)) + (format t "Need at most 5 integers between 0 and 4...~%") + (force-output) + (setq inp (remove-duplicates (read-integers)))))) + +(defun generate-hand () + (->> (make-deck) + alexandria:shuffle + (split 5))) + (defun start () - (--> var - (read-until-integers) - (cons '+ var) - (format t "~a = ~a~%" var (eval var)))) + (destructuring-bind (hand . rest) (generate-hand) + (declare (ignore rest)) + (->> hand cardset->str (format t "Hand=[~a]~%")) + (force-output))) diff --git a/packages.lisp b/packages.lisp index 28fd51b..90c6dcf 100644 --- a/packages.lisp +++ b/packages.lisp @@ -48,5 +48,7 @@ :make-joker :make-deck)) (defpackage cantedraw.main - (:use :cl :cantedraw.lib.macros :cantedraw.lib.functions) + (:use :cl + :cantedraw.lib.macros :cantedraw.lib.functions + :cantedraw.model) (:export :start)) |