From 7cbc4f3acdf4721c3ef9a38b4fe5d4c008ec8f88 Mon Sep 17 00:00:00 2001
From: Dan Barber <github@danbarber.me>
Date: Thu, 15 Mar 2018 08:45:46 -0400
Subject: [PATCH] More idiomatic language

---
 lib/chess/moves/generator.ex |  6 +++---
 lib/chess/moves/pawn.ex      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/chess/moves/generator.ex b/lib/chess/moves/generator.ex
index 3cb39a3..947d313 100644
--- a/lib/chess/moves/generator.ex
+++ b/lib/chess/moves/generator.ex
@@ -9,7 +9,7 @@ defmodule Chess.Moves.Generator do
   def moves(colour, board, {file, rank}, {fv, rv}) do
     next_square = {file + fv, rank + rv}
     cond do
-      can_take_piece?(colour, board, next_square) ->
+      can_capture_piece?(colour, board, next_square) ->
         [next_square]
       obstruction?(colour, board, next_square) ->
         []
@@ -26,7 +26,7 @@ defmodule Chess.Moves.Generator do
       outside_board?(move_square) ||
         obstruction?(colour, board, move_square) ->
         moves(colour, board, {file, rank}, moves)
-      can_take_piece?(colour, board, move_square) ->
+      can_capture_piece?(colour, board, move_square) ->
         [move_square | moves(colour, board, {file, rank}, moves)]
       true ->
         [move_square | moves(colour, board, {file, rank}, moves)]
@@ -38,7 +38,7 @@ defmodule Chess.Moves.Generator do
       rank < 0 || rank > 7
   end
 
-  defp can_take_piece?(colour, board, {file, rank}) do
+  defp can_capture_piece?(colour, board, {file, rank}) do
     piece = board["#{file},#{rank}"]
     piece && piece["colour"] != colour
   end
diff --git a/lib/chess/moves/pawn.ex b/lib/chess/moves/pawn.ex
index aceebe6..cc8405c 100644
--- a/lib/chess/moves/pawn.ex
+++ b/lib/chess/moves/pawn.ex
@@ -3,7 +3,7 @@ defmodule Chess.Moves.Pawn do
 
   def moves(board, {file, rank}) do
     normal_moves(board, {file, rank}) ++
-      taking_moves(board, {file, rank})
+      capture_moves(board, {file, rank})
   end
 
   defp normal_moves(board, {file, rank}) do
@@ -12,13 +12,13 @@ defmodule Chess.Moves.Pawn do
     |> _moves(board, {file, rank})
   end
 
-  defp taking_moves(board, {file, rank}) do
+  defp capture_moves(board, {file, rank}) do
     colour =
       board["#{file},#{rank}"]
       |> Map.get("colour")
 
     colour
-    |> _taking_moves(board, {file, rank}, patterns(colour))
+    |> _capture_moves(board, {file, rank}, patterns(colour))
   end
 
   defp patterns("white") do
@@ -51,17 +51,17 @@ defmodule Chess.Moves.Pawn do
     end
   end
 
-  def _taking_moves(_colour, _board, {_file, _rank}, []), do: []
-  def _taking_moves(colour, board, {file, rank}, [{fv, rv} | moves]) do
+  def _capture_moves(_colour, _board, {_file, _rank}, []), do: []
+  def _capture_moves(colour, board, {file, rank}, [{fv, rv} | moves]) do
     move_square = {file + fv, rank + rv}
-    if can_take_piece?(colour, board, move_square) do
-      [move_square | _taking_moves(colour, board, {file, rank}, moves)]
+    if can_capture_piece?(colour, board, move_square) do
+      [move_square | _capture_moves(colour, board, {file, rank}, moves)]
     else
-      _taking_moves(colour, board, {file, rank}, moves)
+      _capture_moves(colour, board, {file, rank}, moves)
     end
   end
 
-  defp can_take_piece?(colour, board, {file, rank}) do
+  defp can_capture_piece?(colour, board, {file, rank}) do
     piece = board["#{file},#{rank}"]
     piece && piece["colour"] != colour
   end