Merge branch 'hb/line_abstraction/OTP-12195'

* hb/line_abstraction/OTP-12195: (21 commits)
  Ensure that erl_anno is used when building the primary bootstrap
  erl_docgen: Use module erl_anno
  wx: Use module erl_anno
  diameter: Use module erl_anno
  dialyzer: Use module erl_anno
  eunit: Use module erl_anno
  hipe: Use module erl_anno
  edoc: Use module erl_anno
  syntax_tools: Use module erl_anno
  test_server: Use module erl_anno
  tools: Use module erl_anno
  parsetools: Use module erl_anno
  kernel: Use module erl_anno
  asn1: Use module erl_anno
  debugger: Use module erl_anno
  stdlib: Silence some of qlc's warnings
  stdlib: Use module erl_anno
  compiler: Use module erl_anno
  emulator: Use module erl_anno
  Update primary bootstrap
  ...

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 7cfaa2c325..83e4dbc3eb 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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
@@ -118,8 +118,9 @@ parse_preprocessed_file(Epp,File,InCorrectFile) ->
 		{attribute,_,file,{_OtherFile,_}} ->
 		    parse_preprocessed_file(Epp,File,false);
 		{function,L,F,A,[_|C]} when InCorrectFile ->
-		    Clauses = [{clause,CL} || {clause,CL,_,_,_} <- C],
-		    [{atom_to_list(F),A,L} | Clauses] ++
+		    Clauses = [{clause,get_line(CL)} ||
+                                  {clause,CL,_,_,_} <- C],
+		    [{atom_to_list(F),A,get_line(L)} | Clauses] ++
 			parse_preprocessed_file(Epp,File,true);
 		_ ->
 		    parse_preprocessed_file(Epp,File,InCorrectFile)
@@ -147,8 +148,9 @@ parse_non_preprocessed_file(Epp, File, Location) ->
 	{ok,Tree,Location1} ->
 	    try erl_syntax:revert(Tree) of
 		{function,L,F,A,[_|C]} ->
-		    Clauses = [{clause,CL} || {clause,CL,_,_,_} <- C],
-		    [{atom_to_list(F),A,L} | Clauses] ++
+		    Clauses = [{clause,get_line(CL)} ||
+                                  {clause,CL,_,_,_} <- C],
+		    [{atom_to_list(F),A,get_line(L)} | Clauses] ++
 			parse_non_preprocessed_file(Epp, File, Location1);
 		_ ->
 		    parse_non_preprocessed_file(Epp, File, Location1)
@@ -161,6 +163,9 @@ parse_non_preprocessed_file(Epp, File, Location) ->
 	    []
     end.
 
+get_line(Anno) ->
+    erl_anno:line(Anno).
+
 %%%-----------------------------------------------------------------
 %%% Add a link target for each line and one for each function definition.
 build_html(SFd,DFd,Encoding,Functions) ->