diff options
| author | Dan Gudmundsson <[email protected]> | 2018-03-01 12:37:49 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2018-03-01 12:37:49 +0100 |
| commit | 3bba476ad0df599050ccfc0826856111f5ff1bde (patch) | |
| tree | 8703a51657f3a9716863cb2920e4dce88797be12 /lib/stdlib/src/string.erl | |
| parent | 88c4c305636618af4002c8c484083668a88824e9 (diff) | |
| parent | 693315d23293cb107c2ad7e50960dee40d7a3ca9 (diff) | |
| download | otp-3bba476ad0df599050ccfc0826856111f5ff1bde.tar.gz otp-3bba476ad0df599050ccfc0826856111f5ff1bde.tar.bz2 otp-3bba476ad0df599050ccfc0826856111f5ff1bde.zip | |
Merge branch 'maint'
* maint:
ERL-558 Add the missing function clause for string:prefix (#1702)
Diffstat (limited to 'lib/stdlib/src/string.erl')
| -rw-r--r-- | lib/stdlib/src/string.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl index e01bb7d85e..4e89819e41 100644 --- a/lib/stdlib/src/string.erl +++ b/lib/stdlib/src/string.erl @@ -420,10 +420,12 @@ to_number(_, Number, Rest, _, Tail) -> %% Return the remaining string with prefix removed or else nomatch -spec prefix(String::unicode:chardata(), Prefix::unicode:chardata()) -> 'nomatch' | unicode:chardata(). -prefix(Str, []) -> Str; prefix(Str, Prefix0) -> - Prefix = unicode:characters_to_list(Prefix0), - case prefix_1(Str, Prefix) of + Result = case unicode:characters_to_list(Prefix0) of + [] -> Str; + Prefix -> prefix_1(Str, Prefix) + end, + case Result of [] when is_binary(Str) -> <<>>; Res -> Res end. |