Rework warning suppression to use global meta data

3 files changed, 22 insertions, 33 deletions

diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 74297f80738..29c1c9f47dc 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -89,7 +89,7 @@ getDeprecateReason(const ContainedPtr& p1, const ContainedPtr& p2, const string&
 
 }
 
-Slice::JsVisitor::JsVisitor(Output& out, int warningLevel) : ParserVisitor(warningLevel), _out(out)
+Slice::JsVisitor::JsVisitor(Output& out) : _out(out)
 {
 }
 
@@ -329,10 +329,9 @@ Slice::JsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecate
     _out << nl << " **/";
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, int warningLevel) :
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir) :
     _includePaths(includePaths),
-    _useStdout(false),
-    _warningLevel(warningLevel)
+    _useStdout(false)
 {
     _fileBase = base;
     string::size_type pos = base.find_last_of("/\\");
@@ -362,12 +361,10 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st
     printGeneratedHeader(_out, _fileBase + ".ice");
 }
 
-Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, ostream& out,
-                int warningLevel) :
+Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, ostream& out) :
     _out(out),
     _includePaths(includePaths),
-    _useStdout(true),
-    _warningLevel(warningLevel)
+    _useStdout(true)
 {
     _fileBase = base;
     string::size_type pos = base.find_last_of("/\\");
@@ -418,17 +415,17 @@ Slice::Gen::generate(const UnitPtr& p)
             _out.restoreIndent();
         }
     }
-    RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module, _warningLevel);
+    RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module);
     p->visit(&requireVisitor, false);
     vector<string> seenModules = requireVisitor.writeRequires(p);
 
-    TypesVisitor typesVisitor(_out, seenModules, icejs, _warningLevel);
+    TypesVisitor typesVisitor(_out, seenModules, icejs);
     p->visit(&typesVisitor, false);
 
     //
     // Export the top-level modules.
     //
-    ExportVisitor exportVisitor(_out, icejs, es6module, _warningLevel);
+    ExportVisitor exportVisitor(_out, icejs, es6module);
     p->visit(&exportVisitor, false);
 
     if(!es6module)
@@ -481,8 +478,8 @@ Slice::Gen::printHeader()
 }
 
 Slice::Gen::RequireVisitor::RequireVisitor(IceUtilInternal::Output& out, vector<string> includePaths,
-                                           bool icejs, bool es6modules, int warningLevel) :
-    JsVisitor(out, warningLevel),
+                                           bool icejs, bool es6modules) :
+    JsVisitor(out),
     _icejs(icejs),
     _es6modules(es6modules),
     _seenClass(false),
@@ -843,9 +840,8 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p)
     return seenModules;
 }
 
-Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out, vector<string> seenModules, bool icejs,
-                                       int warningLevel) :
-    JsVisitor(out, warningLevel),
+Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out, vector<string> seenModules, bool icejs) :
+    JsVisitor(out),
     _seenModules(seenModules),
     _icejs(icejs)
 {
@@ -1849,8 +1845,8 @@ Slice::Gen::TypesVisitor::encodeTypeForOperation(const TypePtr& type)
     return "???";
 }
 
-Slice::Gen::ExportVisitor::ExportVisitor(IceUtilInternal::Output& out, bool icejs, bool es6modules, int warningLevel) :
-    JsVisitor(out, warningLevel),
+Slice::Gen::ExportVisitor::ExportVisitor(IceUtilInternal::Output& out, bool icejs, bool es6modules) :
+    JsVisitor(out),
     _icejs(icejs),
     _es6modules(es6modules)
 {
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index dc3b65f18ba..8196ba1b48b 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -19,7 +19,7 @@ class JsVisitor : public JsGenerator, public ParserVisitor
 {
 public:
 
-    JsVisitor(::IceUtilInternal::Output&, int);
+    JsVisitor(::IceUtilInternal::Output&);
     virtual ~JsVisitor();
 
 protected:
@@ -44,14 +44,12 @@ public:
 
     Gen(const std::string&,
         const std::vector<std::string>&,
-        const std::string&,
-        int);
+        const std::string&);
 
     Gen(const std::string&,
         const std::vector<std::string>&,
         const std::string&,
-        std::ostream&,
-        int);
+        std::ostream&);
 
     ~Gen();
 
@@ -66,7 +64,6 @@ private:
     std::vector<std::string> _includePaths;
     std::string _fileBase;
     bool _useStdout;
-    int _warningLevel;
 
     void printHeader();
 
@@ -74,7 +71,7 @@ private:
     {
     public:
 
-        RequireVisitor(::IceUtilInternal::Output&, std::vector<std::string>, bool, bool, int);
+        RequireVisitor(::IceUtilInternal::Output&, std::vector<std::string>, bool, bool);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual bool visitStructStart(const StructPtr&);
@@ -106,7 +103,7 @@ private:
     {
     public:
 
-        TypesVisitor(::IceUtilInternal::Output&, std::vector< std::string>, bool, int);
+        TypesVisitor(::IceUtilInternal::Output&, std::vector< std::string>, bool);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -130,7 +127,7 @@ private:
     {
     public:
 
-        ExportVisitor(::IceUtilInternal::Output&, bool, bool, int);
+        ExportVisitor(::IceUtilInternal::Output&, bool, bool);
 
         virtual bool visitModuleStart(const ModulePtr&);
     private:
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 03f17331e59..a73738fcee9 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -80,7 +80,6 @@ usage(const string& n)
         "                        deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
         "--underscore            Allow underscores in Slice identifiers\n"
         "                        deprecated: use instead [[\"underscore\"]] metadata.\n"
-        "--no-warn               Disable all warnings.\n"
         ;
 }
 
@@ -104,7 +103,6 @@ compile(const vector<string>& argv)
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
-    opts.addOpt("", "no-warn");
 
     bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end();
 
@@ -174,8 +172,6 @@ compile(const vector<string>& argv)
 
     bool underscore = opts.isSet("underscore");
 
-    int warningLevel = opts.isSet("no-warn") ? 0 : 1;
-
     if(args.empty())
     {
         consoleErr << argv[0] << ": error: no input file" << endl;
@@ -339,12 +335,12 @@ compile(const vector<string>& argv)
                     {
                         if(useStdout)
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output, cout, warningLevel);
+                            Gen gen(icecpp->getBaseName(), includePaths, output, cout);
                             gen.generate(p);
                         }
                         else
                         {
-                            Gen gen(icecpp->getBaseName(), includePaths, output, warningLevel);
+                            Gen gen(icecpp->getBaseName(), includePaths, output);
                             gen.generate(p);
                         }
                     }