Fix for dializer error.
Conflicts: src/ec_date.erl
This commit is contained in:
parent
3437fc8c1c
commit
5beeb3ff1b
1 changed files with 7 additions and 7 deletions
|
@ -72,8 +72,8 @@ format(Format, Date) ->
|
||||||
parse(Date) ->
|
parse(Date) ->
|
||||||
do_parse(Date, calendar:universal_time(),[]).
|
do_parse(Date, calendar:universal_time(),[]).
|
||||||
|
|
||||||
-spec parse(string(),datetime() | now()) -> datetime();
|
-spec parse(string(),datetime() | now()) -> datetime().
|
||||||
(string(),datetime() | now()) -> now().
|
|
||||||
%% @doc parses the datetime from a string
|
%% @doc parses the datetime from a string
|
||||||
parse(Date, {_,_,_}=Now) ->
|
parse(Date, {_,_,_}=Now) ->
|
||||||
do_parse(Date, calendar:now_to_datetime(Now), []);
|
do_parse(Date, calendar:now_to_datetime(Now), []);
|
||||||
|
@ -92,13 +92,13 @@ do_parse(Date, Now, Opts) ->
|
||||||
true -> {D1, T1};
|
true -> {D1, T1};
|
||||||
false -> erlang:throw({?MODULE, {bad_date, Date}})
|
false -> erlang:throw({?MODULE, {bad_date, Date}})
|
||||||
end;
|
end;
|
||||||
{D1, T1, {Ms}} = {{Y, M, D}, {H, M1, S}, {Ms}}
|
{D1, _T1, {Ms}} = {{Y, M, D}, {H, M1, S}, {Ms}}
|
||||||
when is_number(Y), is_number(M),
|
when is_number(Y), is_number(M),
|
||||||
is_number(D), is_number(H),
|
is_number(D), is_number(H),
|
||||||
is_number(M1), is_number(S),
|
is_number(M1), is_number(S),
|
||||||
is_number(Ms) ->
|
is_number(Ms) ->
|
||||||
case calendar:valid_date(D1) of
|
case calendar:valid_date(D1) of
|
||||||
true -> {D1, T1, {Ms}};
|
true -> {D1, {H,M1,S,Ms}};
|
||||||
false -> erlang:throw({?MODULE, {bad_date, Date}})
|
false -> erlang:throw({?MODULE, {bad_date, Date}})
|
||||||
end;
|
end;
|
||||||
Unknown -> erlang:throw({?MODULE, {bad_date, Date, Unknown }})
|
Unknown -> erlang:throw({?MODULE, {bad_date, Date, Unknown }})
|
||||||
|
@ -108,14 +108,14 @@ do_parse(Date, Now, Opts) ->
|
||||||
%% @doc parses the datetime from a string into 'now' format
|
%% @doc parses the datetime from a string into 'now' format
|
||||||
nparse(Date) ->
|
nparse(Date) ->
|
||||||
case parse(Date) of
|
case parse(Date) of
|
||||||
{DateS, Time, {Ms} } ->
|
{DateS, {H, M, S, Ms} } ->
|
||||||
GSeconds = calendar:datetime_to_gregorian_seconds({DateS, Time}),
|
GSeconds = calendar:datetime_to_gregorian_seconds({DateS, {H, M, S} }),
|
||||||
ESeconds = GSeconds - ?GREGORIAN_SECONDS_1970,
|
ESeconds = GSeconds - ?GREGORIAN_SECONDS_1970,
|
||||||
{ESeconds div 1000000, ESeconds rem 1000000, Ms};
|
{ESeconds div 1000000, ESeconds rem 1000000, Ms};
|
||||||
DateTime ->
|
DateTime ->
|
||||||
GSeconds = calendar:datetime_to_gregorian_seconds(DateTime),
|
GSeconds = calendar:datetime_to_gregorian_seconds(DateTime),
|
||||||
ESeconds = GSeconds - ?GREGORIAN_SECONDS_1970,
|
ESeconds = GSeconds - ?GREGORIAN_SECONDS_1970,
|
||||||
{ESeconds div 1000000, ESeconds rem 1000000, {0}}
|
{ESeconds div 1000000, ESeconds rem 1000000, 0}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
%%
|
%%
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue