stdlib: Remove deprecated functions in erl_parse and erl_scan

The recently added module erl_anno can no longer handle
negative line numbers.

12 files changed, 192 insertions, 853 deletions

diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index b73943422a..1dc5a105bf 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -35,6 +35,6 @@ mnesia_schema.erl:1258: Guard test FromS::'disc_copies' | 'disc_only_copies' | '
 mnesia_schema.erl:1639: The pattern {'false', 'mandatory'} can never match the type {'false','optional'}
 mnesia_schema.erl:2434: The variable Reason can never match since previous clauses completely covered the type {'error',_} | {'ok',_}
 mnesia_schema.erl:451: Guard test UseDirAnyway::'false' == 'true' can never succeed
-mnesia_text.erl:180: The variable T can never match since previous clauses completely covered the type {'error',{integer(),atom() | tuple(),_}} | {'ok',_}
+mnesia_text.erl:180: The variable T can never match since previous clauses completely covered the type {'error',{non_neg_integer(),atom() | tuple(),_}} | {'ok',_}
 mnesia_tm.erl:1522: Function commit_participant/5 has no local return
 mnesia_tm.erl:2169: Function system_terminate/4 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl b/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
index ab84e94106..9ad4810a5e 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
@@ -36,7 +36,7 @@
 
 %% Start of Abstract Format
 
--type line() :: erl_scan:line().
+-type line() :: erl_anno:line().
 
 -export_type([af_record_index/0, af_record_field/1, af_record_name/0,
               af_field_name/0, af_function_decl/0]).
@@ -332,8 +332,8 @@
 %% End of Abstract Format
 
 -type error_description() :: term().
--type error_info() :: {erl_scan:line(), module(), error_description()}.
--type token() :: {Tag :: atom(), Line :: erl_scan:line()}.
+-type error_info() :: {erl_anno:line(), module(), error_description()}.
+-type token() :: {Tag :: atom(), Line :: erl_scan:anno()}.
 
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl b/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
index fc7c5241a8..fe567ff10d 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
@@ -36,7 +36,7 @@
 
 %% Start of Abstract Format
 
