From bab41941d414415d9dd9cdc725ae243488b93940 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 2 Mar 2010 06:52:04 +0000
Subject: OTP-8470 stdlib: epp bug

The Erlang code preprocessor (epp) sent extra messages on the form
{eof,Location} to the client when parsing the file attribute. This bug,
introduced in R11B, has been fixed.
---
 lib/stdlib/src/epp.erl        |  2 +-
 lib/stdlib/test/epp_SUITE.erl | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 424aed3d2e..2aa52ea84a 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -753,7 +753,7 @@ scan_file([{'(',_Llp},{string,_Ls,Name},{',',_Lc},{integer,_Li,Ln},{')',_Lrp},
     Ms = dict:store({atom,'FILE'}, {none,[{string,1,Name}]}, St#epp.macs),
     Locf = loc(Tf),
     NewLoc = new_location(Ln, St#epp.location, Locf),
-    scan_toks(From, St#epp{name=Name,location=NewLoc,macs=Ms});
+    wait_req_scan(St#epp{name=Name,location=NewLoc,macs=Ms});
 scan_file(_Toks, Tf, From, St) ->
     epp_reply(From, {error,{loc(Tf),epp,{bad,file}}}),
     wait_req_scan(St).
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 9a3ae0baf5..01027ba768 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -23,7 +23,7 @@
 	 upcase_mac/1, upcase_mac_1/1, upcase_mac_2/1,
 	 variable/1, variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
-         otp_8130/1, overload_mac/1, otp_8388/1]).
+         otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -63,7 +63,7 @@ all(doc) ->
 all(suite) ->
     [rec_1, upcase_mac, predef_mac, variable, otp_4870, otp_4871, otp_5362,
      pmod, not_circular, skip_header, otp_6277, otp_7702, otp_8130,
-     overload_mac, otp_8388].
+     overload_mac, otp_8388, otp_8470].
 
 rec_1(doc) ->
     ["Recursive macros hang or crash epp (OTP-1398)."];
@@ -1134,11 +1134,32 @@ otp_8388(Config) when is_list(Config) ->
            {errors,[{{2,8},epp,{mismatch,'A'}}],[]}},
           {macro_5,
            <<"-define(Q, {?F0(), ?F1(,,4)}).\n">>,
-           {errors,[{{1,24},epp,{arg_error,'F1'}}],[]}}
+           {errors,[{{1,24},epp,{arg_error,'F1'}}],[]}},
+          {macro_6,
+           <<"-define(FOO(X), ?BAR(X)).\n"
+             "-define(BAR(X), ?FOO(X)).\n"
+             "-undef(FOO).\n"
+             "test() -> ?BAR(1).\n">>,
+           {errors,[{{4,11},epp,{undefined,'FOO',1}}],[]}}
          ],
     ?line [] = compile(Config, Ts),
     ok.
 
+otp_8470(doc) ->
+    ["OTP-8470. Bugfix (one request - two replies)."];
+otp_8470(suite) ->
+    [];
+otp_8470(Config) when is_list(Config) ->
+    Dir = ?config(priv_dir, Config),
+    C = <<"-file(\"erl_parse.yrl\", 486).\n"
+          "-file(\"erl_parse.yrl\", 488).\n">>,
+    ?line File = filename:join(Dir, "otp_8470.erl"),
+    ?line ok = file:write_file(File, C),
+    ?line {ok, _List} = epp:parse_file(File, [], []),
+    file:delete(File),
+    ?line receive _ -> fail() after 0 -> ok end,
+    ok.
+
 check(Config, Tests) ->
     eval_tests(Config, fun check_test/2, Tests).
 
-- 
cgit v1.2.3