stdlib: Add more checks of module names to the linter

Unicode atoms are handled better by the Erlang code linter.

Module names are checked for character codes greater than 255. This
means that modules invoked after the linter can assume that module
names have only Latin-1 characters.

1 files changed, 86 insertions, 65 deletions

diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index d53a31db0d..fcfd0d8493 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -175,49 +175,50 @@ format_error(invalid_record) ->
     "invalid record expression";
 
 format_error({attribute,A}) ->
-    io_lib:format("attribute '~w' after function definitions", [A]);
+    io_lib:format("attribute ~tw after function definitions", [A]);
 format_error({missing_qlc_hrl,A}) ->
     io_lib:format("qlc:q/~w called, but \"qlc.hrl\" not included", [A]);
 format_error({redefine_import,{{F,A},M}}) ->
-    io_lib:format("function ~w/~w already imported from ~w", [F,A,M]);
+    io_lib:format("function ~tw/~w already imported from ~w", [F,A,M]);
 format_error({bad_inline,{F,A}}) ->
-    io_lib:format("inlined function ~w/~w undefined", [F,A]);
+    io_lib:format("inlined function ~tw/~w undefined", [F,A]);
 format_error({invalid_deprecated,D}) ->
-    io_lib:format("badly formed deprecated attribute ~w", [D]);
+    io_lib:format("badly formed deprecated attribute ~tw", [D]);
 format_error({bad_deprecated,{F,A}}) ->
-    io_lib:format("deprecated function ~w/~w undefined or not exported", [F,A]);
+    io_lib:format("deprecated function ~tw/~w undefined or not exported",
+                  [F,A]);
 format_error({bad_nowarn_unused_function,{F,A}}) ->
-    io_lib:format("function ~w/~w undefined", [F,A]);
+    io_lib:format("function ~tw/~w undefined", [F,A]);
 format_error({bad_nowarn_bif_clash,{F,A}}) ->
-    io_lib:format("function ~w/~w undefined", [F,A]);
+    io_lib:format("function ~tw/~w undefined", [F,A]);
 format_error(disallowed_nowarn_bif_clash) ->
     io_lib:format("compile directive nowarn_bif_clash is no longer allowed,~n"
 		  " - use explicit module names or -compile({no_auto_import, [F/A]})", []);
 format_error({bad_nowarn_deprecated_function,{M,F,A}}) ->
-    io_lib:format("~w:~w/~w is not a deprecated function", [M,F,A]);
+    io_lib:format("~tw:~tw/~w is not a deprecated function", [M,F,A]);
 format_error({bad_on_load,Term}) ->
-    io_lib:format("badly formed on_load attribute: ~w", [Term]);
+    io_lib:format("badly formed on_load attribute: ~tw", [Term]);
 format_error(multiple_on_loads) ->
     "more than one on_load attribute";
 format_error({bad_on_load_arity,{F,A}}) ->
-    io_lib:format("function ~w/~w has wrong arity (must be 0)", [F,A]);
+    io_lib:format("function ~tw/~w has wrong arity (must be 0)", [F,A]);
 format_error({undefined_on_load,{F,A}}) ->
-    io_lib:format("function ~w/~w undefined", [F,A]);
+    io_lib:format("function ~tw/~w undefined", [F,A]);
 
 format_error(export_all) ->
     "export_all flag enabled - all functions will be exported";
 format_error({duplicated_export, {F,A}}) ->
-    io_lib:format("function ~w/~w already exported", [F,A]);
+    io_lib:format("function ~tw/~w already exported", [F,A]);
 format_error({unused_import,{{F,A},M}}) ->
-    io_lib:format("import ~w:~w/~w is unused", [M,F,A]);
+    io_lib:format("import ~w:~tw/~w is unused", [M,F,A]);
 format_error({undefined_function,{F,A}}) ->
-    io_lib:format("function ~w/~w undefined", [F,A]);
+    io_lib:format("function ~tw/~w undefined", [F,A]);
 format_error({redefine_function,{F,A}}) ->
-    io_lib:format("function ~w/~w already defined", [F,A]);
+    io_lib:format("function ~tw/~w already defined", [F,A]);
 format_error({define_import,{F,A}}) ->
