Merge branch 'ta/warnings_as_errors' into dev

* ta/warnings_as_errors:
  yecc: add warnings_as_errors option
  leex: add warnings_as_errors option
  leex: fix typo in leex_SUITE

1 files changed, 14 insertions, 1 deletions

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]