From 4babf1a1215fb8ac315ed3a87a7c2fa396e140c3 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Fri, 9 Jun 2017 10:26:43 +0200
Subject: stdlib: Handle Unicode macro names

---
 lib/stdlib/src/epp.erl        | 24 ++++++++++++------------
 lib/stdlib/test/epp_SUITE.erl | 29 +++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index b35e9575a4..31d0d499e3 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -194,27 +194,27 @@ format_error(missing_parenthesis) ->
 format_error(premature_end) ->
     "premature end";
 format_error({call,What}) ->
-    io_lib:format("illegal macro call '~s'",[What]);
+    io_lib:format("illegal macro call '~ts'",[What]);
 format_error({undefined,M,none}) ->
-    io_lib:format("undefined macro '~s'", [M]);
+    io_lib:format("undefined macro '~ts'", [M]);
 format_error({undefined,M,A}) ->
-    io_lib:format("undefined macro '~s/~p'", [M,A]);
+    io_lib:format("undefined macro '~ts/~p'", [M,A]);
 format_error({depth,What}) ->
     io_lib:format("~s too deep",[What]);
 format_error({mismatch,M}) ->
-    io_lib:format("argument mismatch for macro '~s'", [M]);
+    io_lib:format("argument mismatch for macro '~ts'", [M]);
 format_error({arg_error,M}) ->
-    io_lib:format("badly formed argument for macro '~s'", [M]);
+    io_lib:format("badly formed argument for macro '~ts'", [M]);
 format_error({redefine,M}) ->
-    io_lib:format("redefining macro '~s'", [M]);
+    io_lib:format("redefining macro '~ts'", [M]);
 format_error({redefine_predef,M}) ->
     io_lib:format("redefining predefined macro '~s'", [M]);
 format_error({circular,M,none}) ->
-    io_lib:format("circular macro '~s'", [M]);
+    io_lib:format("circular macro '~ts'", [M]);
 format_error({circular,M,A}) ->
-    io_lib:format("circular macro '~s/~p'", [M,A]);
+    io_lib:format("circular macro '~ts/~p'", [M,A]);
 format_error({include,W,F}) ->
-    io_lib:format("can't find include ~s \"~s\"", [W,F]);
+    io_lib:format("can't find include ~s \"~ts\"", [W,F]);
 format_error({illegal,How,What}) ->
     io_lib:format("~s '-~s'", [How,What]);
 format_error({illegal_function,Macro}) ->
@@ -224,9 +224,9 @@ format_error({illegal_function_usage,Macro}) ->
 format_error({'NYI',What}) ->
     io_lib:format("not yet implemented '~s'", [What]);
 format_error({error,Term}) ->
-    io_lib:format("-error(~p).", [Term]);
+    io_lib:format("-error(~tp).", [Term]);
 format_error({warning,Term}) ->
-    io_lib:format("-warning(~p).", [Term]);
+    io_lib:format("-warning(~tp).", [Term]);
 format_error(E) -> file:format_error(E).
 
 -spec parse_file(FileName, IncludePath, PredefMacros) ->
@@ -1307,7 +1307,7 @@ expand_macros([{'?',_Lq},Token|_Toks], _St) ->
                 Text;
             undefined ->
                 Symbol = erl_scan:symbol(Token),
-                io_lib:write(Symbol)
+                io_lib:fwrite(<<"~tp">>, [Symbol])
         end,
     throw({error,loc(Token),{call,[$?|T]}});
 expand_macros([T|Ts], St) ->
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 71d6820c47..915f478dfa 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
          otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1,
          otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1, otp_10820/1,
          otp_11728/1, encoding/1, extends/1,  function_macro/1,
-	 test_error/1, test_warning/1]).
+	 test_error/1, test_warning/1, otp_14285/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -68,7 +68,8 @@ all() ->
      not_circular, skip_header, otp_6277, otp_7702, otp_8130,
      overload_mac, otp_8388, otp_8470, otp_8562,
      otp_8665, otp_8911, otp_10302, otp_10820, otp_11728,
-     encoding, extends, function_macro, test_error, test_warning].
+     encoding, extends, function_macro, test_error, test_warning,
+     otp_14285].
 
 groups() -> 
     [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
@@ -677,7 +678,7 @@ otp_8130(Config) when is_list(Config) ->
           {otp_8130_c6,
            <<"-define(M3(), A).\n"
              "t() -> A = 1, ?3.14159}.\n">>,
-           {errors,[{{2,16},epp,{call,"?3.14159"}}],[]}},
+           {errors,[{{2,16},epp,{call,[$?,"3.14159"]}}],[]}},
 
           {otp_8130_c7,
            <<"\nt() -> ?A.\n">>,
@@ -1384,6 +1385,26 @@ do_otp_10820(File, C, PC) ->
     true = test_server:stop_node(Node),
     ok.
 
+%% OTP_14285: Unicode atoms.
+otp_14285(Config) when is_list(Config) ->
+    %% This is just a sample of errors.
+    Cs = [{otp_8562,
+           <<"-export([f/0]).
+              -define('a\x{400}b', 'a\x{400}d').
+              f() ->
+                  ?'a\x{400}b'.
+              g() ->
+                  ?\"a\x{400}b\".
+              h() ->
+                  ?'a\x{400}no'().
+              "/utf8>>,
+           {errors,[{6,epp,{call,[63,[91,["97",44,"1024",44,"98"],93]]}},
+                    {8,epp,{undefined,'a\x{400}no',0}}],
+            []}}
+         ],
+    [] = compile(Config, Cs),
+    ok.
+
 %% OTP-11728. Bugfix circular macro.
 otp_11728(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
-- 
cgit v1.2.3