aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_util.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-03-10 19:57:07 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-03-12 19:15:34 +0100
commit2fadbefc264d33da526ec61cffc9847f724d8d92 (patch)
tree5359fe987ea2a5e991ffe4fe0298ac264dde0ae3 /erts/emulator/beam/erl_db_util.c
parent27e57aa05354b743b735a41716c0e3af18f2843e (diff)
downloadotp-2fadbefc264d33da526ec61cffc9847f724d8d92.tar.gz
otp-2fadbefc264d33da526ec61cffc9847f724d8d92.tar.bz2
otp-2fadbefc264d33da526ec61cffc9847f724d8d92.zip
erts: Reintroduce is_map macro
as shorthand for is_flatmap || is_hashmap
Diffstat (limited to 'erts/emulator/beam/erl_db_util.c')
-rw-r--r--erts/emulator/beam/erl_db_util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index cca3f381a1..efbefb7492 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2004,7 +2004,7 @@ restart:
++ep;
break;
case matchMap:
- if (!is_flatmap_rel(*ep, base) && !is_hashmap_rel(*ep,base)) {
+ if (!is_map_rel(*ep, base)) {
FAIL();
}
n = *pc++;
@@ -2021,7 +2021,7 @@ restart:
ep = flatmap_val_rel(*ep, base);
break;
case matchPushM:
- if (!is_flatmap_rel(*ep, base) && !is_hashmap_rel(*ep, base)) {
+ if (!is_map_rel(*ep, base)) {
FAIL();
}
n = *pc++;
@@ -4915,7 +4915,7 @@ static DMCRet dmc_expr(DMCContext *context,
return ret;
break;
case TAG_PRIMARY_BOXED:
- if (is_flatmap(t) || is_hashmap(t)) {
+ if (is_map(t)) {
return dmc_map(context, heap, text, t, constant);
}
if (!is_tuple(t)) {