umgeher/erlware_commons
0
Fork 0
Code Issues Pull requests Releases Activity

Removed namespaced_types

Browse source 
* introduced for handling deprecated types existing before R17
* introduced in 523a66ad74
* CI/CD handles R19 up to R24
* R19 and onwards have dict:dict/0 [1,2]

[1] https://www.erlang.org/docs/19/man/dict
[2] https://www.erlang.org/docs/24/man/dict#type-dict
This commit is contained in:
Ariel Otilibili 2024-02-17 21:59:32 +01:00
parent 7b7d5b559d
commit 2286a6ed9b
3 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rebar.config
View file

@ -9,8 +9,7 @@
%% Compiler Options ============================================================ %% Compiler Options ============================================================
{erl_opts, {erl_opts,
[{platform_define, "^[0-9]+", namespaced_types}, [{platform_define, "^2", unicode_str},
{platform_define, "^2", unicode_str},
{platform_define, "^(R|1|20)", fun_stacktrace}, {platform_define, "^(R|1|20)", fun_stacktrace},
debug_info, debug_info,
warnings_as_errors]}. warnings_as_errors]}.

4
src/ec_dict.erl
View file

@ -34,11 +34,7 @@
%%%=================================================================== %%%===================================================================
%% This should be opaque, but that kills dialyzer so for now we export it %% This should be opaque, but that kills dialyzer so for now we export it
%% however you should not rely on the internal representation here %% however you should not rely on the internal representation here
-ifdef(namespaced_types).
-type dictionary(_K, _V) :: dict:dict(). -type dictionary(_K, _V) :: dict:dict().
-else.
-type dictionary(_K, _V) :: dict().
-endif.
%%%=================================================================== %%%===================================================================
%%% API %%% API

14
src/ec_plists.erl
View file

@ -480,16 +480,9 @@ usort(Fun, List, Malt) ->
runmany(Fun2, {recursive, Fuse}, List, Malt). runmany(Fun2, {recursive, Fuse}, List, Malt).
%% @doc Like below, assumes default MapMalt of 1. %% @doc Like below, assumes default MapMalt of 1.
-ifdef(namespaced_types).
-spec mapreduce(MapFunc, list()) -> dict:dict() when -spec mapreduce(MapFunc, list()) -> dict:dict() when
MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), MapFunc :: fun((term()) -> DeepListOfKeyValuePairs),
DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}. DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}.
-else.
-spec mapreduce(MapFunc, list()) -> dict() when
MapFunc :: fun((term()) -> DeepListOfKeyValuePairs),
DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}.
-endif.
mapreduce(MapFunc, List) -> mapreduce(MapFunc, List) ->
mapreduce(MapFunc, List, 1). mapreduce(MapFunc, List, 1).
@ -518,17 +511,10 @@ mapreduce(MapFunc, List, MapMalt) ->
%% %%
%% mapreduce requires OTP R11B, or it may leave monitoring messages in the %% mapreduce requires OTP R11B, or it may leave monitoring messages in the
%% message queue. %% message queue.
-ifdef(namespaced_types).
-spec mapreduce(MapFunc, list(), InitState::term(), ReduceFunc, malt()) -> dict:dict() when -spec mapreduce(MapFunc, list(), InitState::term(), ReduceFunc, malt()) -> dict:dict() when
MapFunc :: fun((term()) -> DeepListOfKeyValuePairs), MapFunc :: fun((term()) -> DeepListOfKeyValuePairs),
DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()}, DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()},
ReduceFunc :: fun((OldState::term(), Key::term(), Value::term()) -> NewState::term()). ReduceFunc :: fun((OldState::term(), Key::term(), Value::term()) -> NewState::term()).
-else.
-spec mapreduce(MapFunc, list(), InitState::term(), ReduceFunc, malt()) -> dict() when
MapFunc :: fun((term()) -> DeepListOfKeyValuePairs),
DeepListOfKeyValuePairs :: [DeepListOfKeyValuePairs] | {Key::term(), Value::term()},
ReduceFunc :: fun((OldState::term(), Key::term(), Value::term()) -> NewState::term()).
-endif.
mapreduce(MapFunc, List, InitState, ReduceFunc, MapMalt) -> mapreduce(MapFunc, List, InitState, ReduceFunc, MapMalt) ->
Parent = self(), Parent = self(),
{Reducer, ReducerRef} = {Reducer, ReducerRef} =