commit 1fa3f18602dc9132a51f0bf72ed96f6c773b04c1
parent a42c098253c0b4a234ebc0444cc100e19fdfa9c0
Author: Lukas Henkel <lh@entf.net>
Date: Sat, 3 Dec 2022 09:40:20 +0100
A bit of cleanup for the previous days
Diffstat:
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/day01.lisp b/src/day01.lisp
@@ -11,7 +11,7 @@
(when (> current max)
(setf max current))
(setf current 0))
- (setf current (+ current input))))
+ (incf current input)))
(when (> current max)
(setf max current))
max))
@@ -24,7 +24,7 @@
(progn
(push current elves)
(setf current 0))
- (setf current (+ current input))))
+ (incf current input)))
(push current elves)
(setf elves (sort elves #'>))
(apply #'+ (subseq elves 0 3))))
diff --git a/src/day02.lisp b/src/day02.lisp
@@ -8,11 +8,9 @@
(if (= (car input) (cdr input))
(incf score 3)
(trivia:match input
- ((cons 1 2)
- (incf score 6))
- ((cons 2 3)
- (incf score 6))
- ((cons 3 1)
+ ((or (cons 1 2)
+ (cons 2 3)
+ (cons 3 1))
(incf score 6))))
(incf score (cdr input)))
score))
@@ -28,17 +26,14 @@
(if (= (cdr input) 2)
(incf score (car input))
(trivia:match input
- ((cons 1 1)
+ ((or (cons 1 1)
+ (cons 2 3))
(incf score 3))
- ((cons 1 3)
+ ((or (cons 1 3)
+ (cons 3 1))
(incf score 2))
- ((cons 2 1)
- (incf score 1))
- ((cons 2 3)
- (incf score 3))
- ((cons 3 1)
- (incf score 2))
- ((cons 3 3)
+ ((or (cons 2 1)
+ (cons 3 3))
(incf score 1)))))
score))
