OTP-8567 The word 'spec' is no longer reserved.

The function erl_scan:reserved_word/1 no longer returns true when given the
word spec. This bug was introduced in STDLIB-1.15.3 (R12B-3).

2 files changed, 93 insertions, 95 deletions

diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 786319d79c..7145cf13fd 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -30,9 +30,8 @@ expr_600 expr_700 expr_800 expr_900
 expr_max
 list tail
 list_comprehension lc_expr lc_exprs
-binary_comprehension 
+binary_comprehension
 tuple
-atom1
 %struct
 record_expr record_tuple record_field record_fields
 if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr
@@ -55,7 +54,7 @@ char integer float atom string var
 
 '(' ')' ',' '->' ':-' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.'
 'after' 'begin' 'case' 'try' 'catch' 'end' 'fun' 'if' 'of' 'receive' 'when'
-'andalso' 'orelse' 'query' 'spec'
+'andalso' 'orelse' 'query'
 'bnot' 'not'
 '*' '/' 'div' 'rem' 'band' 'and'
 '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
@@ -63,6 +62,7 @@ char integer float atom string var
 '==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<='
 '<<' '>>'
 '!' '=' '::'
+'spec' % helper
 dot.
 
 Expect 2.
@@ -77,19 +77,16 @@ attribute -> '-' atom attr_val               : build_attribute('$2', '$3').
 attribute -> '-' atom typed_attr_val         : build_typed_attribute('$2','$3').
 attribute -> '-' atom '(' typed_attr_val ')' : build_typed_attribute('$2','$4').
 attribute -> '-' 'spec' type_spec            : build_type_spec('$2', '$3').
-   
-atom1 -> 'spec' : {atom, ?line('$1'), 'spec'}.
-atom1 -> atom   : '$1'.
 
 type_spec -> spec_fun type_sigs : {'$1', '$2'}.
 type_spec -> '(' spec_fun type_sigs ')' : {'$2', '$3'}.
 
-spec_fun ->                            atom1 : '$1'.
-spec_fun ->                  atom1 ':' atom1 : {'$1', '$3'}.
+spec_fun ->                           atom : '$1'.
+spec_fun ->                  atom ':' atom : {'$1', '$3'}.
 %% The following two are retained only for backwards compatibility;
 %% they are not part of the EEP syntax and should be removed.
-spec_fun ->           atom1 '/' integer '::' : {'$1', '$3'}.
-spec_fun -> atom1 ':' atom1 '/' integer '::' : {'$1', '$3', '$5'}.
+spec_fun ->          atom '/' integer '::' : {'$1', '$3'}.
+spec_fun -> atom ':' atom '/' integer '::' : {'$1', '$3', '$5'}.
 
 typed_attr_val -> expr ',' typed_record_fields : {typed_record, '$1', '$3'}.
 typed_attr_val -> expr '::' top_type           : {type_def, '$1', '$3'}.
@@ -107,13 +104,13 @@ type_sigs -> type_sig                     : ['$1'].
 type_sigs -> type_sig ';' type_sigs       : ['$1'|'$3'].
 
 type_sig -> fun_type                      : '$1'.