--type line() :: erl_scan:line().
+-type line() :: erl_anno:line().
 
 -export_type([af_module/0, af_export/0, af_import/0, af_fa_list/0,
               af_compile/0, af_file/0, af_record_decl/0,
@@ -329,8 +329,8 @@
 %% End of Abstract Format
 
 -type error_description() :: term().
--type error_info() :: {erl_scan:line(), module(), error_description()}.
--type token() :: {Tag :: atom(), Line :: erl_scan:line()}.
+-type error_info() :: {erl_anno:line(), module(), error_description()}.
+-type token() :: {Tag :: atom(), Line :: erl_anno:line()}.
 
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 18e988e286..01b845a039 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -40,39 +40,15 @@
   </description>
   <datatypes>
     <datatype>
-      <name name="attribute_info"></name>
-    </datatype>
-    <datatype>
-      <name name="attributes"></name>
-    </datatype>
-    <datatype>
-      <name name="attributes_data"></name>
-    </datatype>
-    <datatype>
       <name name="category"></name>
     </datatype>
     <datatype>
-      <name name="column"></name>
-    </datatype>
-    <datatype>
       <name name="error_description"></name>
     </datatype>
     <datatype>
       <name name="error_info"></name>
     </datatype>
     <datatype>
-      <name name="info_line"></name>
-    </datatype>
-    <datatype>
-      <name name="info_location"></name>
-    </datatype>
-    <datatype>
-      <name name="line"></name>
-    </datatype>
-    <datatype>
-      <name name="location"></name>
-    </datatype>
-    <datatype>
       <name name="option"></name>
     </datatype>
     <datatype>
@@ -88,9 +64,6 @@
       <name name="token"></name>
     </datatype>
     <datatype>
-      <name name="token_info"></name>
-    </datatype>
-    <datatype>
       <name name="tokens"></name>
     </datatype>
     <datatype>
@@ -122,25 +95,23 @@
           <anno>StartLocation</anno>, [])</c>.</p>
         <p><c><anno>StartLocation</anno></c> indicates the initial location
           when scanning starts. If <c><anno>StartLocation</anno></c> is a line,
-          <c>attributes()</c> as well as <c><anno>EndLocation</anno></c> and
+          <c>Anno</c> as well as <c><anno>EndLocation</anno></c> and
           <c><anno>ErrorLocation</anno></c> will be lines. If
           <c><anno>StartLocation</anno></c> is a pair of a line and a column
-          <c>attributes()</c> takes the form of an opaque compound
+          <c>Anno</c> takes the form of an opaque compound
           data type, and <c><anno>EndLocation</anno></c> and
           <c><anno>ErrorLocation</anno></c>
           will be pairs of a line and a column. The <em>token
-          attributes</em> contain information about the column and the
+          annotations</em> contain information about the column and the
           line where the token begins, as well as the text of the
           token (if the <c>text</c> option is given), all of which can
-          be accessed by calling <seealso
-          marker="#token_info/1">token_info/1,2</seealso>, <seealso
-          marker="#attributes_info/1">attributes_info/1,2</seealso>,
+          be accessed by calling
           <seealso marker="#column/1">column/1</seealso>,
           <seealso marker="#line/1">line/1</seealso>,
           <seealso marker="#location/1">location/1</seealso>, and
           <seealso marker="#text/1">text/1</seealso>.</p>
         <p>A <em>token</em> is a tuple containing information about
-          syntactic category, the token attributes, and the actual
+          syntactic category, the token annotations, and the actual
           terminal symbol. For punctuation characters (e.g. <c>;</c>,
           <c>|</c>) and reserved words, the category and the symbol
           coincide, and the token is represented by a two-tuple.
@@ -172,7 +143,7 @@
         <item><p>Short for <c>[return_comments, return_white_spaces]</c>.</p>
         </item>
         <tag><c>text</c></tag>
-        <item><p>Include the token's text in the token attributes. The
+        <item><p>Include the token's text in the token annotation. The
           text is the part of the input corresponding to the token.</p>
         </item>
         </taglist>
@@ -306,150 +277,6 @@
       </desc>
     </func>
     <func>
-      <name name="token_info" arity="1"/>
-      <fsummary>Return information about a token</fsummary>
-      <desc>
-        <p>Returns a list containing information about the token
-          <c><anno>Token</anno></c>. The order of the
-          <c><anno>TokenInfoTuple</anno></c>s is not
-          defined. See <seealso
-          marker="#token_info/2">token_info/2</seealso> for
-          information about specific
-          <c><anno>TokenInfoTuple</anno></c>s.</p>
-        <p>Note that if <c>token_info(Token, TokenItem)</c> returns
-          <c>undefined</c> for some <c>TokenItem</c>, the
-          item is not included in <c><anno>TokenInfo</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="token_info" arity="2" clause_i="1"/>
-      <name name="token_info" arity="2" clause_i="2"/>
-      <type name="token_item"/>
-      <type name="attribute_item"/>
-      <fsummary>Return information about a token</fsummary>
-      <desc>
-        <p>Returns a list containing information about the token
-          <c><anno>Token</anno></c>. If one single
-          <c><anno>TokenItem</anno></c> is given the returned value is
-          the corresponding
-          <c>TokenInfoTuple</c>, or <c>undefined</c> if the
-          <c>TokenItem</c> has no value. If a list of
-          <c><anno>TokenItem</anno></c>s is given the result is a list of
-          <c><anno>TokenInfoTuple</anno></c>. The
-          <c><anno>TokenInfoTuple</anno></c>s will
-          appear with the corresponding <c><anno>TokenItem</anno></c>s in
-          the same order as the <c><anno>TokenItem</anno></c>s
-	  appear in the list of <c>TokenItem</c>s.
-          <c><anno>TokenItem</anno></c>s with no value are not included
-          in the list of <c><anno>TokenInfoTuple</anno></c>.</p>
-	<p>The following <c><anno>TokenInfoTuple</anno></c>s with corresponding
-	   <c><anno>TokenItem</anno></c>s are valid:</p>
-        <taglist>
-          <tag><c>{category, <seealso marker="#type-category">
-            category()</seealso>}</c></tag>
-          <item><p>The category of the token.</p>
-          </item>
-          <tag><c>{column, <seealso marker="#type-column">
-            column()</seealso>}</c></tag>
-          <item><p>The column where the token begins.</p>
-          </item>
-          <tag><c>{length, integer() > 0}</c></tag>
-          <item><p>The length of the token's text.</p>
-          </item>
-          <tag><c>{line, <seealso marker="#type-line">
-            line()</seealso>}</c></tag>
-          <item><p>The line where the token begins.</p>
-          </item>
-          <tag><c>{location, <seealso marker="#type-location">
-            location()</seealso>}</c></tag>
-          <item><p>The line and column where the token begins, or
-            just the line if the column unknown.</p>
-          </item>
-          <tag><c>{symbol, <seealso marker="#type-symbol">
-            symbol()</seealso>}</c></tag>
-          <item><p>The token's symbol.</p>
-          </item>
-          <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name name="attributes_info" arity="1"/>
-      <fsummary>Return information about token attributes</fsummary>
-      <desc>
-        <p>Returns a list containing information about the token
-          attributes <c><anno>Attributes</anno></c>. The order of the
-          <c><anno>AttributeInfoTuple</anno></c>s is not defined.
-          See <seealso
-          marker="#attributes_info/2">attributes_info/2</seealso> for
-          information about specific
-          <c><anno>AttributeInfoTuple</anno></c>s.</p>
-        <p>Note that if <c>attributes_info(Token, AttributeItem)</c>
-          returns <c>undefined</c> for some <c>AttributeItem</c> in
-          the list above, the item is not included in
-          <c><anno>AttributesInfo</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="attributes_info" arity="2" clause_i="1"/>
-      <name name="attributes_info" arity="2" clause_i="2"/>
-      <fsummary>Return information about a token attributes</fsummary>
-      <type name="attribute_item"/>
-      <desc>
-        <p>Returns a list containing information about the token
-          attributes <c><anno>Attributes</anno></c>. If one single
-          <c><anno>AttributeItem</anno></c> is given the returned value is the
-          corresponding <c><anno>AttributeInfoTuple</anno></c>,
-          or <c>undefined</c> if the <c><anno>AttributeItem</anno></c>
-          has no value. If a list of <c><anno>AttributeItem</anno></c>
-          is given the result is a list of
-          <c><anno>AttributeInfoTuple</anno></c>.
-          The <c><anno>AttributeInfoTuple</anno></c>s
-          will appear with the corresponding <c><anno>AttributeItem</anno></c>s
-          in the same order as the <c><anno>AttributeItem</anno></c>s
-          appear in the list of <c><anno>AttributeItem</anno></c>s.
-          <c><anno>AttributeItem</anno></c>s with no
-          value are not included in the list of
-	  <c><anno>AttributeInfoTuple</anno></c>.</p>
-	<p>The following <c><anno>AttributeInfoTuple</anno></c>s with
-          corresponding <c><anno>AttributeItem</anno></c>s are valid:</p>
-        <taglist>
-          <tag><c>{column, <seealso marker="#type-column">
-            column()</seealso>}</c></tag>
-          <item><p>The column where the token begins.</p>
-          </item>
-          <tag><c>{length, integer() > 0}</c></tag>
-          <item><p>The length of the token's text.</p>
-          </item>
-          <tag><c>{line, <seealso marker="#type-line">
-            line()</seealso>}</c></tag>
-          <item><p>The line where the token begins.</p>
-          </item>
-          <tag><c>{location, <seealso marker="#type-location">
-            location()</seealso>}</c></tag>
-          <item><p>The line and column where the token begins, or
-            just the line if the column unknown.</p>
-          </item>
-          <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name name="set_attribute" arity="3"/>
-      <fsummary>Set a token attribute value</fsummary>
-      <desc>
-        <p>Sets the value of the <c>line</c> attribute of the token
-          attributes <c><anno>Attributes</anno></c>.</p>
-        <p>The <c><anno>SetAttributeFun</anno></c> is called with the value of
-          the <c>line</c> attribute, and is to return the new value of
-          the <c>line</c> attribute.</p>
-      </desc>
-    </func>
-    <func>
       <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
       <desc>
diff --git a/lib/stdlib/src/erl_anno.erl b/lib/stdlib/src/erl_anno.erl
index 143318aa55..d32c34dabd 100644
--- a/lib/stdlib/src/erl_anno.erl
+++ b/lib/stdlib/src/erl_anno.erl
@@ -33,7 +33,7 @@
 
 -export_type([anno_term/0]).
 
--define(LN(L), is_integer(L)).
+-define(LN(L), is_integer(L), L >= 0).
 -define(COL(C), (is_integer(C) andalso C >= 1)).
 
 %% Location.
@@ -52,13 +52,13 @@
                     | {'record', record()}
                     | {'text', string()}.
 
--type anno() :: location() | [annotation(), ...].
+-opaque anno() :: location() | [annotation(), ...].
 -type anno_term() :: term().
 
 -type column() :: pos_integer().
 -type generated() :: boolean().
 -type filename() :: file:filename_all().
--type line() :: integer().
+-type line() :: non_neg_integer().
 -type location() :: line() | {line(), column()}.
 -type record() :: boolean().
 -type text() :: string().
@@ -90,9 +90,13 @@ to_term(Anno) ->
 -ifdef(DEBUG).
 from_term(Term) when is_list(Term) ->
     Term;
+from_term(Line) when is_integer(Line), Line < 0 -> % Before OTP 19
+    set_generated(true, new(-Line));
 from_term(Term) ->
     [{location, Term}].
 -else.
+from_term(Line) when is_integer(Line), Line < 0 -> % Before OTP 19
+    set_generated(true, new(-Line));
 from_term(Term) ->
     Term.
 -endif.
@@ -198,18 +202,11 @@ file(Anno) ->
       Anno :: anno().
 
 generated(Line) when ?ALINE(Line) ->
-    Line =< 0;
+    false;
 generated({Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column) ->
-    Line =< 0;
+    false;
 generated(Anno) ->
-    _ = anno_info(Anno, generated, false),
-    {location, Location} = lists:keyfind(location, 1, Anno),
-    case Location of
-        {Line, _Column} ->
-            Line =< 0;
-        Line ->
-            Line =< 0
-    end.
+    anno_info(Anno, generated, false).
 
 -spec line(Anno) -> line() when
       Anno :: anno().
@@ -226,18 +223,11 @@ line(Anno) ->
       Anno :: anno().
 
 location(Line) when ?ALINE(Line) ->
-    abs(Line);
-location({Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column) ->
-    {abs(Line), Column};
+    Line;
+location({Line, Column}=Location) when ?ALINE(Line), ?ACOLUMN(Column) ->
+    Location;
 location(Anno) ->
-    case anno_info(Anno, location) of
-        Line when Line < 0 ->
-            -Line;
-        {Line, Column} when Line < 0 ->
-            {-Line, Column};
-        Location ->
-            Location
-    end.
+    anno_info(Anno, location).
 
 -spec record(Anno) -> record() when
       Anno :: anno().
@@ -270,31 +260,8 @@ set_file(File, Anno) ->
       Generated :: generated(),
       Anno :: anno().
 
-set_generated(true, Line) when ?ALINE(Line) ->
-    -abs(Line);
-set_generated(false, Line) when ?ALINE(Line) ->
-    abs(Line);
-set_generated(true, {Line, Column}) when ?ALINE(Line),
-                                         ?ACOLUMN(Column) ->
-    {-abs(Line),Column};
-set_generated(false, {Line, Column}) when ?ALINE(Line),
-                                          ?ACOLUMN(Column) ->
-    {abs(Line),Column};
 set_generated(Generated, Anno) ->
-    _ = set(generated, Generated, Anno),
-    {location, Location} = lists:keyfind(location, 1, Anno),
-    NewLocation =
-        case Location of
-            {Line, Column} when Generated ->
-                {-abs(Line), Column};
-            {Line, Column} when not Generated ->
-                {abs(Line), Column};
-            Line when Generated ->
-                -abs(Line);
-            Line when not Generated ->
-                abs(Line)
-        end,
-    lists:keyreplace(location, 1, Anno, {location, NewLocation}).
+    set(generated, Generated, Anno).
 
 -spec set_line(Line, Anno) -> Anno when
       Line :: line(),
@@ -313,38 +280,17 @@ set_line(Line, Anno) ->
       Anno :: anno().
 
 set_location(Line, L) when ?ALINE(L), ?LLINE(Line) ->
-    new_location(fix_line(Line, L));
+    new_location(Line);
 set_location(Line, {L, Column}) when ?ALINE(L), ?ACOLUMN(Column),
                                      ?LLINE(Line) ->
-    new_location(fix_line(Line, L));
+    new_location(Line);
 set_location({L, C}=Loc, Line) when ?ALINE(Line), ?LLINE(L), ?LCOLUMN(C) ->
-    new_location(fix_location(Loc, Line));
+    new_location(Loc);
 set_location({L, C}=Loc, {Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column),
                                               ?LLINE(L), ?LCOLUMN(C) ->
-    new_location(fix_location(Loc, Line));
+    new_location(Loc);
 set_location(Location, Anno) ->
-    _ = set(location, Location, Anno),
-    {location, OldLocation} = lists:keyfind(location, 1, Anno),
-    NewLocation =
-        case {Location, OldLocation} of
-            {{_Line, _Column}=Loc, {L, _C}} ->
-                fix_location(Loc, L);
-            {Line, {L, _C}} ->
-                fix_line(Line, L);
-            {{_Line, _Column}=Loc, L} ->
-                fix_location(Loc, L);
-            {Line, L} ->
-                fix_line(Line, L)
-        end,
-    lists:keyreplace(location, 1, Anno, {location, NewLocation}).
-
-fix_location({Line, Column}, OldLine) ->
-    {fix_line(Line, OldLine), Column}.
-
-fix_line(Line, OldLine) when OldLine < 0, Line > 0 ->
-    -Line;
-fix_line(Line, _OldLine) ->
-    Line.
+    set(location, Location, Anno).
 
 -spec set_record(Record, Anno) -> Anno when
       Record :: record(),
@@ -383,7 +329,7 @@ set_anno(Item, Value, Anno) ->
                     _ ->
                         lists:keyreplace(Item, 1, Anno, {Item, Value})
                 end,
-            simplify(R)
+            reset_simplify(R)
     end.
 
 reset(Anno, Item) ->
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index c4cb5fdc80..a5f0e7dbd3 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -31,12 +31,8 @@
 -export([is_guard_expr/1]).
 -export([bool_option/4,value_option/3,value_option/7]).
 
--export([modify_line/2]).
-
 -import(lists, [member/2,map/2,foldl/3,foldr/3,mapfoldl/3,all/2,reverse/1]).
 
--deprecated([{modify_line, 2, next_major_release}]).
-
 %% bool_option(OnOpt, OffOpt, Default, Options) -> boolean().
 %% value_option(Flag, Default, Options) -> Value.
 %% value_option(Flag, Default, OnOpt, OnVal, OffOpt, OffVal, Options) ->
@@ -79,7 +75,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 %%-define(DEBUGF(X,Y), io:format(X, Y)).
 -define(DEBUGF(X,Y), void).
 
--type line() :: erl_anno:line().     % a convenient alias
+-type line() :: erl_anno:anno().     % a convenient alias
 -type fa()   :: {atom(), arity()}.   % function+arity
 -type ta()   :: {atom(), arity()}.   % type+arity
 
@@ -238,6 +234,9 @@ format_error({removed, MFA, ReplacementMFA, Rel}) ->
 		  "use ~s", [format_mfa(MFA), Rel, format_mfa(ReplacementMFA)]);
 format_error({removed, MFA, String}) when is_list(String) ->
     io_lib:format("~s: ~s", [format_mfa(MFA), String]);
+format_error({removed_type, MNA, ReplacementMNA, Rel}) ->
+    io_lib:format("the type ~s was removed in ~s; use ~s instead",
+                  [format_mna(MNA), Rel, format_mna(ReplacementMNA)]);
 format_error({obsolete_guard, {F, A}}) ->
     io_lib:format("~p/~p obsolete", [F, A]);
 format_error({too_many_arguments,Arity}) ->
@@ -413,6 +412,9 @@ format_mfa({M, F, A}) when is_integer(A) ->
 format_mf(M, F, ArityString) when is_atom(M), is_atom(F) ->
     atom_to_list(M) ++ ":" ++ atom_to_list(F) ++ "/" ++ ArityString.
 
+format_mna({M, N, A}) when is_integer(A) ->
+    atom_to_list(M) ++ ":" ++ atom_to_list(N) ++ gen_type_paren(A).
+
 format_where(L) when is_integer(L) ->
     io_lib:format("(line ~p)", [L]);
 format_where({L,C}) when is_integer(L), is_integer(C) ->
@@ -3482,13 +3484,6 @@ vt_no_unused(Vt) -> [V || {_,{_,U,_L}}=V <- Vt, U =/= unused].
 copy_expr(Expr, Anno) ->
     erl_parse:map_anno(fun(_A) -> Anno end, Expr).
 
-%% modify_line(Form, Fun) -> Form
-%% modify_line(Expression, Fun) -> Expression
-%%  Applies Fun to each line number occurrence.
-
-modify_line(T, F0) ->
-    erl_parse:map_anno(F0, T).
-
 %% Check a record_info call. We have already checked that it is not
 %% shadowed by an import.
 
@@ -3557,6 +3552,7 @@ deprecated_function(Line, M, F, As, St) ->
 	    St
     end.
 
+-dialyzer({no_match, deprecated_type/5}).
 deprecated_type(L, M, N, As, St) ->
     NAs = length(As),
     case otp_internal:obsolete_type(M, N, NAs) of
@@ -3567,6 +3563,8 @@ deprecated_type(L, M, N, As, St) ->
                 false ->
                     St
             end;
+        {removed, Replacement, Rel} ->
+            add_warning(L, {removed_type, {M,N,NAs}, Replacement, Rel}, St);
         no ->
             St
     end.
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index e82282421e..206b0c6e7b 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -525,11 +525,6 @@ Erlang code.
 -export([type_inop_prec/1,type_preop_prec/1]).
 -export([map_anno/2, fold_anno/3, mapfold_anno/3,
          new_anno/1, anno_to_term/1, anno_from_term/1]).
--export([set_line/2,get_attribute/2,get_attributes/1]).
-
--deprecated([{set_line, 2, next_major_release},
-             {get_attribute, 2, next_major_release},
-             {get_attributes, 1, next_major_release}]).
 
 %% The following directive is needed for (significantly) faster compilation
 %% of the generated .erl file by the HiPE compiler.  Please do not remove.
@@ -1118,28 +1113,6 @@ type_preop_prec('-') -> {600,700};
 type_preop_prec('bnot') -> {600,700};
 type_preop_prec('#') -> {700,800}.
 
-%%% [Experimental]. The parser just copies the attributes of the
-%%% scanner tokens to the abstract format. This design decision has
-%%% been hidden to some extent: use set_line() and get_attribute() to
-%%% access the second element of (almost all) of the abstract format
-%%% tuples. A typical use is to negate line numbers to prevent the
-%%% compiler from emitting warnings and errors. The second element can
-%%% (of course) be set to any value, but then these functions no
-%%% longer apply. To get all present attributes as a property list
-%%% get_attributes() should be used.
-
--compile({nowarn_deprecated_function,{erl_scan,set_attribute,3}}).
-set_line(L, F) ->
-    erl_scan:set_attribute(line, L, F).
-
--compile({nowarn_deprecated_function,{erl_scan,attributes_info,2}}).
-get_attribute(L, Name) ->
-    erl_scan:attributes_info(L, Name).
-
--compile({nowarn_deprecated_function,{erl_scan,attributes_info,1}}).
-get_attributes(L) ->
-    erl_scan:attributes_info(L).
-
 -spec map_anno(Fun, Abstr) -> NewAbstr when
       Fun :: fun((Anno) -> Anno),
       Anno :: erl_anno:anno(),
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index d2f53816b8..47223b129c 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -52,25 +52,15 @@
 %%% External exports
 
 -export([string/1,string/2,string/3,tokens/3,tokens/4,
-         format_error/1,reserved_word/1,
-         token_info/1,token_info/2,
-         attributes_info/1,attributes_info/2,set_attribute/3]).
+         format_error/1,reserved_word/1]).
 
 -export([column/1,end_location/1,line/1,location/1,text/1,
          category/1,symbol/1]).
 
--deprecated([{attributes_info, 1, next_major_release},
-             {attributes_info, 2, next_major_release},
-             {set_attribute, 3, next_major_release},
-             {token_info, 1, next_major_release},
-             {token_info, 2, next_major_release}]).
-
 %%% Private
 -export([continuation_location/1]).
 
 -export_type([error_info/0,
-              line/0,
-              location/0,
               options/0,
               return_cont/0,
               token/0,
@@ -85,29 +75,18 @@
 -define(ALINE(L), is_integer(L)).
 -define(STRING(S), is_list(S)).
 -define(RESWORDFUN(F), is_function(F, 1)).
--define(SETATTRFUN(F), is_function(F, 1)).
 
 -type category() :: atom().
--type column() :: pos_integer().                % Deprecated
--type line() :: integer().                      % Deprecated
--type location() :: line() | {line(),column()}. % Deprecated
 -type resword_fun() :: fun((atom()) -> boolean()).
 -type option() :: 'return' | 'return_white_spaces' | 'return_comments'
                 | 'text' | {'reserved_word_fun', resword_fun()}.
 -type options() :: option() | [option()].
 -type symbol() :: atom() | float() | integer() | string().
--type info_line() :: integer() | term().
--type attributes_data()
-       :: [{'column', column()} | {'line', info_line()} | {'text', string()}]
-        |  {line(), column()}.
-%% The fact that {line(),column()} is a possible attributes() type
-%% is hidden.
--type attributes() :: line() | attributes_data().
--type token() :: {category(), attributes(), symbol()}
-               | {category(), attributes()}.
+-type token() :: {category(), Anno :: erl_anno:anno(), symbol()}
+               | {category(), Anno :: erl_anno:anno()}.
 -type tokens() :: [token()].
 -type error_description() :: term().
--type error_info() :: {location(), module(), error_description()}.
+-type error_info() :: {erl_anno:location(), module(), error_description()}.
 
 %%% Local record.
 -record(erl_scan,
@@ -136,8 +115,8 @@ format_error(Other) ->
       String :: string(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String) ->
     string(String, 1, []).
 
@@ -145,9 +124,9 @@ string(String) ->
       String :: string(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      StartLocation :: location(),
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      StartLocation :: erl_anno:location(),
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String, StartLocation) ->
     string(String, StartLocation, []).
 
@@ -156,9 +135,9 @@ string(String, StartLocation) ->
       Options :: options(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      StartLocation :: location(),
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      StartLocation :: erl_anno:location(),
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String, Line, Options) when ?STRING(String), ?ALINE(Line) ->
     string1(String, options(Options), Line, no_col, []);
 string(String, {Line,Column}, Options) when ?STRING(String),
@@ -167,20 +146,23 @@ string(String, {Line,Column}, Options) when ?STRING(String),
     string1(String, options(Options), Line, Column, []).
 
 -type char_spec() :: string() | 'eof'.
--type cont_fun() :: fun((char_spec(), #erl_scan{}, line(), column(),
+-type cont_fun() :: fun((char_spec(), #erl_scan{},
+                         erl_anno:line(), erl_anno:column(),
                          tokens(), any()) -> any()).
 -opaque return_cont() :: {erl_scan_continuation,
-                          string(), column(), tokens(), line(),
+                          string(), erl_anno:column(), tokens(),
+                          erl_anno:line(),
                           #erl_scan{}, any(), cont_fun()}.
--type tokens_result() :: {'ok', Tokens :: tokens(), EndLocation :: location()}
-                       | {'eof', EndLocation :: location()}
+-type tokens_result() :: {'ok', Tokens :: tokens(),
+                          EndLocation :: erl_anno:location()}
+                       | {'eof', EndLocation :: erl_anno:location()}
                        | {'error', ErrorInfo :: error_info(),
-                          EndLocation :: location()}.
+                          EndLocation :: erl_anno:location()}.
 
 -spec tokens(Continuation, CharSpec, StartLocation) -> Return when
       Continuation :: return_cont() | [],
       CharSpec :: char_spec(),
-      StartLocation :: location(),
+      StartLocation :: erl_anno:location(),
       Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
               | {'more', Continuation1 :: return_cont()}.
 tokens(Cont, CharSpec, StartLocation) ->
@@ -189,7 +171,7 @@ tokens(Cont, CharSpec, StartLocation) ->
 -spec tokens(Continuation, CharSpec, StartLocation, Options) -> Return when
       Continuation :: return_cont() | [],
       CharSpec :: char_spec(),
-      StartLocation :: location(),
+      StartLocation :: erl_anno:location(),
       Options :: options(),
       Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
               | {'more', Continuation1 :: return_cont()}.
@@ -257,155 +239,6 @@ symbol({_Category,_Anno,Symbol}) ->
 symbol(T) ->
     erlang:error(badarg, [T]).
 
--type attribute_item() :: 'column' | 'length' | 'line'
-                        | 'location' | 'text'.
--type info_location() :: location() | term().
--type attribute_info() :: {'column', column()}| {'length', pos_integer()}
-                        | {'line', info_line()}
-                        | {'location', info_location()}
-                        | {'text', string()}.
--type token_item() :: 'category' | 'symbol' | attribute_item().
--type token_info() :: {'category', category()} | {'symbol', symbol()}
-                    | attribute_info().
-
--spec token_info(Token) -> TokenInfo when
-      Token :: token(),
-      TokenInfo :: [TokenInfoTuple :: token_info()].
-token_info(Token) ->
-    Items = [category,column,length,line,symbol,text], % undefined order
-    token_info(Token, Items).
-
--spec token_info(Token, TokenItem) -> TokenInfoTuple | 'undefined' when
-                     Token :: token(),
-                     TokenItem :: token_item(),
-                     TokenInfoTuple :: token_info();
-                (Token, TokenItems) -> TokenInfo when
-                     Token :: token(),
-                     TokenItems :: [TokenItem :: token_item()],
-                     TokenInfo :: [TokenInfoTuple :: token_info()].
-token_info(_Token, []) ->
-    [];
-token_info(Token, [Item|Items]) when is_atom(Item) ->
-    case token_info(Token, Item) of
-        undefined ->
-            token_info(Token, Items);
-        TokenInfo when is_tuple(TokenInfo) ->
-            [TokenInfo|token_info(Token, Items)]
-    end;
-token_info({Category,_Attrs}, category=Item) ->
-    {Item,Category};
-token_info({Category,_Attrs,_Symbol}, category=Item) ->
-    {Item,Category};
-token_info({Category,_Attrs}, symbol=Item) ->
-    {Item,Category};
-token_info({_Category,_Attrs,Symbol}, symbol=Item) ->
-    {Item,Symbol};
-token_info({_Category,Attrs}, Item) ->
-    attributes_info(Attrs, Item);
-token_info({_Category,Attrs,_Symbol}, Item) ->
-    attributes_info(Attrs, Item).
-
--spec attributes_info(Attributes) -> AttributesInfo when
-      Attributes :: attributes(),
-      AttributesInfo :: [AttributeInfoTuple :: attribute_info()].
-attributes_info(Attributes) ->
-    Items = [column,length,line,text], % undefined order
-    attributes_info(Attributes, Items).
-
--spec attributes_info
-        (Attributes, AttributeItem) -> AttributeInfoTuple | 'undefined' when
-             Attributes :: attributes(),
-             AttributeItem :: attribute_item(),
-             AttributeInfoTuple :: attribute_info();
-        (Attributes, AttributeItems) -> AttributeInfo when
-             Attributes :: attributes(),
-             AttributeItems :: [AttributeItem :: attribute_item()],
-             AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
-attributes_info(_Attrs, []) ->
-    [];
-attributes_info(Attrs, [A|As]) when is_atom(A) ->
-    case attributes_info(Attrs, A) of
-        undefined ->
-            attributes_info(Attrs, As);
-        AttributeInfo when is_tuple(AttributeInfo) ->
-            [AttributeInfo|attributes_info(Attrs, As)]
-    end;
-attributes_info({Line,Column}, column=Item) when ?ALINE(Line),
-                                                 ?COLUMN(Column) ->
-    {Item,Column};
-attributes_info(Line, column) when ?ALINE(Line) ->
-    undefined;
-attributes_info(Attrs, column=Item) ->
-    case attr_info(Attrs, Item) of
-        undefined ->
-            case erl_anno:column(Attrs) of
-                undefined ->
-                    undefined;
-                Column ->
-                    {Item,Column}
-            end;
-        T ->
-            T
-    end;
-attributes_info(Attrs, length=Item) ->
-    case attributes_info(Attrs, text) of
-        undefined ->
-            undefined;
-        {text,Text} ->
-            {Item,length(Text)}
-    end;
-attributes_info(Line, line=Item) when ?ALINE(Line) ->
-    {Item,Line};
-attributes_info({Line,Column}, line=Item) when ?ALINE(Line),
-                                               ?COLUMN(Column) ->
-    {Item,Line};
-attributes_info(Attrs, line=Item) ->
-    case attr_info(Attrs, Item) of
-        undefined ->
-            case attr_info(Attrs, location) of
-                {location,{Line,_Column}} ->
-                    {Item,Line};
-                {location,Line} ->
-                    {Item,Line};
-                undefined ->
-                    undefined
-            end;
-        T ->
-            T
-    end;
-attributes_info({Line,Column}=Location, location=Item) when ?ALINE(Line),
-                                                            ?COLUMN(Column) ->
-    {Item,Location};
-attributes_info(Line, location=Item) when ?ALINE(Line) ->
-    {Item,Line};
-attributes_info(Attrs, location=Item) ->
-    {line,Line} = attributes_info(Attrs, line),
-    case attributes_info(Attrs, column) of
-        undefined ->
-            %% If set_attribute() has assigned a term such as {17,42}
-            %% to 'line', then Line will look like {Line,Column}. One
-            %% should not use 'location' but 'line' and 'column' in
-            %% such special cases.
-            {Item,Line};
-        {column,Column} ->
-            {Item,{Line,Column}}
-    end;
-attributes_info({Line,Column}, text) when ?ALINE(Line), ?COLUMN(Column) ->
-    undefined;
-attributes_info(Line, text) when ?ALINE(Line) ->
-    undefined;
-attributes_info(Attrs, text=Item) ->
-    attr_info(Attrs, Item);
-attributes_info(T1, T2) ->
-    erlang:error(badarg, [T1,T2]).
-
--spec set_attribute(AttributeItem, Attributes, SetAttributeFun) -> Attributes when
-      AttributeItem :: 'line',
-      Attributes :: attributes(),
-      SetAttributeFun :: fun((info_line()) -> info_line()).
-set_attribute(Tag, Attributes, Fun) when ?SETATTRFUN(Fun) ->
-    set_attr(Tag, Attributes, Fun).
-
 %%%
 %%% Local functions
 %%%
@@ -471,62 +304,6 @@ expand_opt(return, Os) ->
 expand_opt(O, Os) ->
     [O|Os].
 
-attr_info(Attrs, Item) ->
-    try lists:keyfind(Item, 1, Attrs) of
-        {_Item, _Value} = T ->
-            T;
-        false ->
-            undefined
-    catch
-	_:_ ->
-            erlang:error(badarg, [Attrs, Item])
-    end.
-
--spec set_attr('line', attributes(), fun((line()) -> line())) -> attributes().
-
-set_attr(line, Line, Fun) when ?ALINE(Line) ->
-    Ln = Fun(Line),
-    if
-        ?ALINE(Ln) ->
-            Ln;
-        true ->
-            [{line,Ln}]
-    end;
-set_attr(line, {Line,Column}, Fun) when ?ALINE(Line), ?COLUMN(Column) ->
-    Ln = Fun(Line),
-    if
-        ?ALINE(Ln) ->
-            {Ln,Column};
-        true ->
-            [{line,Ln},{column,Column}]
-    end;
-set_attr(line=Tag, Attrs, Fun) when is_list(Attrs) ->
-    case lists:keyfind(Tag, 1, Attrs) of
-        {line,Line} ->
-            case lists:keyreplace(Tag, 1, Attrs, {line,Fun(Line)}) of
-                [{line,Ln}] when ?ALINE(Ln) ->
-                    Ln;
-                As ->
-                    As
-            end;
-        false ->
-            {location, Location} = lists:keyfind(location, 1, Attrs),
-            Ln = case Location of
-                     {Line,Column} when ?ALINE(Line), ?COLUMN(Column) ->
-                         {Fun(Line),Column};
-                     _ ->
-                         Fun(Location)
-                 end,
-            case lists:keyreplace(location, 1, Attrs, {location,Ln}) of
-                [{location,Ln}] when ?ALINE(Ln) ->
-                    Ln;
-                As ->
-                    As
-            end
-    end;
-set_attr(T1, T2, T3) ->
-    erlang:error(badarg, [T1,T2,T3]).
-
 tokens1(Cs, St, Line, Col, Toks, Fun, Any) when ?STRING(Cs); Cs =:= eof ->
     case Fun(Cs, St, Line, Col, Toks, Any) of
         {more,{Cs0,Ncol,Ntoks,Nline,Nany,Nfun}} ->
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 2d77888512..27e195e1f3 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -597,38 +597,29 @@ obsolete_1(core_lib, is_literal_list, 1) ->
 obsolete_1(core_lib, literal_value, 1) ->
     {deprecated,{core_lib,concrete,1}};
 obsolete_1(erl_scan, set_attribute, 3) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:set_line/2 instead"};
+    {removed,{erl_anno,set_line,2},"19.0"};
 obsolete_1(erl_scan, attributes_info, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_scan, attributes_info, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_scan, token_info, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_scan:{category,column,line,location,symbol,text}/1 instead"};
 obsolete_1(erl_scan, token_info, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_scan:{category,column,line,location,symbol,text}/1 instead"};
 obsolete_1(erl_parse, set_line, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:set_line/2 instead"};
+    {removed,{erl_anno,set_line,2},"19.0"};
 obsolete_1(erl_parse, get_attributes, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_parse, get_attribute, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_lint, modify_line, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_parse:map_anno/2 instead"};
+    {removed,{erl_parse,map_anno,2},"19.0"};
 obsolete_1(ssl, negotiated_next_protocol, 1) ->
     {deprecated,{ssl,negotiated_protocol,1}};
 
@@ -698,26 +689,24 @@ is_snmp_agent_function(_,		      _) -> false.
 -spec obsolete_type(module(), atom(), arity()) ->
 	'no' | {tag(), string()} | {tag(), mfas(), release()}.
 
+-dialyzer({no_match, obsolete_type/3}).
 obsolete_type(Module, Name, NumberOfVariables) ->
     case obsolete_type_1(Module, Name, NumberOfVariables) of
-%% 	{deprecated=Tag,{_,_,_}=Replacement} ->
-%% 	    {Tag,Replacement,"in a future release"};
+	{deprecated=Tag,{_,_,_}=Replacement} ->
+	    {Tag,Replacement,"in a future release"};
 	{_,String}=Ret when is_list(String) ->
 	    Ret;
-%% 	{_,_,_}=Ret ->
-%% 	    Ret;
+	{_,_,_}=Ret ->
+	    Ret;
 	no ->
 	    no
     end.
 
 obsolete_type_1(erl_scan,column,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:column() instead"};
+    {removed,{erl_anno,column,0},"19.0"};
 obsolete_type_1(erl_scan,line,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:line() instead"};
+    {removed,{erl_anno,line,0},"19.0"};
 obsolete_type_1(erl_scan,location,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:location() instead"};
+    {removed,{erl_anno,location,0},"19.0"};
 obsolete_type_1(_,_,_) ->
     no.
diff --git a/lib/stdlib/test/erl_anno_SUITE.erl b/lib/stdlib/test/erl_anno_SUITE.erl
index 66b02151a0..0369455846 100644
--- a/lib/stdlib/test/erl_anno_SUITE.erl
+++ b/lib/stdlib/test/erl_anno_SUITE.erl
@@ -34,7 +34,7 @@
          init_per_testcase/2, end_per_testcase/2]).
 
 -export([new/1, is_anno/1, generated/1, end_location/1, file/1,
-         line/1, location/1, record/1, text/1, bad/1, neg_line/1]).
+         line/1, location/1, record/1, text/1, bad/1]).
 
 -export([parse_abstract/1, mapfold_anno/1]).
 
@@ -43,7 +43,7 @@ all() ->
 
 groups() ->
     [{anno, [], [new, is_anno, generated, end_location, file,
-                 line, location, record, text, bad, neg_line]},
+                 line, location, record, text, bad]},
      {parse, [], [parse_abstract, mapfold_anno]}].
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -229,74 +229,6 @@ bad(_Config) ->
         (catch erl_anno:record(bad)), % 1st arg not opaque
     ok.
 
-neg_line(doc) ->
-    ["Test negative line numbers (OTP 18)"];
-neg_line(_Config) ->
-    neg_line1(false),
-    neg_line1(true),
-    ok.
-
-neg_line1(TextToo) ->
-    Minus8_0 = erl_anno:new(-8),
-    Plus8_0 = erl_anno:new(8),
-    Minus8C_0 = erl_anno:new({-8, 17}),
-    Plus8C_0 = erl_anno:new({8, 17}),
-
-    [Minus8, Plus8, Minus8C, Plus8C] =
-        [case TextToo of
-             true ->
-                 erl_anno:set_text("foo", A);
-             false ->
-                 A
-         end || A <- [Minus8_0, Plus8_0, Minus8C_0, Plus8C_0]],
-
-    tst(-3, erl_anno:set_location(3, Minus8)),
-    tst(-3, erl_anno:set_location(-3, Plus8)),
-    tst(-3, erl_anno:set_location(-3, Minus8)),
-    tst({-3,9}, erl_anno:set_location({3, 9}, Minus8)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Plus8)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Minus8)),
-    tst(-3, erl_anno:set_location(3, Minus8C)),
-    tst(-3, erl_anno:set_location(-3, Plus8C)),
-    tst(-3, erl_anno:set_location(-3, Minus8C)),
-    tst({-3,9}, erl_anno:set_location({3, 9}, Minus8C)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Plus8C)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Minus8C)),
-
-    tst(-8, erl_anno:set_generated(true, Plus8)),
-    tst(-8, erl_anno:set_generated(true, Minus8)),
-    tst({-8,17}, erl_anno:set_generated(true, Plus8C)),
-    tst({-8,17}, erl_anno:set_generated(true, Minus8C)),
-    tst(8, erl_anno:set_generated(false, Plus8)),
-    tst(8, erl_anno:set_generated(false, Minus8)),
-    tst({8,17}, erl_anno:set_generated(false, Plus8C)),
-    tst({8,17}, erl_anno:set_generated(false, Minus8C)),
-
-    tst(-3, erl_anno:set_line(3, Minus8)),
-    tst(-3, erl_anno:set_line(-3, Plus8)),
-    tst(-3, erl_anno:set_line(-3, Minus8)),
-    tst({-3,17}, erl_anno:set_line(3, Minus8C)),
-    tst({-3,17}, erl_anno:set_line(-3, Plus8C)),
-    tst({-3,17}, erl_anno:set_line(-3, Minus8C)),
-    ok.
-
-tst(Term, Anno) ->
-    ?format("Term: ~p\n", [Term]),
-    ?format("Anno: ~p\n", [Anno]),
-    case anno_to_term(Anno) of
-        Term ->
-            ok;
-        Else ->
-            case lists:keyfind(location, 1, Else) of
-                {location, Term} ->
-                    ok;
-                _Else2 ->
-                    ?format("Else2 ~p\n", [_Else2]),
-                    io:format("expected ~p\n got     ~p\n", [Term, Else]),
-                    exit({Term, Else})
-            end
-    end.
-
 parse_abstract(doc) ->
     ["Test erl_parse:new_anno/1, erl_parse:anno_to_term/1"
      ", and erl_parse:anno_from_term/1"];
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 0424e2b967..6c07dc1ec6 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -65,7 +65,7 @@
 	  too_many_arguments/1,
 	  basic_errors/1,bin_syntax_errors/1,
           predef/1,
-          maps/1,maps_type/1,otp_11851/1,otp_12195/1
+          maps/1,maps_type/1,otp_11851/1
         ]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -94,7 +94,7 @@ all() ->
      bif_clash, behaviour_basic, behaviour_multiple, otp_11861,
      otp_7550, otp_8051, format_warn, {group, on_load},
      too_many_arguments, basic_errors, bin_syntax_errors, predef,
-     maps, maps_type, otp_11851, otp_12195].
+     maps, maps_type, otp_11851].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3835,40 +3835,6 @@ otp_11851(Config) when is_list(Config) ->
     [] = run(Config, Ts),
     ok.
 
