[compiler] Added the option warnings_as_errors (for the SNMP MIB

compiler (escript) frontend, the option --wae is used) which
specifies whether warnings should be treated as errors.
Tuncer Ayaz.
OTP-9437

Merge branch 'bmk/snmp/compiler/warnings_as_errors/OTP-9437' into bmk/snmp/snmp421_integration

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src
	lib/snmp/src/compile/Makefile

8 files changed, 108 insertions, 18 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 7e4099c7a8..7b389929cf 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -35,7 +35,7 @@
   <section>
     <title>SNMP Development Toolkit 4.21</title>
     <p>Version 4.21 supports code replacement in runtime from/to
-      version 4.20.1, 4.20, 4.19 and 4.18.</p>
+      version 4.20.1, 4.20 and 4.19. </p>
 
     <section>
       <title>Improvements and new features</title>
@@ -58,6 +58,16 @@
           <p>Own Id: OTP-9305</p>
           <p>Aux Id: Seq 11847</p>
         </item>
+
+        <item>
+          <p>[compiler] Added the option 
+	  <seealso marker="snmpc#compile">warnings_as_errors</seealso> 
+	  (for the SNMP MIB compiler (escript) frontend, the option 
+	  <seealso marker="snmpc(command)">--wae</seealso> is used) 
+	  which specifies whether warnings should be treated as errors. </p>
+          <p>Tuncer Ayaz</p>
+          <p>Own Id: OTP-9437</p>
+        </item>
       </list>
     </section>
 
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index 771629492d..61d19251c5 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -48,7 +48,11 @@
       <type>
         <v>File = string()</v>
         <v>Options = [opt()]</v>
-        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | module_compliance() | agent_capabilities() | outdir() |  no_defs() | verbosity() | warnings()</v>
+        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | 
+	description() | reference() | group_check() |  i() | il() | 
+	imports() | module() | module_identity() | module_compliance() | 
+	agent_capabilities() | outdir() |  no_defs() | verbosity() | 
+	warnings() | warnings_as_errors()</v>
         <v>db() = {db, volatile|persistent|mnesia}</v>
         <v>deprecated() = {deprecated, bool()}</v>
         <v>relaxed_row_name_assign_check() = relaxed_row_name_assign_check</v>
@@ -66,6 +70,7 @@
         <v>outdir() = {outdir, dir()}</v>
         <v>verbosity() = {verbosity, silence|warning|info|log|debug|trace}</v>
         <v>warnings() = {warnings, bool()}</v>
+	<v>warnings_as_errors() = warnings_as_errors</v>
         <v>dir() = string()</v>
         <v>BinFileName = string()</v>
       </type>
@@ -200,11 +205,17 @@
 
           <item>
 	    <p>The option <c>warnings</c> specifies whether warning
-              messages should be shown. </p>
+	    messages should be shown. </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
 
+	  <item>
+	    <p>The option <c>warnings_as_errors</c>, if present, specifies 
+	    whether warnings should be treated as errors.</p>
+	  </item>
+
         </list>
+	
         <p>The MIB compiler understands both SMIv1 and SMIv2 MIBs.  It
           uses the <c>MODULE-IDENTITY</c> statement to determine if the MIB is
           version 1 or 2.
diff --git a/lib/snmp/doc/src/snmpc_cmd.xml b/lib/snmp/doc/src/snmpc_cmd.xml
index 9358382a10..e3064fc086 100644
--- a/lib/snmp/doc/src/snmpc_cmd.xml
+++ b/lib/snmp/doc/src/snmpc_cmd.xml
@@ -178,6 +178,11 @@
 	it will be. </p>
       </item>
 
+      <tag>--wae</tag>
+      <item>
+        <p>Warnings as errors. Indicates that warnings shall be treated as errors. </p>
+      </item>
+
     </taglist>
   </section>
 
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index 477002e59f..627af6f185 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -45,12 +45,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 
 include modules.mk
 
-ESCRIPT_BIN = $(ESCRIPT_SRC:%.src=$(BIN)/%)
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-EBIN_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
+ESCRIPT_BIN  = $(ESCRIPT_SRC:%.src=$(BIN)/%)
+ERL_FILES    = $(MODULES:%=%.erl)
+EBIN_FILES   = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
 TARGET_FILES = $(EBIN_FILES) $(ESCRIPT_BIN)
 
 GENERATED_PARSER = $(PARSER_MODULE:%=%.erl)
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 195c238184..5e6b81f1ec 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -108,6 +108,7 @@ compile(FileName) ->
 %%          {i,           [import_dir_string()]}          ["./"]
 %%          {il,          [import_lib_dir_string()]}      []
 %%          {warnings,    bool()}                         true
