Fix more tests -- broken after encryption

package.lisp

@@ -84,6 +84,7 @@
     :parse-char
     :extract-positive-integers
     :extract-integers
+    :extract-forms
 
     :define-solution
     :define-test))

src/2022/day02.lisp

@@ -1,9 +1,9 @@
 (defpackage :aoc/2022/02 #.cl-user::*aoc-use*)
 (in-package :aoc/2022/02)
 
-(defun parse-moves ()
+(defun parse-moves (&optional (strings (uiop:read-file-lines #P"src/2022/day02.txt")))
   (flet ((move (v) (ecase v ((a x) 'r) ((b y) 'p) ((c z) 's))))
-    (loop for (them you) on (uiop:read-file-forms #P"src/2022/day02.txt") by #'cddr
+    (loop for (them you) in (mapcar #'extract-forms strings)
           collect (cons (move them) (move you)))))
 
 (defun win? (you them) (member (list you them) '((r s) (p r) (s p)) :test 'equal))
@@ -16,9 +16,9 @@
         else if (win? you them) sum (+ (move-score you) 6)
         else sum (+ (move-score you) 3)))
 
-(defun parse-moves2 ()
+(defun parse-moves2 (&optional (strings (uiop:read-file-lines #P"src/2022/day02.txt")))
   (flet ((move (v) (ecase v (a 'r) (b 'p) (c 's))))
-    (loop for (them you) on (uiop:read-file-forms #P"src/2022/day02.txt") by #'cddr
+    (loop for (them you) in (mapcar #'extract-forms strings)
           collect (let ((them (move them)))
                     (cons
                       them
@@ -30,9 +30,9 @@
 
 (defun loses-to (you) (ecase you (r 's) (p 'r) (s 'p)))
 
-(defun solution-run ()
-  (values (solve (parse-moves))
-          (solve (parse-moves2))))
+(define-solution (2022 02) (strings)
+  (values (solve (parse-moves strings))
+          (solve (parse-moves2 strings))))
 
 (define-test (2022 02) (14297 10498))
 

src/2022/day03.lisp

@@ -1,22 +1,21 @@
 (defpackage :aoc/2022/03 #.cl-user::*aoc-use*)
 (in-package :aoc/2022/03)
 
-(defun backpacks ()
-  (mapcar [coerce _ 'list]
-          (uiop:read-file-lines #P"src/2022/day03.txt")))
+(defun backpacks (&optional (strings (uiop:read-file-lines #P"src/2022/day03.txt")))
+  (mapcar [coerce _ 'list] strings))
 
 (defun item-priority (c)
   (1+ (position c "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")))
 
 (defun find-duplicate-item (&rest lists)
   (first (reduce #'intersection (cdr lists) :initial-value (car lists))))
 
-(defun solution-run ()
+(define-solution (2022 03) (bps backpacks)
   (values
-    (loop for pack in (backpacks)
+    (loop for pack in bps
           for (c1 c2) = (split pack (/ (length pack) 2))
           sum (item-priority (find-duplicate-item c1 c2)))
-    (loop for (b1 b2 b3) on (backpacks) by #'cdddr
+    (loop for (b1 b2 b3) on bps by #'cdddr
           sum (item-priority (find-duplicate-item b1 b2 b3)))))
 
 (define-test (2022 03) (7746 2604))

src/2022/day04.lisp

@@ -2,12 +2,11 @@
 (in-package :aoc/2022/04)
 
 
-(defun assignment-pairs ()
-  (mapcar [extract-positive-integers _]
-          (uiop:read-file-lines #P"src/2022/day04.txt")))
+(defun assignment-pairs (&optional (strings (uiop:read-file-lines #P"src/2022/day04.txt")))
+  (mapcar [extract-positive-integers _] strings))
 
-(defun solution-run ()
-  (loop for (a b c d) in (assignment-pairs)
+(define-solution (2022 04) (strings)
+  (loop for (a b c d) in (assignment-pairs strings)
         count (or (<= a c d b) (<= c a b d)) into part1
         count (or (<= a c b d) (<= a c d b)
                   (<= c a d b) (<= c a b d)) into part2

src/2022/day05.lisp

@@ -19,21 +19,21 @@
 (defun top-crates (stacks)
   (format nil "~{~A~}" (map 'list #'car (subseq stacks 1))))
 
-(defun part1 ()
-  (destructuring-bind (stacks moves) (parse-input)
+(defun part1 (&optional (input (parse-input)))
+  (destructuring-bind (stacks moves) input
    (loop for (n from to) in moves do
          (loop repeat n do (push (pop (aref stacks from)) (aref stacks to)))
          finally (return (top-crates stacks)))))
 
-(defun part2 ()
-  (destructuring-bind (stacks moves) (parse-input)
+(defun part2 (&optional (input (parse-input)))
+  (destructuring-bind (stacks moves) input
     (loop for (n from to) in moves do
           (loop for a in (reverse (loop repeat n collect (pop (aref stacks from))))
                 do (push a (aref stacks to)))
           finally (return (top-crates stacks)))))
 
-(defun solution-run ()
-  (values (part1) (part2)))
+(define-solution (2022 05) (strings)
+  (values (part1 (parse-input strings)) (part2 (parse-input strings))))
 
 (define-test (2022 05) ("SVFDLGLWV" "DCVTCVPCL"))
 

src/2022/day06.lisp

@@ -7,8 +7,8 @@
 (defun all-distinct (seq)
   (= (length (remove-duplicates seq)) (length seq)))
 
-(defun solution-run ()
-  (values (marker-position 4) (marker-position 14)))
+(define-solution (2022 06) (s first)
+  (values (marker-position 4 s) (marker-position 14 s)))
 
 (define-test (2022 06) (1702 3559))
 

src/2022/day08.lisp

@@ -38,7 +38,7 @@
         (loop for jj from (1+ j) below n sum 1 while (smallerp i jj))))))
 
 
-(defun solution-run (&optional (map (parse-map)))
+(define-solution (2022 08) (map parse-map)
   (values (part1 map) (part2 map)))
 
 (define-test (2022 08) (1719 590824))

src/2022/day10.enc

@@ -1 +1 @@
-(:C "WW8XehlJvZLgDZZk3yiDwgXv7JGnLN3g4qbDgtkHiYS99Uqh71E/5tqoykfUycWKBJe00NrDX/lWZJghCOiDu6xwH9zPR7zKkCfdnTHflfbVEzX3zVmAN5Bp/Gjf3QX5xxT5yKHFDhlGivYHyQDR5kVhqEDdVNp/76M66hYGTb8AdCA13qYaJcRyo3C4JAQ4x3/DSFnEHyTUsoxq/dPTgfsZ3bYNpT66BhsrEh1r0s3lsXxnEznnIkUDG7sW1Hw35c0YeooLpvy575/MSCcQ/NBAUAPFbz8pSSrWidSSyBKq6U6+Vm0xbKENApr0Ya22pRVamrc1oeLv6C46QK2yK2VGw4h/yVHlsN6JpHmKdAXYkTvQJ8OjfeXxTioBs9jjxl0ZlYK5dvR99nG9RKEgMSaH5DvvMdOPrnVgS8jLCOkvdNnCBmbSpIeZUVJjDQA4ud9/phYh/lXqdMrzKcwiMtDvRmkQgx0jhSx/jLpe4GcSgNZV7k0d7PM/ghA7MEWQcBBIo4HDn4Z1iXh2R7tD99kN09eT4sSwkGUpFemFZzFHPKepSmPBEJkAj3fc+ojFV8fmg9Bg3snyoWmweB+7rkufNamSEXgxOcwXaLyCPB0p0UIoTaESrwhJJtMsrWFYAUQt8fw5LT4g0IGEqIuBZFLvhrYgp7qxoNvvnPWm60Hr/73chiHcbyF45uFTzTuly51m7W26FEUUhTaPG39djerpPVOTvLXXaRJgLNw2Iqcjhl1uy+NjupM5fS1CzEQRKVx7bkED1NlokakmcKe3AqZFvRkee0q1UpHXHEXK5tQWgIFcx12FGh4gbvd1f6w/kXSwXaf737gLYdfIS1YM0HYWGDdp7QHvUV9CvvtWmDbNPA269DFRXx5SwlCI33UtbD6j7G+j3iyU+PwSoukPtMPv9QKtql21uobhqGEptXGxjG3L5FMNvkKC+FR+zTzXKxLZPiVIx4KDVkC03F0GOZHri/fDEhjGhUhunsUBFPs4yBg0+bo2XVstuxRns5FxguistwRw1ktszrCwasfVjDJJanqQ5cSTi64g9lHqBgaM3q0c0iiLIzTnpJCZ9I+HXjxmOsHHOc2ZDo+yl+ibRfluS4N9YAmGmIQ/E+hnvDgbQuvBSuQZs5i7z0QBtk/35Xb0eMqYU2qNpLgzaET8eFq6HbB9yhLk2fJTAHtKRUWz+EL/kzpLwRHfYP/qfIg5lhnWYIc/CwTh1reAtMkGEZWf/iwChy5oUuh0bWmeY80TQyYBrSo=" :I "2mnPWOCAZYVr9dvUh15mN+ttvYOeTgH6hp72gwAKmp4=" :G "m3g8jJ0ZAQpVPvPQCsVaaQ==")
+(:C "fNXE84IVT2MhCsj6I7GvQ0kFZ/8mPNlaakjdNRIDN4JysIFfztvwdinxJvs0HDgGiQHHzfooHr9i//Uy7z4JDJo3esVzsLqc5qMzV4MaopgPrxVNs7xjbkfm5pBfEoqSGg2mRqa/L8E8EkC1bW3RLKIMiAsREmnG872YpmjOON9QwCPwQ3mPmYITUp7i6hveGMClfWaxdQpVakduF3GB6qfwQL5z8AihxJfZIMJGVAXZgH/sl9q7nDOZNINLJ8ToiWYg1V2xqs4qbwN/zTsYu866bzDfNlWCwIQ09TadwKezY16C54iR9Jn2n3PXVzWD0pZWBG/IqA6ALUJxWffdmifgUwlDC5Mbp7ofo+v+4ZdUk170z+T5pJA5orjgMieONwJSSZBYD3F/t5zhGFB4GL3k+YA3+FSJzurVPAlWYt/k/vjRbEM+u2a6cFHQ1Epp6RI6HaepJLJm6YUhH+XyzKnPALSmL80myCavllIKhYxZvUyImsoXt70xz2G1H7gDGdv3z4jTT5zZyvaIxmTsGohqHQdDF+hg6vavlszvhb1TIFNPzaZT63hea5MvLJaOqItIk9iOEa8EzGuhAs3ZYrQzFSz3QtAtrFN3g7EQgfaU0B7j/dcShrUUxWr8buXwpsHP0IeFl7XGqewsM1IWtY0+yTQvpNbw6t1lPe0b/MDIxerTIyA3+K/+MlLl2IL9u6L9HBbXY68oO2rsUfSUP1+NK6QOOMx35Fth9BNGMbIRJ/oYEpv1yrXBCKtz/FaJgLLQCfFdnAjTV0fLCVZ6zKRKNqNxYrcl9K9qN5iAMh+8M6/PrtlMPnK4pF3Uu3eZRZb2Zde/pAfWiFon82K3as8cnmWEK+fyb8Ql7j2atbOaH6AuIZ4qax+LvSjFkKfxQIMXwJ9SICHuWDBU8VS6QMGVPYucvMSu8DvlmjWY+hKPvieJubU1dYIPePn7hcCkGZZhaDno74Qyn1YYgXwXT1PNie1LXsC1L5uvEQmrnlJ+OUX83IqM7X3o05TR3KslXgFuTsM9jSy5LOA0+z43UVa9CA/0TVif7DixQP8oVCySBoFCTp2LU3ygYjrpK9khvPW6VPRsVbpepJQszUthrKdm0S8atyCgJP276WwcQIJG21DMLrt4pVRnd7QqfqWrD+S25T8iyAMwZjeID7n4rmPL7drzEilshoVvHca5XlKaDoKNhUEn2jdnIRIOo7ii1XtsQ+qRhRekP2xoIN4IkmqnX8gY28OkvVO8/U5HGR7LGoLb7mQ=" :I "pja9ckuyvN4Qnq29mwg222ZHxiPG1X3f/RW2do31stA=" :G "0uLYtPRmshMJqHt33qJ4sw==")

src/2022/day10.lisp

@@ -2,7 +2,10 @@
 (in-package :aoc/2022/10)
 
 
-(defun solution-run (&optional (program (uiop:read-file-forms #P"src/2022/day10.txt")))
+(defun parse-program (&optional (strings (uiop:read-file-lines #P"src/2022/day10.txt")))
+  (reduce #'nconc (mapcar #'extract-forms strings)))
+
+(define-solution (2022 10) (program parse-program)
   (let ((crt (make-array (list 6 40))) (cycle 1) (x 1) (part1 0))
     (dolist (token program)
       (when (member cycle (list 20 60 100 140 180 220))

src/2022/day11.lisp

@@ -74,22 +74,22 @@
                          :throw-if-not-div (parse-number (pop g)))))
     monkeys))
 
-(defun solve (&optional (monkeys (parse-monkeys #+#:excluded (uiop:read-file-lines #P"scratch.txt"))))
-  (bnd1 (counts (make-array (length monkeys) :initial-element 0))
-    (loop repeat 20 do
-          (loop for m across monkeys for i from 0 do
-                (loop until (queue-empty-p (items m)) for wl = (dequeue (items m)) do
-                      (incf (aref counts i))
-                      (bnd1 nwl
-                        (setf nwl (funcall (operation m) wl))
-                        (setf nwl (floor nwl 3))
-                        (if (dividesp (div-by m) nwl)
-                          (enqueue nwl (items (aref monkeys (throw-if-div m))))
-                          (enqueue nwl (items (aref monkeys (throw-if-not-div m)))))))))
-    (reduce #'* (sort counts #'>) :end 2)))
-
-
-(solve)
+#+#:excluded (defun solve (&optional (monkeys (parse-monkeys #+#:excluded (uiop:read-file-lines #P"scratch.txt"))))
+               (bnd1 (counts (make-array (length monkeys) :initial-element 0))
+                 (loop repeat 20 do
+                       (loop for m across monkeys for i from 0 do
+                             (loop until (queue-empty-p (items m)) for wl = (dequeue (items m)) do
+                                   (incf (aref counts i))
+                                   (bnd1 nwl
+                                     (setf nwl (funcall (operation m) wl))
+                                     (setf nwl (floor nwl 3))
+                                     (if (dividesp (div-by m) nwl)
+                                       (enqueue nwl (items (aref monkeys (throw-if-div m))))
+                                       (enqueue nwl (items (aref monkeys (throw-if-not-div m)))))))))
+                 (reduce #'* (sort counts #'>) :end 2)))
+
+
+#+#:excluded (solve)
 
 ;; I don't know how to use divides anymore (flipped the order of its operands)
 
@@ -108,7 +108,7 @@
                           (enqueue nwl (items (aref monkeys (throw-if-not-div m)))))))))
     (reduce #'* (sort counts #'>) :end 2)))
 
-(solve)
+#+#:excluded (solve)
 
 ;;;
 
@@ -164,8 +164,8 @@
                           (enqueue nwl (items (aref monkeys (throw-if-not-div m)))))))))
     (reduce #'* (sort counts #'>) :end 2)))
 
-(defun solution-run ()
-  (values (solve 20    (parse-monkeys))
-          (solve 10000 (parse-monkeys) t)))
+(define-solution (2022 11) (strings)
+  (values (solve 20    (parse-monkeys strings))
+          (solve 10000 (parse-monkeys strings) t)))
 
 (define-test (2022 11) (119715 18085004878))

src/2022/day12.lisp

@@ -27,7 +27,7 @@
                                            (aref map i j) 25)
                     (setf (aref map i j) (- (char-code ch) (char-code #\a)))))))
     (list map start end)))
-(parse-map)
+#+#:excluded (parse-map)
 (- (char-code #\b) (char-code #\a))
 
 (defun solve ()

src/utils.lisp

@@ -822,6 +822,9 @@
 (defun extract-integers (s)
   (mapcar #'parse-integer (cl-ppcre:all-matches-as-strings "-?\\d+" s)))
 
+(defun extract-symbols (s)
+  (mapcar #'read-from-string (cl-ppcre:all-matches-as-strings "\\w+" s)))
+
 ;;;; Problems -----------------------------------------------------------------
 
 (defun read-decrypted-problem-input (year day)