-otp_12195(doc) ->
-    "OTP-12195: Check obsolete types (tailor made for OTP 18).";
-otp_12195(Config) when is_list(Config) ->
-    Ts = [{otp_12195_1,
-           <<"-export_type([r1/0]).
-              -type r1() :: erl_scan:line()
-                          | erl_scan:column()
-                          | erl_scan:location()
-                          | erl_anno:line().">>,
-           [],
-           {warnings,[{2,erl_lint,
-                       {deprecated_type,{erl_scan,line,0},
-                        "deprecated (will be removed in OTP 19); "
-                        "use erl_anno:line() instead"}},
-                      {3,erl_lint,
-                       {deprecated_type,{erl_scan,column,0},
-                        "deprecated (will be removed in OTP 19); use "
-                        "erl_anno:column() instead"}},
-                      {4,erl_lint,
-                       {deprecated_type,{erl_scan,location,0},
-                        "deprecated (will be removed in OTP 19); "
-                        "use erl_anno:location() instead"}}]}},
-          {otp_12195_2,
-           <<"-export_type([r1/0]).
-              -compile(nowarn_deprecated_type).
-              -type r1() :: erl_scan:line()
-                          | erl_scan:column()
-                          | erl_scan:location()
-                          | erl_anno:line().">>,
-           [],
-           []}],
-    [] = run(Config, Ts),
-    ok.
-
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 12ea3d128c..db669aae99 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -191,8 +191,7 @@ otp_7810(Config) when is_list(Config) ->
 
     ?line ok = more_chars(),
     ?line ok = more_options(),
