3 files changed, 92 insertions, 19 deletions

diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index 5c40fb7747..52ab8cd504 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -306,12 +306,29 @@ static int print_term(FILE* fp, ei_x_buff* x,
             
         }
         break;
-
     case ERL_FLOAT_EXT:
     case NEW_FLOAT_EXT:
 	if (ei_decode_double(buf, index, &d) < 0) goto err;
 	ch_written += xprintf(fp, x, "%f", d);
 	break;
+    case ERL_MAP_EXT:
+	if (ei_decode_map_header(buf, &tindex, &n) < 0) goto err;
+        ch_written += xprintf(fp, x, "#{");
+	for (i = 0; i < n; ++i) {
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+            ch_written += xprintf(fp, x, " => ");
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+	    if (i < n-1) {
+		xputs(", ", fp, x); ch_written += 2;
+	    }
+	}
+	*index = tindex;
+	xputc('}', fp, x); ch_written++;
+	break;
     default:
 	goto err;
     }
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index c75ce55a7d..9d88a28102 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -26,7 +26,7 @@
 
 -export([all/0, suite/0,
          init_per_testcase/2,
-         atoms/1, tuples/1, lists/1, strings/1]).
+         atoms/1, tuples/1, lists/1, strings/1, maps/1]).
 
 -import(runner, [get_term/1]).
 
@@ -36,8 +36,8 @@
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
-    [atoms, tuples, lists, strings].
+all() ->
+    [atoms, tuples, lists, strings, maps].
 
 init_per_testcase(Case, Config) ->
     runner:init_per_testcase(?MODULE, Case, Config).
@@ -142,3 +142,13 @@ strings(Config) when is_list(Config) ->
 
     runner:recv_eot(P),
     ok.
+
+maps(Config) ->
+    P = runner:start(Config, ?maps),
+
+    {term, "#{}"} = get_term(P),
+    {term, "#{key => value}"} = get_term(P),
+    {term, "#{key => value, another_key => {ok, 42}}"} = get_term(P),
+
+    runner:recv_eot(P),
+    ok.
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
index 80be3016e6..685596e34a 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
+++ b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
@@ -29,39 +29,54 @@
  */
 
 static void
-send_printed3(char* format, char* p1, char* p2, int fl)
+send_printed_buf(ei_x_buff* x)
 {
     char* b = NULL;
-    char fn[100], * tmp = getenv("temp");
+    char fn[256];
+    char *tmp = getenv("temp");
     FILE* f;
     int n, index = 0, ver;
-    ei_x_buff x;
 
-    ei_x_new(&x);
-    if (fl) {
-	ei_x_format(&x, format, *(float*)p1, *(float*)p2);
-    } else {
-	ei_x_format(&x, format, p1, p2);
-    }
 #ifdef VXWORKS
     tmp = ".";
 #else
-    if (tmp == NULL) tmp = "/tmp";
+    if (tmp == NULL) {
+        tmp = "/tmp";
+    }
 #endif
     strcpy(fn, tmp);
     strcat(fn, "/ei_print_test.txt");
     f = fopen(fn, "w+");
-    ei_decode_version(x.buff, &index, &ver);
-    n = ei_print_term(f, x.buff, &index);
+    ei_decode_version(x->buff, &index, &ver);
+    n = ei_print_term(f, x->buff, &index);
     fseek(f, 0, SEEK_SET);
     b = malloc(n+1);
     fread(b, 1, n, f);
     b[n] = '\0';
     fclose(f);
-    x.index = 0;
-    ei_x_format(&x, "~s", b);
-    send_bin_term(&x);
+    x->index = 0;
+    ei_x_format(x, "~s", b);
+    send_bin_term(x);
     free(b);
+}
+
+
+static void
+send_printed3(char* format, char* p1, char* p2, int fl)
+{
+    char* b = NULL;
+    char fn[100], * tmp = getenv("temp");
+    FILE* f;
+    int n, index = 0, ver;
+    ei_x_buff x;
+
+    ei_x_new(&x);
+    if (fl) {
+	ei_x_format(&x, format, *(float*)p1, *(float*)p2);
+    } else {
+	ei_x_format(&x, format, p1, p2);
+    }
+    send_printed_buf(&x);
     ei_x_free(&x);
 }
 
@@ -184,4 +199,35 @@ TESTCASE(strings)
     report(1);
 }
 
+TESTCASE(maps)
+{
+    ei_x_buff x;
+
+    ei_init();
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 0);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 1);
+    ei_x_encode_atom(&x, "key");
+    ei_x_encode_atom(&x, "value");
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 2);
+    ei_x_encode_atom(&x, "key");
+    ei_x_encode_atom(&x, "value");
+    ei_x_encode_atom(&x, "another_key");
+    ei_x_encode_tuple_header(&x, 2);
+    ei_x_encode_atom(&x, "ok");
+    ei_x_encode_long(&x, 42L);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    report(1);
+}