Add top-level lisp file

8 files changed, 33 insertions, 37 deletions

diff --git a/src/01.lisp b/src/01.lisp
index 7f36bf1..36be5d6 100644
--- a/src/01.lisp
+++ b/src/01.lisp
@@ -1,5 +1,3 @@
-(load "../src/common.lisp")
-
 (defun 01/parse-input-direct (input)
   (mapcar 'parse-integer input))
 
diff --git a/src/02.lisp b/src/02.lisp
index 2eeb799..25d3e4f 100644
--- a/src/02.lisp
+++ b/src/02.lisp
@@ -1,7 +1,3 @@
-(load "../src/common.lisp")
-(ql:quickload 'uiop :silent t)
-(ql:quickload 'cl-ppcre :silent t)
-
 ;; Turn the input file into whatever form you will use for both parts
 ;; (get-file-lines) and (get-file-string) will be useful
 (defun 02/parse-input-direct (input)
@@ -28,6 +24,3 @@
         (up (decf a (cdr i)))
         (down (incf a (cdr i)))))
     (* h v)))
-
-;;(time (format t "part 2: ~a~%" (part-a (parse-input "../inputs/02.txt"))))
-;;(time (format t "part 2: ~a~%" (part-b (parse-input "../inputs/02.txt"))))
diff --git a/src/03.lisp b/src/03.lisp
index b1727fc..a9cd314 100644
--- a/src/03.lisp
+++ b/src/03.lisp
@@ -54,6 +54,3 @@
 (defun 03/part-b (parsed-input)
   (* (03/to-dec (03/recursive-b #'03/find-most-common parsed-input nil))
      (03/to-dec (03/recursive-b #'03/find-least-common parsed-input nil))))
-
-;;(time (format t "part 1: ~a~%" (03/part-a (03/parse-input "../inputs/03.txt"))))
-;;(time (format t "part 2: ~a~%" (03/part-b (03/parse-input "../inputs/03.txt"))))
diff --git a/src/common.lisp b/src/common.lisp
index 998db58..c59ea79 100644
--- a/src/common.lisp
+++ b/src/common.lisp
@@ -1,4 +1,2 @@
-(ql:quickload "uiop")
-
 (defun get-file-lines (name)
   (uiop:read-file-lines name))
diff --git a/test/01.lisp b/test/01.lisp
index aa02b7d..46bb1b5 100644
--- a/test/01.lisp
+++ b/test/01.lisp
@@ -1,9 +1,6 @@
-(ql:quickload "clunit")
-(load "../src/01.lisp")
-
 (use-package :clunit)
 
-(defsuite aoc-01 ())
+(defsuite 01/aoc (aoc))
 
 (defvar 01/default-input nil)
 
@@ -22,20 +19,20 @@
 ;;(time (format t "part 1: ~a~%" (part-a (parse-input "../inputs/01.txt"))))
 ;;(time (format t "part 1: ~a~%" (part-b (parse-input "../inputs/01.txt"))))
 
-(deftest 01/test-ex-a (aoc-01)
+(deftest 01/test-ex-a (01/aoc)
   (let ((result (01/part-a (01/parse-input-direct 01/default-input))))
     (assert-equalp 7 result)))
 
-(deftest 01/test-ex-b (aoc-01)
+(deftest 01/test-ex-b (01/aoc)
   (let ((result (01/part-b (01/parse-input-direct 01/default-input))))
     (assert-equalp 5 result)))
 
-(deftest 01/test-a (aoc-01)
-  (let ((result (01/part-a (01/parse-input "../inputs/01.txt"))))
+(deftest 01/test-a (01/aoc)
+  (let ((result (01/part-a (01/parse-input "inputs/01.txt"))))
     (assert-equalp 1451 result)))
 
-(deftest 01/test-b (aoc-01)
-  (let ((result (01/part-b (01/parse-input "../inputs/01.txt"))))
+(deftest 01/test-b (01/aoc)
+  (let ((result (01/part-b (01/parse-input "inputs/01.txt"))))
     (assert-equalp 1395 result)))
 
-(run-suite 'aoc-01)
+(defun 01/run-tests () (run-suite '01/aoc))
diff --git a/test/02.lisp b/test/02.lisp
index fd1a7ea..631dd92 100644
--- a/test/02.lisp
+++ b/test/02.lisp
@@ -1,9 +1,6 @@
-(ql:quickload "clunit")
-(load "../src/02.lisp")
-
 (use-package :clunit)
 
-(defsuite 02/aoc ())
+(defsuite 02/aoc (aoc))
 
 (defvar 02/default-input nil)
 
@@ -24,11 +21,11 @@
     (assert-equalp 900 result)))
 
 (deftest 02/test-a (02/aoc)
-  (let ((result (02/part-a (02/parse-input "../inputs/02.txt"))))
+  (let ((result (02/part-a (02/parse-input "inputs/02.txt"))))
     (assert-equalp 1561344 result)))
 
 (deftest 02/test-b (02/aoc)
-  (let ((result (02/part-b (02/parse-input "../inputs/02.txt"))))
+  (let ((result (02/part-b (02/parse-input "inputs/02.txt"))))
     (assert-equalp 1848454425 result)))
 
-(run-suite '02/aoc)
+(defun 02/run-tests () (run-suite '02/aoc))
diff --git a/test/03.lisp b/test/03.lisp
index 52ea534..000ece8 100644
--- a/test/03.lisp
+++ b/test/03.lisp
@@ -1,8 +1,6 @@
-(ql:quickload "clunit")
-
 (use-package :clunit)
 
-(defsuite 03/aoc ())
+(defsuite 03/aoc (aoc))
 
 (defvar 03/default-input nil)
 
@@ -29,11 +27,11 @@
     (assert-equalp 230 result)))
 
 (deftest 03/test-a (03/aoc)
-  (let ((result (03/part-a (03/parse-input "../inputs/03.txt"))))
+  (let ((result (03/part-a (03/parse-input "inputs/03.txt"))))
     (assert-equalp 3912944 result)))
 
 (deftest 03/test-b (03/aoc)
-  (let ((result (03/part-b (03/parse-input "../inputs/03.txt"))))
+  (let ((result (03/part-b (03/parse-input "inputs/03.txt"))))
     (assert-equalp 4996233 result)))
 
 (defun 03/run-tests () (run-suite '03/aoc))
diff --git a/top.lisp b/top.lisp
new file mode 100644
index 0000000..065291c
--- /dev/null
+++ b/top.lisp
@@ -0,0 +1,18 @@
+(ql:quickload 'uiop :silent t)
+(ql:quickload 'cl-ppcre :silent t)
+(ql:quickload 'clunit :silent t)
+
+(load "src/common.lisp")
+
+(clunit:defsuite aoc ())
+
+(load "src/01.lisp")
+(load "test/01.lisp")
+
+(load "src/02.lisp")
+(load "test/02.lisp")
+
+(load "src/03.lisp")
+(load "test/03.lisp")
+
+(defun run-all () (run-suite 'aoc))