From fc3b5a1a287780bced92f2f1a1744bf86d7b9ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 16 Mar 2017 15:42:15 +0100
Subject: Don't allow module names with non-latin1 characters

In OTP 20, all Unicode characters are allowed in atoms.

However, we have decided that we will not allow non-latin1
characters in module names in OTP 20. This restriction may
be lifted in a future major release of OTP.

Enforce the restriction in erl_lint, so that it will be a
compilation error to have a module name containing non-latin1
characters. That means that tools such as debugger, xref,
dialyzer, syntax_tools, and so on, do not have to be modified
to handle non-latin1 module names.
---
 lib/stdlib/src/erl_lint.erl        | 15 +++++++++++++--
 lib/stdlib/test/erl_lint_SUITE.erl | 23 +++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 0ffca0886f..0789f5dfb7 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -156,6 +156,8 @@ format_error(pmod_unsupported) ->
     "parameterized modules are no longer supported";
 %% format_error({redefine_mod_import, M, P}) ->
 %%     io_lib:format("module '~s' already imported from package '~s'", [M, P]);
+format_error(non_latin1_module_unsupported) ->
+    "module names with non-latin1 characters are not supported";
 
 format_error(invalid_call) ->
     "invalid function call";
@@ -733,9 +735,15 @@ form(Form, #lint{state=State}=St) ->
 start_state({attribute,Line,module,{_,_}}=Form, St0) ->
     St1 = add_error(Line, pmod_unsupported, St0),
     attribute_state(Form, St1#lint{state=attribute});
-start_state({attribute,_,module,M}, St0) ->
+start_state({attribute,Line,module,M}, St0) ->
     St1 = St0#lint{module=M},
-    St1#lint{state=attribute};
+    St2 = St1#lint{state=attribute},
+    case is_non_latin1_name(M) of
+        true ->
+            add_error(Line, non_latin1_module_unsupported, St2);
+        false ->
+            St2
+    end;
 start_state(Form, St) ->
     Anno = case Form of
                {eof, L} -> erl_anno:new(L);
@@ -745,6 +753,9 @@ start_state(Form, St) ->
     St1 = add_error(Anno, undefined_module, St),
     attribute_state(Form, St1#lint{state=attribute}).
 
+is_non_latin1_name(Name) ->
+    lists:any(fun(C) -> C > 255 end, atom_to_list(Name)).
+
 %% attribute_state(Form, State) ->
 %%      State'
 
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index df38edf393..4af1c26c0f 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -64,7 +64,8 @@
          predef/1,
          maps/1,maps_type/1,maps_parallel_match/1,
          otp_11851/1,otp_11879/1,otp_13230/1,
-         record_errors/1, otp_xxxxx/1]).
+         record_errors/1, otp_xxxxx/1,
+         non_latin1_module/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -84,7 +85,7 @@ all() ->
      too_many_arguments, basic_errors, bin_syntax_errors, predef,
      maps, maps_type, maps_parallel_match,
      otp_11851, otp_11879, otp_13230,
-     record_errors, otp_xxxxx].
+     record_errors, otp_xxxxx, non_latin1_module].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3923,6 +3924,24 @@ otp_xxxxx(Config) ->
            []}],
     run(Config, Ts).
 
+%% OTP-14285: We currently don't support non-latin1 module names.
+
+non_latin1_module(_Config) ->
+    do_non_latin1_module('юникод'),
+    do_non_latin1_module(list_to_atom([256,$a,$b,$c])),
+    do_non_latin1_module(list_to_atom([$a,$b,256,$c])),
+    ok.
+
+do_non_latin1_module(Mod) ->
+    File = atom_to_list(Mod) ++ ".erl",
+    Forms = [{attribute,1,file,{File,1}},
+             {attribute,1,module,Mod},
+             {eof,2}],
+    error = compile:forms(Forms),
+    {error,_,[]} = compile:forms(Forms, [return]),
+    ok.
+
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
-- 
cgit v1.2.3