From 4732b2e14710cc6287df82ddcf1bb7d8777706a9 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Thu, 20 Aug 2015 08:50:58 +0200
Subject: stdlib: fix a qlc bug introduced in 18.0

As pointed out by roowe, qlc does not handle errors in early compiler
(scanner, parser) well in OTP 18.0.
---
 lib/stdlib/src/qlc_pt.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/src/qlc_pt.erl')

diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index 4e81e2c2dd..9577d17a85 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -428,7 +428,13 @@ compile_errors(FormsNoShadows) ->
     end.
 
 compile_forms(Forms0, Options) ->
-    Forms = [F || F <- Forms0, element(1, F) =/= eof] ++  [{eof,anno0()}],
+    Exclude = fun(eof) -> true;
+                 (warning) -> true;
+                 (error) -> true;
+                 (_) -> false
+              end,
+    Forms = ([F || F <- Forms0, not Exclude(element(1, F))]
+             ++ [{eof,anno0()}]),
     try 
         case compile:noenv_forms(Forms, compile_options(Options)) of
             {ok, _ModName, Ws0} ->
-- 
cgit v1.2.3