+%%          warnings_as_errors
 %%          {outdir,      string()}                       "./"
 %%          description
 %%          reference
@@ -199,6 +200,8 @@ get_options([reference|Opts], Formats, Args) ->
     get_options(Opts, ["~n   reference"|Formats], Args);
 get_options([{warnings, Val}|Opts], Formats, Args) ->
     get_options(Opts, ["~n   warnings:    ~w"|Formats], [Val|Args]);
+get_options([warnings_as_errors|Opts], Formats, Args) ->
+    get_options(Opts, ["~n   warnings_as_errors"|Formats], Args);
 get_options([{verbosity, Val}|Opts], Formats, Args) ->
     get_options(Opts, ["~n   verbosity:   ~w"|Formats], [Val|Args]);
 get_options([imports|Opts], Formats, Args) ->
@@ -261,6 +264,8 @@ check_options([{group_check, Atom} | T]) when is_atom(Atom) ->
 check_options([{warnings, Bool} | T]) ->
     check_bool(warnings, Bool),
     check_options(T);
+check_options([warnings_as_errors | T]) ->
+    check_options(T);
 check_options([{db, volatile} | T]) ->
     check_options(T);
 check_options([{db, persistent} | T]) ->
@@ -331,6 +336,9 @@ get_agent_capabilities(Options) ->
 get_module_compliance(Options) ->
     get_bool_option(module_compliance, Options).
 
+get_warnings_as_errors(Options) ->
+    lists:member(warnings_as_errors, Options).
+
 get_relaxed_row_name_assign_check(Options) ->
     lists:member(relaxed_row_name_assign_check, Options).
 
@@ -409,6 +417,7 @@ init(From, MibFileName, Options) ->
     put(reference,          get_reference(Options)),
     put(agent_capabilities, get_agent_capabilities(Options)),
     put(module_compliance,  get_module_compliance(Options)),
+    put(warnings_as_errors, get_warnings_as_errors(Options)),
     File = filename:rootname(MibFileName, ".mib"),
     put(filename, filename:basename(File ++ ".mib")),
     R = case catch c_impl(File) of
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index 5f9b154bfa..4e91ae9a03 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -50,7 +50,8 @@
 	 %% The default verbosity (silence) will be filled in 
 	 %% during argument processing.
 	 verbosity, 
-	 warnings           = false
+	 warnings           = false,
+	 warnings_as_errors = false
         }).
 
 
@@ -74,6 +75,7 @@
 %% --version
 %% --verbosity V
 %% --warnings
+%% --wae
 main(Args) when is_list(Args) ->
     case (catch process_args(Args)) of
 	ok ->
