refactor: error handling

rootulp · Dec 1, 2023 · ac268a8 · ac268a8
1 parent f3d6b3f
commit ac268a8
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/go/queen-attack/queen_attack.go b/go/queen-attack/queen_attack.go
@@ -28,28 +28,17 @@ func CanQueenAttack(whitePosition, blackPosition string) (bool, error) {
 }
 
 func parse(position string) (location, error) {
-	if position == "" {
-		return location{}, errors.New("empty position")
-	}
 	if len(position) != 2 {
 		return location{}, errors.New("invalid position")
 	}
 
 	column := string(position[0])
 	row, err := strconv.Atoi(position[1:])
 
-	if err != nil {
+	if err != nil || !isValidRow(row) || !isValidColumn(column) {
 		return location{}, errors.New("invalid position")
 	}
 
-	if !isValidRow(row) {
-		return location{}, errors.New("invalid row")
-	}
-
-	if !isValidColumn(column) {
-		return location{}, errors.New("invalid column")
-	}
-
 	return location{row: row, column: column}, nil
 }