-    ?line ok = attributes_info(),
-    ?line ok = set_attribute(),
+    ?line ok = anno_info(),
 
     ok.
 
@@ -269,7 +268,7 @@ punctuations() ->
 
 comments() ->
     ?line test("a %%\n b"),
-    {ok,[],1} = erl_scan_string("%"),
+    ?line {ok,[],1} = erl_scan_string("%"),
     ?line test("a %%\n b"),
     {ok,[{atom,{1,1},a},{atom,{2,2},b}],{2,3}} =
         erl_scan_string("a %%\n b", {1,1}),
@@ -338,7 +337,7 @@ base_integers() ->
              erl_scan:string(Str)
      end || {BS,S} <- [{"3","3"},{"15","f"}, {"12","c"}] ],
 
-    {ok,[{integer,1,239},{'@',1}],1} = erl_scan_string("16#ef@"),
+    ?line {ok,[{integer,1,239},{'@',1}],1} = erl_scan_string("16#ef@"),
     {ok,[{integer,{1,1},239},{'@',{1,6}}],{1,7}} =
         erl_scan_string("16#ef@", {1,1}, []),
     {ok,[{integer,{1,1},14},{atom,{1,5},g@}],{1,7}} =
@@ -387,20 +386,15 @@ dots() ->
          R2 = erl_scan_string(S, {1,1}, [])
      end || {S, R, R2} <- Dot],
 
