fix for Erlang R18.0 changes in maps module

Signed-off-by: José Valim <[email protected]>

Author: bsmr

lib/elixir/lib/exception.ex

@@ -564,6 +564,14 @@ defmodule BadStructError do
   end
 end
 
+defmodule BadMapError do
+  defexception [map: nil]
+  
+  def message(exception) do
+    "expected a map, got: #{inspect(exception.map)}"
+  end
+end
+
 defmodule MatchError do
   defexception [term: nil]
 
@@ -669,7 +677,12 @@ defmodule KeyError do
   defexception key: nil, term: nil
 
   def message(exception) do
-    "key #{inspect exception.key} not found in: #{inspect exception.term}"
+    msg = "key #{inspect exception.key} not found"
+    if exception.term != nil do
+      msg <> " in: #{inspect exception.term}"
+    else
+      msg
+    end
   end
 end
 
@@ -767,6 +780,20 @@ defmodule ErlangError do
   def normalize({:badmatch, term}, _stacktrace) do
     %MatchError{term: term}
   end
+  
+  # Erlang R18.0 changed this for various functions in the maps module
+  def normalize({:badmap, map}, _stacktrace) do
+    %BadMapError{map: map}
+  end
+  
+  # Erlang R18.0 changed this for various functions in the maps module
+  def normalize({:badkey, key}, stacktrace) do
+    term = case stacktrace do
+      [{:maps, :update, [_, _, map], []}|_] -> map
+      _                                     -> nil
+    end
+    %KeyError{key: key, term: term }
+  end
 
   def normalize({:case_clause, term}, _stacktrace) do
     %CaseClauseError{term: term}

lib/elixir/test/elixir/map_test.exs

@@ -84,9 +84,17 @@ defmodule MapTest do
 
   test "update maps" do
     assert %{two_items_map | a: 3} == %{a: 3, b: 2}
-
-    assert_raise ArgumentError, fn ->
-      %{two_items_map | c: 3}
+    
+    # TODO: proper handling of API changes in different Erlang/OTP releases
+    case :erlang.system_info(:otp_release) do
+      '17' ->
+        assert_raise ArgumentError, fn ->
+          %{two_items_map | c: 3}
+        end
+      _ ->
+        assert_raise KeyError, fn ->
+          %{two_items_map | c: 3}
+        end
     end
   end