aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-10-15 20:10:46 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-12-07 19:34:39 +0100
commit2ae91c3ade0538500ff4dbda29ad539e595f64df (patch)
tree5d3e77bfd2c97b6391710b1030c766fedde0d3ca /erts/preloaded
parente656b6e26de27db6a4235961f7e667998d3a2832 (diff)
downloadotp-2ae91c3ade0538500ff4dbda29ad539e595f64df.tar.gz
otp-2ae91c3ade0538500ff4dbda29ad539e595f64df.tar.bz2
otp-2ae91c3ade0538500ff4dbda29ad539e595f64df.zip
erts: Change erts_internal:map_type/1 into term_type/1
to support other terms, not just maps
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erts_internal.beambin5964 -> 5988 bytes
-rw-r--r--erts/preloaded/src/erts_internal.erl12
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index dc8c711e1a..d63f79c327 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
Binary files differ
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 7ed4efea4b..023af1579f 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -31,7 +31,7 @@
-export([await_port_send_result/3]).
-export([cmp_term/2]).
--export([map_to_tuple_keys/1, map_type/1, map_hashmap_children/1]).
+-export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1]).
-export([port_command/3, port_connect/2, port_close/1,
port_control/3, port_call/3, port_info/1, port_info/2]).
@@ -215,12 +215,12 @@ cmp_term(_A,_B) ->
map_to_tuple_keys(_M) ->
erlang:nif_error(undefined).
-%% return the internal map type
--spec map_type(M) -> Type when
- M :: map(),
- Type :: 'flatmap' | 'hashmap' | 'hashmap_node'.
+%% return the internal term type
+-spec term_type(M) -> Type when
+ M :: term(),
+ Type :: 'flatmap' | 'hashmap' | 'hashmap_node' | 'small' | 'big' | 'ifloat' | 'hfloat'.
-map_type(_M) ->
+term_type(_M) ->
erlang:nif_error(undefined).
%% return the internal hashmap sub-nodes from