Add cl-interpol

diff --git a/adventofcode2020.asd b/adventofcode2020.asd
index 69c5919bb0a6ce671b5af369b09d9c38eb2b61b6..1a39ad7606a0853bd117c34e66d0c354f4841b68 100644 (file)
--- a/adventofcode2020.asd
+++ b/adventofcode2020.asd
@@ -9,6 +9,7 @@
                :arrow-macros
                :cl-ppcre
                :cl-utilities
                :arrow-macros
                :cl-ppcre
                :cl-utilities

+               :cl-interpol

                :fn
                :fiveam)
   :pathname "src/"
                :fn
                :fiveam)
   :pathname "src/"

diff --git a/package.lisp b/package.lisp
index a21511cb8f526b2eb9124b20ddeb2ba8f62cfae7..54e35cf252da6775e1f15e41e063434e792e9993 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -1,6 +1,3 @@
-; (progn (ql:quickload :fiveam) 
-;        (ql:quickload :cl-ppcre) 
-;        (ql:quickload :fn))

 (defpackage :adventofcode2020
   (:use :cl 
         :arrow-macros
 (defpackage :adventofcode2020
   (:use :cl 
         :arrow-macros


@@ -13,3 +10,6 @@
                 :split-sequence-if 
                 :split-sequence-if-not)
   (:nicknames :aoc2020))
                 :split-sequence-if 
                 :split-sequence-if-not)
   (:nicknames :aoc2020))

+(in-package :adventofcode2020)
+(named-readtables:defreadtable :adventofcode2020
+  (:merge :standard fn-reader :interpol-syntax))

diff --git a/src/day03.lisp b/src/day03.lisp
index 093654f6acfe7ba082a2582e3ae957fa3c4e52f5..6098daabd933414cbbcbb08efc9e9e1ce7d95ab1 100644 (file)
--- a/src/day03.lisp
+++ b/src/day03.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun tree-collisions (slope tree-map)
   (loop with (rise run) = slope
 
 (defun tree-collisions (slope tree-map)
   (loop with (rise run) = slope

diff --git a/src/day04.lisp b/src/day04.lisp
index cb8916f414c0c6a90420d87a6ac4a9e0bfc3a46c..42e12d625878e4c5b54bef9a27d7803875ba5ac8 100644 (file)
--- a/src/day04.lisp
+++ b/src/day04.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun parse-passport (str-list)
   (flet ((parser (str)
 
 (defun parse-passport (str-list)
   (flet ((parser (str)

diff --git a/src/day06.lisp b/src/day06.lisp
index e116865cd5d652ed0a27d7b14671ae40b815a0f9..2f58f7210a2c1eacf85f5e310fbac72272d1c3c8 100644 (file)
--- a/src/day06.lisp
+++ b/src/day06.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun count-answers (join ans-list)
   (->> ans-list
 
 (defun count-answers (join ans-list)
   (->> ans-list

diff --git a/src/day07.lisp b/src/day07.lisp
index db50ca806cdc68a308d354f061f459b0dc585c64..13c4d334941e552ff72247f487e6a21469946fb0 100644 (file)
--- a/src/day07.lisp
+++ b/src/day07.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun parse-bag-rule (rule)
   (cl-ppcre:all-matches-as-strings 
 
 (defun parse-bag-rule (rule)
   (cl-ppcre:all-matches-as-strings 

diff --git a/src/day08.lisp b/src/day08.lisp
index 8d8f7c857e8fd0a34a451550dd849534c22a51a9..458a56294418d8b35684faeab9a6120ff60c6292 100644 (file)
--- a/src/day08.lisp
+++ b/src/day08.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun make-program (insts)
   (let ((len (length insts))
 
 (defun make-program (insts)
   (let ((len (length insts))

diff --git a/src/day09.lisp b/src/day09.lisp
index 7d5aab827679511cca00e3f5db3524134caef18f..c1a8a590bceb11cdce10c3b9c5fd609e733cc3c9 100644 (file)
--- a/src/day09.lisp
+++ b/src/day09.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun make-preambled-list (list k i)
   (subseq list (- i k) (1+ i)))
 
 (defun make-preambled-list (list k i)
   (subseq list (- i k) (1+ i)))

diff --git a/src/day10.lisp b/src/day10.lisp
index 5359b46c583573513c17eadf995936d6854ac7f7..7f37259dbc281d12548c3abc789d072efdc2ad97 100644 (file)
--- a/src/day10.lisp
+++ b/src/day10.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun joltage-distribution (ratings)
   (let* ((extended (append '(0) ratings (mapcar λ(+ 3 _) (last ratings)))))
 
 (defun joltage-distribution (ratings)
   (let* ((extended (append '(0) ratings (mapcar λ(+ 3 _) (last ratings)))))

diff --git a/src/day11.lisp b/src/day11.lisp
index f5641dcbb59932106d6de5098e783108fe44d471..ac4b8314f4d2d0a04986a67eb9d4e6f840fd1be6 100644 (file)
--- a/src/day11.lisp
+++ b/src/day11.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun parse-layout (layout)
   (make-array (list (length layout) (length (car layout)))
 
 (defun parse-layout (layout)
   (make-array (list (length layout) (length (car layout)))

diff --git a/src/day12.lisp b/src/day12.lisp
index 0dbfdfcf85db471c3381be10c28f92d462518a93..3e3b5562dea68ab9f8cb27c73780adcf6dc87cfd 100644 (file)
--- a/src/day12.lisp
+++ b/src/day12.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (defun parse-action (str)
   (cl-ppcre:register-groups-bind
 
 (defun parse-action (str)
   (cl-ppcre:register-groups-bind

diff --git a/src/dayNN.lisp b/src/dayNN.lisp
index bd53ef0b636a72e493f8c5e15213a6e009ad18c1..9e8375083c17bd93011d5861ffec96b26ac418b0 100644 (file)
--- a/src/dayNN.lisp
+++ b/src/dayNN.lisp
@@ -1,6 +1,6 @@
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)
 (asdf:load-system :adventofcode2020)
 (in-package #:adventofcode2020)

-(named-readtables:in-readtable fn-reader)
+(named-readtables:in-readtable :adventofcode2020)

 
 (day 00 input
   (let ((lines (list-from input)))
 
 (day 00 input
   (let ((lines (list-from input)))