erts: Add map construction to driver API

erl_drv_output_term() and erl_drv_send_term() can send messages
containing maps with the use of the new ERL_DRV_MAP.

The driver API minor version is updated as new functionality is added.

1 files changed, 2 insertions, 29 deletions

diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 57251286c8..a4cc3435c3 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -3795,37 +3795,10 @@ dec_term_atom_common:
      */
 
     while (maps_head) {
-	map_t *mp  = (map_t*)maps_head;
-	Eterm *ks  = map_get_keys(mp);
-	Eterm *vs  = map_get_values(mp);
-	Uint   sz  = map_get_size(mp);
-	Uint   ix,jx;
-	Eterm  tmp;
-	int c;
-
 	next  = (Eterm *)(EXPAND_POINTER(*maps_head));
-
-	/* sort */
-
-	for ( ix = 1; ix < sz; ix++) {
-	    jx = ix;
-	    while( jx > 0 && (c = CMP_TERM(ks[jx],ks[jx-1])) <= 0 ) {
-		/* identical key -> error */
-		if (c == 0) goto error;
-
-		tmp = ks[jx];
-		ks[jx] = ks[jx - 1];
-		ks[jx - 1] = tmp;
-
-		tmp = vs[jx];
-		vs[jx] = vs[jx - 1];
-		vs[jx - 1] = tmp;
-
-		jx--;
-	    }
-
-	}
 	*maps_head = MAP_HEADER;
+	if (!erts_validate_and_sort_map((map_t*)maps_head))
+	    goto error;
 	maps_head  = next;
     }