Fix

Co-authored-by: Smaug123 <patrick+github@patrickstevens.co.uk>
Reviewed-on: #1

.woodpecker/.all-checks-complete.yml

@@ -0,0 +1,10 @@
+steps:
+  echo:
+    image: alpine
+    commands:
+      - echo "All required checks complete"
+
+depends_on:
+  - build
+
+skip_clone: true

.woodpecker/.build.yml

@@ -0,0 +1,13 @@
+steps:
+  build:
+    image: nixos/nix
+    commands:
+      - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf
+      - nix develop --command dotnet --info
+      - nix develop --command dotnet publish AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj --configuration Release
+      - nix develop --command sh -c "$(find . -type f -name AdventOfCode2023.FSharp | grep Release | grep publish) AdventOfCode2023.FSharp/Test/samples"
+
+    when:
+      - event: "push"
+        evaluate: 'CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
+      - event: "pull_request"

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/AdventOfCode2023.FSharp.fsproj

@@ -1,28 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <PublishAot>true</PublishAot>
-        <InvariantGlobalization>true</InvariantGlobalization>
-        <UseSystemResourceKeys>true</UseSystemResourceKeys>
-
-        <IlcOptimizationPreference>Speed</IlcOptimizationPreference>
-        <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
-
-        <DebuggerSupport>false</DebuggerSupport>
-        <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
-        <EventSourceSupport>false</EventSourceSupport>
-        <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
-        <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
     </PropertyGroup>
 
     <ItemGroup>
         <Compile Include="Program.fs"/>
     </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\AdventOfCode2023.FSharp.Lib\AdventOfCode2023.FSharp.Lib.fsproj" />
-    </ItemGroup>
-
 </Project>

AdventOfCode2023.FSharp/AdventOfCode2023.FSharp/Program.fs

@@ -1,66 +1,7 @@
-namespace AdventOfCode2023
-
-#if DEBUG
-#else
-#nowarn "9"
-#endif
-
-open System.Diagnostics
-open System.IO
+namespace AdventOfCode2023
 
 module Program =
 
-    let inline toUs (ticks : int64) =
-        1_000_000.0 * float ticks / float Stopwatch.Frequency
-
     [<EntryPoint>]
     let main argv =
-        let endToEnd = Stopwatch.StartNew ()
-        endToEnd.Restart ()
-
-        let sw = Stopwatch.StartNew ()
-        sw.Restart ()
-        let contents = File.ReadAllBytes argv.[0]
-        sw.Stop ()
-        System.Console.Error.WriteLine ("Reading file (us): " + (toUs sw.ElapsedTicks).ToString ())
-
-        sw.Restart ()
-        let resultArr, len, lineCount = Day3.parse contents
-
-        sw.Stop ()
-        System.Console.Error.WriteLine ("Populating array (us): " + (toUs sw.ElapsedTicks).ToString ())
-
-#if DEBUG
-        let contents =
-            {
-                Elements = Array.take len resultArr
-                Width = len / lineCount
-            }
-#else
-        use ptr = fixed resultArr
-
-        let contents =
-            {
-                Elements = ptr
-                Length = len
-                Width = len / lineCount
-            }
-#endif
-        // |> Array.map (fun s -> Array.init s.Length (fun i -> if s.[i] = '.' then 100uy elif s.[i] = '*' then 255uy elif '0' <= s.[i] && s.[i] <= '9' then byte s.[i] - byte '0' else 254uy))
-
-        sw.Restart ()
-        let part1 = Day3.part1 contents
-        sw.Stop ()
-        System.Console.Error.WriteLine ("Part 1 (us): " + (toUs sw.ElapsedTicks).ToString ())
-        System.Console.WriteLine (part1.ToString ())
-
-        sw.Restart ()
-        let part2 = Day3.part2 contents
-        sw.Stop ()
-        System.Console.Error.WriteLine ("Part 2 (us): " + (toUs sw.ElapsedTicks).ToString ())
-        System.Console.WriteLine (part2.ToString ())
-
-        endToEnd.Stop ()
-        System.Console.Error.WriteLine ("Total (us): " + (toUs endToEnd.ElapsedTicks).ToString ())
-
         0