-    ?line {ok,[{dot,_}=T1],{1,2}} = erl_scan:string(".", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T1, [column, length, line, text]),
-    ?line {ok,[{dot,_}=T2],{1,3}} = erl_scan:string(".%", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T2, [column, length, line, text]),
-    ?line {ok,[{dot,_}=T3],{1,6}} =
+    {ok,[{dot,_}=T1],{1,2}} = erl_scan:string(".", {1,1}, text),
+    [1, 1, "."] = token_info(T1),
+    {ok,[{dot,_}=T2],{1,3}} = erl_scan:string(".%", {1,1}, text),
+    [1, 1, "."] = token_info(T2),
+    {ok,[{dot,_}=T3],{1,6}} =
         erl_scan:string(".% öh", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T3, [column, length, line, text]),
-    ?line {error,{{1,2},erl_scan,char},{1,3}} =
-        erl_scan:string(".$", {1,1}),
-    ?line {error,{{1,2},erl_scan,char},{1,4}} =
-        erl_scan:string(".$\\", {1,1}),
+    [1, 1, "."] = token_info(T3),
+    {error,{{1,2},erl_scan,char},{1,3}} = erl_scan:string(".$", {1,1}),
+    {error,{{1,2},erl_scan,char},{1,4}} = erl_scan:string(".$\\", {1,1}),
 
     test_string(". ", [{dot,{1,1}}]),
     test_string(".  ", [{dot,{1,1}}]),
