Browse Source

Cleanup

main
Jens Kadenbach 1 year ago
parent
commit
29afc2ff7b
4 changed files with 19 additions and 14 deletions
  1. 3
    9
      aoc2022.cabal
  2. 0
    2
      package.yaml
  3. 0
    1
      src/Day1.hs
  4. 16
    2
      src/Lib.hs

+ 3
- 9
aoc2022.cabal View File

50
       src
50
       src
51
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
51
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
52
   build-depends:
52
   build-depends:
53
-      QuickCheck
54
-    , Ranged-sets
53
+      Ranged-sets
55
     , base >=4.7 && <5
54
     , base >=4.7 && <5
56
     , containers
55
     , containers
57
     , heredoc
56
     , heredoc
59
     , lens
58
     , lens
60
     , split
59
     , split
61
     , text
60
     , text
62
-    , these
63
   default-language: Haskell2010
61
   default-language: Haskell2010
64
 
62
 
65
 executable aoc2022-exe
63
 executable aoc2022-exe
70
       app
68
       app
71
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
69
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
72
   build-depends:
70
   build-depends:
73
-      QuickCheck
74
-    , Ranged-sets
71
+      Ranged-sets
75
     , aoc2022
72
     , aoc2022
76
     , base >=4.7 && <5
73
     , base >=4.7 && <5
77
     , containers
74
     , containers
80
     , lens
77
     , lens
81
     , split
78
     , split
82
     , text
79
     , text
83
-    , these
84
   default-language: Haskell2010
80
   default-language: Haskell2010
85
 
81
 
86
 test-suite aoc2022-test
82
 test-suite aoc2022-test
97
       test
93
       test
98
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
94
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
99
   build-depends:
95
   build-depends:
100
-      QuickCheck
101
-    , Ranged-sets
96
+      Ranged-sets
102
     , aoc2022
97
     , aoc2022
103
     , base >=4.7 && <5
98
     , base >=4.7 && <5
104
     , containers
99
     , containers
107
     , lens
102
     , lens
108
     , split
103
     , split
109
     , text
104
     , text
110
-    , these
111
   default-language: Haskell2010
105
   default-language: Haskell2010

+ 0
- 2
package.yaml View File

22
 dependencies:
22
 dependencies:
23
 - base >= 4.7 && < 5
23
 - base >= 4.7 && < 5
24
 - hspec
24
 - hspec
25
-- QuickCheck
26
 - text
25
 - text
27
 - split
26
 - split
28
 - heredoc
27
 - heredoc
30
 - split
29
 - split
31
 - lens
30
 - lens
32
 - Ranged-sets
31
 - Ranged-sets
33
-- these
34
 
32
 
35
 ghc-options:
33
 ghc-options:
36
 - -Wall
34
 - -Wall

+ 0
- 1
src/Day1.hs View File

14
   putStrLn ("Highest calorie count = " ++ calorieCount)
14
   putStrLn ("Highest calorie count = " ++ calorieCount)
15
   caloriesOfTop3Elves <- day1_2
15
   caloriesOfTop3Elves <- day1_2
16
   putStrLn ("Calories of top 3 elves = " ++ caloriesOfTop3Elves)
16
   putStrLn ("Calories of top 3 elves = " ++ caloriesOfTop3Elves)
17
-  putStrLn "-----------"
18
 
17
 
19
 
18
 
20
 day1_1 :: IO String
19
 day1_1 :: IO String

+ 16
- 2
src/Lib.hs View File

2
     ( someFunc
2
     ( someFunc
3
     ) where
3
     ) where
4
       
4
       
5
-import Day5      
5
+import Day1
6
+import Day2
7
+import Day3
8
+import Day4
9
+import Day5
6
 
10
 
7
 someFunc :: IO ()
11
 someFunc :: IO ()
8
-someFunc = day5
12
+someFunc = do
13
+  day1
14
+  putStrLn "-----------"
15
+  day2
16
+  putStrLn "-----------"
17
+  day3
18
+  putStrLn "-----------"
19
+  day4
20
+  putStrLn "-----------"
21
+  day5
22
+  
9
 
23
 

Loading…
Cancel
Save