2nd: refactor

pkg/two/two.go

@@ -28,42 +28,30 @@ func solve(commands []string, alt bool) int {
 		command := strings.Split(v, " ")
 		switch command[0] {
 		case "forward":
-			i, _ := strconv.Atoi(command[1])
+			x, _ := strconv.Atoi(command[1])
-			forward(i, alt)
+			horizontalPosition += x
+			if alt {
+				depth += aim * x
+			}
 		case "up":
-			i, _ := strconv.Atoi(command[1])
+			x, _ := strconv.Atoi(command[1])
-			up(i, alt)
+			if !alt {
+				depth -= x
+			} else {
+				aim -= x
+			}
 		case "down":
-			i, _ := strconv.Atoi(command[1])
+			x, _ := strconv.Atoi(command[1])
-			down(i, alt)
+			if !alt {
+				depth += x
+			} else {
+				aim += x
+			}
 		}
 	}
 	return horizontalPosition * depth
 }
 
-func up(d int, alt bool) {
-	if !alt {
-		depth -= d
-	} else {
-		aim -= d
-	}
-}
-
-func down(d int, alt bool) {
-	if !alt {
-		depth += d
-	} else {
-		aim += d
-	}
-}
-
-func forward(d int, alt bool) {
-	horizontalPosition += d
-	if alt {
-		depth += aim * d
-	}
-}
-
 func readInput() []string {
 	file, err := os.Open("./pkg/two/input.txt")
 	if err != nil {