-type_sig -> fun_type 'when' type_guards   : {type, ?line('$1'), bounded_fun, 
+type_sig -> fun_type 'when' type_guards   : {type, ?line('$1'), bounded_fun,
                                              ['$1','$3']}.
 
 type_guards -> type_guard                 : ['$1'].
 type_guards -> type_guard ',' type_guards : ['$1'|'$3'].
 
-type_guard -> atom1 '(' top_types ')'     : {type, ?line('$1'), constraint, 
+type_guard -> atom '(' top_types ')'      : {type, ?line('$1'), constraint,
                                              ['$1', '$3']}.
 
 top_types -> top_type                     : ['$1'].
@@ -127,53 +124,53 @@ top_type_100 -> type '|' top_type_100     : lift_unions('$1','$3').
 
 type -> '(' top_type ')'                  : {paren_type, ?line('$2'), ['$2']}.
 type -> var                               : '$1'.
-type -> atom1                             : '$1'.
-type -> atom1 '(' ')'                     : build_gen_type('$1').
-type -> atom1 '(' top_types ')'           : {type, ?line('$1'), 
+type -> atom                              : '$1'.
+type -> atom '(' ')'                      : build_gen_type('$1').
+type -> atom '(' top_types ')'            : {type, ?line('$1'),
                                              normalise('$1'), '$3'}.
-type -> atom1 ':' atom1 '(' ')'           : {remote_type, ?line('$1'), 
+type -> atom ':' atom '(' ')'             : {remote_type, ?line('$1'),
                                              ['$1', '$3', []]}.
-type -> atom1 ':' atom1 '(' top_types ')' : {remote_type, ?line('$1'), 
+type -> atom ':' atom '(' top_types ')'   : {remote_type, ?line('$1'),
                                              ['$1', '$3', '$5']}.
 type -> '[' ']'                           : {type, ?line('$1'), nil, []}.
 type -> '[' top_type ']'                  : {type, ?line('$1'), list, ['$2']}.
-type -> '[' top_type ',' '.' '.' '.' ']'  : {type, ?line('$1'), 
+type -> '[' top_type ',' '.' '.' '.' ']'  : {type, ?line('$1'),
                                              nonempty_list, ['$2']}.
 type -> '{' '}'                           : {type, ?line('$1'), tuple, []}.
 type -> '{' top_types '}'                 : {type, ?line('$1'), tuple, '$2'}.
-type -> '#' atom1 '{' '}'                 : {type, ?line('$1'), record, ['$2']}.
-type -> '#' atom1 '{' field_types '}'     : {type, ?line('$1'), 
+type -> '#' atom '{' '}'                  : {type, ?line('$1'), record, ['$2']}.
+type -> '#' atom '{' field_types '}'      : {type, ?line('$1'),
                                              record, ['$2'|'$4']}.
 type -> binary_type                       : '$1'.
 type -> int_type                          : '$1'.
-type -> int_type '.' '.' int_type         : {type, ?line('$1'), range, 
+type -> int_type '.' '.' int_type         : {type, ?line('$1'), range,
                                              ['$1', '$4']}.
 type -> 'fun' '(' ')'                     : {type, ?line('$1'), 'fun', []}.
 type -> 'fun' '(' fun_type_100 ')'        : '$3'.
 
 int_type -> integer                       : '$1'.
-int_type -> '-' integer                   : abstract(-normalise('$2'), 
+int_type -> '-' integer                   : abstract(-normalise('$2'),
                                                      ?line('$2')).
 
-fun_type_100 -> '(' '.' '.' '.' ')' '->' top_type 
+fun_type_100 -> '(' '.' '.' '.' ')' '->' top_type
                                           : {type, ?line('$1'), 'fun',
                                              [{type, ?line('$1'), any}, '$7']}.
 fun_type_100 -> fun_type                  : '$1'.
 
 fun_type -> '(' ')' '->' top_type  : {type, ?line('$1'), 'fun',
                                       [{type, ?line('$1'), product, []}, '$4']}.
-fun_type -> '(' top_types ')' '->' top_type 
+fun_type -> '(' top_types ')' '->' top_type
                                    : {type, ?line('$1'), 'fun',
                                       [{type, ?line('$1'), product, '$2'},'$5']}.
 
 field_types -> field_type                 : ['$1'].
 field_types -> field_type ',' field_types : ['$1'|'$3'].
 
-field_type -> atom1 '::' top_type          : {type, ?line('$1'), field_type, 
+field_type -> atom '::' top_type          : {type, ?line('$1'), field_type,
                                              ['$1', '$3']}.
 
-binary_type -> '<<' '>>'                  : {type, ?line('$1'),binary, 
-					     [abstract(0, ?line('$1')), 
+binary_type -> '<<' '>>'                  : {type, ?line('$1'),binary,
+					     [abstract(0, ?line('$1')),
 					      abstract(0, ?line('$1'))]}.
 binary_type -> '<<' bin_base_type '>>'    : {type, ?line('$1'),binary,
 					     ['$2', abstract(0, ?line('$1'))]}.
@@ -195,7 +192,7 @@ function -> function_clauses : build_function('$1').
 function_clauses -> function_clause : ['$1'].
 function_clauses -> function_clause ';' function_clauses : ['$1'|'$3'].
 
-function_clause -> atom1 clause_args clause_guard clause_body :
+function_clause -> atom clause_args clause_guard clause_body :
 	{clause,?line('$1'),element(3, '$1'),'$2','$3','$4'}.
 
 
@@ -248,9 +245,9 @@ expr_800 -> expr_900 ':' expr_max :
 	{remote,?line('$2'),'$1','$3'}.
 expr_800 -> expr_900 : '$1'.
 
-expr_900 -> '.' atom1 :
+expr_900 -> '.' atom :
 	{record_field,?line('$1'),{atom,?line('$1'),''},'$2'}.
-expr_900 -> expr_900 '.' atom1 :
+expr_900 -> expr_900 '.' atom :
 	{record_field,?line('$2'),'$1','$3'}.
 expr_900 -> expr_max : '$1'.
 
@@ -301,8 +298,8 @@ opt_bit_type_list -> '$empty' : default.
 bit_type_list -> bit_type '-' bit_type_list : ['$1' | '$3'].
 bit_type_list -> bit_type : ['$1'].
 
-bit_type -> atom1             : element(3,'$1').
-bit_type -> atom1 ':' integer : { element(3,'$1'), element(3,'$3') }.
+bit_type -> atom             : element(3,'$1').
+bit_type -> atom ':' integer : { element(3,'$1'), element(3,'$3') }.
 
 bit_size_expr -> expr_max : '$1'.
 
@@ -322,7 +319,7 @@ tuple -> '{' '}' : {tuple,?line('$1'),[]}.
 tuple -> '{' exprs '}' : {tuple,?line('$1'),'$2'}.
 
 
-%%struct -> atom1 tuple :
+%%struct -> atom tuple :
 %%	{struct,?line('$1'),element(3, '$1'),element(3, '$2')}.
 
 
@@ -330,13 +327,13 @@ tuple -> '{' exprs '}' : {tuple,?line('$1'),'$2'}.
 %% N.B. Field names are returned as the complete object, even if they are
 %% always atoms for the moment, this might change in the future.
 
-record_expr -> '#' atom1 '.' atom1 :
+record_expr -> '#' atom '.' atom :
 	{record_index,?line('$1'),element(3, '$2'),'$4'}.
-record_expr -> '#' atom1 record_tuple :
+record_expr -> '#' atom record_tuple :
 	{record,?line('$1'),element(3, '$2'),'$3'}.
-record_expr -> expr_max '#' atom1 '.' atom1 :
+record_expr -> expr_max '#' atom '.' atom :
 	{record_field,?line('$2'),'$1',element(3, '$3'),'$5'}.
-record_expr -> expr_max '#' atom1 record_tuple :
+record_expr -> expr_max '#' atom record_tuple :
 	{record,?line('$2'),'$1',element(3, '$3'),'$4'}.
 
 record_tuple -> '{' '}' : [].
@@ -346,7 +343,7 @@ record_fields -> record_field : ['$1'].
 record_fields -> record_field ',' record_fields : ['$1' | '$3'].
 
 record_field -> var '=' expr : {record_field,?line('$1'),'$1','$3'}.
-record_field -> atom1 '=' expr : {record_field,?line('$1'),'$1','$3'}.
+record_field -> atom '=' expr : {record_field,?line('$1'),'$1','$3'}.
 
 %% N.B. This is called from expr_700.
 
@@ -380,9 +377,9 @@ receive_expr -> 'receive' cr_clauses 'after' expr clause_body 'end' :
 	{'receive',?line('$1'),'$2','$4','$5'}.
 
 
-fun_expr -> 'fun' atom1 '/' integer :
+fun_expr -> 'fun' atom '/' integer :
 	{'fun',?line('$1'),{function,element(3, '$2'),element(3, '$4')}}.
-fun_expr -> 'fun' atom1 ':' atom1 '/' integer :
+fun_expr -> 'fun' atom ':' atom '/' integer :
 	{'fun',?line('$1'),{function,element(3, '$2'),element(3, '$4'),element(3,'$6')}}.
 fun_expr -> 'fun' fun_clauses 'end' :
 	build_fun(?line('$1'), '$2').
@@ -412,7 +409,7 @@ try_clauses -> try_clause ';' try_clauses : ['$1' | '$3'].
 try_clause -> expr clause_guard clause_body :
 	L = ?line('$1'),
 	{clause,L,[{tuple,L,[{atom,L,throw},'$1',{var,L,'_'}]}],'$2','$3'}.
-try_clause -> atom1 ':' expr clause_guard clause_body :
+try_clause -> atom ':' expr clause_guard clause_body :
 	L = ?line('$1'),
 	{clause,L,[{tuple,L,['$1','$3',{var,L,'_'}]}],'$4','$5'}.
 try_clause -> var ':' expr clause_guard clause_body :
@@ -436,7 +433,7 @@ guard -> exprs ';' guard : ['$1'|'$3'].
 atomic -> char : '$1'.
 atomic -> integer : '$1'.
 atomic -> float : '$1'.
-atomic -> atom1 : '$1'.
+atomic -> atom : '$1'.
 atomic -> strings : '$1'.
 
 strings -> string : '$1'.
@@ -481,7 +478,7 @@ rule -> rule_clauses : build_rule('$1').
 rule_clauses -> rule_clause : ['$1'].
 rule_clauses -> rule_clause ';' rule_clauses : ['$1'|'$3'].
 
-rule_clause -> atom1 clause_args clause_guard rule_body :
+rule_clause -> atom clause_args clause_guard rule_body :
 	{clause,?line('$1'),element(3, '$1'),'$2','$3','$4'}.
 
 rule_body -> ':-' lc_exprs: '$2'.
@@ -503,8 +500,8 @@ Erlang code.
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
 
--define(mkop2(L, OpPos, R), 
-        begin 
+-define(mkop2(L, OpPos, R),
+        begin
             {Op,Pos} = OpPos,
             {op,Pos,Op,L,R}
         end).
@@ -522,6 +519,8 @@ Erlang code.
 %% These really suck and are only here until Calle gets multiple
 %% entry points working.
 
+parse_form([{'-',L1},{atom,L2,spec}|Tokens]) ->
+    parse([{'-',L1},{'spec',L2}|Tokens]);
 parse_form(Tokens) ->
     parse(Tokens).
 
@@ -548,7 +547,7 @@ parse_term(Tokens) ->
 -type attributes() :: 'export' | 'file' | 'import' | 'module'
 		    | 'opaque' | 'record' | 'type'.
 
-build_typed_attribute({atom,La,record}, 
+build_typed_attribute({atom,La,record},
 		      {typed_record, {atom,_Ln,RecordName}, RecTuple}) ->
     {attribute,La,record,{RecordName,record_tuple(RecTuple)}};
 build_typed_attribute({atom,La,Attr},
@@ -571,7 +570,7 @@ build_typed_attribute({atom,La,Attr},_) ->
 build_type_spec({spec,La}, {SpecFun, TypeSpecs}) ->
     NewSpecFun =
 	case SpecFun of
-	    {atom, _, Fun} -> 
+	    {atom, _, Fun} ->
 		{Fun, find_arity_from_specs(TypeSpecs)};
 	    {{atom,_, Mod}, {atom,_, Fun}} ->
 		{Mod,Fun,find_arity_from_specs(TypeSpecs)};
@@ -705,7 +704,7 @@ attribute_farity(Other) -> Other.
 
 attribute_farity_list(Args) ->
     [attribute_farity(A) || A <- Args].
-    
+
 -spec error_bad_decl(integer(), attributes()) -> no_return().
 
 error_bad_decl(L, S) ->
@@ -728,17 +727,17 @@ record_fields([{match,_Lm,{atom,La,A},Expr}|Fields]) ->
     [{record_field,La,{atom,La,A},Expr}|record_fields(Fields)];
 record_fields([{typed,Expr,TypeInfo}|Fields]) ->
     [Field] = record_fields([Expr]),
-    TypeInfo1 = 
+    TypeInfo1 =
 	case Expr of
 	    {match, _, _, _} -> TypeInfo; %% If we have an initializer.
-	    {atom, La, _} -> 
+	    {atom, La, _} ->
                 case has_undefined(TypeInfo) of
                     false ->
                         lift_unions(abstract(undefined, La), TypeInfo);
                     true ->
                         TypeInfo
                 end
-	end, 
+	end,
     [{typed_record_field,Field,TypeInfo1}|record_fields(Fields)];
 record_fields([Other|_Fields]) ->
     ret_err(?line(Other), "bad record field");
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 52ec81a78b..1013d54bdc 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -48,7 +48,7 @@
 
 -module(erl_scan).
 
-%%% External exports 
+%%% External exports
 
 -export([string/1,string/2,string/3,tokens/3,tokens/4,
          format_error/1,reserved_word/1,
@@ -98,41 +98,41 @@
 -spec format_error(Error :: term()) -> string().
 format_error({string,Quote,Head}) ->
     lists:flatten(["unterminated " ++ string_thing(Quote) ++
-                   " starting with " ++ 
+                   " starting with " ++
                    io_lib:write_unicode_string(Head, Quote)]);
-format_error({illegal,Type}) -> 
+format_error({illegal,Type}) ->
     lists:flatten(io_lib:fwrite("illegal ~w", [Type]));
 format_error(char) -> "unterminated character";
-format_error({base,Base}) -> 
+format_error({base,Base}) ->
     lists:flatten(io_lib:fwrite("illegal base '~w'", [Base]));
-format_error(Other) -> 
+format_error(Other) ->
     lists:flatten(io_lib:write(Other)).
 
--type string_return() :: {'ok', tokens(), location()} 
+-type string_return() :: {'ok', tokens(), location()}
                        | {'error', error_info(), location()}.
 
 -spec string(String :: string()) -> string_return().
 string(String) ->
     string(String, 1, []).
 
--spec string(String :: string(), StartLocation :: location()) -> 
+-spec string(String :: string(), StartLocation :: location()) ->
                    string_return().
 string(String, StartLocation) ->
     string(String, StartLocation, []).
 
--spec string(String :: string(), StartLocation :: location(), 
+-spec string(String :: string(), StartLocation :: location(),
              Options :: options()) -> string_return().
 string(String, Line, Options) when ?STRING(String), ?ALINE(Line) ->
     string1(String, options(Options), Line, no_col, []);
 string(String, {Line,Column}, Options) when ?STRING(String),
-                                            ?ALINE(Line), 
+                                            ?ALINE(Line),
                                             ?COLUMN(Column) ->
     string1(String, options(Options), Line, Column, []).
 
 -type char_spec() :: string() | 'eof'.
 -type cont_fun() :: fun((char_spec(), #erl_scan{}, line(), column(),
                          tokens(), any()) -> any()).
--opaque return_cont() :: {string(), column(), tokens(), line(), 
+-opaque return_cont() :: {string(), column(), tokens(), line(),
                           #erl_scan{}, cont_fun(), any()}.
 -type cont() :: return_cont() | [].
 -type tokens_result() :: {'ok', tokens(), location()}
@@ -141,13 +141,13 @@ string(String, {Line,Column}, Options) when ?STRING(String),
 -type tokens_return() :: {'done', tokens_result(), char_spec()}
                        | {'more', return_cont()}.
 
--spec tokens(Cont :: cont(), CharSpec :: char_spec(), 
+-spec tokens(Cont :: cont(), CharSpec :: char_spec(),
              StartLocation :: location()) -> tokens_return().
 tokens(Cont, CharSpec, StartLocation) ->
     tokens(Cont, CharSpec, StartLocation, []).
 
--spec tokens(Cont :: cont(), CharSpec :: char_spec(), 
-             StartLocation :: location(), Options :: options()) -> 
+-spec tokens(Cont :: cont(), CharSpec :: char_spec(),
+             StartLocation :: location(), Options :: options()) ->
           tokens_return().
 tokens([], CharSpec, Line, Options) when ?ALINE(Line) ->
     tokens1(CharSpec, options(Options), Line, no_col, [], fun scan/6, []);
@@ -157,15 +157,15 @@ tokens([], CharSpec, {Line,Column}, Options) when ?ALINE(Line),
 tokens({Cs,Col,Toks,Line,St,Any,Fun}, CharSpec, _Loc, _Opts) ->
     tokens1(Cs++CharSpec, St, Line, Col, Toks, Fun, Any).
 
--type attribute_item() :: 'column' | 'length' | 'line' 
+-type attribute_item() :: 'column' | 'length' | 'line'
                         | 'location' | 'text'.
 -type info_location() :: location() | term().
--type attribute_info() :: {'column', column()}| {'length', pos_integer()} 
-                        | {'line', info_line()} 
+-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()} 
+-type token_info() :: {'category', category()} | {'symbol', symbol()}
                     | attribute_info().
 
 -spec token_info(token()) -> [token_info()].
@@ -214,7 +214,7 @@ attributes_info(Attrs, [A|As]) when is_atom(A) ->
         AttributeInfo when is_tuple(AttributeInfo) ->
             [AttributeInfo|attributes_info(Attrs, As)]
     end;
-attributes_info({Line,Column}, column=Item) when ?ALINE(Line), 
+attributes_info({Line,Column}, column=Item) when ?ALINE(Line),
                                                  ?COLUMN(Column) ->
     {Item,Column};
 attributes_info(Line, column) when ?ALINE(Line) ->
@@ -230,12 +230,12 @@ attributes_info(Attrs, length=Item) ->
     end;
 attributes_info(Line, line=Item) when ?ALINE(Line) ->
     {Item,Line};
-attributes_info({Line,Column}, line=Item) when ?ALINE(Line), 
+attributes_info({Line,Column}, line=Item) when ?ALINE(Line),
                                                ?COLUMN(Column) ->
     {Item,Line};
 attributes_info(Attrs, line=Item) ->
     attr_info(Attrs, Item);
-attributes_info({Line,Column}=Location, location=Item) when ?ALINE(Line), 
+attributes_info({Line,Column}=Location, location=Item) when ?ALINE(Line),
                                                             ?COLUMN(Column) ->
     {Item,Location};
 attributes_info(Line, location=Item) when ?ALINE(Line) ->
@@ -289,11 +289,11 @@ string_thing(_) -> "string".
 
 options(Opts0) when is_list(Opts0) ->
     Opts = lists:foldr(fun expand_opt/2, [], Opts0),
-    [RW_fun] = 
+    [RW_fun] =
         case opts(Opts, [reserved_word_fun], []) of
             badarg ->
                 erlang:error(badarg, [Opts0]);
-            R -> 
+            R ->
                 R
         end,
     Comment = proplists:get_bool(return_comments, Opts),
@@ -336,7 +336,7 @@ attr_info(Attrs, Item) ->
     case catch lists:keysearch(Item, 1, Attrs) of
         {value,{Item,Value}} ->
             {Item,Value};
-        false -> 
+        false ->
             undefined;
         _ ->
             erlang:error(badarg, [Attrs, Item])
@@ -591,12 +591,12 @@ scan_atom(Cs0, St, Line, Col, Toks, Ncs0) ->
             case catch list_to_atom(Wcs) of
                 Name when is_atom(Name) ->
                     case (St#erl_scan.resword_fun)(Name) of
-                        true -> 
+                        true ->
                             tok2(Cs, St, Line, Col, Toks, Wcs, Name);
-                        false -> 
+                        false ->
                             tok3(Cs, St, Line, Col, Toks, atom, Wcs, Name)
                     end;
-                _Error -> 
+                _Error ->
                     Ncol = incr_column(Col, length(Wcs)),
                     scan_error({illegal,atom}, Line, Col, Line, Ncol, Cs)
             end
@@ -610,7 +610,7 @@ scan_variable(Cs0, St, Line, Col, Toks, Ncs0) ->
             case catch list_to_atom(Wcs) of
                 Name when is_atom(Name) ->
                     tok3(Cs, St, Line, Col, Toks, var, Wcs, Name);
-                _Error -> 
+                _Error ->
                     Ncol = incr_column(Col, length(Wcs)),
                     scan_error({illegal,var}, Line, Col, Line, Ncol, Cs)
             end
@@ -690,7 +690,7 @@ scan_nl_spcs([]=Cs, _St, Line, Col, Toks, N) ->
     {more,{Cs,Col,Toks,Line,N,fun scan_nl_spcs/6}};
 scan_nl_spcs(Cs, St, Line, Col, Toks, N) ->
     newline_end(Cs, St, Line, Col, Toks, N, nl_spcs(N)).
-    
+
 scan_nl_tabs([$\t|Cs], St, Line, Col, Toks, N) when N < 11 ->
     scan_nl_tabs(Cs, St, Line, Col, Toks, N+1);
 scan_nl_tabs([]=Cs, _St, Line, Col, Toks, N) ->
@@ -701,7 +701,7 @@ scan_nl_tabs(Cs, St, Line, Col, Toks, N) ->
 %% Note: returning {more,Cont} is meaningless here; one could just as
 %% well return several tokens. But since tokens() scans up to a full
 %% stop anyway, nothing is gained by not collecting all white spaces.
-scan_nl_white_space([$\n|Cs], #erl_scan{text = false}=St, Line, no_col=Col, 
+scan_nl_white_space([$\n|Cs], #erl_scan{text = false}=St, Line, no_col=Col,
                     Toks0, Ncs) ->
     Toks = [{white_space,Line,lists:reverse(Ncs)}|Toks0],
     scan_newline(Cs, St, Line+1, Col, Toks);
@@ -714,7 +714,7 @@ scan_nl_white_space([C|Cs], St, Line, Col, Toks, Ncs) when ?WHITE_SPACE(C) ->
     scan_nl_white_space(Cs, St, Line, Col, Toks, [C|Ncs]);
 scan_nl_white_space([]=Cs, _St, Line, Col, Toks, Ncs) ->
     {more,{Cs,Col,Toks,Line,Ncs,fun scan_nl_white_space/6}};
-scan_nl_white_space(Cs, #erl_scan{text = false}=St, Line, no_col=Col, 
+scan_nl_white_space(Cs, #erl_scan{text = false}=St, Line, no_col=Col,
                     Toks, Ncs) ->
     scan1(Cs, St, Line+1, Col, [{white_space,Line,lists:reverse(Ncs)}|Toks]);
 scan_nl_white_space(Cs, St, Line, Col, Toks, Ncs0) ->
@@ -723,7 +723,7 @@ scan_nl_white_space(Cs, St, Line, Col, Toks, Ncs0) ->
     Token = {white_space,Attrs,Ncs},
     scan1(Cs, St, Line+1, new_column(Col, length(Ncs)), [Token|Toks]).
 
-newline_end(Cs, #erl_scan{text = false}=St, Line, no_col=Col, 
+newline_end(Cs, #erl_scan{text = false}=St, Line, no_col=Col,
             Toks, _N, Ncs) ->
     scan1(Cs, St, Line+1, Col, [{white_space,Line,Ncs}|Toks]);
 newline_end(Cs, St, Line, Col, Toks, N, Ncs) ->
@@ -789,7 +789,7 @@ scan_char([$\\|Cs]=Cs0, St, Line, Col, Toks) ->
             Ntoks = [{char,Attrs,Val}|Toks],
             scan1(Ncs, St, Line, Ncol, Ntoks)
     end;
-scan_char([$\n=C|Cs], St, Line, Col, Toks) ->    
+scan_char([$\n=C|Cs], St, Line, Col, Toks) ->
     Attrs = attributes(Line, Col, St, [$$,C]),
     scan1(Cs, St, Line+1, new_column(Col, 1), [{char,Attrs,C}|Toks]);
 scan_char([C|Cs], St, Line, Col, Toks) when ?CHAR(C) ->
@@ -896,7 +896,7 @@ scan_string_no_col([Q|Cs], Line, Col, Q, Wcs, Uni) ->
     {Cs,Line,Col,_DontCare=[],lists:reverse(Wcs),Uni};
 scan_string_no_col([$\n=C|Cs], Line, Col, Q, Wcs, Uni) ->
     scan_string_no_col(Cs, Line+1, Col, Q, [C|Wcs], Uni);
-scan_string_no_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\, 
+scan_string_no_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\,
                                                         ?CHAR(C), ?UNI255(C) ->
     scan_string_no_col(Cs, Line, Col, Q, [C|Wcs], Uni);
 scan_string_no_col(Cs, Line, Col, Q, Wcs, Uni) ->
@@ -909,7 +909,7 @@ scan_string_col([Q|Cs], Line, Col, Q, Wcs0, Uni) ->
     {Cs,Line,Col+1,Str,Wcs,Uni};
 scan_string_col([$\n=C|Cs], Line, _xCol, Q, Wcs, Uni) ->
     scan_string_col(Cs, Line+1, 1, Q, [C|Wcs], Uni);
-scan_string_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\, 
+scan_string_col([C|Cs], Line, Col, Q, Wcs, Uni) when C =/= $\\,
                                                      ?CHAR(C), ?UNI255(C) ->
     scan_string_col(Cs, Line, Col+1, Q, [C|Wcs], Uni);
 scan_string_col(Cs, Line, Col, Q, Wcs, Uni) ->
@@ -970,8 +970,8 @@ scan_string1(eof, Line, Col, _Q, _Str, Wcs, _Uni) ->
     {error,Line,Col,lists:reverse(Wcs),eof}.
 
 -define(OCT(C), C >= $0, C =< $7).
--define(HEX(C), C >= $0 andalso C =< $9 orelse 
-                C >= $A andalso C =< $F orelse 
+-define(HEX(C), C >= $0 andalso C =< $9 orelse
+                C >= $A andalso C =< $F orelse
                 C >= $a andalso C =< $f).
 
 %% \<1-3> octal digits
@@ -1086,7 +1086,7 @@ scan_number(Cs, St, Line, Col, Toks, Ncs0) ->
             Ncol = incr_column(Col, length(Ncs)),
             scan_error({illegal,integer}, Line, Col, Line, Ncol, Cs)
     end.
-    
+
 scan_based_int([C|Cs], St, Line, Col, Toks, {B,Ncs,Bcs})
     when ?DIGIT(C), C < $0+B ->
     scan_based_int(Cs, St, Line, Col, Toks, {B,[C|Ncs],Bcs});
@@ -1262,7 +1262,7 @@ nl_tabs(8)  -> "\n\t\t\t\t\t\t\t";
 nl_tabs(9)  -> "\n\t\t\t\t\t\t\t\t";
 nl_tabs(10) -> "\n\t\t\t\t\t\t\t\t\t";
 nl_tabs(11) -> "\n\t\t\t\t\t\t\t\t\t\t".
-    
+
 tabs(1)  ->  "\t";
 tabs(2)  ->  "\t\t";
 tabs(3)  ->  "\t\t\t";
@@ -1303,5 +1303,4 @@ reserved_word('bsl') -> true;
 reserved_word('bsr') -> true;
 reserved_word('or') -> true;
 reserved_word('xor') -> true;
-reserved_word('spec') -> true;
 reserved_word(_) -> false.