Merge branch 'sverk/maps-erl_interface'

* sverk/maps-erl_interface:
  erts: Add distribution capability flag for maps DFLAG_MAP_TAG
  erts: Change external format for maps
  erts: Document external format for maps (MAP_EXT)
  erl_interface: Add test for ei_skip_term of container terms
  erl_interface: Add map support in ei_skip_term
  erl_interface: Fix mem leak in ei_decode_encode_test
  erl_interface: test decode/encode of maps
  erl_interface: Add ei encode/decode for maps
  erl_interface: test decode_encode of tuples and lists
  erl_interface: refactor ei_decode_encode_test.c

4 files changed, 63 insertions, 46 deletions

diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index f91ed78122..fa083db4c7 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2007</year>
-      <year>2013</year>
+      <year>2014</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -573,6 +573,33 @@
     </section>
 
     <section>
+      <marker id="MAP_EXT"/>
+      <title>MAP_EXT</title>
+
+	<table align="left">
+	  <row>
+	    <cell align="center">1</cell>
+	    <cell align="center">4</cell>
+	    <cell align="center">N</cell>
+	  </row>
+	  <row>
+	    <cell align="center">116</cell>
+	    <cell align="center">Arity</cell>
+	    <cell align="center">Pairs</cell>
+	  </row>
+	<tcaption></tcaption></table>
+	<p>
+	  <c>MAP_EXT</c> encodes a map. The <c>Arity</c> field is an unsigned
+	  4 byte integer in big endian format that determines the number of
+	  key-value pairs in the map. Key and value pairs (<c>Ki => Vi</c>)
+	  are encoded in the <c>Pairs</c> section in the following order:
+	  <c>K1, V1, K2, V2,..., Kn, Vn</c>.
+	  Duplicate keys are <em>not allowed</em> within the same map.
+	</p>
+	<p><em>Since: </em>OTP 17.0</p>
+    </section>
+
+    <section>
       <marker id="NIL_EXT"/>
       <title>NIL_EXT</title>
 
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index 0519a9225e..f32b999198 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2014. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -40,6 +40,7 @@
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
 #define DFLAG_INTERNAL_TAGS       0x8000
 #define DFLAG_UTF8_ATOMS          0x10000
+#define DFLAG_MAP_TAG             0x20000
 
 /* All flags that should be enabled when term_to_binary/1 is used. */
 #define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES	\
@@ -47,7 +48,8 @@
 			       | DFLAG_NEW_FLOATS		\
 			       | DFLAG_EXTENDED_PIDS_PORTS	\
 			       | DFLAG_EXPORT_PTR_TAG		\
-			       | DFLAG_BIT_BINARIES)
+			       | DFLAG_BIT_BINARIES             \
+			       | DFLAG_MAP_TAG)
 
 /* opcodes used in distribution messages */
 #define DOP_LINK		1
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 9671cde228..656de7c49a 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -2562,29 +2562,25 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    {
 		map_t *mp = (map_t*)map_val(obj);
 		Uint size = map_get_size(mp);
-		Eterm *mptr;
 
 		*ep++ = MAP_EXT;
 		put_int32(size, ep); ep += 4;
 
-		/* Push values first */
 		if (size > 0) {
-		    mptr = map_get_values(mp);
+		    Eterm *kptr = map_get_keys(mp);
+		    Eterm *vptr = map_get_values(mp);
+
 		    for (i = size-1; i >= 1; i--) {
 			WSTACK_PUSH(s, ENC_TERM);
-			WSTACK_PUSH(s, (UWord) mptr[i]);
+			WSTACK_PUSH(s, (UWord) vptr[i]);
+			WSTACK_PUSH(s, ENC_TERM);
+			WSTACK_PUSH(s, (UWord) kptr[i]);
 		    }
 
 		    WSTACK_PUSH(s, ENC_TERM);
-		    WSTACK_PUSH(s, (UWord) mptr[0]);
-
-		    mptr = map_get_keys(mp);
-		    for (i = size-1; i >= 1; i--) {
-			WSTACK_PUSH(s, ENC_TERM);
-			WSTACK_PUSH(s, (UWord) mptr[i]);
-		    }
+		    WSTACK_PUSH(s, (UWord) vptr[0]);
 
-		    obj = mptr[0];
+		    obj = kptr[0];
 		    goto L_jump_start;
 		}
 	    }
@@ -3518,16 +3514,16 @@ dec_term_atom_common:
 
 		keys  = make_tuple(hp);
 		*hp++ = make_arityval(size);
-		kptr  = hp;
 		hp   += size;
+		kptr = hp - 1;
 
 		mp    = (map_t*)hp;
 		hp   += MAP_HEADER_SIZE;
