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 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/stdlib/src/epp.erl')

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) ->
-- 
cgit v1.2.3