Up

Author: jonatanklosko

lib/elixir/lib/macro.ex

@@ -2386,18 +2386,13 @@ defmodule Macro do
   """
   @doc since: "1.14.0"
   @spec inspect_atom(:literal | :key | :remote_call, atom, keyword) :: binary
-  def inspect_atom(source_format, atom, opts \\ []) do
-    opts = Keyword.validate!(opts, [:escape])
+  def inspect_atom(source_format, atom, opts \\ [])
 
-    escape = Keyword.get(opts, :escape, &inspect_atom_escape/2)
-    do_inspect_atom(source_format, atom, escape)
-  end
-
-  def do_inspect_atom(:literal, atom, _escape) when is_nil(atom) or is_boolean(atom) do
+  def inspect_atom(:literal, atom, _opts) when is_nil(atom) or is_boolean(atom) do
     Atom.to_string(atom)
   end
 
-  def do_inspect_atom(:literal, atom, escape) when is_atom(atom) do
+  def inspect_atom(:literal, atom, opts) when is_atom(atom) do
     binary = Atom.to_string(atom)
 
     case classify_atom(atom) do
@@ -2409,31 +2404,31 @@ defmodule Macro do
         end
 
       :quoted ->
-        escaped = escape.(binary, ?")
+        escaped = inspect_atom_escape(opts, binary, ?")
         IO.iodata_to_binary([?:, ?", escaped, ?"])
 
       _ ->
         ":" <> binary
     end
   end
 
-  def do_inspect_atom(:key, atom, escape) when is_atom(atom) do
+  def inspect_atom(:key, atom, opts) when is_atom(atom) do
     binary = Atom.to_string(atom)
 
     case classify_atom(atom) do
       :alias ->
         IO.iodata_to_binary([?", binary, ?", ?:])
 
       :quoted ->
-        escaped = escape.(binary, ?")
+        escaped = inspect_atom_escape(opts, binary, ?")
         IO.iodata_to_binary([?", escaped, ?", ?:])
 
       _ ->
         IO.iodata_to_binary([binary, ?:])
     end
   end
 
-  def do_inspect_atom(:remote_call, atom, escape) when is_atom(atom) do
+  def inspect_atom(:remote_call, atom, opts) when is_atom(atom) do
     binary = Atom.to_string(atom)
 
     case inner_classify(atom) do
@@ -2445,16 +2440,20 @@ defmodule Macro do
           if type in [:not_callable, :alias] do
             binary
           else
-            escape.(binary, ?")
+            inspect_atom_escape(opts, binary, ?")
           end
 
         IO.iodata_to_binary([?", escaped, ?"])
     end
   end
 
-  defp inspect_atom_escape(string, char) do
-    {escaped, _} = Code.Identifier.escape(string, char)
-    escaped
+  defp inspect_atom_escape(opts, string, char) do
+    if escape = opts[:escape] do
+      escape.(string, char)
+    else
+      {escaped, _} = Code.Identifier.escape(string, char)
+      escaped
+    end
   end
 
   # Classifies the given atom into one of the following categories: