File 0630-dialyzer-replace-size-1-by-XXX_size-1.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0630-dialyzer-replace-size-1-by-XXX_size-1.patch of Package erlang (Revision c667b5069ef18e7eb4954e8113ac1037)

Currently displaying revision c667b5069ef18e7eb4954e8113ac1037 , Show latest

From e62adcbffa01cd6d82d0e84842886c725cd18d2e Mon Sep 17 00:00:00 2001
From: Kiko Fernandez-Reyes <kiko@erlang.org>
Date: Mon, 16 Jan 2023 14:47:58 +0100
Subject: [PATCH] dialyzer: replace size/1 by XXX_size/1

---
 .../test/indent_SUITE_data/src/map_galore.erl |  4 +-
 .../test/opaque_SUITE_data/src/ewgi/ewgi.hrl  | 10 ++--
 .../test/opaque_SUITE_data/src/ewgi2/ewgi.hrl | 10 ++--
 .../options1_SUITE_data/src/compiler/cerl.erl |  4 +-
 .../src/compiler/cerl_inline.erl              |  4 +-
 .../test/user_SUITE_data/src/wsp_pdu.erl      | 54 +++++++++----------
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl b/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl
index 99eb73a5f6..616d4d62bf 100644
--- a/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl
+++ b/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl
@@ -1649,9 +1649,9 @@ cmp_others(T1, T2, _) ->
 
 map_gen(Pairs, Size) ->
     {_,L} = lists:foldl(fun(_, {Keys, Acc}) ->
-				KI = random:uniform(size(Keys)),
+				KI = random:uniform(tuple_size(Keys)),
 				K = element(KI,Keys),
-				KV = element(random:uniform(size(K)), K),
+				KV = element(random:uniform(tuple_size(K)), K),
 				{erlang:delete_element(KI,Keys), [KV | Acc]}
 			end,
 			{Pairs, []},
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
index 5cbc79f948..3702c30747 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
@@ -55,7 +55,7 @@
                       bag()}.
 
 -define(IS_EWGI_SPEC(R), ((element(1, R) =:= 'ewgi_spec')
-                          and (size(R) =:= 6))).
+                          and (tuple_size(R) =:= 6))).
 -define(GET_EWGI_READ_INPUT(R), element(2, R)).
 -define(SET_EWGI_READ_INPUT(A, R), setelement(2, R, A)).
 -define(GET_EWGI_WRITE_ERROR(R), element(3, R)).
@@ -88,7 +88,7 @@
                               ewgi_header_val(), bag()}.
 
 -define(IS_HTTP_HEADERS(R), ((element(1, R) =:= 'ewgi_http_headers')
-                             and (size(R) =:= 8))).
+                             and (tuple_size(R) =:= 8))).
 -define(GET_HTTP_ACCEPT(R), element(2, R)).
 -define(SET_HTTP_ACCEPT(A, R), setelement(2, R, A)).
 -define(GET_HTTP_COOKIE(R), element(3, R)).
@@ -129,7 +129,7 @@
                          ewgi_val(), ewgi_val()}.
 
 -define(IS_EWGI_REQUEST(R), ((element(1, R) =:= 'ewgi_request')
-                             and (size(R) =:= 21))).
+                             and (tuple_size(R) =:= 21))).
 -define(GET_AUTH_TYPE(R), element(2, R)).
 -define(SET_AUTH_TYPE(A, R), setelement(2, R, A)).
 -define(GET_CONTENT_LENGTH(R), element(3, R)).
@@ -192,7 +192,7 @@
 -type ewgi_response() :: {'ewgi_response', ewgi_status(), ewgi_header_list(), ewgi_message_body(), any()}.
 
 -define(IS_EWGI_RESPONSE(R), ((element(1, R) =:= 'ewgi_response')
-                              and (size(R) =:= 5))).
+                              and (tuple_size(R) =:= 5))).
 -define(GET_RESPONSE_STATUS(R), element(2, R)).
 -define(SET_RESPONSE_STATUS(A, R), setelement(2, R, A)).
 -define(GET_RESPONSE_HEADERS(R), element(3, R)).
