diff options
| author | Joe George <joe@zeroc.com> | 2017-05-02 13:58:41 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-05-02 15:42:34 -0400 |
| commit | cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9 (patch) | |
| tree | 5dbc0bfc43e2c195ab7e7d819e1914611f943f1d /cpp/src/slice2js | |
| parent | Removed trailing whitespace generated by slice2js (diff) | |
| download | ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.tar.bz2 ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.tar.xz ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.zip | |
Remove trailing whitespace
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/Gen.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/slice2js/JsUtil.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/slice2js/JsUtil.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 7665cb7167f..90c473f405e 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -1074,7 +1074,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) { bool preserved = p->hasMetaData("preserve-slice") && !p->inheritsMetaData("preserve-slice"); - _out << nl << "Slice.defineValue(" << localScope << "." << name << ", " + _out << nl << "Slice.defineValue(" << localScope << "." << name << ", " << "iceC_" << getLocalScope(scoped, "_") << "_ids[" << scopedPos << "], " << (preserved ? "true" : "false") ; if(p->compactId() >= 0) @@ -1115,7 +1115,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) ClassDefPtr base = *q; if(base->isInterface()) { - _out << nl << getLocalScope(base->scope()) << "." << + _out << nl << getLocalScope(base->scope()) << "." << (base->isInterface() ? base->name() : base->name() + "Disp"); if(++q != bases.end()) { @@ -1132,7 +1132,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) _out << eb; } _out << eb << ";"; - + // // Generate a proxy class for interfaces or classes with operations. // @@ -1157,7 +1157,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "static get _implements()"; _out << sb; _out << nl << "return ["; - + _out.inc(); for(ClassList::const_iterator q = bases.begin(); q != bases.end();) { diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index c96900cf4bf..93afe423819 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -35,8 +35,8 @@ lookupKwd(const string& name) // static const string keywordList[] = { - "await", "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", - "else", "enum", "export", "extends", "false", "finally", "for", "function", "if", "implements", "import", + "await", "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", + "else", "enum", "export", "extends", "false", "finally", "for", "function", "if", "implements", "import", "in", "instanceof", "interface", "let", "new", "null", "package", "private", "protected", "public", "return", "static", "super", "switch", "this", "throw", "true", "try", "typeof", "var", "void", "while", "with", "yield" @@ -578,7 +578,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type) { return typeToString(type); } - + ProxyPtr prx = ProxyPtr::dynamicCast(type); if(prx) { diff --git a/cpp/src/slice2js/JsUtil.h b/cpp/src/slice2js/JsUtil.h index 2ffa4f8ebd6..2c3398bdde1 100644 --- a/cpp/src/slice2js/JsUtil.h +++ b/cpp/src/slice2js/JsUtil.h @@ -39,7 +39,7 @@ protected: void writeOptionalMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, int, bool); private: - + std::vector< std::string> _seenProxy; }; |