-    io_lib:format("defining imported function ~w/~w", [F,A]);
+    io_lib:format("defining imported function ~tw/~w", [F,A]);
 format_error({unused_function,{F,A}}) ->
-    io_lib:format("function ~w/~w is unused", [F,A]);
+    io_lib:format("function ~tw/~w is unused", [F,A]);
 format_error({call_to_redefined_bif,{F,A}}) ->
     io_lib:format("ambiguous call of overridden auto-imported BIF ~w/~w~n"
 		  " - use erlang:~w/~w or \"-compile({no_auto_import,[~w/~w]}).\" "
@@ -273,7 +274,7 @@ format_error(illegal_bin_pattern) ->
     "binary patterns cannot be matched in parallel using '='";
 format_error(illegal_expr) -> "illegal expression";
 format_error({illegal_guard_local_call, {F,A}}) -> 
-    io_lib:format("call to local/imported function ~w/~w is illegal in guard",
+    io_lib:format("call to local/imported function ~tw/~w is illegal in guard",
 		  [F,A]);
 format_error(illegal_guard_expr) -> "illegal guard expression";
 %% --- maps ---
@@ -281,23 +282,23 @@ format_error(illegal_map_construction) ->
     "only association operators '=>' are allowed in map construction";
 %% --- records ---
 format_error({undefined_record,T}) ->
-    io_lib:format("record ~w undefined", [T]);
+    io_lib:format("record ~tw undefined", [T]);
 format_error({redefine_record,T}) ->
-    io_lib:format("record ~w already defined", [T]);
+    io_lib:format("record ~tw already defined", [T]);
 format_error({redefine_field,T,F}) ->
-    io_lib:format("field ~w already defined in record ~w", [F,T]);
+    io_lib:format("field ~tw already defined in record ~tw", [F,T]);
 format_error({undefined_field,T,F}) ->
-    io_lib:format("field ~w undefined in record ~w", [F,T]);
+    io_lib:format("field ~tw undefined in record ~tw", [F,T]);
 format_error(illegal_record_info) ->
     "illegal record info";
 format_error({field_name_is_variable,T,F}) ->
-    io_lib:format("field ~w is not an atom or _ in record ~w", [F,T]);
+    io_lib:format("field ~tw is not an atom or _ in record ~tw", [F,T]);
 format_error({wildcard_in_update,T}) ->
-    io_lib:format("meaningless use of _ in update of record ~w", [T]);
+    io_lib:format("meaningless use of _ in update of record ~tw", [T]);
 format_error({unused_record,T}) ->
-    io_lib:format("record ~w is unused", [T]);
+    io_lib:format("record ~tw is unused", [T]);
 format_error({untyped_record,T}) ->
-    io_lib:format("record ~w has field(s) without type information", [T]);
+    io_lib:format("record ~tw has field(s) without type information", [T]);
 %% --- variables ----
 format_error({unbound_var,V}) ->
     io_lib:format("variable ~w is unbound", [V]);
@@ -315,7 +316,7 @@ format_error({variable_in_record_def,V}) ->
     io_lib:format("variable ~w in record definition", [V]);
 %% --- binaries ---
 format_error({undefined_bittype,Type}) ->
-    io_lib:format("bit type ~w undefined", [Type]);
+    io_lib:format("bit type ~tw undefined", [Type]);
 format_error({bittype_mismatch,Val1,Val2,What}) ->
     io_lib:format("conflict in ~s specification for bit field: '~p' and '~p'",
 		  [What,Val1,Val2]);
@@ -335,13 +336,13 @@ format_error(unsized_binary_in_bin_gen_pattern) ->
     "binary fields without size are not allowed in patterns of bit string generators";
 %% --- behaviours ---
 format_error({conflicting_behaviours,{Name,Arity},B,FirstL,FirstB}) ->
-    io_lib:format("conflicting behaviours - callback ~w/~w required by both '~p' "
+    io_lib:format("conflicting behaviours - callback ~tw/~w required by both '~p' "
 		  "and '~p' ~s", [Name,Arity,B,FirstB,format_where(FirstL)]);
 format_error({undefined_behaviour_func, {Func,Arity}, Behaviour}) ->
-    io_lib:format("undefined callback function ~w/~w (behaviour '~w')",
+    io_lib:format("undefined callback function ~tw/~w (behaviour '~w')",
 		  [Func,Arity,Behaviour]);
 format_error({undefined_behaviour,Behaviour}) ->
-    io_lib:format("behaviour ~w undefined", [Behaviour]);
+    io_lib:format("behaviour ~tw undefined", [Behaviour]);
 format_error({undefined_behaviour_callbacks,Behaviour}) ->
     io_lib:format("behaviour ~w callback functions are undefined",
 		  [Behaviour]);
@@ -352,23 +353,23 @@ format_error({ill_defined_optional_callbacks,Behaviour}) ->
     io_lib:format("behaviour ~w optional callback functions erroneously defined",
 		  [Behaviour]);
 format_error({behaviour_info, {_M,F,A}}) ->
-    io_lib:format("cannot define callback attibute for ~w/~w when "
+    io_lib:format("cannot define callback attibute for ~tw/~w when "
                   "behaviour_info is defined",[F,A]);
 format_error({redefine_optional_callback, {F, A}}) ->
-    io_lib:format("optional callback ~w/~w duplicated", [F, A]);
+    io_lib:format("optional callback ~tw/~w duplicated", [F, A]);
 format_error({undefined_callback, {_M, F, A}}) ->
-    io_lib:format("callback ~w/~w is undefined", [F, A]);
+    io_lib:format("callback ~tw/~w is undefined", [F, A]);
 %% --- types and specs ---
 format_error({singleton_typevar, Name}) ->
     io_lib:format("type variable ~w is only used once (is unbound)", [Name]);
 format_error({bad_export_type, _ETs}) ->
     io_lib:format("bad export_type declaration", []);
 format_error({duplicated_export_type, {T, A}}) ->
-    io_lib:format("type ~w/~w already exported", [T, A]);
+    io_lib:format("type ~tw/~w already exported", [T, A]);
 format_error({undefined_type, {TypeName, Arity}}) ->
-    io_lib:format("type ~w~s undefined", [TypeName, gen_type_paren(Arity)]);
+    io_lib:format("type ~tw~s undefined", [TypeName, gen_type_paren(Arity)]);
 format_error({unused_type, {TypeName, Arity}}) ->
-    io_lib:format("type ~w~s is unused", [TypeName, gen_type_paren(Arity)]);
+    io_lib:format("type ~tw~s is unused", [TypeName, gen_type_paren(Arity)]);
 format_error({new_builtin_type, {TypeName, Arity}}) ->
     io_lib:format("type ~w~s is a new builtin type; "
 		  "its (re)definition is allowed only until the next release",
@@ -380,25 +381,26 @@ format_error({renamed_type, OldName, NewName}) ->
     io_lib:format("type ~w() is now called ~w(); "
 		  "please use the new name instead", [OldName, NewName]);
 format_error({redefine_type, {TypeName, Arity}}) ->
-    io_lib:format("type ~w~s already defined",
+    io_lib:format("type ~tw~s already defined",
 		  [TypeName, gen_type_paren(Arity)]);
 format_error({type_syntax, Constr}) ->
-    io_lib:format("bad ~w type", [Constr]);
+    io_lib:format("bad ~tw type", [Constr]);
 format_error(old_abstract_code) ->
     io_lib:format("abstract code generated before Erlang/OTP 19.0 and "
                   "having typed record fields cannot be compiled", []);
 format_error({redefine_spec, {M, F, A}}) ->
-    io_lib:format("spec for ~w:~w/~w already defined", [M, F, A]);
+    io_lib:format("spec for ~tw:~tw/~w already defined", [M, F, A]);
 format_error({redefine_spec, {F, A}}) ->
-    io_lib:format("spec for ~w/~w already defined", [F, A]);
+    io_lib:format("spec for ~tw/~w already defined", [F, A]);
 format_error({redefine_callback, {F, A}}) ->
-    io_lib:format("callback ~w/~w already defined", [F, A]);
+    io_lib:format("callback ~tw/~w already defined", [F, A]);
 format_error({bad_callback, {M, F, A}}) ->
-    io_lib:format("explicit module not allowed for callback ~w:~w/~w ", [M, F, A]);
+    io_lib:format("explicit module not allowed for callback ~tw:~tw/~w",
+                  [M, F, A]);
 format_error({spec_fun_undefined, {F, A}}) ->
-    io_lib:format("spec for undefined function ~w/~w", [F, A]);
+    io_lib:format("spec for undefined function ~tw/~w", [F, A]);
 format_error({missing_spec, {F,A}}) ->
-    io_lib:format("missing specification for function ~w/~w", [F, A]);
+    io_lib:format("missing specification for function ~tw/~w", [F, A]);
 format_error(spec_wrong_arity) ->
     "spec has wrong arity";
 format_error(callback_wrong_arity) ->
@@ -417,15 +419,15 @@ format_error({deprecated_builtin_type, {Name, Arity},
                   "removed in ~s; use ~s",
                   [Name, Arity, Rel, UseS]);
 format_error({not_exported_opaque, {TypeName, Arity}}) ->
-    io_lib:format("opaque type ~w~s is not exported",
+    io_lib:format("opaque type ~tw~s is not exported",
                   [TypeName, gen_type_paren(Arity)]);
 format_error({underspecified_opaque, {TypeName, Arity}}) ->
-    io_lib:format("opaque type ~w~s is underspecified and therefore meaningless",
+    io_lib:format("opaque type ~tw~s is underspecified and therefore meaningless",
                   [TypeName, gen_type_paren(Arity)]);
 format_error({bad_dialyzer_attribute,Term}) ->
-    io_lib:format("badly formed dialyzer attribute: ~w", [Term]);
+    io_lib:format("badly formed dialyzer attribute: ~tw", [Term]);
 format_error({bad_dialyzer_option,Term}) ->
-    io_lib:format("unknown dialyzer warning option: ~w", [Term]);
+    io_lib:format("unknown dialyzer warning option: ~tw", [Term]);
 %% --- obsolete? unused? ---
 format_error({format_error, {Fmt, Args}}) ->
     io_lib:format(Fmt, Args).
@@ -763,12 +765,7 @@ start_state({attribute,Line,module,{_,_}}=Form, St0) ->
 start_state({attribute,Line,module,M}, St0) ->
     St1 = St0#lint{module=M},
     St2 = St1#lint{state=attribute},
-    case is_non_latin1_name(M) of
-        true ->
-            add_error(Line, non_latin1_module_unsupported, St2);
-        false ->
-            St2
-    end;
+    check_module_name(M, Line, St2);
 start_state(Form, St) ->
     Anno = case Form of
                {eof, L} -> erl_anno:new(L);
@@ -778,9 +775,6 @@ 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'
 
@@ -865,7 +859,11 @@ not_deprecated(Forms, St0) ->
     Bad = [MFAL || {{M,F,A},_L}=MFAL <- MFAsL,
                    otp_internal:obsolete(M, F, A) =:= no],
     St1 = func_line_warning(bad_nowarn_deprecated_function, Bad, St0),
-    St1#lint{not_deprecated = ordsets:from_list(Nowarn)}.
+    ML = [{M,L} || {{M,_F,_A},L} <- MFAsL, is_atom(M)],
+    St3 = foldl(fun ({M,L}, St2) ->
+                        check_module_name(M, L, St2)
+                end, St1, ML),
+    St3#lint{not_deprecated = ordsets:from_list(Nowarn)}.
 
 %% The nowarn_bif_clash directive is not only deprecated, it's actually an error from R14A
 disallowed_compile_flags(Forms, St0) ->
@@ -972,7 +970,8 @@ behaviour_callbacks(Line, B, St0) ->
     catch
         _:_ ->
             St1 = add_warning(Line, {undefined_behaviour, B}, St0),
-            {[], [], St1}
+            St2 = check_module_name(B, Line, St1),
+            {[], [], St2}
     end.
 
 behaviour_missing_callbacks([{{Line,B},Bfs0,OBfs}|T], St0) ->
@@ -1310,7 +1309,8 @@ exports(#lint{compile = Opts, defined = Defs, exports = Es}) ->
 -type import() :: {module(), [fa()]} | module().
 -spec import(line(), import(), lint_state()) -> lint_state().
 
-import(Line, {Mod,Fs}, St) ->
+import(Line, {Mod,Fs}, St00) ->
+    St = check_module_name(Mod, Line, St00),
     Mfs = ordsets:from_list(Fs),
     case check_imports(Line, Mfs, St#lint.imports) of
 	[] ->
@@ -2294,11 +2294,18 @@ expr({call,L,{tuple,Lt,[{atom,Lm,erlang},{atom,Lf,is_record}]},As}, Vt, St) ->
 expr({call,Line,{remote,_Lr,{atom,_Lm,M},{atom,Lf,F}},As}, Vt, St0) ->
     St1 = keyword_warning(Lf, F, St0),
     St2 = check_remote_function(Line, M, F, As, St1),
-    expr_list(As, Vt, St2);
+    St3 = check_module_name(M, Line, St2),
+    expr_list(As, Vt, St3);
 expr({call,Line,{remote,_Lr,M,F},As}, Vt, St0) ->
     St1 = keyword_warning(Line, M, St0),
     St2 = keyword_warning(Line, F, St1),
-    expr_list([M,F|As], Vt, St2);
+    St3 = case M of
+              {atom,Lm,Mod} ->
+                  check_module_name(Mod, Lm, St2);
+              _ ->
+                  St2
+          end,
+    expr_list([M,F|As], Vt, St3);
 expr({call,Line,{atom,La,F},As}, Vt, St0) ->
     St1 = keyword_warning(La, F, St0),
     {Asvt,St2} = expr_list(As, Vt, St1),
@@ -2814,7 +2821,8 @@ check_type(Types, St) ->
 check_type({ann_type, _L, [_Var, Type]}, SeenVars, St) ->
     check_type(Type, SeenVars, St);
 check_type({remote_type, L, [{atom, _, Mod}, {atom, _, Name}, Args]},
-	   SeenVars, St0) ->
+	   SeenVars, St00) ->
+    St0 = check_module_name(Mod, L, St00),
     St = deprecated_type(L, Mod, Name, Args, St0),
     CurrentMod = St#lint.module,
     case Mod =:= CurrentMod of
@@ -2973,11 +2981,12 @@ obsolete_builtin_type({Name, A}) when is_atom(Name), is_integer(A) -> no.
 
 %% spec_decl(Line, Fun, Types, State) -> State.
 
-spec_decl(Line, MFA0, TypeSpecs, St0 = #lint{specs = Specs, module = Mod}) ->
+spec_decl(Line, MFA0, TypeSpecs, St00 = #lint{specs = Specs, module = Mod}) ->
     MFA = case MFA0 of
 	      {F, Arity} -> {Mod, F, Arity};
 	      {_M, _F, Arity} -> MFA0
 	  end,
+    St0 = check_module_name(element(1, MFA), Line, St00),
     St1 = St0#lint{specs = dict:store(MFA, Line, Specs)},
     case dict:is_key(MFA, Specs) of
 	true -> add_error(Line, {redefine_spec, MFA0}, St1);
@@ -2989,7 +2998,9 @@ spec_decl(Line, MFA0, TypeSpecs, St0 = #lint{specs = Specs, module = Mod}) ->
 callback_decl(Line, MFA0, TypeSpecs,
 	      St0 = #lint{callbacks = Callbacks, module = Mod}) ->
     case MFA0 of
-        {_M, _F, _A} -> add_error(Line, {bad_callback, MFA0}, St0);
+        {M, _F, _A} ->
+            St1 = check_module_name(M, Line, St0),
+            add_error(Line, {bad_callback, MFA0}, St1);
         {F, Arity} ->
             MFA = {Mod, F, Arity},
             St1 = St0#lint{callbacks = dict:store(MFA, Line, Callbacks)},
@@ -3033,6 +3044,16 @@ is_fa({FuncName, Arity})
   when is_atom(FuncName), is_integer(Arity), Arity >= 0 -> true;
 is_fa(_) -> false.
 
+check_module_name(M, Line, St) ->
+    case is_latin1_name(M) of
+        true -> St;
+        false ->
+            add_error(Line, non_latin1_module_unsupported, St)
+    end.
+
+is_latin1_name(Name) ->
+    io_lib:latin1_char_list(atom_to_list(Name)).
+
 check_specs([FunType|Left], ETag, Arity, St0) ->
     {FunType1, CTypes} =
 	case FunType of