Removed unicode_str
* introduced in f8f72b7cc5
* introduced for working around compile warning starting from R20
* CI/CD uses R23 and onwards.
This commit is contained in:
parent
c0a02892cd
commit
f378d3ec46
3 changed files with 4 additions and 29 deletions
|
@ -101,7 +101,7 @@ parse(Date, Now) ->
|
||||||
do_parse(Date, Now, []).
|
do_parse(Date, Now, []).
|
||||||
|
|
||||||
do_parse(Date, Now, Opts) ->
|
do_parse(Date, Now, Opts) ->
|
||||||
case filter_hints(parse(tokenise(uppercase(Date), []), Now, Opts)) of
|
case filter_hints(parse(tokenise(string:uppercase(Date), []), Now, Opts)) of
|
||||||
{error, bad_date} ->
|
{error, bad_date} ->
|
||||||
erlang:throw({?MODULE, {bad_date, Date}});
|
erlang:throw({?MODULE, {bad_date, Date}});
|
||||||
{D1, T1} = {{Y, M, D}, {H, M1, S}}
|
{D1, T1} = {{Y, M, D}, {H, M1, S}}
|
||||||
|
@ -709,12 +709,6 @@ pad6(X) when is_integer(X) ->
|
||||||
ltoi(X) ->
|
ltoi(X) ->
|
||||||
list_to_integer(X).
|
list_to_integer(X).
|
||||||
|
|
||||||
-ifdef(unicode_str).
|
|
||||||
uppercase(Str) -> string:uppercase(Str).
|
|
||||||
-else.
|
|
||||||
uppercase(Str) -> string:to_upper(Str).
|
|
||||||
-endif.
|
|
||||||
|
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
%%% Tests
|
%%% Tests
|
||||||
%%%===================================================================
|
%%%===================================================================
|
||||||
|
|
|
@ -94,22 +94,11 @@ parse_tags(Pattern) ->
|
||||||
"fatal: " ++ _ ->
|
"fatal: " ++ _ ->
|
||||||
{undefined, ""};
|
{undefined, ""};
|
||||||
_ ->
|
_ ->
|
||||||
Vsn = slice(Tag, len(Pattern)),
|
Vsn = string:slice(Tag, string:length(Pattern)),
|
||||||
Vsn1 = trim(trim(Vsn, left, "v"), right, "\n"),
|
Vsn1 = string:trim(string:trim(Vsn, leading, "v"), trailing, "\n"),
|
||||||
{Tag, Vsn1}
|
{Tag, Vsn1}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
-ifdef(unicode_str).
|
|
||||||
len(Str) -> string:length(Str).
|
|
||||||
trim(Str, right, Chars) -> string:trim(Str, trailing, Chars);
|
|
||||||
trim(Str, left, Chars) -> string:trim(Str, leading, Chars).
|
|
||||||
slice(Str, Len) -> string:slice(Str, Len).
|
|
||||||
-else.
|
|
||||||
len(Str) -> string:len(Str).
|
|
||||||
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
|
|
||||||
slice(Str, Len) -> string:substr(Str, Len + 1).
|
|
||||||
-endif.
|
|
||||||
|
|
||||||
-ifdef(TEST).
|
-ifdef(TEST).
|
||||||
-include_lib("eunit/include/eunit.hrl").
|
-include_lib("eunit/include/eunit.hrl").
|
||||||
|
|
||||||
|
|
|
@ -127,7 +127,7 @@ ask_convert(Prompt, TransFun, Type, Default) ->
|
||||||
Default ->
|
Default ->
|
||||||
[" (", io_lib:format("~p", [Default]) , ")"]
|
[" (", io_lib:format("~p", [Default]) , ")"]
|
||||||
end, "> "])),
|
end, "> "])),
|
||||||
Data = trim(trim(io:get_line(NewPrompt)), both, [$\n]),
|
Data = string:trim(string:trim(io:get_line(NewPrompt)), both, [$\n]),
|
||||||
Ret = TransFun(Data),
|
Ret = TransFun(Data),
|
||||||
case Ret of
|
case Ret of
|
||||||
no_data ->
|
no_data ->
|
||||||
|
@ -197,14 +197,6 @@ get_string(String) ->
|
||||||
no_clue
|
no_clue
|
||||||
end.
|
end.
|
||||||
|
|
||||||
-ifdef(unicode_str).
|
|
||||||
trim(Str) -> string:trim(Str).
|
|
||||||
trim(Str, both, Chars) -> string:trim(Str, both, Chars).
|
|
||||||
-else.
|
|
||||||
trim(Str) -> string:strip(Str).
|
|
||||||
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
|
|
||||||
-endif.
|
|
||||||
|
|
||||||
%%%====================================================================
|
%%%====================================================================
|
||||||
%%% tests
|
%%% tests
|
||||||
%%%====================================================================
|
%%%====================================================================
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue