diff options
| author | Hans Bolinder <[email protected]> | 2016-01-13 09:45:52 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-01-13 09:45:52 +0100 |
| commit | d230f885454acbc1492f42d0f190b9d5c8eb98ec (patch) | |
| tree | 9dc803a49b398d306971e286401bec5b556e6ce7 /lib/stdlib/src | |
| parent | 0348087d57b912755c3288ec5d57b0d82a51874b (diff) | |
| parent | 72d6687a6514c6cd2e0af5b67760b5f83f62915c (diff) | |
| download | otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.tar.gz otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.tar.bz2 otp-d230f885454acbc1492f42d0f190b9d5c8eb98ec.zip | |
Merge branch 'maint'
* maint:
stdlib: Fix linter crash due to missing -module declaration
Conflicts:
lib/stdlib/test/erl_lint_SUITE.erl
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/erl_lint.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index 3ce6abe752..4a42754d92 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2015. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. 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. @@ -96,7 +96,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) -> %% 'called' and 'exports' contain {Line, {Function, Arity}}, %% the other function collections contain {Function, Arity}. -record(lint, {state=start :: 'start' | 'attribute' | 'function', - module=[], %Module + module='', %Module behaviour=[], %Behaviour exports=gb_sets:empty() :: gb_sets:set(fa()),%Exports imports=[] :: [fa()], %Imports, an orddict() @@ -731,7 +731,7 @@ start_state(Form, St) -> %% attribute_state(Form, State) -> %% State' -attribute_state({attribute,_L,module,_M}, #lint{module=[]}=St) -> +attribute_state({attribute,_L,module,_M}, #lint{module=''}=St) -> St; attribute_state({attribute,L,module,_M}, St) -> add_error(L, redefine_module, St); |