Merge branch 'master' of https://github.com/neenjaw/exercism-elixir

Author: neenjaw

nth-prime/nth_prime.exs

@@ -10,16 +10,23 @@ defmodule Prime do
   def nth(n), do: calc_nth(n)
 
   defp calc_nth(n, acc \\ 5, i \\ 11)
-  defp calc_nth(n, n, i), do: i
+  
+  defp calc_nth(n, n, i) do
+    i
+  end
+  
   defp calc_nth(n, acc, i) when acc < n do
     cond do
-      is_prime(i+1) -> calc_nth(n, acc+1, i+1)
-      true          -> calc_nth(n, acc, i+1)
+      prime?(i+1) -> 
+        calc_nth(n, acc+1, i+1)
+        
+      true -> 
+        calc_nth(n, acc, i+1)
     end
   end
 
-  defp is_prime(i, n \\ 2)
-  defp is_prime(i, n) when n < i and rem(i, n) == 0, do: false
-  defp is_prime(i, n) when n < i, do: is_prime(i, n+1)
-  defp is_prime(i, i), do: true
+  defp prime?(i, n \\ 2)
+  defp prime?(i, n) when n < i and rem(i, n) == 0, do: false
+  defp prime?(i, n) when n < i, do: is_prime(i, n+1)
+  defp prime?(i, i), do: true
 end