diff options
| author | Dan Gudmundsson <[email protected]> | 2017-04-24 12:41:10 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-04-24 12:41:10 +0200 |
| commit | 739bca3fc267c55d84c8f5c193d16c0b2a7eee13 (patch) | |
| tree | a7ac2a4c90bdeadd2a313e7d49cecf84d3e1ba28 /erts/emulator/beam/bif.c | |
| parent | 515dc2d603d449ed3621d96028ba403aef05ea7f (diff) | |
| parent | a9d0d119837fb0bc52d2bb3d48a47568de9100b4 (diff) | |
| download | otp-739bca3fc267c55d84c8f5c193d16c0b2a7eee13.tar.gz otp-739bca3fc267c55d84c8f5c193d16c0b2a7eee13.tar.bz2 otp-739bca3fc267c55d84c8f5c193d16c0b2a7eee13.zip | |
Merge branch 'dgud/stdlib/unicode-string/OTP-10289'
* dgud/stdlib/unicode-string/OTP-10289:
Handle chardata in string:to_float and string:to_list
New unicode aware string module that works with unicode:chardata()
Add nf(k)d, nf(k)c conversion functions to unicode module
Reorder code and whitespace fixes
Add unicode_util
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 214de3652f..075909a881 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -3109,7 +3109,7 @@ BIF_RETTYPE integer_to_list_1(BIF_ALIST_1) * On error returns: {error,not_a_list}, or {error, no_integer} */ -BIF_RETTYPE string_to_integer_1(BIF_ALIST_1) +BIF_RETTYPE string_list_to_integer_1(BIF_ALIST_1) { Eterm res; Eterm tail; @@ -3295,7 +3295,7 @@ BIF_RETTYPE float_to_binary_2(BIF_ALIST_2) #define LOAD_E(xi,xim,xl,xlm) ((xi)=(xim), (xl)=(xlm)) #define STRING_TO_FLOAT_BUF_INC_SZ (128) -BIF_RETTYPE string_to_float_1(BIF_ALIST_1) +BIF_RETTYPE string_list_to_float_1(BIF_ALIST_1) { Eterm orig = BIF_ARG_1; Eterm list = orig; |