AdventOfCode2023.FSharp/Test/Test.fsproj

@@ -8,9 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <Compile Include="Util.fs" />
         <Compile Include="TestDay1.fs" />
         <Compile Include="TestDay2.fs" />
         <Compile Include="TestDay3.fs" />
+        <EmbeddedResource Include="samples\day1.txt" />
+        <EmbeddedResource Include="samples\day1part1.txt" />
+        <EmbeddedResource Include="samples\day2.txt" />
+        <EmbeddedResource Include="samples\day3.txt" />
     </ItemGroup>
 
     <ItemGroup>

AdventOfCode2023.FSharp/Test/TestDay1.fs

@@ -8,26 +8,13 @@ open System.IO
 [<TestFixture>]
 module TestDay1 =
 
-    let sample1 =
-        """1abc2
-pqr3stu8vwx
-a1b2c3d4e5f
-treb7uchet
-"""
+    let sample1 = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day1part1.txt"
 
     [<Test>]
     let part1Sample () =
         sample1 |> Day1.part1 |> shouldEqual 142
 
-    let sample2 =
-        """two1nine
-eightwothree
-abcone2threexyz
-xtwone3four
-4nineeightseven2
-zoneight234
-7pqrstsixteen
-"""
+    let sample2 = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day1.txt"
 
     [<Test>]
     let part2Sample () =
@@ -38,7 +25,9 @@ zoneight234
         let s =
             try
                 File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 
@@ -49,7 +38,9 @@ zoneight234
         let s =
             try
                 File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day1.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 

AdventOfCode2023.FSharp/Test/TestDay2.fs

@@ -8,13 +8,7 @@ open System.IO
 [<TestFixture>]
 module TestDay2 =
 
-    let sample =
-        """Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green
-Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue
-Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red
-Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red
-Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
-"""
+    let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day2.txt"
 
     [<Test>]
     let part1Sample () = sample |> Day2.part1 |> shouldEqual 8
@@ -28,7 +22,9 @@ Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
         let s =
             try
                 File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 
