From 6477f1ddad8cb2e8eb8336cda15fbb14d7fa8e93 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Wed, 13 May 2015 11:23:26 +0200
Subject: Fix failing test case and handling double functions on one line

---
 lib/test_server/src/erl2html2.erl        | 12 ++++++------
 lib/test_server/test/erl2html2_SUITE.erl | 31 +++++++++++++++++++------------
 2 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index 9101212852..acab8dfa52 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -188,18 +188,18 @@ build_html(SFd,DFd,Encoding,FuncsAndCs) ->
     build_html(SFd,DFd,Encoding,file:read_line(SFd),1,FuncsAndCs,
 	       false,undefined).
 
-%% function start line found
-build_html(SFd,DFd,Enc,{ok,Str},L0,[{F,A,L0,LastL}|FuncsAndCs],
-	   _IsFuncDef,_FAndLastL) ->
-    FALink = test_server_ctrl:uri_encode(F++"-"++integer_to_list(A),utf8),
-    file:write(DFd,["<a name=\"",to_raw_list(FALink,Enc),"\"/>"]),
-    build_html(SFd,DFd,Enc,{ok,Str},L0,FuncsAndCs,true,{F,LastL});
 %% line of last expression in function found
 build_html(SFd,DFd,Enc,{ok,Str},LastL,FuncsAndCs,_IsFuncDef,{F,LastL}) ->
     LastLineLink = test_server_ctrl:uri_encode(F++"-last_expr",utf8),
 	    file:write(DFd,["<a name=\"",
 			    to_raw_list(LastLineLink,Enc),"\"/>"]),
     build_html(SFd,DFd,Enc,{ok,Str},LastL,FuncsAndCs,true,undefined);
+%% function start line found
+build_html(SFd,DFd,Enc,{ok,Str},L0,[{F,A,L0,LastL}|FuncsAndCs],
+	   _IsFuncDef,_FAndLastL) ->
+    FALink = test_server_ctrl:uri_encode(F++"-"++integer_to_list(A),utf8),
+    file:write(DFd,["<a name=\"",to_raw_list(FALink,Enc),"\"/>"]),
+    build_html(SFd,DFd,Enc,{ok,Str},L0,FuncsAndCs,true,{F,LastL});
 build_html(SFd,DFd,Enc,{ok,Str},L,[{clause,L}|FuncsAndCs],
 	   _IsFuncDef,FAndLastL) ->
     build_html(SFd,DFd,Enc,{ok,Str},L,FuncsAndCs,true,FAndLastL);
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/test_server/test/erl2html2_SUITE.erl
index 908985c879..7001b6086d 100644
--- a/lib/test_server/test/erl2html2_SUITE.erl
+++ b/lib/test_server/test/erl2html2_SUITE.erl
@@ -232,33 +232,40 @@ check_line_number(Last,Line,OrigLine) ->
 check_link_targets(Src,Dst,L,RmFncs) ->
     Mod = list_to_atom(filename:basename(filename:rootname(Src))),
     Exports = Mod:module_info(exports)--[{module_info,0},{module_info,1}|RmFncs],
-    {ok,{[],L},_} = xmerl_sax_parser:file(Dst,
-				     [{event_fun,fun sax_event/3},
-				      {event_state,{Exports,0}}]),
+    LastExprFuncs = [Func || {Func,_A} <- Exports],
+    {ok,{[],[],L},_} =
+	xmerl_sax_parser:file(Dst,
+			      [{event_fun,fun sax_event/3},
+			       {event_state,{Exports,LastExprFuncs,0}}]),
     ok.
 
 sax_event(Event,_Loc,State) ->
     sax_event(Event,State).
 
-sax_event({startElement,_Uri,"a",_QN,Attrs},{Exports,PrevLine}) ->
+sax_event({startElement,_Uri,"a",_QN,Attrs},{Exports,LastExprFuncs,PrevLine}) ->
     {_,_,"name",Name} = lists:keyfind("name",3,Attrs),
     case catch list_to_integer(Name) of
 	Line when is_integer(Line) ->
 	    case PrevLine + 1 of
 		Line ->
-%		    erlang:display({found_line,Line}),
-		    {Exports,Line};
+		    {Exports,LastExprFuncs,Line};
 		Other ->
 		    ct:fail({unexpected_line_number_target,Other})
 	    end;
 	{'EXIT',_} ->
-	    {match,[FStr,AStr]} =
-		 re:run(Name,"^(.*)-([0-9]+)$",[{capture,all_but_first,list}]),
+	    {match,[FStr,EndStr]} =
+		 re:run(Name,"^(.*)-(last_expr|[0-9]+)$",
+			[{capture,all_but_first,list}]),
 	    F = list_to_atom(http_uri:decode(FStr)),
-	    A = list_to_integer(AStr),
-%	    erlang:display({found_fnc,F,A}),
-	    A = proplists:get_value(F,Exports),
-	    {lists:delete({F,A},Exports),PrevLine}
+	    case EndStr of
+		"last_expr" ->
+		    true = lists:member(F,LastExprFuncs),
+		    {Exports,lists:delete(F,LastExprFuncs),PrevLine};
+		_ ->
+		    A = list_to_integer(EndStr),
+		    A = proplists:get_value(F,Exports),
+		    {lists:delete({F,A},Exports),LastExprFuncs,PrevLine}
+	    end
     end;
 sax_event(_,State) ->
     State.
-- 
cgit v1.2.3


From 42cf8b8ca9daec40a3595034a15f9f4be1cc854b Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Wed, 13 May 2015 15:56:11 +0200
Subject: Fix problem not recognizing 'macro' tuple from epp_dodger

