From 66039320f16622b62fe9dbd413034171130d4de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 12 Mar 2014 22:25:30 +0100
Subject: stdlib: Move map type to proper definition

---
 lib/stdlib/test/erl_lint_SUITE.erl | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/test')

diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 5d189006a1..919489e3d7 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -63,7 +63,7 @@
 	  too_many_arguments/1,
 	  basic_errors/1,bin_syntax_errors/1,
           predef/1,
-          maps/1
+          maps/1,maps_type/1
         ]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -91,7 +91,8 @@ all() ->
      otp_11772, otp_11771, export_all,
      bif_clash, behaviour_basic, behaviour_multiple,
      otp_7550, otp_8051, format_warn, {group, on_load},
-     too_many_arguments, basic_errors, bin_syntax_errors, predef, maps].
+     too_many_arguments, basic_errors, bin_syntax_errors, predef,
+     maps,maps_type].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3394,6 +3395,36 @@ maps(Config) ->
     [] = run(Config, Ts),
     ok.
 
+maps_type(Config) when is_list(Config) ->
+    Ts = [
+	{maps_type1,
+	 <<"
+	-type m() :: #{a => integer()}.
+	-spec t1(#{k=>term()}) -> {term(), map()}.
+
+	t1(#{k:=V}=M) -> {V,M}.
+
+	-spec t2(m()) -> integer().
+
+	t2(#{a:=V}) -> V.
+	">>,
+	[],
+	[]},
+	{maps_type2,
+	 <<"
+            %% Built-in var arity map type:
+	    -type map() :: tuple().
+	    -type a() :: map().
+
+	    -spec t(a()) -> a().
+	    t(M) -> M.
+	 ">>,
+	 [],
+	 {errors,[{3,erl_lint,{redefine_type,{map,0}}}],[]}}],
+    [] = run(Config, Ts),
+    ok.
+
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
-- 
cgit v1.2.3


From fdda3a16a4f37e44c496b9fef55b763afa4d77ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 13 Mar 2014 03:01:02 +0100
Subject: stdlib: Test Map key linting

This will change in future release.
---
 lib/stdlib/test/erl_lint_SUITE.erl | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/test')

diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 919489e3d7..673a3cf159 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -3389,9 +3389,28 @@ maps(Config) ->
           {error_in_illegal_map_construction,
            <<"t() -> #{ a := X }.">>,
            [],
-           {errors,[{1,erl_lint,illegal_map_construction},
+	   {errors,[{1,erl_lint,illegal_map_construction},
                     {1,erl_lint,{unbound_var,'X'}}],
-            []}}],
+            []}},
+	  {errors_in_map_keys,
+	   <<"t(V) -> #{ a => 1,
+			#{a=>V} => 2,
+			#{ \"hi\" => wazzup, hi => ho } => yep,
+			[try a catch _:_ -> b end] => nope,
+			ok => 1.0,
+			[3+3] => nope,
+			1.0 => yep,
+			{3.0+3} => nope,
+			{yep} => yep,
+			[case a of a -> a end] => nope
+		      }.
+	   ">>,
+	   [],
+	   {errors,[{2,erl_lint,{illegal_map_key_variable,'V'}},
+		    {4,erl_lint,illegal_map_key},
+		    {6,erl_lint,illegal_map_key},
+		    {8,erl_lint,illegal_map_key},
+		    {10,erl_lint,illegal_map_key}],[]}}],
     [] = run(Config, Ts),
     ok.
 
-- 
cgit v1.2.3