Merge branch 'dev' into major

6 files changed, 78 insertions, 19 deletions

diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml
index 12abfd244f..1fa426a79e 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -79,6 +79,10 @@ Token = tuple()</code>
             <item><p>Causes warnings to be printed as they occur. Default is
               <c>true</c>.</p>
             </item>
+            <tag><c>warnings_as_errors</c></tag>
+            <item>
+              <p>Causes warnings to be treated as errors.</p>
+            </item>
             <tag><c>{report, bool()}</c></tag>
             <item><p>This is a short form for both <c>report_errors</c> and
               <c>report_warnings</c>.</p>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 81f1550b0a..c712609cf4 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -95,6 +95,10 @@
           <item>This is a short form for both <c>report_errors</c> and
           <c>report_warnings</c>.
           </item>
+          <tag><c>warnings_as_errors</c></tag>
+          <item>
+            <p>Causes warnings to be treated as errors.</p>
+          </item>
           <tag><c>{return_errors, bool()}</c>.</tag>
           <item>If this flag is set, <c>{error, Errors, Warnings}</c>
            is returned when there are errors. Default is
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index d0b4b9efe7..e49032ebe4 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -107,10 +107,15 @@ file(File, Opts0) ->
     St = try
              {ok,REAs,Actions,Code,St2} = parse_file(St1),
              {DFA,DF} = make_dfa(REAs, St2),
