Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/elixir/lib/integer.ex
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,9 @@ defmodule Integer do

defp undigits([], _base, acc), do: acc

defp undigits([digit | _], base, _) when is_integer(digit) and digit >= base,
do: raise(ArgumentError, "invalid digit #{digit} in base #{base}")
defp undigits([digit | _], base, _)
when is_integer(digit) and (digit >= base or digit <= -base),
do: raise(ArgumentError, "invalid digit #{digit} in base #{base}")

defp undigits([digit | tail], base, acc) when is_integer(digit),
do: undigits(tail, base, acc * base + digit)
Expand Down
8 changes: 8 additions & 0 deletions lib/elixir/test/elixir/integer_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ defmodule IntegerTest do
assert_raise ArgumentError, "invalid digit 17 in base 16", fn ->
Integer.undigits([1, 2, 17], 16)
end

assert_raise ArgumentError, "invalid digit -10 in base 10", fn ->
Integer.undigits([-10], 10)
end

assert_raise ArgumentError, "invalid digit -17 in base 16", fn ->
Integer.undigits([1, 2, -17], 16)
end
end

test "parse/2" do
Expand Down