-		vptr  = hp;
 		hp   += size;
+		vptr = hp - 1;
 
-		/* kptr, first word for keys
-		 * vptr, first word for values
+		/* kptr, last word for keys
+		 * vptr, last word for values
 		 */
 
 		/*
@@ -3542,27 +3538,12 @@ dec_term_atom_common:
 		mp->keys       = keys;
 		*objp          = make_map(mp);
 
-		/* We assume the map is wellformed, meaning:
-		 * - ascending key order
-		 * - unique keys
-		 */
-
-		objp  = vptr + size - 1;
-		n     = size;
-
-		while (n-- > 0) {
-		    *objp = (Eterm) COMPRESS_POINTER(next);
-		    next  = objp;
-		    objp--;
-		}
-
-		objp  = kptr + size - 1;
-		n     = size;
-
-		while (n-- > 0) {
-		    *objp = (Eterm) COMPRESS_POINTER(next);
-		    next  = objp;
-		    objp--;
+		for (n = size; n; n--) {
+		    *vptr = (Eterm) COMPRESS_POINTER(next);
+		    *kptr = (Eterm) COMPRESS_POINTER(vptr);
+		    next  = kptr;
+		    vptr--;
+		    kptr--;
 		}
 	    }
 	    break;
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl
index 753d6f7727..888ed8e272 100644
--- a/erts/emulator/test/map_SUITE.erl
+++ b/erts/emulator/test/map_SUITE.erl
@@ -813,16 +813,16 @@ t_map_encode_decode(Config) when is_list(Config) ->
 
     %% literally #{ b=>2, a=>1 } in the internal order
     #{ a:=1, b:=2 } =
-	erlang:binary_to_term(<<131,116,0,0,0,2,100,0,1,98,100,0,1,97,97,2,97,1>>),
+	erlang:binary_to_term(<<131,116,0,0,0,2,100,0,1,98,97,2,100,0,1,97,97,1>>),
 
 
     %% literally #{ "hi" => "value", a=>33, b=>55 } in the internal order
     #{ a:=33, b:=55, "hi" := "value"} = erlang:binary_to_term(<<131,116,0,0,0,3,
 	107,0,2,104,105, % "hi" :: list()
-	100,0,1,97, % a :: atom()
-	100,0,1,98, % b :: atom()
 	107,0,5,118,97,108,117,101, % "value" :: list()
+	100,0,1,97, % a :: atom()
 	97,33, % 33 :: integer()
+	100,0,1,98, % b :: atom()
 	97,55  % 55 :: integer()
 	>>),
 
@@ -834,11 +834,17 @@ t_map_encode_decode(Config) when is_list(Config) ->
     %% uniqueness violation
     %% literally #{ a=>1, "hi"=>"value", a=>2 }
     {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
-	erlang:binary_to_term(<<131,116,0,0,0,3,100,0,1,97,107,0,2,104,105,100,0,1,97,97,1,107,0,5,118,97,108,117,101,97,2>>)),
+	erlang:binary_to_term(<<131,116,0,0,0,3,
+			       100,0,1,97,
+			       97,1,
+			       107,0,2,104,105,
+			       107,0,5,118,97,108,117,101,
+			       100,0,1,97,
+			       97,2>>)),
 
     %% bad size (too large)
     {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
-	erlang:binary_to_term(<<131,116,0,0,0,12,100,0,1,97,100,0,1,98,97,1,97,1>>)),
+	erlang:binary_to_term(<<131,116,0,0,0,12,100,0,1,97,97,1,100,0,1,98,97,1>>)),
 
     %% bad size (too small) .. should fail just truncate it .. weird.
     %% possibly change external format so truncated will be #{a:=1}
@@ -852,7 +858,8 @@ map_encode_decode_and_match([{K,V}|Pairs], EncodedPairs, M0) ->
     B0 = erlang:term_to_binary(M1),
     Ls = lists:sort(fun(A,B) -> erts_internal:cmp_term(A,B) < 0 end, [{K, erlang:term_to_binary(K), erlang:term_to_binary(V)}|EncodedPairs]),
     %% sort Ks and Vs according to term spec, then match it
-    ok = match_encoded_map(B0, length(Ls), [Kbin||{_,Kbin,_}<-Ls] ++ [Vbin||{_,_,Vbin}<-Ls]),
+    KVbins = lists:foldr(fun({_,Kbin,Vbin}, Acc) -> [Kbin,Vbin | Acc] end, [], Ls),
+    ok = match_encoded_map(B0, length(Ls), KVbins),
     %% decode and match it
     M1 = erlang:binary_to_term(B0),
     map_encode_decode_and_match(Pairs,Ls,M1);