@@ -156,7 +158,8 @@ mk_mib_options(#state{outdir             = OutDir,
 		      %% The default verbosity (silence) will be filled in 
 		      %% during argument processing.
 		      verbosity          = V, 
-		      warnings           = W}) ->
+		      warnings           = W,
+                      warnings_as_errors = WAE}) ->
     [{outdir,                        OutDir}, 
      {db,                            DB},
      {i,                             IDs},
@@ -178,7 +181,8 @@ mk_mib_options(#state{outdir             = OutDir,
 	maybe_option(Imp,   imports) ++ 
 	maybe_option(MI,    module_identity) ++ 
 	maybe_option(MC,    module_compliance) ++ 
-	maybe_option(AC,    agent_capabilities).
+	maybe_option(AC,    agent_capabilities) ++ 
+	maybe_option(WE,    warnings_as_errors).
 
 maybe_option(true, Opt) -> [Opt];
 maybe_option(_,    _)   -> [].
@@ -292,6 +296,8 @@ process_args(["--nd"|Args], State) ->
     process_args(Args, State#state{no_defaults = true});
 process_args(["--rrnac"|Args], State) ->
     process_args(Args, State#state{relaxed_row_name_assigne_check = true});
+process_args(["--wae"|Args], State) ->
+    process_args(Args, State#state{warnings_as_errors = true});
 process_args([MIB], State) ->
     Ext = filename:extension(MIB),
     if 
@@ -371,6 +377,8 @@ usage() ->
 	      "~n                              a warning. "
 	      "~n                              By default it is not included, but if this option is "
 	      "~n                              present it will be. "
+	      "~n   --wae                    - Warnings as errors. "
+              "~n                              Indicates that warnings shall be treated as errors. "
 	      "~n   "
 	      "~n", []),
     halt(1).
diff --git a/lib/snmp/src/compile/snmpc_lib.hrl b/lib/snmp/src/compile/snmpc_lib.hrl
index 000486e728..35ec9abd03 100644
--- a/lib/snmp/src/compile/snmpc_lib.hrl
+++ b/lib/snmp/src/compile/snmpc_lib.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -20,8 +20,17 @@
 -ifndef(snmpc_lib).
 -define(snmpc_lib, true).
 
--define(vwarning(F, A),           ?verbosity(warning, F, A, ignore)).
--define(vwarning2(F, A, MibLine), ?verbosity(warning, F, A, MibLine)).
+-define(vwarning(F, A),
+	case get(warnings_as_errors) of
+	    true -> snmpc_lib:error(F, A);
+	    _ -> ?verbosity(warning, F, A, ignore)
+	end).
+
+-define(vwarning2(F, A, MibLine),
+	 case get(warnings_as_errors) of
+	     true -> snmpc_lib:error(F, A, MibLine);
+	     _ -> ?verbosity(warning, F, A, MibLine)
+	 end).
 -define(vinfo(F, A),              ?verbosity(info,    F, A, ignore)).
 -define(vinfo2(F, A, MibLine),    ?verbosity(info,    F, A, MibLine)).
 -define(vlog(F, A),               ?verbosity(log,     F, A, ignore)).
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 2e6020ae7a..cee11ba97a 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -47,6 +47,7 @@
 	 module_identity/1,
 	 agent_capabilities/1,
 	 module_compliance/1, 
+	 warnings_as_errors/1, 
 
 	 otp_6150/1,
 	 otp_8574/1, 
@@ -97,9 +98,10 @@ all() ->
      description, 
      oid_conflicts, 
      imports, 
-     module_identity,
-     agent_capabilities,
-     module_compliance,
+     module_identity, 
+     agent_capabilities, 
+     module_compliance, 
+     warnings_as_errors, 
      {group, tickets}
     ].
 
@@ -152,6 +154,8 @@ description(Config) when is_list(Config) ->
     ok.
 
 
+%%======================================================================
+
 oid_conflicts(suite) -> [];
 oid_conflicts(Config) when is_list(Config) ->
     put(tname,oid_conflicts),
@@ -165,18 +169,24 @@ oid_conflicts(Config) when is_list(Config) ->
     ok.
 
 
+%%======================================================================
+
 imports(suite) ->
     [];
 imports(Config) when is_list(Config) ->
     ?SKIP(not_yet_implemented).
 
 
+%%======================================================================
+
 module_identity(suite) ->
     [];
 module_identity(Config) when is_list(Config) ->
     ?SKIP(not_yet_implemented).
 
 
+%%======================================================================
+
 agent_capabilities(suite) ->
     [];
 agent_capabilities(Config) when is_list(Config) ->
@@ -218,6 +228,8 @@ agent_capabilities(Config) when is_list(Config) ->
     ok.
 
 
+%%======================================================================
+
 module_compliance(suite) ->
     [];
 module_compliance(Config) when is_list(Config) ->
@@ -259,6 +271,31 @@ module_compliance(Config) when is_list(Config) ->
     ok.
 
 
+%%======================================================================
+
+warnings_as_errors(suite) ->
+    ["OTP-9437"];
+warnings_as_errors(Config) when is_list(Config) ->
+    put(tname,warnings_as_errors),
+    p("starting with Config: ~p~n", [Config]),
+    Dir     = ?config(comp_dir, Config),
+    MibDir  = ?config(mib_dir,  Config),
+    MibFile = join(MibDir, "OTP8574-MIB.mib"),
+    OutFile = join(Dir, "OTP8574-MIB.bin"),
+    Opts =  [{group_check, false}, 
+	     {outdir,      Dir}, 
+	     {verbosity,   trace},
+	     relaxed_row_name_assign_check],
+    {error, compilation_failed} =
+	snmpc:compile(MibFile, [warnings_as_errors|Opts]),
+    false = filelib:is_regular(OutFile),
+    {ok, _} = snmpc:compile(MibFile, Opts),
+    true = filelib:is_regular(OutFile),
+    ok.
+
+
+%%======================================================================
+
 otp_6150(suite) ->
     [];
 otp_6150(Config) when is_list(Config) ->
@@ -273,6 +310,8 @@ otp_6150(Config) when is_list(Config) ->
     ok.
 
 
+%%======================================================================
+
 otp_8574(suite) ->
     [];
 otp_8574(Config) when is_list(Config) ->
@@ -304,6 +343,8 @@ otp_8574(Config) when is_list(Config) ->
     end.
 
 
+%%======================================================================
+
 otp_8595(suite) ->
     [];
 otp_8595(Config) when is_list(Config) ->