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
30 changes: 21 additions & 9 deletions lib/elixir/lib/float.ex
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,40 @@ defmodule Float do

"""
@spec parse(binary) :: { float, binary } | :error
def parse(binary) when is_binary(binary) do
def parse("-" <> binary) do
case parse_unsign(binary) do
:error -> :error
{ number, remainder } -> { -number, remainder }
end
end

def parse(binary) do
parse_unsign(binary)
end

defp parse_unsign("-" <> binary), do: :error
defp parse_unsign(binary) when is_binary(binary) do
case Integer.parse binary do
:error -> :error
{ integer_part, after_integer } -> parse after_integer, integer_part
{ integer_part, after_integer } -> parse_unsign after_integer, integer_part
end
end

# Dot followed by digit is required afterwards or we are done
defp parse(<< ?., char, rest :: binary >>, int) when char in ?0..?9 do
parse(rest, char - ?0, 1, int)
defp parse_unsign(<< ?., char, rest :: binary >>, int) when char in ?0..?9 do
parse_unsign(rest, char - ?0, 1, int)
end

defp parse(rest, int) do
defp parse_unsign(rest, int) do
{ :erlang.float(int), rest }
end

# Handle decimal points
defp parse(<< char, rest :: binary >>, float, decimal, int) when char in ?0..?9 do
parse rest, 10 * float + (char - ?0), decimal + 1, int
defp parse_unsign(<< char, rest :: binary >>, float, decimal, int) when char in ?0..?9 do
parse_unsign rest, 10 * float + (char - ?0), decimal + 1, int
end

defp parse(<< ?e, after_e :: binary >>, float, decimal, int) do
defp parse_unsign(<< ?e, after_e :: binary >>, float, decimal, int) do
case Integer.parse after_e do
:error ->
# Note we rebuild the binary here instead of breaking it apart at
Expand All @@ -56,7 +68,7 @@ defmodule Float do
end
end

defp parse(bitstring, float, decimal, int) do
defp parse_unsign(bitstring, float, decimal, int) do
{ floatify(int, float, decimal), bitstring }
end

Expand Down
1 change: 1 addition & 0 deletions lib/elixir/test/elixir/float_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ defmodule FloatTest do
test :parse do
assert Float.parse("12") === {12.0, ""}
assert Float.parse("-12") === {-12.0, ""}
assert Float.parse("-0.1") === {-0.1, ""}
assert Float.parse("123456789") === {123456789.0, ""}
assert Float.parse("12.5") === {12.5, ""}
assert Float.parse("12.524235") === {12.524235, ""}
Expand Down