@@ -413,18 +407,18 @@ dots() ->
     test_string(".a", [{'.',{1,1}},{atom,{1,2},a}]),
 
     test_string("%. \n. ", [{dot,{2,1}}]),
-    ?line {more,C} = erl_scan:tokens([], "%. ",{1,1}, return),
+    {more,C} = erl_scan:tokens([], "%. ",{1,1}, return),
     {done,{ok,[{comment,{1,1},"%. "},
                {white_space,{1,4},"\n"},
                {dot,{2,1}}],
            {2,3}}, ""} =
         erl_scan_tokens(C, "\n. ", {1,1}, return), % any loc, any options
 
-    ?line [test_string(S, R) ||
-              {S, R} <- [{".$\n",   [{'.',{1,1}},{char,{1,2},$\n}]},
-                         {"$\\\n",  [{char,{1,1},$\n}]},
-                         {"'\\\n'", [{atom,{1,1},'\n'}]},
-                         {"$\n",    [{char,{1,1},$\n}]}] ],
+    [test_string(S, R) ||
+        {S, R} <- [{".$\n",   [{'.',{1,1}},{char,{1,2},$\n}]},
+                   {"$\\\n",  [{char,{1,1},$\n}]},
+                   {"'\\\n'", [{atom,{1,1},'\n'}]},
+                   {"$\n",    [{char,{1,1},$\n}]}] ],
     ok.
 
 chars() ->
@@ -540,8 +534,8 @@ eof() ->
 
     %% A dot followed by eof is special:
     ?line {more, C} = erl_scan:tokens([], "a.", 1),
