umgeher/erlware_commons
0
Fork 0
Code Issues Pull requests Releases Activity

Fix bad unicode transition for OTP 20+

Browse source 
The trim/3 function accepts a list of graphemes rather than a single
character. This means previous patches were wrong and totally breaking.
This commit is contained in:
Fred Hebert 2017-11-14 21:20:36 -05:00
parent d792f8c5ff
commit df7728d81f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ec_git_vsn.erl
View file

@ -89,7 +89,7 @@ parse_tags(Pattern) ->
Cmd = io_lib:format("git describe --abbrev=0 --match \"~s*\"", [Pattern]),
Tag = os:cmd(Cmd),
Vsn = slice(Tag, len(Pattern) + 1),
Vsn1 = trim(Vsn, left, $v),
Vsn1 = trim(Vsn, left, "v"),
{Tag, Vsn1}.
-ifdef(unicode_str).
@ -98,6 +98,6 @@ trim(Str, Dir, Chars) -> string:trim(Str, Dir, Chars).
slice(Str, Len) -> string:slice(Str, Len).
-else.
len(Str) -> string:len(Str).
trim(Str, Dir, Chars) -> string:strip(Str, Dir, Chars).
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
slice(Str, Len) -> string:substr(Str, Len).
-endif.

4
src/ec_talk.erl
View file

@ -127,7 +127,7 @@ ask_convert(Prompt, TransFun, Type, Default) ->
Default ->
[" (", io_lib:format("~p", [Default]) , ")"]
end, "> "])),
Data = trim(trim(io:get_line(NewPrompt)), both, $\n),
Data = trim(trim(io:get_line(NewPrompt)), both, [$\n]),
Ret = TransFun(Data),
case Ret of
no_data ->
@ -202,7 +202,7 @@ trim(Str) -> string:trim(Str).
trim(Str, Dir, Chars) -> string:trim(Str, Dir, Chars).
-else.
trim(Str) -> string:strip(Str).
trim(Str, Dir, Chars) -> string:strip(Str, Dir, Chars).
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
-endif.
%%%====================================================================