@@ -209,7 +209,7 @@
 -define(IS_EWGI_CONTEXT(R), ((element(1, R) =:= 'ewgi_context')
                              and ?IS_EWGI_REQUEST(element(2, R))
                              and ?IS_EWGI_RESPONSE(element(3, R))
-                             and (size(R) =:= 3))).
+                             and (tuple_size(R) =:= 3))).
 -define(GET_EWGI_REQUEST(R), element(2, R)).
 -define(SET_EWGI_REQUEST(A, R), setelement(2, R, A)).
 -define(GET_EWGI_RESPONSE(R), element(3, R)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
index d8e15cb081..f961c0b67e 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
@@ -56,7 +56,7 @@
                       bag()}.
 
 -define(IS_EWGI_SPEC(R), ((element(1, R) =:= 'ewgi_spec')
-                          and (size(R) =:= 6))).
+                          and (tuple_size(R) =:= 6))).
 -define(GET_EWGI_READ_INPUT(R), element(2, R)).
 -define(SET_EWGI_READ_INPUT(A, R), setelement(2, R, A)).
 -define(GET_EWGI_WRITE_ERROR(R), element(3, R)).
@@ -89,7 +89,7 @@
                               ewgi_header_val(), bag()}.
 
 -define(IS_HTTP_HEADERS(R), ((element(1, R) =:= 'ewgi_http_headers')
-                             and (size(R) =:= 8))).
+                             and (tuple_size(R) =:= 8))).
 -define(GET_HTTP_ACCEPT(R), element(2, R)).
 -define(SET_HTTP_ACCEPT(A, R), setelement(2, R, A)).
 -define(GET_HTTP_COOKIE(R), element(3, R)).
@@ -130,7 +130,7 @@
                          ewgi_val(), ewgi_val()}.
 
 -define(IS_EWGI_REQUEST(R), ((element(1, R) =:= 'ewgi_request')
-                             and (size(R) =:= 21))).
+                             and (tuple_size(R) =:= 21))).
 -define(GET_AUTH_TYPE(R), element(2, R)).
 -define(SET_AUTH_TYPE(A, R), setelement(2, R, A)).
 -define(GET_CONTENT_LENGTH(R), element(3, R)).
@@ -193,7 +193,7 @@
 -type ewgi_response() :: {'ewgi_response', ewgi_status(), ewgi_header_list(), ewgi_message_body(), any()}.
 
 -define(IS_EWGI_RESPONSE(R), ((element(1, R) =:= 'ewgi_response')
-                              and (size(R) =:= 5))).
+                              and (tuple_size(R) =:= 5))).
 -define(GET_RESPONSE_STATUS(R), element(2, R)).
 -define(SET_RESPONSE_STATUS(A, R), setelement(2, R, A)).
 -define(GET_RESPONSE_HEADERS(R), element(3, R)).
@@ -210,7 +210,7 @@
 -define(IS_EWGI_CONTEXT(R), ((element(1, R) =:= 'ewgi_context')
                              and ?IS_EWGI_REQUEST(element(2, R))
                              and ?IS_EWGI_RESPONSE(element(3, R))
-                             and (size(R) =:= 3))).
+                             and (tuple_size(R) =:= 3))).
 -define(GET_EWGI_REQUEST(R), element(2, R)).
 -define(SET_EWGI_REQUEST(A, R), setelement(2, R, A)).
 -define(GET_EWGI_RESPONSE(R), element(3, R)).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl
