remove fizzbuzz const in kt

advent-of-craft · Jan 5, 2024 · ee82360 · ee82360
1 parent 158a566
commit ee82360
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 54 deletions.
diff --git a/exercise/kotlin/day06/src/main/kotlin/games/FizzBuzz.kt b/exercise/kotlin/day06/src/main/kotlin/games/FizzBuzz.kt
@@ -2,9 +2,6 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String {
@@ -14,9 +11,9 @@ object FizzBuzz {
 
     private fun convertSafely(input: Int): String {
         return when {
-            `is`(FIZZBUZZ, input) -> "FizzBuzz"
-            `is`(FIZZ, input) -> "Fizz"
-            `is`(BUZZ, input) -> "Buzz"
+            `is`(15, input) -> "FizzBuzz"
+            `is`(3, input) -> "Fizz"
+            `is`(5, input) -> "Buzz"
             else -> input.toString()
         }
     }

diff --git a/exercise/kotlin/day10/src/main/kotlin/games/FizzBuzz.kt b/exercise/kotlin/day10/src/main/kotlin/games/FizzBuzz.kt
@@ -2,9 +2,6 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String {
@@ -14,9 +11,9 @@ object FizzBuzz {
 
     private fun convertSafely(input: Int): String {
         return when {
-            `is`(FIZZBUZZ, input) -> "FizzBuzz"
-            `is`(FIZZ, input) -> "Fizz"
-            `is`(BUZZ, input) -> "Buzz"
+            `is`(15, input) -> "FizzBuzz"
+            `is`(3, input) -> "Fizz"
+            `is`(5, input) -> "Buzz"
             else -> input.toString()
         }
     }

diff --git a/exercise/kotlin/day14/src/main/kotlin/games/FizzBuzz.kt b/exercise/kotlin/day14/src/main/kotlin/games/FizzBuzz.kt
@@ -2,9 +2,6 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String {
@@ -14,9 +11,9 @@ object FizzBuzz {
 
     private fun convertSafely(input: Int): String {
         return when {
-            `is`(FIZZBUZZ, input) -> "FizzBuzz"
-            `is`(FIZZ, input) -> "Fizz"
-            `is`(BUZZ, input) -> "Buzz"
+            `is`(15, input) -> "FizzBuzz"
+            `is`(3, input) -> "Fizz"
+            `is`(5, input) -> "Buzz"
             else -> input.toString()
         }
     }

diff --git a/exercise/kotlin/day17/src/main/kotlin/games/FizzBuzz.kt b/exercise/kotlin/day17/src/main/kotlin/games/FizzBuzz.kt
@@ -6,9 +6,6 @@ import arrow.core.Some
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): Option<String> = when {
@@ -17,9 +14,9 @@ object FizzBuzz {
     }
 
     private fun convertSafely(input: Int): String = when {
-        `is`(FIZZBUZZ, input) -> "FizzBuzz"
-        `is`(FIZZ, input) -> "Fizz"
-        `is`(BUZZ, input) -> "Buzz"
+        `is`(15, input) -> "FizzBuzz"
+        `is`(3, input) -> "Fizz"
+        `is`(5, input) -> "Buzz"
         else -> input.toString()
     }
 

diff --git a/solution/kotlin/day02/src/main/kotlin/games/FizzBuzz.kt b/solution/kotlin/day02/src/main/kotlin/games/FizzBuzz.kt
@@ -2,9 +2,6 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String {
@@ -14,9 +11,9 @@ object FizzBuzz {
 
     private fun convertSafely(input: Int): String {
         return when {
-            `is`(FIZZBUZZ, input) -> "FizzBuzz"
-            `is`(FIZZ, input) -> "Fizz"
-            `is`(BUZZ, input) -> "Buzz"
+            `is`(15, input) -> "FizzBuzz"
+            `is`(3, input) -> "Fizz"
+            `is`(5, input) -> "Buzz"
             else -> input.toString()
         }
     }

diff --git a/solution/kotlin/day06/src/main/kotlin/games/FizzBuzz.kt b/solution/kotlin/day06/src/main/kotlin/games/FizzBuzz.kt
@@ -2,16 +2,13 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String = when {
         isOutOfRange(input) -> throw OutOfRangeException()
-        `is`(FIZZBUZZ, input) -> "FizzBuzz"
-        `is`(FIZZ, input) -> "Fizz"
-        `is`(BUZZ, input) -> "Buzz"
+        `is`(15, input) -> "FizzBuzz"
+        `is`(3, input) -> "Fizz"
+        `is`(5, input) -> "Buzz"
         else -> input.toString()
     }
 

diff --git a/solution/kotlin/day10/src/main/kotlin/games/FizzBuzz.kt b/solution/kotlin/day10/src/main/kotlin/games/FizzBuzz.kt
@@ -2,16 +2,13 @@ package games
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): String = when {
         isOutOfRange(input) -> throw OutOfRangeException()
-        `is`(FIZZBUZZ, input) -> "FizzBuzz"
-        `is`(FIZZ, input) -> "Fizz"
-        `is`(BUZZ, input) -> "Buzz"
+        `is`(15, input) -> "FizzBuzz"
+        `is`(3, input) -> "Fizz"
+        `is`(5, input) -> "Buzz"
         else -> input.toString()
     }
 

diff --git a/solution/kotlin/day14/src/main/kotlin/games/FizzBuzz.kt b/solution/kotlin/day14/src/main/kotlin/games/FizzBuzz.kt
@@ -6,9 +6,6 @@ import arrow.core.Some
 
 private const val MIN = 0
 private const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): Option<String> = when {
@@ -17,9 +14,9 @@ object FizzBuzz {
     }
 
     private fun convertSafely(input: Int): String = when {
-        `is`(FIZZBUZZ, input) -> "FizzBuzz"
-        `is`(FIZZ, input) -> "Fizz"
-        `is`(BUZZ, input) -> "Buzz"
+        `is`(15, input) -> "FizzBuzz"
+        `is`(3, input) -> "Fizz"
+        `is`(5, input) -> "Buzz"
         else -> input.toString()
     }
 

diff --git a/solution/kotlin/day17/src/main/kotlin/games/FizzBuzz.kt b/solution/kotlin/day17/src/main/kotlin/games/FizzBuzz.kt
@@ -6,9 +6,6 @@ import arrow.core.Some
 
 const val MIN = 1
 const val MAX = 100
-private const val FIZZBUZZ = 15
-private const val FIZZ = 3
-private const val BUZZ = 5
 
 object FizzBuzz {
     fun convert(input: Int): Option<String> = when {
@@ -17,9 +14,9 @@ object FizzBuzz {
     }
 
     private fun convertSafely(input: Int): String = when {
-        `is`(FIZZBUZZ, input) -> "FizzBuzz"
-        `is`(FIZZ, input) -> "Fizz"
-        `is`(BUZZ, input) -> "Buzz"
+        `is`(15, input) -> "FizzBuzz"
+        `is`(3, input) -> "Fizz"
+        `is`(5, input) -> "Buzz"
         else -> input.toString()
     }