From ab01c2f9e41bb5c9be6c3ed1a510577c6cd592a1 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 19 Dec 2023 18:27:31 -0600
Subject: [PATCH] day 17 part 2 solved

D'oh; copy-and-paste bites again.  At 52.6s, this is now my slowest
solution; probably room for optimization.
---
 2023/day17.m4 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/2023/day17.m4 b/2023/day17.m4
index efb4296..188bff3 100644
--- a/2023/day17.m4
+++ b/2023/day17.m4
@@ -43,8 +43,8 @@ define(`vn2', `w($@, 1)n($@, 3)e($@, 1)')
 define(`vn3', `w($@, 1)e($@, 1)')
 
 define(`vE1', `ifdef(`g'eval($1+4)`_$2', `addwork(eval($1+4), $2, `E4',
-  $3+defn(`g'eval($1+1)`_$2')+defn(`g'eval($1+2)`_$2')+defn(`g'eval($1+3)`_$2')
-  +defn(`g'eval($1+4)`_$2'), `$4EEEE')')')
+  $3+defn(`g'eval($1+1)`_$2')+defn(`g'eval($1+2)`_$2')+defn(`g'eval($1+3
+  )`_$2')+defn(`g'eval($1+4)`_$2'), `$4EEEE')')')
 define(`vE4', `vN1($@)E($@, 5)vS1($@)')
 define(`vE5', `vN1($@)E($@, 6)vS1($@)')
 define(`vE6', `vN1($@)E($@, 7)vS1($@)')
@@ -53,8 +53,8 @@ define(`vE8', `vN1($@)E($@, 9)vS1($@)')
 define(`vE9', `vN1($@)E($@, 10)vS1($@)')
 define(`vE10', `vN1($@)vS1($@)')
 define(`vS1', `ifdef(`g$1_'eval($2+4), `addwork($1, eval($2+4), `S4',
-  $3+defn(`g$1_'eval($2+1))+defn(`g$1_'eval($2+2))+defn(`g$1_'eval($2+3))
-  +defn(`g$1_'eval($2+4)), `$4SSSS')')')
+  $3+defn(`g$1_'eval($2+1))+defn(`g$1_'eval($2+2))+defn(`g$1_'eval($2+3
+  ))+defn(`g$1_'eval($2+4)), `$4SSSS')')')
 define(`vS4', `vE1($@)S($@, 5)vW1($@)')
 define(`vS5', `vE1($@)S($@, 6)vW1($@)')
 define(`vS6', `vE1($@)S($@, 7)vW1($@)')
@@ -63,8 +63,8 @@ define(`vS8', `vE1($@)S($@, 9)vW1($@)')
 define(`vS9', `vE1($@)S($@, 10)vW1($@)')
 define(`vS10', `vE1($@)vW1($@)')
 define(`vW1', `ifdef(`g'eval($1-4)`_$2', `addwork(eval($1-4), $2, `W4',
-  $3+defn(`g'eval($1-1)`_$2')+defn(`g'eval($1-2)`_$2')+defn(`g'eval($1-3)`_$2')
-  +defn(`g'eval($1-4)`_$2'), `$4WWWW')')')
+  $3+defn(`g'eval($1-1)`_$2')+defn(`g'eval($1-2)`_$2')+defn(`g'eval($1-3
+  )`_$2')+defn(`g'eval($1-4)`_$2'), `$4WWWW')')')
 define(`vW4', `vS1($@)W($@, 5)vN1($@)')
 define(`vW5', `vS1($@)W($@, 6)vN1($@)')
 define(`vW6', `vS1($@)W($@, 7)vN1($@)')
@@ -72,9 +72,9 @@ define(`vW7', `vS1($@)W($@, 8)vN1($@)')
 define(`vW8', `vS1($@)W($@, 9)vN1($@)')
 define(`vW9', `vS1($@)W($@, 10)vN1($@)')
 define(`vW10', `vS1($@)vN1($@)')
-define(`vN1', `ifdef(`g$1_'eval($2+4), `addwork($1, eval($2+4), `N4',
-  $3+defn(`g$1_'eval($2+1))+defn(`g$1_'eval($2+2))+defn(`g$1_'eval($2+3))
-  +defn(`g$1_'eval($2+4)), `$4NNNN')')')
+define(`vN1', `ifdef(`g$1_'eval($2-4), `addwork($1, eval($2-4), `N4',
+  $3+defn(`g$1_'eval($2-1))+defn(`g$1_'eval($2-2))+defn(`g$1_'eval($2-3
+  ))+defn(`g$1_'eval($2-4)), `$4NNNN')')')
 define(`vN4', `vW1($@)N($@, 5)vE1($@)')
 define(`vN5', `vW1($@)N($@, 6)vE1($@)')
 define(`vN6', `vW1($@)N($@, 7)vE1($@)')
-- 
2.11.4.GIT