index c71b835123..44fb8510b6 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl.erl
@@ -1503,7 +1503,7 @@ tuple_es(#literal{val = V}) ->
 tuple_arity(#tuple{es = Es}) ->
     length(Es);
 tuple_arity(#literal{val = V}) when tuple(V) ->
-    size(V).
+    tuple_size(V).
 
 
 %% ---------------------------------------------------------------------
@@ -3597,7 +3597,7 @@ data_arity(#literal{val = V}) ->
 	[_ | _] ->
 	    2;
 	_ when tuple(V) ->
-	    size(V);
+	    tuple_size(V);
 	_ ->
 	    0
     end;
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl
index 8fca202b8c..d42cc49842 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/cerl_inline.erl
@@ -2211,7 +2211,7 @@ reduce_bif_call_1(erlang, element, 2, [X, Y], _Env) ->
 	    %% the elements, so lifting out a particular element is OK.
 	    T = list_to_tuple(tuple_es(Y)),
 	    N = int_val(X),
-	    if integer(N), N > 0, N =< size(T) ->
+	    if integer(N), N > 0, N =< tuple_size(T) ->
 		    E = element(N, T),
 		    Es = tuple_to_list(setelement(N, T, void())),
 		    {true, make_seq(c_tuple(Es), E)};
@@ -2255,7 +2255,7 @@ reduce_bif_call_1(erlang, setelement, 3, [X, Y, Z], Env) ->
 	    %% evaluated before any part of `Y'.
 	    T = list_to_tuple(tuple_es(Y)),
 	    N = int_val(X),
-	    if integer(N), N > 0, N =< size(T) ->
+	    if integer(N), N > 0, N =< tuple_size(T) ->
 		    E = element(N, T),
 		    case is_simple(Z) of
 			true ->
diff --git a/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl b/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl
index e5b387478f..02212328e4 100644
--- a/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl
+++ b/lib/dialyzer/test/user_SUITE_data/src/wsp_pdu.erl
@@ -106,9 +106,9 @@ encode1(Pdu, Version) ->
 			    headers=Headers} ->
 	    EncServerSessionId = e_uintvar(ServerSessionId),
 	    EncCapabilities = encode_capabilities(Capabilities),
-	    EncCapabilitiesLength = e_uintvar(size(EncCapabilities)),
+	    EncCapabilitiesLength = e_uintvar(byte_size(EncCapabilities)),
 	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncHeaders)),
+	    EncHeadersLength = e_uintvar(byte_size(EncHeaders)),
 	    <<?WSP_ConnectReply,
 	     EncServerSessionId/binary,
 	     EncCapabilitiesLength/binary, EncHeadersLength/binary,
@@ -121,8 +121,8 @@ encode1(Pdu, Version) ->
 	    EncStatus = encode_status_code(Status),
 	    EncContentType = encode_content_type(ContentType,Version),
 	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),
+	    EncHeadersLength = e_uintvar(byte_size(EncContentType)+
+					 byte_size(EncHeaders)),
 	    <<?WSP_Reply,
 	     EncStatus:8,
 	     EncHeadersLength/binary,
@@ -137,8 +137,8 @@ encode1(Pdu, Version) ->
 	    UriLength = e_uintvar(length(URI)),
 	    EncContentType = encode_content_type(ContentType,Version),
 	    EncHeaders = encode_headers(Headers,Version),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),
+	    EncHeadersLength = e_uintvar(byte_size(EncContentType)+
+					 byte_size(EncHeaders)),
 	    %% FIXME
 	    <<PDUType:8,
 	     UriLength/binary,
@@ -156,8 +156,8 @@ encode1(Pdu, Version) ->
 	    EncHeaders = encode_headers(Headers,Version),
 	    ?dbg("Version ~p Headers ~p", [Version, Headers]),
 	    ?dbg("EncHeaders ~p", [EncHeaders]),
-	    EncHeadersLength = e_uintvar(size(EncContentType)+
-					 size(EncHeaders)),
+	    EncHeadersLength = e_uintvar(byte_size(EncContentType)+
+					 byte_size(EncHeaders)),
 	    ?dbg("EncCT = ~w ~w", [ContentType, EncContentType]),
 	    ?dbg("EncHL = ~w", [EncHeadersLength]),
 	    <<PDUType:8,
@@ -278,7 +278,7 @@ decode(Data0, Version) ->
 	    {HL0, D2} = d_uintvar(D1),
 	    <<UriData:URILen/binary,D3/binary>> = D2,
 	    {FieldData,D4} = scan_header_data(D3),
-	    HL1 = (HL0-(size(D3)-size(D4))),
+	    HL1 = (HL0-(byte_size(D3)-byte_size(D4))),
 	    <<D5:HL1/binary,Data/binary>> = D4,
 	    ContentType = decode_content_type(FieldData, Version),
 	    Headers = decode_headers(D5, Version),
@@ -290,7 +290,7 @@ decode(Data0, Version) ->
 	    {HL0, D2} = d_uintvar(D1),
 	    <<UriData:URILen/binary,D3/binary>> = D2,
 	    {FieldData,D4} = scan_header_data(D3),
-	    HL1 = (HL0-(size(D3)-size(D4))),
+	    HL1 = (HL0-(byte_size(D3)-byte_size(D4))),
 	    <<D5:HL1/binary,Data/binary>> = D4,
 	    ContentType = decode_content_type(FieldData, Version),
 	    Headers = decode_headers(D5, Version),
@@ -304,7 +304,7 @@ decode(Data0, Version) ->
 	    {FieldData, D2} = scan_header_data(D1),
 	    ContentType = decode_content_type(FieldData, Version),
 	    %% Headers are headersLength - binary size of content type
-	    HL1 = (HL0-(size(D1)-size(D2))),
+	    HL1 = (HL0-(byte_size(D1)-byte_size(D2))),
 	    <<D3:HL1/binary,Data/binary>> = D2,
 	    Hs = decode_headers(D3, Version),
 	    #wsp_reply{status=Status, content_type=ContentType,
@@ -322,7 +322,7 @@ decode(Data0, Version) ->
 	    {HeadersLength, T200} = d_uintvar(D0),
 	    {FieldData, T300} = scan_header_data(T200),
 	    ContentType = decode_content_type(FieldData, Version),
-	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
+	    RealHeadersLength = (HeadersLength-(byte_size(T200)-byte_size(T300))),
 	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
 	    Headers = decode_headers(T400, Version),
 	    #wsp_push{type=push,content_type=ContentType,
@@ -332,7 +332,7 @@ decode(Data0, Version) ->
 	    {HeadersLength, T200} = d_uintvar(D0),
 	    {FieldData, T300} = scan_header_data(T200),
 	    ContentType = decode_content_type(FieldData, Version),
-	    RealHeadersLength = (HeadersLength-(size(T200)-size(T300))),
+	    RealHeadersLength = (HeadersLength-(byte_size(T200)-byte_size(T300))),
 	    <<T400:RealHeadersLength/binary,Data/binary>> = T300,
 	    Headers = decode_headers(T400, Version),
 	    #wsp_push{type=confirmed_push,
@@ -443,7 +443,7 @@ encode_capabilities(Cap,Def) ->
     list_to_binary(
       lists:map(fun(<<>>) -> [];
 		   (Bin) ->
-			[e_uintvar(size(Bin)), Bin]
+			[e_uintvar(byte_size(Bin)), Bin]
 		end, Known ++ Unknown)).
 
 
@@ -3135,7 +3135,7 @@ encode_cookies([{Name,Value,Ps} | Cs], Acc) ->
 	     [] ->
 		 []
 	 end],
-    Sz = lists:sum(lists:map(fun(B) -> size(B) end, List)),
+    Sz = lists:sum(lists:map(fun(B) -> byte_size(B) end, List)),
     encode_cookies(Cs, [[e_uintvar(Sz) | List] | Acc]);
 encode_cookies([], Acc) ->
     list_to_binary(lists:reverse(Acc)).
@@ -4430,8 +4430,8 @@ encode_multipart_entry(Entry, Version) ->
 			   data = Data } = Entry,
     EncContentType = encode_content_type(ContentType,Version),
     EncHeaders = encode_headers(Headers, Version),
-    EncHeadersLength = e_uintvar(size(EncContentType)+size(EncHeaders)),
-    DataLen = e_uintvar(size(Data)),
+    EncHeadersLength = e_uintvar(byte_size(EncContentType)+byte_size(EncHeaders)),
+    DataLen = e_uintvar(byte_size(Data)),
     <<EncHeadersLength/binary,
      DataLen/binary,
      EncContentType/binary,
@@ -4462,7 +4462,7 @@ decode_multipart_entry(Data, Version) ->
     {DataLen, Data2} = d_uintvar(Data1),
     {FieldData,Data3} = scan_header_data(Data2),
     ContentType = decode_content_type(FieldData, Version),
-    BinHeadersLen = (HeadersLen-(size(Data2)-size(Data3))),
+    BinHeadersLen = (HeadersLen-(byte_size(Data2)-byte_size(Data3))),
     <<BinHeaders:BinHeadersLen/binary,Data4/binary>> = Data3,
     Headers = decode_headers(BinHeaders, Version),
     <<ValueData:DataLen/binary, Data5/binary>> = Data4,
@@ -5014,7 +5014,7 @@ encode_integer(List) when list(List) ->
 decode_integer(Value) when integer(Value) ->
     Value;
 decode_integer({short,Data}) ->
-    Sz = size(Data)*8,
+    Sz = byte_size(Data)*8,
     <<Value:Sz>> = Data,
     Value.
 
@@ -5051,7 +5051,7 @@ decode_long_integer(<<0:3,Len:5,Data/binary>>) when Len =/= 31 ->
     <<Val:Sz, Tail/binary>> = Data,
     {Val, Tail}.
 
-d_long(Data) ->
+d_long(Data) when is_binary(Data) ->
     Sz = size(Data)*8,
     <<Value:Sz>> = Data,
     Value.
@@ -5176,7 +5176,7 @@ e_uintvar(I,Acc) ->
 
 
 e_value(B) ->
-    Sz = size(B),
+    Sz = byte_size(B),
     if Sz =< 30 ->
 	    <<Sz:8, B/binary>>;
        true ->
@@ -5184,7 +5184,7 @@ e_value(B) ->
     end.
 
 e_value(B1,B2) ->
-    Sz = size(B1)+size(B2),
+    Sz = byte_size(B1)+byte_size(B2),
     if Sz =< 30 ->
 	    <<Sz:8, B1/binary, B2/binary>>;
        true ->
@@ -5192,7 +5192,7 @@ e_value(B1,B2) ->
     end.
 
 e_value(B1,B2,B3) ->
-    Sz = size(B1)+size(B2)+size(B3),
+    Sz = byte_size(B1)+byte_size(B2)+byte_size(B3),
     if Sz =< 30 ->
 	    <<Sz:8, B1/binary,B2/binary,B3/binary>>;
        true ->
@@ -5200,7 +5200,7 @@ e_value(B1,B2,B3) ->
     end.
 
 e_value(B1,B2,B3,B4) ->
-    Sz = size(B1)+size(B2)+size(B3)+size(B4),
+    Sz = byte_size(B1)+byte_size(B2)+byte_size(B3)+byte_size(B4),
     if Sz =< 30 ->
 	    <<Sz:8, B1/binary,B2/binary,B3/binary,B4/binary>>;
        true ->
@@ -5266,7 +5266,7 @@ encode_address(#wdp_address { bearer = B, address = Addr, portnum = P }) ->
 	       binary(Addr) ->
 		    Addr
 	    end,
-    Len = size(BAddr),
+    Len = byte_size(BAddr),
     if B == undefined, P == undefined ->
 	    <<0:1, 0:1, Len:6, BAddr/binary>>;
        B == undefined ->
@@ -5284,8 +5284,8 @@ encode_address(#wdp_address { bearer = B, address = Addr, portnum = P }) ->
 
 d_date(Val) when integer(Val) ->
     calendar:gregorian_seconds_to_datetime(Val+?UNIX_TIME_OFFSET);
-d_date({short,Data}) ->
-    Sz = size(Data)*8,
+d_date({short,Data}) when is_binary(Data) ->
+    Sz = byte_size(Data)*8,
     <<Sec:Sz>> = Data,
     calendar:gregorian_seconds_to_datetime(Sec+?UNIX_TIME_OFFSET).
 
-- 
2.35.3

Places

File 0630-dialyzer-replace-size-1-by-XXX_size-1.patch of Package erlang (Revision c667b5069ef18e7eb4954e8113ac1037)

Places