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

Merge pull request #124 from ferd/fix-trim-usage-otp21

Browse source 
Fix bad unicode transition for OTP 20+
This commit is contained in:
Tristan Sloughter 2017-11-14 18:58:35 -08:00 • committed by GitHub
commit 2690bd14a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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]), Cmd = io_lib:format("git describe --abbrev=0 --match \"~s*\"", [Pattern]),
Tag = os:cmd(Cmd), Tag = os:cmd(Cmd),
Vsn = slice(Tag, len(Pattern) + 1), Vsn = slice(Tag, len(Pattern) + 1),
Vsn1 = trim(Vsn, left, $v), Vsn1 = trim(Vsn, left, "v"),
{Tag, Vsn1}. {Tag, Vsn1}.
-ifdef(unicode_str). -ifdef(unicode_str).
@ -98,6 +98,6 @@ trim(Str, Dir, Chars) -> string:trim(Str, Dir, Chars).
slice(Str, Len) -> string:slice(Str, Len). slice(Str, Len) -> string:slice(Str, Len).
-else. -else.
len(Str) -> string:len(Str). 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). slice(Str, Len) -> string:substr(Str, Len).
-endif. -endif.

4
src/ec_talk.erl
View file

@ -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 = trim(trim(io:get_line(NewPrompt)), both, [$\n]),
Ret = TransFun(Data), Ret = TransFun(Data),
case Ret of case Ret of
no_data -> no_data ->
@ -202,7 +202,7 @@ trim(Str) -> string:trim(Str).
trim(Str, Dir, Chars) -> string:trim(Str, Dir, Chars). trim(Str, Dir, Chars) -> string:trim(Str, Dir, Chars).
-else. -else.
trim(Str) -> string:strip(Str). trim(Str) -> string:strip(Str).
trim(Str, Dir, Chars) -> string:strip(Str, Dir, Chars). trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
-endif. -endif.
%%%==================================================================== %%%====================================================================