OTP-12740
---
 lib/test_server/src/erl2html2.erl                  |  6 +++-
 lib/test_server/test/erl2html2_SUITE.erl           | 39 ++++++++++++----------
 .../test/erl2html2_SUITE_data/include/header3.hrl  |  1 +
 lib/test_server/test/erl2html2_SUITE_data/m1.erl   |  6 ++++
 4 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl

(limited to 'lib')

diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index acab8dfa52..b0b5c40965 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -170,7 +170,11 @@ get_line(Anno) ->
 %%% Find the line number of the last expression in the function
 find_clause_lines([{clause,CL,_Params,_Op,Exprs}], CLs) -> % last clause
     try tuple_to_list(lists:last(Exprs)) of
-	[_Type,ExprLine | _] ->
+	[_Type,ExprLine | _] when is_integer(ExprLine) ->
+	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(ExprLine)};
+	[tree,_ | Exprs1] ->
+	    find_clause_lines([{clause,CL,undefined,undefined,Exprs1}], CLs);
+	[macro,{_var,ExprLine,_MACRO} | _] when is_integer(ExprLine) ->
 	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(ExprLine)};
 	_ ->
 	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(CL)}
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/test_server/test/erl2html2_SUITE.erl
index 7001b6086d..796b84dedd 100644
--- a/lib/test_server/test/erl2html2_SUITE.erl
+++ b/lib/test_server/test/erl2html2_SUITE.erl
@@ -130,15 +130,7 @@ groups() ->
 %% @end
 %%--------------------------------------------------------------------
 all() ->
-    [m1].
-
-%%--------------------------------------------------------------------
-%% @spec TestCase() -> Info
-%% Info = [tuple()]
-%% @end
-%%--------------------------------------------------------------------
-m1() ->
-    [].
+    [macros_defined, macros_undefined].
 
 %%--------------------------------------------------------------------
 %% @spec TestCase(Config0) ->
@@ -149,19 +141,29 @@ m1() ->
 %% Comment = term()
 %% @end
 %%--------------------------------------------------------------------
-m1(Config) ->
-    {Src,Dst} = convert_module("m1",Config),
+macros_defined(Config) ->
+    %% let erl2html2 use epp as parser
+    DataDir = ?config(data_dir,Config),
+    InclDir = filename:join(DataDir, "include"),
+    {Src,Dst} = convert_module("m1",[InclDir],Config),
+    {true,L} = check_line_numbers(Src,Dst),
+    ok = check_link_targets(Src,Dst,L,[{baz,0}],[]),
+    ok.
+
+macros_undefined(Config) ->
+    %% let erl2html2 use epp_dodger as parser
+    {Src,Dst} = convert_module("m1",[],Config),
     {true,L} = check_line_numbers(Src,Dst),
-    ok = check_link_targets(Src,Dst,L,[{baz,0}]),
+    ok = check_link_targets(Src,Dst,L,[{baz,0}],[{quux,0}]),
     ok.
 
-convert_module(Mod,Config) ->
+convert_module(Mod,InclDirs,Config) ->
     DataDir = ?config(data_dir,Config),
     PrivDir = ?config(priv_dir,Config),
     Src = filename:join(DataDir,Mod++".erl"),
     Dst = filename:join(PrivDir,Mod++".erl.html"),
     io:format("<a href=\"~s\">~s</a>\n",[Src,filename:basename(Src)]),
-    ok = erl2html2:convert(Src, Dst, [], "<html><body>"),
+    ok = erl2html2:convert(Src, Dst, InclDirs, "<html><body>"),
     io:format("<a href=\"~s\">~s</a>\n",[Dst,filename:basename(Dst)]),
     {Src,Dst}.
 
@@ -229,14 +231,17 @@ check_line_number(Last,Line,OrigLine) ->
 %% function.
 %% The test module has -compile(export_all), so all functions are
 %% found by listing the exported ones.
-check_link_targets(Src,Dst,L,RmFncs) ->
+check_link_targets(Src,Dst,L,RmFncs,ShouldRemain) ->
     Mod = list_to_atom(filename:basename(filename:rootname(Src))),
     Exports = Mod:module_info(exports)--[{module_info,0},{module_info,1}|RmFncs],
     LastExprFuncs = [Func || {Func,_A} <- Exports],
-    {ok,{[],[],L},_} =
+    {ok,{FAs,Fs,L},_} =
 	xmerl_sax_parser:file(Dst,
 			      [{event_fun,fun sax_event/3},
-			       {event_state,{Exports,LastExprFuncs,0}}]),
+			       {event_state,{Exports,LastExprFuncs,0}}]),    
+    true = (length(FAs) == length(ShouldRemain)),
+    [] = [FA || FA <- FAs, not lists:member(FA,ShouldRemain)],
+    [] = [F || F <- Fs, not lists:keymember(F,1,ShouldRemain)],
     ok.
 
 sax_event(Event,_Loc,State) ->
diff --git a/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl b/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl
new file mode 100644
index 0000000000..2a20850a3a
--- /dev/null
+++ b/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl
@@ -0,0 +1 @@
+-define(EPP_SWITCH, on).
diff --git a/lib/test_server/test/erl2html2_SUITE_data/m1.erl b/lib/test_server/test/erl2html2_SUITE_data/m1.erl
index 156f1d0a51..1d405963a5 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/m1.erl
+++ b/lib/test_server/test/erl2html2_SUITE_data/m1.erl
@@ -7,9 +7,15 @@
 
 -include("header1.hrl").
 -include("header2.hrl").
+-include("header3.hrl").
 
 -define(MACRO1,value).
 
+%% This macro is used to select parser in erl2html2.
+%% If EPP_SWITCH is defined epp is used, else epp_dodger.
+epp_switch() ->
+    ?EPP_SWITCH.
+
 %%% Comment
 foo(x) ->
     %% Comment
-- 
cgit v1.2.3