-    {done,{ok,[{atom,1,a},{dot,1}],1},eof} = erl_scan_tokens(C,eof,1),
-    {ok,[{atom,1,foo},{dot,1}],1} = erl_scan_string("foo."),
+    ?line {done,{ok,[{atom,1,a},{dot,1}],1},eof} = erl_scan_tokens(C,eof,1),
+    ?line {ok,[{atom,1,foo},{dot,1}],1} = erl_scan_string("foo."),
 
     %% With column.
     {more, CCol} = erl_scan:tokens([], "a.", {1,1}),
@@ -655,145 +649,72 @@ options() ->
     ok.
 
 more_options() ->
-    ?line {ok,[{atom,A1,foo}],{19,20}} =
+    {ok,[{atom,_,foo}=T1],{19,20}} =
         erl_scan:string("foo", {19,17},[]),
-    ?line [{column,17},{line,19}] = erl_scan:attributes_info(A1),
-    ?line {done,{ok,[{atom,A2,foo},{dot,_}],{19,22}},[]} =
+    {19,17} = erl_scan:location(T1),
+    {done,{ok,[{atom,_,foo}=T2,{dot,_}],{19,22}},[]} =
         erl_scan:tokens([], "foo. ", {19,17}, [bad_opt]), % type error
-    ?line [{column,17},{line,19}] = erl_scan:attributes_info(A2),
-    ?line {ok,[{atom,A3,foo}],{19,20}} =
+    {19,17} = erl_scan:location(T2),
+    {ok,[{atom,_,foo}=T3],{19,20}} =
         erl_scan:string("foo", {19,17},[text]),
-    ?line [{column,17},{length,3},{line,19},{text,"foo"}] =
-        erl_scan:attributes_info(A3),
+    {19,17} = erl_scan:location(T3),
+    "foo" = erl_scan:text(T3),
 
-    ?line {ok,[{atom,A4,foo}],1} = erl_scan:string("foo", 1, [text]),
-    ?line [{length,3},{line,1},{text,"foo"}] = erl_scan:attributes_info(A4),
+    {ok,[{atom,_,foo}=T4],1} = erl_scan:string("foo", 1, [text]),
+    1 = erl_scan:line(T4),
+    1 = erl_scan:location(T4),
+    "foo" = erl_scan:text(T4),
 
     ok.
 
 token_info() ->
-    ?line {ok,[T1],_} = erl_scan:string("foo", {1,18}, [text]),
+    {ok,[T1],_} = erl_scan:string("foo", {1,18}, [text]),
     {'EXIT',{badarg,_}} =
-        (catch {foo, erl_scan:token_info(T1, foo)}), % type error
-    ?line {line,1} = erl_scan:token_info(T1, line),
-    ?line {column,18} = erl_scan:token_info(T1, column),
-    ?line {length,3} = erl_scan:token_info(T1, length),
-    ?line {text,"foo"} = erl_scan:token_info(T1, text),
-    ?line [{category,atom},{column,18},{length,3},{line,1},
-           {symbol,foo},{text,"foo"}] =
-        erl_scan:token_info(T1),
-    ?line [{length,3},{column,18}] =
-        erl_scan:token_info(T1, [length, column]),
-    ?line [{location,{1,18}}] =
-        erl_scan:token_info(T1, [location]),
-    ?line {category,atom} = erl_scan:token_info(T1, category),
-    ?line [{symbol,foo}] = erl_scan:token_info(T1, [symbol]),
-
-    ?line {ok,[T2],_} = erl_scan:string("foo", 1, []),
-    ?line {line,1} = erl_scan:token_info(T2, line),
-    ?line undefined = erl_scan:token_info(T2, column),
-    ?line undefined = erl_scan:token_info(T2, length),
-    ?line undefined = erl_scan:token_info(T2, text),
-    ?line {location,1} = erl_scan:token_info(T2, location),
-    ?line [{category,atom},{line,1},{symbol,foo}] = erl_scan:token_info(T2),
-    ?line [{line,1}] = erl_scan:token_info(T2, [length, line]),
-
-    ?line {ok,[T3],_} = erl_scan:string("=", 1, []),
-    ?line [{line,1}] = erl_scan:token_info(T3, [column, line]),
-    ?line {category,'='} = erl_scan:token_info(T3, category),
-    ?line [{symbol,'='}] = erl_scan:token_info(T3, [symbol]),
+        (catch {foo, erl_scan:category(foo)}), % type error
+    {'EXIT',{badarg,_}} =
+        (catch {foo, erl_scan:symbol(foo)}), % type error
+    atom = erl_scan:category(T1),
+    foo = erl_scan:symbol(T1),
+
+    {ok,[T2],_} = erl_scan:string("foo", 1, []),
+    1 = erl_scan:line(T2),
+    undefined = erl_scan:column(T2),
+    undefined = erl_scan:text(T2),
+    1 = erl_scan:location(T2),
+
+    {ok,[T3],_} = erl_scan:string("=", 1, []),
+    '=' = erl_scan:category(T3),
+    '=' = erl_scan:symbol(T3),
     ok.
 
-attributes_info() ->
-    ?line {'EXIT',_} =
-        (catch {foo,erl_scan:attributes_info(foo)}), % type error
-    [{line,18}] = erl_scan:attributes_info(erl_anno:new(18)),
-    {location,19} =
-        erl_scan:attributes_info(erl_anno:new(19), location),
-    ?line {ok,[{atom,A0,foo}],_} = erl_scan:string("foo", 19, [text]),
-    ?line {location,19} = erl_scan:attributes_info(A0, location),
-
-    ?line {ok,[{atom,A3,foo}],_} = erl_scan:string("foo", {1,3}, [text]),
-    ?line {line,1} = erl_scan:attributes_info(A3, line),
-    ?line {column,3} = erl_scan:attributes_info(A3, column),
-    ?line {location,{1,3}} = erl_scan:attributes_info(A3, location),
-    ?line {text,"foo"} = erl_scan:attributes_info(A3, text),
-
-    ?line {ok,[{atom,A4,foo}],_} = erl_scan:string("foo", 2, [text]),
-    ?line {line,2} = erl_scan:attributes_info(A4, line),
-    ?line undefined = erl_scan:attributes_info(A4, column),
-    ?line {location,2} = erl_scan:attributes_info(A4, location),
-    ?line {text,"foo"} = erl_scan:attributes_info(A4, text),
-
-    ?line {ok,[{atom,A5,foo}],_} = erl_scan:string("foo", {1,3}, []),
-    ?line {line,1} = erl_scan:attributes_info(A5, line),
-    ?line {column,3} = erl_scan:attributes_info(A5, column),
-    ?line {location,{1,3}} = erl_scan:attributes_info(A5, location),
-    ?line undefined = erl_scan:attributes_info(A5, text),
-
-    ?line undefined = erl_scan:attributes_info([], line), % type error
+anno_info() ->
+    {'EXIT',_} =
+        (catch {foo,erl_scan:line(foo)}), % type error
+    {ok,[{atom,_,foo}=T0],_} = erl_scan:string("foo", 19, [text]),
+    19 = erl_scan:location(T0),
+    19 = erl_scan:end_location(T0),
+
+    {ok,[{atom,_,foo}=T3],_} = erl_scan:string("foo", {1,3}, [text]),
+    1 = erl_scan:line(T3),
+    3 = erl_scan:column(T3),
+    {1,3} = erl_scan:location(T3),
+    {1,6} = erl_scan:end_location(T3),
+    "foo" = erl_scan:text(T3),
+
+    {ok,[{atom,_,foo}=T4],_} = erl_scan:string("foo", 2, [text]),
+    2 = erl_scan:line(T4),
+    undefined = erl_scan:column(T4),
+    2 = erl_scan:location(T4),
+    "foo" = erl_scan:text(T4),
+
+    {ok,[{atom,_,foo}=T5],_} = erl_scan:string("foo", {1,3}, []),
+    1 = erl_scan:line(T5),
+    3 = erl_scan:column(T5),
+    {1,3} = erl_scan:location(T5),
+    undefined = erl_scan:text(T5),
 
     ok.
 
