diff options
author | Björn Gustavsson <[email protected]> | 2012-11-12 15:42:47 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-11-12 15:42:47 +0100 |
commit | a7190c2356ed82317a860e9db691e2d1a49a67d8 (patch) | |
tree | d72ee232eedddee826d16a578823a860ea94f28c /lib/compiler/test/bs_match_SUITE.erl | |
parent | 135fdb3b1804089c5170c5995a9dae653a28f927 (diff) | |
parent | 2da980f03b0f67b1e8e15cb65049a90e3de401c0 (diff) | |
download | otp-a7190c2356ed82317a860e9db691e2d1a49a67d8.tar.gz otp-a7190c2356ed82317a860e9db691e2d1a49a67d8.tar.bz2 otp-a7190c2356ed82317a860e9db691e2d1a49a67d8.zip |
Merge branch 'bjorn/compiler/binary-matching/OTP-10567' into maint
* bjorn/compiler/binary-matching/OTP-10567:
Fix compiler crash for binary matching and a complicated guard
Diffstat (limited to 'lib/compiler/test/bs_match_SUITE.erl')
-rw-r--r-- | lib/compiler/test/bs_match_SUITE.erl | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl index 01b7568122..313de3470c 100644 --- a/lib/compiler/test/bs_match_SUITE.erl +++ b/lib/compiler/test/bs_match_SUITE.erl @@ -800,12 +800,29 @@ matching_and_andalso(Config) when is_list(Config) -> ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, -8)), ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, blurf)), ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, 19)), + + {"abc",<<"xyz">>} = matching_and_andalso_2("abc", <<"-xyz">>), + {"abc",<<"">>} = matching_and_andalso_2("abc", <<($a-1)>>), + {"abc",<<"">>} = matching_and_andalso_2("abc", <<($z+1)>>), + {"abc",<<"">>} = matching_and_andalso_2("abc", <<($A-1)>>), + {"abc",<<"">>} = matching_and_andalso_2("abc", <<($Z+1)>>), + error = matching_and_andalso_2([], <<>>), + error = matching_and_andalso_2([], <<$A>>), + error = matching_and_andalso_2([], <<$Z>>), + error = matching_and_andalso_2([], <<$a>>), + error = matching_and_andalso_2([], <<$z>>), ok. matching_and_andalso_1(<<Bitmap/binary>>, K) when is_integer(K) andalso size(Bitmap) >= K andalso 0 < K -> ok. +matching_and_andalso_2(Datetime, <<H,T/binary>>) + when not ((H >= $a) andalso (H =< $z)) andalso + not ((H >= $A) andalso (H =< $Z)) -> + {Datetime,T}; +matching_and_andalso_2(_, _) -> error. + %% Thanks to Tomas Stejskal. otp_7188(Config) when is_list(Config) -> MP3 = <<84,65,71,68,117,154,105,232,107,121,0,0,0,0,0,0,0,0,0,0, |