aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-01 16:40:37 +0100
committerZandra <[email protected]>2015-12-01 16:40:37 +0100
commit4653ae787c44adc081d7757a706bb115ba67229f (patch)
tree01c309d6b47cf986b5e6999e94aea9eaa50024e7 /lib/stdlib/src
parent8f2c74038cfdd10270d349de4898828f915d3a50 (diff)
parentc7c27a608e219d7aa2ecd20203632095af94da8a (diff)
downloadotp-4653ae787c44adc081d7757a706bb115ba67229f.tar.gz
otp-4653ae787c44adc081d7757a706bb115ba67229f.tar.bz2
otp-4653ae787c44adc081d7757a706bb115ba67229f.zip
Merge branch 'lexmag/bin-gen-pattern-bytes'
* lexmag/bin-gen-pattern-bytes: Forbid bytes modifier for unsized part of binary generator OTP-13152
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/erl_lint.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index a5f0e7dbd3..69eff615b4 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -3189,8 +3189,8 @@ handle_generator(P,E,Vt,Uvt,St0) ->
handle_bitstring_gen_pat({bin,_,Segments=[_|_]},St) ->
case lists:last(Segments) of
{bin_element,Line,{var,_,_},default,Flags} when is_list(Flags) ->
- case member(binary, Flags) orelse member(bits, Flags)
- orelse member(bitstring, Flags) of
+ case member(binary, Flags) orelse member(bytes, Flags)
+ orelse member(bits, Flags) orelse member(bitstring, Flags) of
true ->
add_error(Line, unsized_binary_in_bin_gen_pattern, St);
false ->