diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/erl_lint.erl | 14 | ||||
| -rw-r--r-- | lib/stdlib/test/erl_lint_SUITE.erl | 9 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index 95e2ed8847..cbc494df23 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -900,10 +900,18 @@ function_state({attribute,A,opaque,{TypeName,TypeDef,Args}}, St) -> type_def(opaque, A, TypeName, TypeDef, Args, St); function_state({attribute,A,spec,{Fun,Types}}, St) -> spec_decl(A, Fun, Types, St); -function_state({attribute,_A,dialyzer,_Val}, St) -> - St; -function_state({attribute,Aa,Attr,_Val}, St) -> +function_state({attribute,Aa,Attr,_Val}, St) when Attr =:= module; + Attr =:= export; + Attr =:= export_type; + Attr =:= import; + Attr =:= behaviour; + Attr =:= behavior; + Attr =:= callback; + Attr =:= optional_callbacks; + Attr =:= on_load -> add_error(Aa, {attribute,Attr}, St); +function_state({attribute,_A,_Attr,_Val}, St) -> + St; function_state({function,Anno,N,A,Cs}, St) -> function(Anno, N, A, Cs, St); function_state({eof,Location}, St) -> eof(Location, St). diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl index 7e89b5f891..3f7e67760f 100644 --- a/lib/stdlib/test/erl_lint_SUITE.erl +++ b/lib/stdlib/test/erl_lint_SUITE.erl @@ -3643,7 +3643,7 @@ basic_errors(Config) -> <<"f() -> ok. -attr(x).">>, [], - {errors,[{{2,17},erl_lint,{attribute,attr}}],[]}}, + []}, {redefine_function, <<"f() -> ok. @@ -4280,12 +4280,9 @@ stacktrace_syntax(Config) -> otp_14285(Config) -> %% A small sample of all the errors and warnings in module erl_lint. E1 = {redefine_function,{'кирилли́ческий атом',0}}, - E2 = {attribute,'кирилли́ческий атом'}, E3 = {undefined_record,'кирилли́ческий атом'}, E4 = {undefined_bittype,'кирилли́ческий атом'}, "function 'кирилли́ческий атом'/0 already defined" = format_error(E1), - "attribute 'кирилли́ческий атом' after function definitions" = - format_error(E2), "record 'кирилли́ческий атом' undefined" = format_error(E3), "bit type 'кирилли́ческий атом' undefined" = format_error(E4), Ts = [{otp_14285_1, @@ -4301,9 +4298,7 @@ otp_14285(Config) -> -'кирилли́ческий атом'(a). "/utf8>>, [], - {errors, - [{{2,16},erl_lint,E2}], - []}}, + []}, {otp_14285_3, <<"'кирилли́ческий атом'() -> #'кирилли́ческий атом'{}. "/utf8>>, |