-set_attribute() ->
-    F = fun(Line) -> -Line end,
-    Anno2 = erl_anno:new(2),
-    A0 = erl_scan:set_attribute(line, Anno2, F),
-    {line, -2} = erl_scan:attributes_info(A0, line),
-    ?line {ok,[{atom,A1,foo}],_} = erl_scan:string("foo", {9,17}),
-    ?line A2 = erl_scan:set_attribute(line, A1, F),
-    ?line {line,-9} = erl_scan:attributes_info(A2, line),
-    ?line {location,{-9,17}} = erl_scan:attributes_info(A2, location),
-    ?line [{line,-9},{column,17}] =
-        erl_scan:attributes_info(A2, [line,column,text]),
-
-    F2 = fun(Line) -> {17,Line} end,
-    ?line Attr1 = erl_scan:set_attribute(line, 2, F2),
-    ?line {line,{17,2}} = erl_scan:attributes_info(Attr1, line),
-    ?line undefined = erl_scan:attributes_info(Attr1, column),
-    ?line {location,{17,2}} = % a bit mixed up
-        erl_scan:attributes_info(Attr1, location),
-
-    ?line A3 = erl_scan:set_attribute(line, A1, F2),
-    ?line {line,{17,9}} = erl_scan:attributes_info(A3, line),
-    ?line {location,{{17,9},17}} = erl_scan:attributes_info(A3, location),
-    ?line [{line,{17,9}},{column,17}] =
-        erl_scan:attributes_info(A3, [line,column,text]),
-
-    ?line {ok,[{atom,A4,foo}],_} = erl_scan:string("foo", {9,17}, [text]),
-    ?line A5 = erl_scan:set_attribute(line, A4, F),
-    ?line {line,-9} = erl_scan:attributes_info(A5, line),
-    ?line {location,{-9,17}} = erl_scan:attributes_info(A5, location),
-    ?line [{line,-9},{column,17},{text,"foo"}] =
-        erl_scan:attributes_info(A5, [line,column,text]),
-
-    ?line {ok,[{atom,A6,foo}],_} = erl_scan:string("foo", 11, [text]),
-    ?line A7 = erl_scan:set_attribute(line, A6, F2),
-    %% Incompatible with pre 18:
-    %% {line,{17,11}} = erl_scan:attributes_info(A7, line),
-    {line,17} = erl_scan:attributes_info(A7, line),
-    ?line {location,{17,11}} = % mixed up
-        erl_scan:attributes_info(A7, location),
-    %% Incompatible with pre 18:
-    %% [{line,{17,11}},{text,"foo"}] =
-    %%   erl_scan:attributes_info(A7, [line,column,text]),
-    [{line,17},{column,11},{text,"foo"}] =
-        erl_scan:attributes_info(A7, [line,column,text]),
-
-    ?line {'EXIT',_} =
-        (catch {foo, erl_scan:set_attribute(line, [], F2)}), % type error
-    ?line {'EXIT',{badarg,_}} =
-        (catch {foo, erl_scan:set_attribute(column, [], F2)}), % type error
-
-    Attr10 = erl_anno:new(8),
-    Attr20 = erl_scan:set_attribute(line, Attr10,
-                                    fun(L) -> {nos,'X',L} end),
-    %% OTP-9412
-    Attr30 = erl_scan:set_attribute(line, Attr20,
-                                    fun({nos,_V,VL}) -> VL end),
-    8 = erl_anno:to_term(Attr30),
-    ok.
-
 column_errors() ->
     ?line {error,{{1,1},erl_scan,{string,$',""}},{1,3}} = % $'
         erl_scan:string("'\\",{1,1}),
@@ -892,14 +813,13 @@ unicode() ->
         erl_scan_string(Qs, 1),
     {ok,[Q2],{1,9}} =
         erl_scan:string("$\\x{aaa}", {1,1}, [text]),
-    [{category,char},{column,1},{length,8},
-           {line,1},{symbol,16#aaa},{text,Qs}] =
-        erl_scan:token_info(Q2),
+    [{category,char},{column,1},{line,1},{symbol,16#aaa},{text,Qs}] =
+        token_info_long(Q2),
 
     U1 = "\"\\x{aaa}\"",
-    {ok,[{string,A1,[2730]}],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
-    [{line,1},{column,1},{text,"\"\\x{aaa}\""}] =
-        erl_scan:attributes_info(A1, [line, column, text]),
+    {ok,[{string,_,[2730]}=T1],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
+    {1,1} = erl_scan:location(T1),
+    "\"\\x{aaa}\"" = erl_scan:text(T1),
     {ok,[{string,1,[2730]}],1} = erl_scan_string(U1, 1),
 
     U2 = "\"\\x41\\x{fff}\\x42\"",
@@ -1012,16 +932,13 @@ otp_10302(Config) when is_list(Config) ->
     Qs = "$\\x{aaa}",
     {ok,[{char,1,2730}],1} = erl_scan_string(Qs, 1),
     {ok,[Q2],{1,9}} = erl_scan:string(Qs,{1,1},[text]),
-    [{category,char},{column,1},{length,8},
-     {line,1},{symbol,16#aaa},{text,Qs}] =
-        erl_scan:token_info(Q2),
-
-    Tags = [category, column, length, line, symbol, text],
+    [{category,char},{column,1},{line,1},{symbol,16#aaa},{text,Qs}] =
+        token_info_long(Q2),
 
     U1 = "\"\\x{aaa}\"",
     {ok,[T1],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
-    [{category,string},{column,1},{length,9},{line,1},
-     {symbol,[16#aaa]},{text,U1}] = erl_scan:token_info(T1, Tags),
+    [{category,string},{column,1},{line,1},{symbol,[16#aaa]},{text,U1}] =
+        token_info_long(T1),
 
     U2 = "\"\\x41\\x{fff}\\x42\"",
     {ok,[{string,1,[65,4095,66]}],1} = erl_scan_string(U2, 1),
@@ -1353,9 +1270,7 @@ test_wsc([], []) ->
     ok;
 test_wsc([Token|Tokens], [Token2|Tokens2]) ->
     [Text, Text2] = [Text ||
-                        {text, Text} <-
-                            [erl_scan:token_info(T, text) ||
-                                T <- [Token, Token2]]],
+                        Text <- [erl_scan:text(T) || T <- [Token, Token2]]],
     Sz = erts_debug:size(Text),
     Sz2 = erts_debug:size({Text, Text2}),
     IsCompacted = Sz2 < 2*Sz+erts_debug:size({a,a}),
@@ -1394,7 +1309,7 @@ all_same(L, Char) ->
 newlines_first([]) ->
     ok;
 newlines_first([Token|Tokens]) ->
-    {text,Text} = erl_scan:token_info(Token, text),
+    Text = erl_scan:text(Token),
     Nnls = length([C || C <- Text, C =:= $\n]),
     OK = case Text of
              [$\n|_] ->
@@ -1414,7 +1329,7 @@ select_tokens(Tokens, Tags) ->
     lists:filter(fun(T) -> lists:member(element(1, T), Tags) end, Tokens).
 
 simplify([Token|Tokens]) ->
-    {line,Line} = erl_scan:token_info(Token, line),
+    Line = erl_scan:line(Token),
     [setelement(2, Token, erl_anno:new(Line)) | simplify(Tokens)];
 simplify([]) ->
     [].
@@ -1423,17 +1338,31 @@ get_text(Tokens) ->
     lists:flatten(
       [T ||
           Token <- Tokens,
-          ({text,T} = erl_scan:token_info(Token, text)) =/= []]).
+          (T = erl_scan:text(Token)) =/= []]).
 
 test_decorated_tokens(String, Tokens) ->
     ToksAttrs = token_attrs(Tokens),
     test_strings(ToksAttrs, String, 1, 1).
 
 token_attrs(Tokens) ->
-    [{L,C,Len,T} ||
+    [{L,C,length(T),T} ||
         Token <- Tokens,
-        ([{line,L},{column,C},{length,Len},{text,T}] =
-         erl_scan:token_info(Token, [line,column,length,text])) =/= []].
+        ([C,L,T] = token_info(Token)) =/= []].
+
+token_info(T) ->
+    Column = erl_scan:column(T),
+    Line = erl_scan:line(T),
+    Text = erl_scan:text(T),
+    [Column, Line, Text].
+
+token_info_long(T) ->
+    Column = erl_scan:column(T),
+    Line = erl_scan:line(T),
+    Text = erl_scan:text(T),
+    Category = erl_scan:category(T),
+    Symbol = erl_scan:symbol(T),
+    [{category,Category},{column,Column},{line,Line},
+     {symbol,Symbol},{text,Text}].
 
 test_strings([], _S, Line, Column) ->
     {Line,Column};
@@ -1514,8 +1443,7 @@ consistent_attributes([Ts | TsL]) ->
     L = [T || T <- Ts, is_integer(element(2, T))],
     case L of
         [] ->
-            TagsL = [[Tag || {Tag,_} <-
-                                 erl_scan:attributes_info(element(2, T))] ||
+            TagsL = [[Tag || {Tag,_} <- defined(token_info_long(T))] ||
                         T <- Ts],
             case lists:usort(TagsL) of
                 [_] ->
@@ -1531,6 +1459,9 @@ consistent_attributes([Ts | TsL]) ->
             Ts
     end.
 
+defined(L) ->
+    [{T,V} || {T,V} <- L, V =/= undefined].
+
 family_list(L) ->
     sofs:to_external(family(L)).