diff options
| author | Hans Bolinder <[email protected]> | 2013-03-29 08:28:59 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-03-29 08:28:59 +0100 |
| commit | fe7e36baf92a92198b21c698c62f61acb5dee9af (patch) | |
| tree | a516ffe1a266c8f520f3dcefd8983f162ffa8429 | |
| parent | 9754ff636fac43cc550c443e18f90afacf21344e (diff) | |
| parent | b90269e836b72e1ceeacbbac697cd16aa529cd31 (diff) | |
| download | otp-fe7e36baf92a92198b21c698c62f61acb5dee9af.tar.gz otp-fe7e36baf92a92198b21c698c62f61acb5dee9af.tar.bz2 otp-fe7e36baf92a92198b21c698c62f61acb5dee9af.zip | |
Merge branch 'hb/stdlib/unicode_bugfix/OTP-10990' into maint
* hb/stdlib/unicode_bugfix/OTP-10990:
Fix a bug in the Erlang scanner
| -rw-r--r-- | lib/stdlib/src/erl_scan.erl | 1 | ||||
| -rw-r--r-- | lib/stdlib/test/erl_scan_SUITE.erl | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index 3651f608bc..d988a4d8c7 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -338,6 +338,7 @@ string_thing(_) -> "string". -define(DIGIT(C), C >= $0, C =< $9). -define(CHAR(C), is_integer(C), C >= 0). -define(UNICODE(C), + is_integer(C) andalso (C >= 0 andalso C < 16#D800 orelse C > 16#DFFF andalso C < 16#FFFE orelse C > 16#FFFF andalso C =< 16#10FFFF)). diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl index ecd181e87c..7e33166c6a 100644 --- a/lib/stdlib/test/erl_scan_SUITE.erl +++ b/lib/stdlib/test/erl_scan_SUITE.erl @@ -21,7 +21,8 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). --export([ error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1]). +-export([ error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1, + otp_10990/1]). -import(lists, [nth/2,flatten/1]). -import(io_lib, [print/1]). @@ -60,7 +61,7 @@ end_per_testcase(_Case, Config) -> suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [{group, error}, iso88591, otp_7810, otp_10302]. + [{group, error}, iso88591, otp_7810, otp_10302, otp_10990]. groups() -> [{error, [], [error_1, error_2]}]. @@ -1121,6 +1122,14 @@ otp_10302(Config) when is_list(Config) -> erl_parse:abstract("a"++[1024]++"c", [{encoding,latin1}]), ok. +otp_10990(doc) -> + "OTP-10990. Floating point number in input string."; +otp_10990(suite) -> + []; +otp_10990(Config) when is_list(Config) -> + {'EXIT',_} = (catch {foo, erl_scan:string([$",42.0,$"],1)}), + ok. + test_string(String, Expected) -> {ok, Expected, _End} = erl_scan:string(String), test(String). |