@@ -39,7 +35,9 @@ Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
         let s =
             try
                 File.ReadAllText (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day2.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 

AdventOfCode2023.FSharp/Test/TestDay3.fs

@@ -13,18 +13,7 @@ open System.IO
 [<TestFixture>]
 module TestDay3 =
 
-    let sample =
-        """467..114..
-...*......
-..35..633.
-......#...
-617*......
-.....+.58.
-..592.....
-......755.
-...$.*....
-.664.598..
-"""
+    let sample = Assembly.getEmbeddedResource typeof<Dummy>.Assembly "day3.txt"
 
     [<Test>]
     let part1Sample () =
@@ -77,7 +66,9 @@ module TestDay3 =
         let bytes =
             try
                 File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 
@@ -107,7 +98,9 @@ module TestDay3 =
         let bytes =
             try
                 File.ReadAllBytes (Path.Combine (__SOURCE_DIRECTORY__, "../../inputs/day3.txt"))
-            with :? FileNotFoundException ->
+            with
+            | :? DirectoryNotFoundException
+            | :? FileNotFoundException ->
                 Assert.Inconclusive ()
                 failwith "unreachable"
 

AdventOfCode2023.FSharp/Test/Util.fs

@@ -0,0 +1,22 @@
+namespace AdventOfCode2023.Test
+
+open System.IO
+open System.Reflection
+
+type Dummy =
+    class
+    end
+
+[<RequireQualifiedAccess>]
+module Assembly =
+    let getEmbeddedResource (assembly : Assembly) (name : string) : string =
+        let names = assembly.GetManifestResourceNames ()
+        let names = names |> Seq.filter (fun s -> s.EndsWith name)
+
+        use s =
+            names
+            |> Seq.exactlyOne
+            |> assembly.GetManifestResourceStream
+            |> fun s -> new StreamReader (s)
+
+        s.ReadToEnd ()

AdventOfCode2023.FSharp/Test/samples/day1.txt

@@ -0,0 +1,7 @@
+two1nine
+eightwothree
+abcone2threexyz
+xtwone3four
+4nineeightseven2
+zoneight234
+7pqrstsixteen

AdventOfCode2023.FSharp/Test/samples/day1part1.txt

@@ -0,0 +1,4 @@
+1abc2
+pqr3stu8vwx
+a1b2c3d4e5f
+treb7uchet

AdventOfCode2023.FSharp/Test/samples/day2.txt

@@ -0,0 +1,5 @@
+Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green
+Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue
+Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red
+Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red
+Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green

AdventOfCode2023.FSharp/Test/samples/day3.txt

@@ -0,0 +1,10 @@
+467..114..
+...*......
+..35..633.
+......#...
+617*......
+.....+.58.
+..592.....
+......755.
+...$.*....
+.664.598..

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Patrick Stevens
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -0,0 +1,33 @@
+# Advent of Code 2023
+
+[Puzzle site](https://adventofcode.com/2023).
+
+# Speed
+
+Ahead-of-time compiled with `PublishAot`, M1 Max.
+The format is: "answer part1\ntime\nanswer part2\ntime\n...", with possible extra lines indicating how long it took to parse the input if I happen to have split that out.
+
+After day 3:
+
+```
+54304
+0.549458ms
+54418
+0.710375ms
+2727
+0.119959ms
+56580
+0.155708ms
+0.1395ms parse
+540131
+0.1395ms
+86879020
+0.840791ms
+4.144166ms total
+```
+
+# Building yourself
+
+Note that `PublishAot` assumes a lot of stuff about your environment, which is not necessarily true.
+The given flake should allow you to complete the publish except for a linking stage at the end: the publish will print out a failed command line, and you'll have to strip out some `-o` flags from it and run it manually.
+Then run `dotnet publish` again and it should succeed.

flake.nix

@@ -1,26 +1,45 @@
 {
-    description = "Advent of Code 2023";
-    inputs = {
-        flake-utils.url = "github:numtide/flake-utils";
-        nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    };
+  description = "Advent of Code 2023";
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
 
-    outputs = {
-        self,
-        nixpkgs,
-        flake-utils,
-    }: flake-utils.lib.eachDefaultSystem (system:
-    let pkgs = nixpkgs.legacyPackages.${system}; in
-    {
-        devShells = { default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            (with dotnetCorePackages;
-              combinePackages [
-                dotnet-sdk_8
-                dotnetPackages.Nuget
-              ])
-          ] ++ [pkgs.swift darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.CryptoKit darwin.apple_sdk.frameworks.GSS pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu];
-        };};
-    }
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+        # Conditionally include Swift and Apple SDK for Darwin systems
+        let
+          darwinDeps =
+            if system == "x86_64-darwin" || system == "aarch64-darwin"
+            then [
+              pkgs.swift
+              pkgs.darwin.apple_sdk.frameworks.Foundation
+              pkgs.darwin.apple_sdk.frameworks.CryptoKit
+              pkgs.darwin.apple_sdk.frameworks.GSS
+            ]
+            else [];
+        in {
+          devShells = {
+            default = pkgs.mkShell {
+              buildInputs = with pkgs;
+                [
+                  (with dotnetCorePackages;
+                    combinePackages [
+                      dotnet-sdk_8
+                      dotnetPackages.Nuget
+                    ])
+                ]
+                ++ darwinDeps
+                ++ [pkgs.zlib pkgs.zlib.dev pkgs.openssl pkgs.icu pkgs.alejandra];
+            };
+          };
+        }
     );
 }