-             St3 = out_file(St2, DFA, DF, Actions, Code),
-             case lists:member(dfa_graph, St3#leex.opts) of
-                 true -> out_dfa_graph(St3, DFA, DF);
-                 false -> St3
+             case werr(St2) of
+                 false ->
+                     St3 = out_file(St2, DFA, DF, Actions, Code),
+                     case lists:member(dfa_graph, St3#leex.opts) of
+                         true -> out_dfa_graph(St3, DFA, DF);
+                         false -> St3
+                     end;
+                 true ->
+                     St2
              end
          catch #leex{}=St4 ->
              St4
@@ -163,7 +168,8 @@ options(Options0) when is_list(Options0) ->
                              (T) -> [T]
                           end, Options0),
         options(Options, [scannerfile,includefile,report_errors,
-                          report_warnings,return_errors,return_warnings,
+                          report_warnings,warnings_as_errors,
+                          return_errors,return_warnings,
                           verbose,dfa_graph], [])
     catch error: _ -> badarg
     end;
@@ -217,6 +223,7 @@ default_option(dfa_graph) -> false;
 default_option(includefile) -> [];
 default_option(report_errors) -> true;
 default_option(report_warnings) -> true;
+default_option(warnings_as_errors) -> false;
 default_option(return_errors) -> false;
 default_option(return_warnings) -> false;
 default_option(scannerfile) -> [];
@@ -225,6 +232,7 @@ default_option(verbose) -> false.
 atom_option(dfa_graph) -> {dfa_graph,true};
 atom_option(report_errors) -> {report_errors,true};
 atom_option(report_warnings) -> {report_warnings,true};
+atom_option(warnings_as_errors) -> {warnings_as_errors,true};
 atom_option(return_errors) -> {return_errors,true};
 atom_option(return_warnings) -> {return_warnings,true};
 atom_option(verbose) -> {verbose,true};
@@ -251,19 +259,29 @@ leex_ret(St) ->
     report_warnings(St),
     Es = pack_errors(St#leex.errors),
     Ws = pack_warnings(St#leex.warnings),
+    Werr = werr(St),
     if 
+        Werr ->
+            do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#leex.opts) of
                 true -> {ok, St#leex.efile, Ws};
                 false -> {ok, St#leex.efile}
             end;
-        true -> 
-            case member(return_errors, St#leex.opts) of
-                true -> {error, Es, Ws};
-                false -> error
-            end
+        true ->
+            do_error_return(St, Es, Ws)
     end.
 
+do_error_return(St, Es, Ws) ->
+    case member(return_errors, St#leex.opts) of
+        true -> {error, Es, Ws};
+        false -> error
+    end.
+
+werr(St) ->
+    member(warnings_as_errors, St#leex.opts)
+        andalso length(St#leex.warnings) > 0.
+
 pack_errors([{File,_} | _] = Es) ->
     [{File, flatmap(fun({_,E}) -> [E] end, sort(Es))}];
 pack_errors([]) ->
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 4119e2631b..72cff3af92 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -278,8 +278,8 @@ options(Options0) when is_list(Options0) ->
                              (T) -> [T]
                           end, Options0),
         options(Options, [file_attributes, includefile, parserfile, 
-                          report_errors, report_warnings, return_errors, 
-                          return_warnings, time, verbose], [])
+                          report_errors, report_warnings, warnings_as_errors,
+                          return_errors, return_warnings, time, verbose], [])
     catch error: _ -> badarg
     end;
 options(Option) ->
@@ -333,6 +333,7 @@ default_option(includefile) -> [];
 default_option(parserfile) -> [];
 default_option(report_errors) -> true;
 default_option(report_warnings) -> true;
+default_option(warnings_as_errors) -> false;
 default_option(return_errors) -> false;
 default_option(return_warnings) -> false;
 default_option(time) -> false;
@@ -341,6 +342,7 @@ default_option(verbose) -> false.
 atom_option(file_attributes) -> {file_attributes, true};
 atom_option(report_errors) -> {report_errors, true};
 atom_option(report_warnings) -> {report_warnings, true};
+atom_option(warnings_as_errors) -> {warnings_as_errors,true};
 atom_option(return_errors) -> {return_errors, true};
 atom_option(return_warnings) -> {return_warnings, true};
 atom_option(time) -> {time, true};
@@ -409,12 +411,16 @@ infile(Parent, Infilex, Options) ->
              {error, Reason} ->
                  add_error(St0#yecc.infile, none, {file_error, Reason}, St0)
          end,
-    case St#yecc.errors of
-        [] -> ok;
+    case {St#yecc.errors, werr(St)} of
+        {[], false} -> ok;
         _ -> _ = file:delete(St#yecc.outfile)
     end,
     Parent ! {self(), yecc_ret(St)}.
 
+werr(St) ->
+    member(warnings_as_errors, St#yecc.options)
+        andalso length(St#yecc.warnings) > 0.
+
 outfile(St0) ->
     case file:open(St0#yecc.outfile, [write, delayed_write]) of
         {ok, Outport} ->
@@ -777,17 +783,23 @@ yecc_ret(St0) ->
     report_warnings(St),
     Es = pack_errors(St#yecc.errors),
     Ws = pack_warnings(St#yecc.warnings),
+    Werr = werr(St),
     if 
+        Werr ->
+            do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#yecc.options) of
                 true -> {ok, St#yecc.outfile, Ws};
                 false -> {ok, St#yecc.outfile}
             end;
         true -> 
-            case member(return_errors, St#yecc.options) of
-                true -> {error, Es, Ws};
-                false -> error
-            end
+            do_error_return(St, Es, Ws)
+    end.
+
+do_error_return(St, Es, Ws) ->
+    case member(return_errors, St#yecc.options) of
+        true -> {error, Es, Ws};
+        false -> error
     end.
 
 check_expected(St0) ->
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 23ad16f98d..48312445ef 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -152,6 +152,19 @@ file(Config) when is_list(Config) ->
     ?line writable(Dotfile),
     file:delete(Dotfile),
 
+    Warn = <<"Definitions.1998\n"
+             "D  = [0-9]\n"
+             "Rules.\n"
+             "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
+             "Erlang code.\n">>,
+    ok = file:write_file(Filename, Warn),
+    error = leex:file(Filename, [warnings_as_errors]),
+    error = leex:file(Filename, [return_warnings,warnings_as_errors]),
+    {ok,Scannerfile,[{Filename,[{1,leex,ignored_characters}]}]} =
+	leex:file(Filename, [return_warnings]),
+    {error,_,[{Filename,[{1,leex,ignored_characters}]}]} =
+	leex:file(Filename, [return_errors,warnings_as_errors]),
+
     file:delete(Filename),
     ok.
 
@@ -551,7 +564,7 @@ ex2(Config) when is_list(Config) ->
      <<"
 %%% File : erlang_scan.xrl
 %%% Author : Robert Virding
-%%% Purpose : Tkoen definitions for Erlang.
+%%% Purpose : Token definitions for Erlang.
  
 Definitions.
 O  = [0-7]
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 1de87b3bff..0133524950 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -247,6 +247,14 @@ syntax(Config) when is_list(Config) ->
     ?line {ok,_,[{_,[{2,yecc,bad_declaration}]}]} = 
         yecc:file(Filename, Ret),
 
+    %% Bad declaration with warnings_as_errors.
+    error = yecc:file(Filename, [warnings_as_errors]),
+    error = yecc:file(Filename, [return_warnings,warnings_as_errors]),
+    {ok,_,[{_,[{2,yecc,bad_declaration}]}]} =
+        yecc:file(Filename, [return_warnings]),
+    {error,_,[{_,[{2,yecc,bad_declaration}]}]} =
+        yecc:file(Filename, [return_errors,warnings_as_errors]),
+
     %% Bad declaration.
     ?line ok = file:write_file(Filename, 
          <<"Nonterminals nt. Terminals t.