diff options
Diffstat (limited to 'cpp/src/slice2js/Gen.cpp')
-rw-r--r-- | cpp/src/slice2js/Gen.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 29c1c9f47dc..74297f80738 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) : _out(out) +Slice::JsVisitor::JsVisitor(Output& out, int warningLevel) : ParserVisitor(warningLevel), _out(out) { } @@ -329,9 +329,10 @@ Slice::JsVisitor::writeDocComment(const ContainedPtr& p, const string& deprecate _out << nl << " **/"; } -Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir) : +Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, int warningLevel) : _includePaths(includePaths), - _useStdout(false) + _useStdout(false), + _warningLevel(warningLevel) { _fileBase = base; string::size_type pos = base.find_last_of("/\\"); @@ -361,10 +362,12 @@ 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) : +Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, ostream& out, + int warningLevel) : _out(out), _includePaths(includePaths), - _useStdout(true) + _useStdout(true), + _warningLevel(warningLevel) { _fileBase = base; string::size_type pos = base.find_last_of("/\\"); @@ -415,17 +418,17 @@ Slice::Gen::generate(const UnitPtr& p) _out.restoreIndent(); } } - RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module); + RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module, _warningLevel); p->visit(&requireVisitor, false); vector<string> seenModules = requireVisitor.writeRequires(p); - TypesVisitor typesVisitor(_out, seenModules, icejs); + TypesVisitor typesVisitor(_out, seenModules, icejs, _warningLevel); p->visit(&typesVisitor, false); // // Export the top-level modules. // - ExportVisitor exportVisitor(_out, icejs, es6module); + ExportVisitor exportVisitor(_out, icejs, es6module, _warningLevel); p->visit(&exportVisitor, false); if(!es6module) @@ -478,8 +481,8 @@ Slice::Gen::printHeader() } Slice::Gen::RequireVisitor::RequireVisitor(IceUtilInternal::Output& out, vector<string> includePaths, - bool icejs, bool es6modules) : - JsVisitor(out), + bool icejs, bool es6modules, int warningLevel) : + JsVisitor(out, warningLevel), _icejs(icejs), _es6modules(es6modules), _seenClass(false), @@ -840,8 +843,9 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) return seenModules; } -Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out, vector<string> seenModules, bool icejs) : - JsVisitor(out), +Slice::Gen::TypesVisitor::TypesVisitor(IceUtilInternal::Output& out, vector<string> seenModules, bool icejs, + int warningLevel) : + JsVisitor(out, warningLevel), _seenModules(seenModules), _icejs(icejs) { @@ -1845,8 +1849,8 @@ Slice::Gen::TypesVisitor::encodeTypeForOperation(const TypePtr& type) return "???"; } -Slice::Gen::ExportVisitor::ExportVisitor(IceUtilInternal::Output& out, bool icejs, bool es6modules) : - JsVisitor(out), +Slice::Gen::ExportVisitor::ExportVisitor(IceUtilInternal::Output& out, bool icejs, bool es6modules, int warningLevel) : + JsVisitor(out, warningLevel), _icejs(icejs), _es6modules(es6modules) { |