diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-12-14 14:02:37 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-12-14 14:02:37 -0500 |
| commit | 006bdff840ed5c834a6640c1690844d38cdafff4 (patch) | |
| tree | 8116d1c1bb38b4fc8dc6c6178b0353f1029c0e07 | |
| parent | Fixes to JS test scripts and more work on iOS C++ controller (diff) | |
| download | ice-006bdff840ed5c834a6640c1690844d38cdafff4.tar.bz2 ice-006bdff840ed5c834a6640c1690844d38cdafff4.tar.xz ice-006bdff840ed5c834a6640c1690844d38cdafff4.zip | |
Removed or replaced double underscores in Ice for JavaScript
104 files changed, 648 insertions, 996 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index 8a7854ff623..e5e658f4aaa 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -98,78 +98,6 @@ Slice::JsVisitor::~JsVisitor() } void -Slice::JsVisitor::writeMarshalUnmarshalParams(const ParamDeclList& params, const OperationPtr& op, bool marshal) -{ - ParamDeclList optionals; - - for(ParamDeclList::const_iterator pli = params.begin(); pli != params.end(); ++pli) - { - string param = fixId((*pli)->name()); - TypePtr type = (*pli)->type(); - - if((*pli)->optional()) - { - optionals.push_back(*pli); - } - else - { - writeMarshalUnmarshalCode(_out, type, param, marshal); - } - } - - TypePtr ret; - - if(op && op->returnType()) - { - ret = op->returnType(); - - string param = "__ret"; - - if(!op->returnIsOptional()) - { - writeMarshalUnmarshalCode(_out, ret, param, marshal); - } - } - - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - // - // Handle optional parameters. - // - bool checkReturnType = op && op->returnIsOptional(); - - for(ParamDeclList::const_iterator pli = optionals.begin(); pli != optionals.end(); ++pli) - { - if(checkReturnType && op->returnTag() < (*pli)->tag()) - { - writeOptionalMarshalUnmarshalCode(_out, ret, "__ret", op->returnTag(), marshal); - checkReturnType = false; - } - - string param = fixId((*pli)->name()); - TypePtr type = (*pli)->type(); - - writeOptionalMarshalUnmarshalCode(_out, type, param, (*pli)->tag(), marshal); - } - - if(checkReturnType) - { - writeOptionalMarshalUnmarshalCode(_out, ret, "__ret", op->returnTag(), marshal); - } -} - -void Slice::JsVisitor::writeMarshalDataMembers(const DataMemberList& dataMembers, const DataMemberList& optionalMembers) { for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q) @@ -213,155 +141,6 @@ Slice::JsVisitor::writeInitDataMembers(const DataMemberList& dataMembers, const } } -vector<string> -Slice::JsVisitor::getParams(const OperationPtr& op) -{ - vector<string> params; - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - if(!(*q)->isOutParam()) - { - params.push_back(fixId((*q)->name())); - } - } - return params; -} - -vector<string> -Slice::JsVisitor::getParamsAsync(const OperationPtr& op, bool amd, bool newAMI) -{ - vector<string> params; - - string name = fixId(op->name()); - ContainerPtr container = op->container(); - ClassDefPtr cl = ClassDefPtr::dynamicCast(container); // Get the class containing the op. - string scope = fixId(cl->scope()); - if(!newAMI) - { - params.push_back(scope + (amd ? "AMD_" : "AMI_") + cl->name() + '_' + op->name() + " cb__"); - } - - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - if(!(*q)->isOutParam()) - { - params.push_back(typeToString((*q)->type(), (*q)->optional()) + " " + fixId((*q)->name())); - } - } - return params; -} - -vector<string> -Slice::JsVisitor::getParamsAsyncCB(const OperationPtr& op, bool newAMI, bool outKeyword) -{ - vector<string> params; - - if(!newAMI) - { - TypePtr ret = op->returnType(); - if(ret) - { - params.push_back(typeToString(ret, op->returnIsOptional()) + " ret__"); - } - } - - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - if((*q)->isOutParam()) - { - if(!newAMI) - { - params.push_back(typeToString((*q)->type(), (*q)->optional()) + ' ' + fixId((*q)->name())); - } - else - { - string s; - if(outKeyword) - { - s += "out "; - } - s += typeToString((*q)->type(), (*q)->optional()) + ' ' + fixId((*q)->name()); - params.push_back(s); - } - } - } - - return params; -} - -vector<string> -Slice::JsVisitor::getArgs(const OperationPtr& op) -{ - vector<string> args; - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - string arg = fixId((*q)->name()); - if((*q)->isOutParam()) - { - arg = "out " + arg; - } - args.push_back(arg); - } - return args; -} - -vector<string> -Slice::JsVisitor::getArgsAsync(const OperationPtr& op, bool newAMI) -{ - vector<string> args; - - if(!newAMI) - { - args.push_back("cb__"); - } - - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - if(!(*q)->isOutParam()) - { - args.push_back(fixId((*q)->name())); - } - } - return args; -} - -vector<string> -Slice::JsVisitor::getArgsAsyncCB(const OperationPtr& op, bool newAMI, bool outKeyword) -{ - vector<string> args; - - if(!newAMI) - { - TypePtr ret = op->returnType(); - if(ret) - { - args.push_back("ret__"); - } - } - - ParamDeclList paramList = op->parameters(); - for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) - { - if((*q)->isOutParam()) - { - string s; - if(outKeyword) - { - s = "out "; - } - s += fixId((*q)->name()); - args.push_back(s); - } - } - - return args; -} - string Slice::JsVisitor::getValue(const string& scope, const TypePtr& type) { @@ -660,7 +439,7 @@ Slice::Gen::generate(const UnitPtr& p) _out << eb; _out << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined," - << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require : this.Ice.__require," + << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require : this.Ice._require," << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports : this));"; if(icejs) @@ -909,7 +688,8 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) if(_es6modules) { _out << nl << "import { Ice } from \"ice\";"; - _out << nl << "const __M = Ice.__M;"; + _out << nl << "const _ModuleRegistry = Ice._ModuleRegistry;"; + seenModules.push_back("Ice"); @@ -999,11 +779,11 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) if(!_icejs) { _out << nl << "const Ice = require(\"ice\").Ice;"; - _out << nl << "const __M = Ice.__M;"; + _out << nl << "const _ModuleRegistry = Ice._ModuleRegistry;"; } else { - _out << nl << "const __M = require(\"../Ice/ModuleRegistry\").Ice.__M;"; + _out << nl << "const _ModuleRegistry = require(\"../Ice/ModuleRegistry\").Ice._ModuleRegistry;"; } for(map<string, list<string> >::const_iterator i = requires.begin(); i != requires.end(); ++i) @@ -1024,7 +804,7 @@ Slice::Gen::RequireVisitor::writeRequires(const UnitPtr& p) } else { - _out << nl << "const " << i->first << " = __M.require(module, "; + _out << nl << "const " << i->first << " = _ModuleRegistry.require(module, "; _out << nl << "["; _out.inc(); for(list<string>::const_iterator j = i->second.begin(); j != i->second.end();) @@ -1072,11 +852,11 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p) // // For a top-level module we write the following: // - // let Foo = __M.module("Foo"); + // let Foo = _ModuleRegistry.module("Foo"); // // For a nested module we write // - // Foo.Bar = __M.module("Foo.Bar"); + // Foo.Bar = _ModuleRegistry.module("Foo.Bar"); // const string scoped = getLocalScope(p->scoped()); vector<string>::const_iterator i = find(_seenModules.begin(), _seenModules.end(), scoped); @@ -1097,7 +877,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p) { _out << "let "; } - _out << scoped << " = __M.module(\"" << scoped << "\");"; + _out << scoped << " = _ModuleRegistry.module(\"" << scoped << "\");"; if(_icejs) { @@ -1183,7 +963,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(!p->isLocal()) { _out << sp; - _out << nl << "let " << getLocalScope(scoped, "_") << "_ids__ = ["; + _out << nl << "const iceC_" << getLocalScope(scoped, "_") << "_ids = ["; _out.inc(); for(StringList::const_iterator q = ids.begin(); q != ids.end(); ++q) @@ -1253,7 +1033,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << sp; - _out << nl << "static get __parent()"; + _out << nl << "static get _iceParent()"; _out << sb; if(!p->isLocal() || hasBaseClass) { @@ -1268,19 +1048,19 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(!p->isLocal()) { _out << sp; - _out << nl << "static get __ids()"; + _out << nl << "static get _iceIds()"; _out << sb; - _out << nl << "return " << getLocalScope(scoped, "_") << "_ids__;"; + _out << nl << "return iceC_" << getLocalScope(scoped, "_") << "_ids;"; _out << eb; _out << sp; - _out << nl << "static get __id()"; + _out << nl << "static get _iceId()"; _out << sb; - _out << nl << "return " << getLocalScope(scoped, "_") << "_ids__[" << scopedPos << "];"; + _out << nl << "return iceC_" << getLocalScope(scoped, "_") << "_ids[" << scopedPos << "];"; _out << eb; _out << sp; - _out << nl << "__mostDerivedType()"; + _out << nl << "_iceMostDerivedType()"; _out << sb; _out << nl << "return " << localScope << "." << name << ";"; _out << eb; @@ -1289,7 +1069,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(!bases.empty()) { _out << sp; - _out << nl << "static get __implements()"; + _out << nl << "static get _iceImplements()"; _out << sb; _out << nl << "return ["; _out.inc(); @@ -1317,7 +1097,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(p->compactId() != -1) { _out << sp; - _out << nl << "static get __compactId()"; + _out << nl << "static get _iceCompactId()"; _out << sb; _out << nl << "return " << p->compactId() << ";"; _out << eb; @@ -1326,13 +1106,13 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(!dataMembers.empty()) { _out << sp; - _out << nl << "__writeMemberImpl(__os)"; + _out << nl << "_iceWriteMemberImpl(ostr)"; _out << sb; writeMarshalDataMembers(dataMembers, optionalMembers); _out << eb; _out << sp; - _out << nl << "__readMemberImpl(__is)"; + _out << nl << "_iceReadMemberImpl(istr)"; _out << sb; writeUnmarshalDataMembers(dataMembers, optionalMembers); _out << eb; @@ -1353,11 +1133,11 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) _out << sp; _out << nl << "static ice_staticId()"; _out << sb; - _out << nl << "return " << localScope << "." << name << ".__id;"; + _out << nl << "return " << localScope << "." << name << "._iceId;"; _out << eb; _out << sp; - _out << nl << "static get __implements()"; + _out << nl << "static get _implements()"; _out << sb; _out << nl << "return ["; if(!bases.empty()) @@ -1726,13 +1506,13 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) _out << eb; _out << sp; - _out << nl << "static get __parent()"; + _out << nl << "static get _parent()"; _out << sb; _out << nl << "return " << baseRef << ";"; _out << eb; _out << sp; - _out << nl << "static get __id()"; + _out << nl << "static get _id()"; _out << sb; _out << nl << "return \"" << p->scoped() << "\";"; _out << eb; @@ -1748,7 +1528,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) if(!p->isLocal()) { _out << sp; - _out << nl << "__mostDerivedType()"; + _out << nl << "_mostDerivedType()"; _out << sb; _out << nl << "return " << localScope << '.' << name << ";"; _out << eb; @@ -1756,13 +1536,13 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) if(!dataMembers.empty()) { _out << sp; - _out << nl << "__writeMemberImpl(__os)"; + _out << nl << "_writeMemberImpl(ostr)"; _out << sb; writeMarshalDataMembers(dataMembers, optionalMembers); _out << eb; _out << sp; - _out << nl << "__readMemberImpl(__is)"; + _out << nl << "_readMemberImpl(istr)"; _out << sb; writeUnmarshalDataMembers(dataMembers, optionalMembers); _out << eb; @@ -1771,7 +1551,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) if(p->usesClasses(false) && (!base || (base && !base->usesClasses(false)))) { _out << sp; - _out << nl << "__usesClasses()"; + _out << nl << "_usesClasses()"; _out << sb; _out << nl << "return true;"; _out << eb; @@ -1850,13 +1630,13 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p) if(!p->isLocal()) { _out << sp; - _out << nl << "__write(__os)"; + _out << nl << "_write(ostr)"; _out << sb; writeMarshalDataMembers(dataMembers, DataMemberList()); _out << eb; _out << sp; - _out << nl << "__read(__is)"; + _out << nl << "_read(istr)"; _out << sb; writeUnmarshalDataMembers(dataMembers, DataMemberList()); _out << eb; @@ -2033,7 +1813,7 @@ Slice::Gen::TypesVisitor::encodeTypeForOperation(const TypePtr& type) EnumPtr e = EnumPtr::dynamicCast(type); if(e) { - return fixId(e->scoped()) + ".__helper"; + return fixId(e->scoped()) + "._helper"; } StructPtr st = StructPtr::dynamicCast(type); diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h index e86686d5fe3..8196ba1b48b 100644 --- a/cpp/src/slice2js/Gen.h +++ b/cpp/src/slice2js/Gen.h @@ -24,19 +24,10 @@ public: protected: - void writeMarshalUnmarshalParams(const ParamDeclList&, const OperationPtr&, bool); - void writePostUnmarshalParams(const ParamDeclList&, const OperationPtr&); void writeMarshalDataMembers(const DataMemberList&, const DataMemberList&); void writeUnmarshalDataMembers(const DataMemberList&, const DataMemberList&); void writeInitDataMembers(const DataMemberList&, const std::string&); - virtual std::vector<std::string> getParams(const OperationPtr&); - virtual std::vector<std::string> getParamsAsync(const OperationPtr&, bool, bool = false); - virtual std::vector<std::string> getParamsAsyncCB(const OperationPtr&, bool = false, bool = true); - virtual std::vector<std::string> getArgs(const OperationPtr&); - virtual std::vector<std::string> getArgsAsync(const OperationPtr&, bool = false); - virtual std::vector<std::string> getArgsAsyncCB(const OperationPtr&, bool = false, bool = false); - std::string getValue(const std::string&, const TypePtr&); std::string writeConstantValue(const std::string&, const TypePtr&, const SyntaxTreeBasePtr&, const std::string&); diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp index 787c47d981f..641cc7c5632 100644 --- a/cpp/src/slice2js/JsUtil.cpp +++ b/cpp/src/slice2js/JsUtil.cpp @@ -388,7 +388,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out, const string& param, bool marshal) { - string stream = marshal ? "__os" : "__is"; + string stream = marshal ? "ostr" : "istr"; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); if(builtin) @@ -521,11 +521,11 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out, { if(marshal) { - out << nl << typeToString(type) << ".__write(" << stream << ", " << param << ");"; + out << nl << typeToString(type) << "._write(" << stream << ", " << param << ");"; } else { - out << nl << param << " = " << typeToString(type) << ".__read(" << stream << ");"; + out << nl << param << " = " << typeToString(type) << "._read(" << stream << ");"; } return; } @@ -551,7 +551,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out, } else { - out << nl << stream << ".readValue(__o => " << param << " = __o, " << typeToString(type) << ");"; + out << nl << stream << ".readValue(obj => " << param << " = obj, " << typeToString(type) << ");"; } return; } @@ -579,7 +579,7 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, int tag, bool marshal) { - string stream = marshal ? "__os" : "__is"; + string stream = marshal ? "ostr" : "istr"; if(isClassType(type)) { @@ -589,7 +589,7 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, } else { - out << nl << stream << ".readOptionalValue(" << tag << ", __o => " << param << " = __o, " + out << nl << stream << ".readOptionalValue(" << tag << ", obj => " << param << " = obj, " << typeToString(type) << ");"; } return; @@ -599,11 +599,11 @@ Slice::JsGenerator::writeOptionalMarshalUnmarshalCode(Output &out, { if(marshal) { - out << nl << typeToString(type) <<".__writeOpt(" << stream << ", " << tag << ", " << param << ");"; + out << nl << typeToString(type) <<"._writeOpt(" << stream << ", " << tag << ", " << param << ");"; } else { - out << nl << param << " = " << typeToString(type) << ".__readOpt(" << stream << ", " << tag << ");"; + out << nl << param << " = " << typeToString(type) << "._readOpt(" << stream << ", " << tag << ");"; } return; } @@ -677,7 +677,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type) if(EnumPtr::dynamicCast(type)) { - return typeToString(type) + ".__helper"; + return typeToString(type) + "._helper"; } if(ProxyPtr::dynamicCast(type) || StructPtr::dynamicCast(type)) diff --git a/js/gulp/bundle.js b/js/gulp/bundle.js index b05ca2c9ea7..a3dce508b50 100644 --- a/js/gulp/bundle.js +++ b/js/gulp/bundle.js @@ -209,8 +209,8 @@ Parser.transverse = function(object, depend, srcDir) } else if(value.callee.type == "MemberExpression" && value.callee.property.name == "require" && - (value.callee.object.name == "__M" || - (value.callee.object.property && value.callee.object.property.name == "__M"))) + (value.callee.object.name == "_ModuleRegistry" || + (value.callee.object.property && value.callee.object.property.name == "_ModuleRegistry"))) { value.arguments[1].elements.forEach(appendfile); } @@ -298,7 +298,7 @@ function bundle(args) var lineOffset = 0; // - // Wrap the library in a closure to hold the private __Slice module. + // Wrap the library in a closure to hold the private Slice module. // var preamble = "(function()\n" + @@ -322,11 +322,11 @@ function bundle(args) var sb = new StringBuffer(); sb.write(preamble); - sb.write(" var __root = typeof(window) !== \"undefined\" ? window : typeof(global) !== \"undefined\" ? global : typeof(self) !== \"undefined\" ? self : {};\n"); + sb.write(" var root = typeof(window) !== \"undefined\" ? window : typeof(global) !== \"undefined\" ? global : typeof(self) !== \"undefined\" ? self : {};\n"); lineOffset += 3; args.modules.forEach( function(m){ - sb.write(" __root." + m + " = __root." + m + " || {};\n"); + sb.write(" root." + m + " = root." + m + " || {};\n"); lineOffset++; if(m == "Ice") @@ -382,7 +382,7 @@ function bundle(args) { continue; } - if(line.match(/__M\.require\(/)) + if(line.match(/_ModuleRegistry\.require\(/)) { if(line.lastIndexOf(";") === -1) { @@ -394,10 +394,10 @@ function bundle(args) } // - // Get rid of __M.module statements, in browser top level modules are + // Get rid of _ModuleRegistry.module statements, in browser top level modules are // global. // - if(line.match(/const .* = __M.module\(/)) + if(line.match(/const .* = _ModuleRegistry.module\(/)) { if(line.lastIndexOf(";") === -1) { @@ -459,7 +459,7 @@ function bundle(args) // args.modules.forEach( function(m){ - sb.write(" __root." + m + " = " + m + ";\n"); + sb.write(" root." + m + " = " + m + ";\n"); lineOffset++; }); diff --git a/js/src/Glacier2/Glacier2.js b/js/src/Glacier2/Glacier2.js index b77b6396bbd..53bb57a53a8 100644 --- a/js/src/Glacier2/Glacier2.js +++ b/js/src/Glacier2/Glacier2.js @@ -7,9 +7,9 @@ // // ********************************************************************** -var __M = require("../Ice/ModuleRegistry").Ice.__M; +var _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry; -module.exports.Glacier2 = __M.require(module, +module.exports.Glacier2 = _ModuleRegistry.require(module, [ "../Glacier2/PermissionsVerifier", "../Glacier2/Router", diff --git a/js/src/Ice/ACM.js b/js/src/Ice/ACM.js index 32a69d0d75e..5476943696a 100644 --- a/js/src/Ice/ACM.js +++ b/js/src/Ice/ACM.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/Debug", "../Ice/Connection"]); +Ice._ModuleRegistry.require(module, ["../Ice/Debug", "../Ice/Connection"]); const Debug = Ice.Debug; diff --git a/js/src/Ice/ArrayUtil.js b/js/src/Ice/ArrayUtil.js index d2e8b56b287..09e057e931c 100644 --- a/js/src/Ice/ArrayUtil.js +++ b/js/src/Ice/ArrayUtil.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -const __M = Ice.__M; +const _ModuleRegistry = Ice._ModuleRegistry; const Slice = Ice.Slice; const eq = function(e1, e2) @@ -96,7 +96,7 @@ Slice.defineSequence = function(module, name, valueHelper, fixed, elementType) { if(helper === null) { - helper = Ice.StreamHelpers.generateSeqHelper(__M.type(valueHelper), fixed, __M.type(elementType)); + helper = Ice.StreamHelpers.generateSeqHelper(_ModuleRegistry.type(valueHelper), fixed, _ModuleRegistry.type(elementType)); } return helper; } diff --git a/js/src/Ice/AsyncResult.js b/js/src/Ice/AsyncResult.js index 489837740fd..6993c7da5d0 100644 --- a/js/src/Ice/AsyncResult.js +++ b/js/src/Ice/AsyncResult.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncResultBase", "../Ice/Debug", @@ -38,7 +38,7 @@ class AsyncResult extends AsyncResultBase cancel() { - this.__cancel(new Ice.InvocationCanceledException()); + this.cancelWithException(new Ice.InvocationCanceledException()); } isCompleted() @@ -64,7 +64,7 @@ class AsyncResult extends AsyncResultBase return this._sentSynchronously; } - __markSent(done) + markSent(done) { Debug.assert((this._state & AsyncResult.Done) === 0); this._state |= AsyncResult.Sent; @@ -76,7 +76,7 @@ class AsyncResult extends AsyncResultBase } } - __markFinished(ok, completed) + markFinished(ok, completed) { Debug.assert((this._state & AsyncResult.Done) === 0); this._state |= AsyncResult.Done; @@ -95,7 +95,7 @@ class AsyncResult extends AsyncResultBase } } - __markFinishedEx(ex) + markFinishedEx(ex) { Debug.assert((this._state & AsyncResult.Done) === 0); this._exception = ex; @@ -104,7 +104,7 @@ class AsyncResult extends AsyncResultBase this.reject(ex); } - __cancel(ex) + cancelWithException(ex) { this._cancellationException = ex; if(this._cancellationHandler) @@ -113,7 +113,7 @@ class AsyncResult extends AsyncResultBase } } - __cancelable(handler) + cancelable(handler) { if(this._cancellationException) { @@ -129,38 +129,28 @@ class AsyncResult extends AsyncResultBase this._cancellationHandler = handler; } - __os() + getOs() { return this._os; } - - __is() - { - return this._is; - } - __startReadParams() + startReadParams() { this._is.startEncapsulation(); return this._is; } - __endReadParams() + endReadParams() { this._is.endEncapsulation(); } - __readEmptyParams() + readEmptyParams() { this._is.skipEmptyEncapsulation(); } - __readParamEncaps() - { - return this._is.readEncapsulation(null); - } - - __throwUserException() + throwUserException() { Debug.assert((this._state & AsyncResult.Done) !== 0); if((this._state & AsyncResult.OK) === 0) diff --git a/js/src/Ice/BatchRequestQueue.js b/js/src/Ice/BatchRequestQueue.js index cfc965763e4..41c62be5e99 100644 --- a/js/src/Ice/BatchRequestQueue.js +++ b/js/src/Ice/BatchRequestQueue.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Stream", "../Ice/Debug", diff --git a/js/src/Ice/Buffer.js b/js/src/Ice/Buffer.js index e652ea3732e..591e070a92b 100644 --- a/js/src/Ice/Buffer.js +++ b/js/src/Ice/Buffer.js @@ -10,9 +10,9 @@ const Ice = require("../Ice/Long").Ice; const Long = Ice.Long; -const __BufferOverflowException__ = "BufferOverflowException"; -const __BufferUnderflowException__ = "BufferUnderflowException"; -const __IndexOutOfBoundsException__ = "IndexOutOfBoundsException"; +const bufferOverflowExceptionMsg = "BufferOverflowException"; +const bufferUnderflowExceptionMsg = "BufferUnderflowException"; +const indexOutOfBoundsExceptionMsg = "IndexOutOfBoundsException"; // // Buffer implementation to be used by web browsers, it uses ArrayBuffer as @@ -135,7 +135,7 @@ class Buffer { if(this._position === this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setUint8(this._position, v); this._position++; @@ -145,7 +145,7 @@ class Buffer { if(i >= this._limit) { - throw new Error(__IndexOutOfBoundsException__); + throw new Error(indexOutOfBoundsExceptionMsg); } this.v.setUint8(i, v); } @@ -161,7 +161,7 @@ class Buffer { if(this._position + v.length > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } new Uint8Array(this.b, 0, this.b.byteLength).set(v, this._position); this._position += v.byteLength; @@ -172,7 +172,7 @@ class Buffer { if(this._position + 2 > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setInt16(this._position, v, true); this._position += 2; @@ -182,7 +182,7 @@ class Buffer { if(this._position + 4 > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setInt32(this._position, v, true); this._position += 4; @@ -192,7 +192,7 @@ class Buffer { if(i + 4 > this._limit || i < 0) { - throw new Error(__IndexOutOfBoundsException__); + throw new Error(indexOutOfBoundsExceptionMsg); } this.v.setInt32(i, v, true); } @@ -201,7 +201,7 @@ class Buffer { if(this._position + 4 > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setFloat32(this._position, v, true); this._position += 4; @@ -211,7 +211,7 @@ class Buffer { if(this._position + 8 > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setFloat64(this._position, v, true); this._position += 8; @@ -221,7 +221,7 @@ class Buffer { if(this._position + 8 > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } this.v.setInt32(this._position, v.low, true); this._position += 4; @@ -245,7 +245,7 @@ class Buffer { if(this._position + sz > this._limit) { - throw new Error(__BufferOverflowException__); + throw new Error(bufferOverflowExceptionMsg); } for(var i = 0; i < sz; ++i) { @@ -258,7 +258,7 @@ class Buffer { if(this._position >= this._limit) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = this.v.getUint8(this._position); this._position++; @@ -269,7 +269,7 @@ class Buffer { if(i < 0 || i >= this._limit) { - throw new Error(__IndexOutOfBoundsException__); + throw new Error(indexOutOfBoundsExceptionMsg); } return this.v.getUint8(i); } @@ -278,7 +278,7 @@ class Buffer { if(this._position + length > this._limit) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var buffer = this.b.slice(this._position, this._position + length); this._position += length; @@ -289,7 +289,7 @@ class Buffer { if(position + length > this._limit) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } length = length === undefined ? (this.b.byteLength - position) : length; return new Uint8Array(this.b.slice(position, position + length)); @@ -299,7 +299,7 @@ class Buffer { if(this._limit - this._position < 2) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = this.v.getInt16(this._position, true); this._position += 2; @@ -310,7 +310,7 @@ class Buffer { if(this._limit - this._position < 4) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = this.v.getInt32(this._position, true); this._position += 4; @@ -321,7 +321,7 @@ class Buffer { if(this._limit - this._position < 4) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = this.v.getFloat32(this._position, true); this._position += 4; @@ -332,7 +332,7 @@ class Buffer { if(this._limit - this._position < 8) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = this.v.getFloat64(this._position, true); this._position += 8; @@ -343,7 +343,7 @@ class Buffer { if(this._limit - this._position < 8) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var v = new Long(); v.low = this.v.getUint32(this._position, true); @@ -357,7 +357,7 @@ class Buffer { if(this._position + length > this._limit) { - throw new Error(__BufferUnderflowException__); + throw new Error(bufferUnderflowExceptionMsg); } var data = new DataView(this.b, this._position, length); @@ -429,4 +429,4 @@ class Buffer } Ice.Buffer = Buffer; -module.exports.Ice = Ice;
\ No newline at end of file +module.exports.Ice = Ice; diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/Communicator.js index e4556285275..93663b459fd 100644 --- a/js/src/Ice/Communicator.js +++ b/js/src/Ice/Communicator.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Instance", "../Ice/UUID", diff --git a/js/src/Ice/ConnectRequestHandler.js b/js/src/Ice/ConnectRequestHandler.js index 42b6e81f738..b991f6c26aa 100644 --- a/js/src/Ice/ConnectRequestHandler.js +++ b/js/src/Ice/ConnectRequestHandler.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncStatus", "../Ice/ConnectionRequestHandler", @@ -59,7 +59,7 @@ class ConnectRequestHandler { if(!this._initialized) { - out.__cancelable(this); // This will throw if the request is canceled + out.cancelable(this); // This will throw if the request is canceled } if(!this.initialized()) @@ -67,7 +67,7 @@ class ConnectRequestHandler this._requests.push(out); return AsyncStatus.Queued; } - return out.__invokeRemote(this._connection, this._compress, this._response); + return out.invokeRemote(this._connection, this._compress, this._response); } asyncRequestCanceled(out, ex) @@ -83,7 +83,7 @@ class ConnectRequestHandler { if(this._requests[i] === out) { - out.__completedEx(ex); + out.completedEx(ex); this._requests.splice(i, 1); return; } @@ -168,7 +168,7 @@ class ConnectRequestHandler { if(request !== null) { - request.__completedEx(this._exception); + request.completedEx(this._exception); } }); this._requests.length = 0; @@ -213,7 +213,7 @@ class ConnectRequestHandler { try { - request.__invokeRemote(this._connection, this._compress, this._response); + request.invokeRemote(this._connection, this._compress, this._response); } catch(ex) { @@ -224,13 +224,13 @@ class ConnectRequestHandler // Remove the request handler before retrying. this._reference.getInstance().requestHandlerFactory().removeRequestHandler(this._reference, this); - request.__retryException(ex.inner); + request.retryException(ex.inner); } else { Debug.assert(ex instanceof LocalException); exception = ex; - request.out.__completedEx(ex); + request.out.completedEx(ex); } } }); @@ -239,7 +239,7 @@ class ConnectRequestHandler if(this._reference.getCacheConnection() && exception === null) { this._requestHandler = new ConnectionRequestHandler(this._reference, this._connection, this._compress); - this._proxies.forEach(proxy => proxy.__updateRequestHandler(this, this._requestHandler)); + this._proxies.forEach(proxy => proxy._updateRequestHandler(this, this._requestHandler)); } Debug.assert(!this._initialized); diff --git a/js/src/Ice/ConnectionI.js b/js/src/Ice/ConnectionI.js index 287a4e255b7..c56e764a01e 100644 --- a/js/src/Ice/ConnectionI.js +++ b/js/src/Ice/ConnectionI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncStatus", "../Ice/Stream", @@ -220,12 +220,12 @@ class ConnectionI close(force) { - const __r = new AsyncResultBase(this._communicator, "close", this, null, null); + const r = new AsyncResultBase(this._communicator, "close", this, null, null); if(force) { this.setState(StateClosed, new Ice.ForcedCloseConnectionException()); - __r.resolve(); + r.resolve(); } else { @@ -236,11 +236,11 @@ class ConnectionI // requests to be retried, regardless of whether the // server has processed them or not. // - this._closePromises.push(__r); + this._closePromises.push(r); this.checkClose(); } - return __r; + return r; } checkClose() @@ -365,7 +365,7 @@ class ConnectionI sendAsyncRequest(out, compress, response, batchRequestNum) { let requestId = 0; - const os = out.__os(); + const ostr = out.getOs(); if(this._exception !== null) { @@ -384,13 +384,13 @@ class ConnectionI // Ensure the message isn't bigger than what we can send with the // transport. // - this._transceiver.checkSendSize(os); + this._transceiver.checkSendSize(ostr); // // Notify the request that it's cancelable with this connection. // This will throw if the request is canceled. // - out.__cancelable(this); // Notify the request that it's cancelable + out.cancelable(this); // Notify the request that it's cancelable if(response) { @@ -407,19 +407,19 @@ class ConnectionI // // Fill in the request ID. // - os.pos = Protocol.headerSize; - os.writeInt(requestId); + ostr.pos = Protocol.headerSize; + ostr.writeInt(requestId); } else if(batchRequestNum > 0) { - os.pos = Protocol.headerSize; - os.writeInt(batchRequestNum); + ostr.pos = Protocol.headerSize; + ostr.writeInt(batchRequestNum); } let status; try { - status = this.sendMessage(OutgoingMessage.create(out, out.__os(), compress, requestId)); + status = this.sendMessage(OutgoingMessage.create(out, out.getOs(), compress, requestId)); } catch(ex) { @@ -454,7 +454,7 @@ class ConnectionI flushBatchRequests() { const result = new ConnectionFlushBatch(this, this._communicator, "flushBatchRequests"); - result.__invoke(); + result.invoke(); return result; } @@ -541,7 +541,7 @@ class ConnectionI { this._sendStreams.splice(i, 1); } - outAsync.__completedEx(ex); + outAsync.completedEx(ex); return; // We're done. } } @@ -553,7 +553,7 @@ class ConnectionI if(value === outAsync) { this._asyncRequests.delete(key); - outAsync.__completedEx(ex); + outAsync.completedEx(ex); return; // We're done. } } @@ -750,10 +750,10 @@ class ConnectionI throw new Ice.BadMagicException("", Ice.Buffer.createNative([magic0, magic1, magic2, magic3])); } - this._readProtocol.__read(this._readStream); + this._readProtocol._read(this._readStream); Protocol.checkSupportedProtocol(this._readProtocol); - this._readProtocolEncoding.__read(this._readStream); + this._readProtocolEncoding._read(this._readStream); Protocol.checkSupportedProtocolEncoding(this._readProtocolEncoding); this._readStream.readByte(); // messageType @@ -909,7 +909,7 @@ class ConnectionI { if(info.outAsync !== null) { - info.outAsync.__completed(info.stream); + info.outAsync.completed(info.stream); ++count; } @@ -1058,7 +1058,7 @@ class ConnectionI for(let value of this._asyncRequests.values()) { - value.__completedEx(this._exception); + value.completedEx(this._exception); } this._asyncRequests.clear(); @@ -1428,8 +1428,8 @@ class ConnectionI // const os = new OutputStream(this._instance, Protocol.currentProtocolEncoding); os.writeBlob(Protocol.magic); - Protocol.currentProtocol.__write(os); - Protocol.currentProtocolEncoding.__write(os); + Protocol.currentProtocol._write(os); + Protocol.currentProtocolEncoding._write(os); os.writeByte(Protocol.closeConnectionMsg); os.writeByte(0); // compression status: always report 0 for CloseConnection. os.writeInt(Protocol.headerSize); // Message size. @@ -1462,8 +1462,8 @@ class ConnectionI { const os = new OutputStream(this._instance, Protocol.currentProtocolEncoding); os.writeBlob(Protocol.magic); - Protocol.currentProtocol.__write(os); - Protocol.currentProtocolEncoding.__write(os); + Protocol.currentProtocol._write(os); + Protocol.currentProtocolEncoding._write(os); os.writeByte(Protocol.validateConnectionMsg); os.writeByte(0); os.writeInt(Protocol.headerSize); // Message size. @@ -1506,8 +1506,8 @@ class ConnectionI if(this._writeStream.size === 0) { this._writeStream.writeBlob(Protocol.magic); - Protocol.currentProtocol.__write(this._writeStream); - Protocol.currentProtocolEncoding.__write(this._writeStream); + Protocol.currentProtocol._write(this._writeStream); + Protocol.currentProtocolEncoding._write(this._writeStream); this._writeStream.writeByte(Protocol.validateConnectionMsg); this._writeStream.writeByte(0); // Compression status (always zero for validate connection). this._writeStream.writeInt(Protocol.headerSize); // Message size. @@ -1545,10 +1545,10 @@ class ConnectionI throw new Ice.BadMagicException("", m); } - this._readProtocol.__read(this._readStream); + this._readProtocol._read(this._readStream); Protocol.checkSupportedProtocol(this._readProtocol); - this._readProtocolEncoding.__read(this._readStream); + this._readProtocolEncoding._read(this._readStream); Protocol.checkSupportedProtocolEncoding(this._readProtocolEncoding); const messageType = this._readStream.readByte(); @@ -2118,7 +2118,7 @@ class OutgoingMessage { if(this.outAsync !== null) { - this.outAsync.__sent(); + this.outAsync.sent(); } } @@ -2126,7 +2126,7 @@ class OutgoingMessage { if(this.outAsync !== null) { - this.outAsync.__completedEx(ex); + this.outAsync.completedEx(ex); } } diff --git a/js/src/Ice/ConnectionRequestHandler.js b/js/src/Ice/ConnectionRequestHandler.js index afdc1b4446d..84e0c1a42a7 100644 --- a/js/src/Ice/ConnectionRequestHandler.js +++ b/js/src/Ice/ConnectionRequestHandler.js @@ -47,7 +47,7 @@ class ConnectionRequestHandler sendAsyncRequest(out) { - return out.__invokeRemote(this._connection, this._compress, this._response); + return out.invokeRemote(this._connection, this._compress, this._response); } asyncRequestCanceled(out) diff --git a/js/src/Ice/DefaultsAndOverrides.js b/js/src/Ice/DefaultsAndOverrides.js index 92a98526d6b..420cdd048ea 100644 --- a/js/src/Ice/DefaultsAndOverrides.js +++ b/js/src/Ice/DefaultsAndOverrides.js @@ -9,7 +9,7 @@ const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/FormatType", "../Ice/EndpointTypes", diff --git a/js/src/Ice/EndpointFactoryManager.js b/js/src/Ice/EndpointFactoryManager.js index 8570d8a757c..cdeb7ca65eb 100644 --- a/js/src/Ice/EndpointFactoryManager.js +++ b/js/src/Ice/EndpointFactoryManager.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/StringUtil", "../Ice/Stream", diff --git a/js/src/Ice/EnumBase.js b/js/src/Ice/EnumBase.js index 8cc6cb1b616..5c0fe02ad52 100644 --- a/js/src/Ice/EnumBase.js +++ b/js/src/Ice/EnumBase.js @@ -66,22 +66,22 @@ class EnumHelper write(os, v) { - this._enumType.__write(os, v); + this._enumType._write(os, v); } writeOptional(os, tag, v) { - this._enumType.__writeOpt(os, tag, v); + this._enumType._writeOpt(os, tag, v); } read(is) { - return this._enumType.__read(is); + return this._enumType._read(is); } readOptional(is, tag) { - return this._enumType.__readOpt(is, tag); + return this._enumType._readOpt(is, tag); } } @@ -125,7 +125,7 @@ Slice.defineEnum = function(enumerators) get: function(){ return 1; } }); - type.__write = function(os, v) + type._write = function(os, v) { if(v) { @@ -136,26 +136,26 @@ Slice.defineEnum = function(enumerators) os.writeEnum(firstEnum); } }; - type.__read = function(is) + type._read = function(is) { return is.readEnum(type); }; - type.__writeOpt = function(os, tag, v) + type._writeOpt = function(os, tag, v) { if(v !== undefined) { if(os.writeOptional(tag, Ice.OptionalFormat.Size)) { - type.__write(os, v); + type._write(os, v); } } }; - type.__readOpt = function(is, tag) + type._readOpt = function(is, tag) { return is.readOptionalEnum(tag, type); }; - type.__helper = new EnumHelper(type); + type._helper = new EnumHelper(type); Object.defineProperty(type, 'valueOf', { value: function(v) { diff --git a/js/src/Ice/Exception.js b/js/src/Ice/Exception.js index 973c4ff7436..afba1e4b15b 100644 --- a/js/src/Ice/Exception.js +++ b/js/src/Ice/Exception.js @@ -92,7 +92,7 @@ class Exception extends Error } } - if(Ice.__printStackTraces === true && this.stack) + if(Ice._printStackTraces === true && this.stack) { s += "\n" + this.stack; } @@ -140,8 +140,6 @@ class LocalException extends Exception Ice.LocalException = LocalException; -const Slice = Ice.Slice; - // // Ice.UserException // @@ -158,26 +156,26 @@ class UserException extends Exception return "Ice::UserException"; } - __write(os) + _write(os) { os.startException(null); - __writeImpl(this, os, this.__mostDerivedType()); + writeImpl(this, os, this._mostDerivedType()); os.endException(); } - __read(is) + _read(is) { is.startException(); - __readImpl(this, is, this.__mostDerivedType()); + readImpl(this, is, this._mostDerivedType()); is.endException(false); } - __usesClasses() + _usesClasses() { return false; } - __mostDerivedType() + _mostDerivedType() { return Ice.UserException; } @@ -188,12 +186,12 @@ Ice.UserException = UserException; // Private methods // -const __writeImpl = function(obj, os, type) +const writeImpl = function(obj, os, type) { // - // The __writeImpl method is a recursive method that goes down the + // The writeImpl method is a recursive method that goes down the // class hierarchy to marshal each slice of the class using the - // generated __writeMemberImpl method. + // generated _writeMemberImpl method. // if(type === undefined || type === UserException) @@ -201,21 +199,21 @@ const __writeImpl = function(obj, os, type) return; // Don't marshal anything for Ice.UserException } - os.startSlice(type.__id, -1, type.__parent === UserException); - if(type.prototype.__writeMemberImpl) + os.startSlice(type._id, -1, type._parent === UserException); + if(type.prototype._writeMemberImpl) { - type.prototype.__writeMemberImpl.call(obj, os); + type.prototype._writeMemberImpl.call(obj, os); } os.endSlice(); - __writeImpl(obj, os, type.__parent); + writeImpl(obj, os, type._parent); }; -const __readImpl = function(obj, is, type) +const readImpl = function(obj, is, type) { // - // The __readImpl method is a recursive method that goes down the + // The readImpl method is a recursive method that goes down the // class hierarchy to marshal each slice of the class using the - // generated __readMemberImpl method. + // generated _readMemberImpl method. // if(type === undefined || type === UserException) @@ -224,40 +222,40 @@ const __readImpl = function(obj, is, type) } is.startSlice(); - if(type.prototype.__readMemberImpl) + if(type.prototype._readMemberImpl) { - type.prototype.__readMemberImpl.call(obj, is); + type.prototype._readMemberImpl.call(obj, is); } is.endSlice(); - __readImpl(obj, is, type.__parent); + readImpl(obj, is, type._parent); }; -const __writePreserved = function(os) +const writePreserved = function(os) { // // For Slice exceptions which are marked "preserved", the implementation of this method - // replaces the Ice.Object.prototype.__write method. + // replaces the Ice.UserException.prototype._write method. // - os.startException(this.__slicedData); - __writeImpl(this, os, this.__mostDerivedType()); + os.startException(this._slicedData); + writeImpl(this, os, this._mostDerivedType()); os.endException(); }; -const __readPreserved = function(is) +const readPreserved = function(is) { // // For Slice exceptions which are marked "preserved", the implementation of this method - // replaces the Ice.Object.prototype.__read method. + // replaces the Ice.UserException.prototype._read method. // is.startException(); - __readImpl(this, is, this.__mostDerivedType()); - this.__slicedData = is.endException(true); + readImpl(this, is, this._mostDerivedType()); + this._slicedData = is.endException(true); }; -Slice.PreservedUserException = function(ex) +Ice.Slice.PreservedUserException = function(ex) { - ex.prototype.__write = __writePreserved; - ex.prototype.__read = __readPreserved; + ex.prototype._write = writePreserved; + ex.prototype._read = readPreserved; }; module.exports.Ice = Ice; diff --git a/js/src/Ice/HashMap.js b/js/src/Ice/HashMap.js index b7a223bc777..970e9253ed0 100644 --- a/js/src/Ice/HashMap.js +++ b/js/src/Ice/HashMap.js @@ -8,8 +8,8 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -const __M = Ice.__M; -__M.require(module, ["../Ice/StringUtil", "../Ice/UUID"]); +const _ModuleRegistry = Ice._ModuleRegistry; +_ModuleRegistry.require(module, ["../Ice/StringUtil", "../Ice/UUID"]); const StringUtil = Ice.StringUtil; function setInternal(map, key, value, hash, index) @@ -465,10 +465,10 @@ Slice.defineDictionary = function(module, name, helperName, keyHelper, valueHelp { if(helper === null) { - helper = Ice.StreamHelpers.generateDictHelper(__M.type(keyHelper), - __M.type(valueHelper), + helper = Ice.StreamHelpers.generateDictHelper(_ModuleRegistry.type(keyHelper), + _ModuleRegistry.type(valueHelper), fixed, - __M.type(valueType), + _ModuleRegistry.type(valueType), module[name]); } return helper; diff --git a/js/src/Ice/IPEndpointI.js b/js/src/Ice/IPEndpointI.js index cc268eb2949..6e5321eea26 100644 --- a/js/src/Ice/IPEndpointI.js +++ b/js/src/Ice/IPEndpointI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Address", "../Ice/HashUtil", diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js index 27499437162..32a471ded42 100644 --- a/js/src/Ice/Ice.js +++ b/js/src/Ice/Ice.js @@ -8,9 +8,9 @@ // ********************************************************************** -const __M = require("../Ice/ModuleRegistry").Ice.__M; +const _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry; -module.exports.Ice = __M.require(module, +module.exports.Ice = _ModuleRegistry.require(module, [ "../Ice/Initialize", "../Ice/Communicator", diff --git a/js/src/Ice/IdentityUtil.js b/js/src/Ice/IdentityUtil.js index 4e257bb30a7..764f07b6c5b 100644 --- a/js/src/Ice/IdentityUtil.js +++ b/js/src/Ice/IdentityUtil.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, [ "../Ice/StringUtil", "../Ice/Identity", "../Ice/LocalException"]); +Ice._ModuleRegistry.require(module, [ "../Ice/StringUtil", "../Ice/Identity", "../Ice/LocalException"]); const StringUtil = Ice.StringUtil; const Identity = Ice.Identity; diff --git a/js/src/Ice/ImplicitContextI.js b/js/src/Ice/ImplicitContextI.js index b5cf0a640b3..5b67574f5d3 100644 --- a/js/src/Ice/ImplicitContextI.js +++ b/js/src/Ice/ImplicitContextI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/LocalException", "../Ice/Current"]); +Ice._ModuleRegistry.require(module, ["../Ice/LocalException", "../Ice/Current"]); const Context = Ice.Context; const InitializationException = Ice.InitializationException; diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js index 995b81fd1f3..faa9cab178f 100644 --- a/js/src/Ice/IncomingAsync.js +++ b/js/src/Ice/IncomingAsync.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Stream", "../Ice/BuiltinSequences", @@ -214,7 +214,7 @@ class IncomingAsync { Debug.assert(false); } - ex.id.__write(this._os); + ex.id._write(this._os); // // For compatibility with the old FacetPath. @@ -379,7 +379,7 @@ class IncomingAsync // // Read the current. // - this._current.id.__read(this._is); + this._current.id._read(this._is); // // For compatibility with the old FacetPath. @@ -467,7 +467,7 @@ class IncomingAsync { Debug.assert(this._servant !== null); - let promise = this._servant.__dispatch(this, this._current); + let promise = this._servant._iceDispatch(this, this._current); if(promise !== null) { promise.then(() => this.response(), (ex) => this.exception(ex)); diff --git a/js/src/Ice/Initialize.js b/js/src/Ice/Initialize.js index 6ff5e1ce8ad..b8e635f851f 100644 --- a/js/src/Ice/Initialize.js +++ b/js/src/Ice/Initialize.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Protocol", "../Ice/LocalException", diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js index f521ec74499..79c4447e84b 100644 --- a/js/src/Ice/Instance.js +++ b/js/src/Ice/Instance.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncResultBase", "../Ice/Debug", @@ -40,7 +40,7 @@ Ice.__M.require(module, "../Ice/ToStringMode" ]); -const IceSSL = Ice.__M.require(module, ["../Ice/EndpointInfo"]).IceSSL; +const IceSSL = Ice._ModuleRegistry.require(module, ["../Ice/EndpointInfo"]).IceSSL; const AsyncResultBase = Ice.AsyncResultBase; const Debug = Ice.Debug; @@ -298,12 +298,12 @@ class Instance this._initData.properties = Properties.createProperties(); } - if(Ice.__oneOfDone === undefined) + if(Ice._oneOfDone === undefined) { - Ice.__printStackTraces = + Ice._printStackTraces = this._initData.properties.getPropertyAsIntWithDefault("Ice.PrintStackTraces", 0) > 0; - Ice.__oneOfDone = true; + Ice._oneOfDone = true; } if(this._initData.logger === null) diff --git a/js/src/Ice/LocatorInfo.js b/js/src/Ice/LocatorInfo.js index 8219a62e0b5..f1ba37a7fb6 100644 --- a/js/src/Ice/LocatorInfo.js +++ b/js/src/Ice/LocatorInfo.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/Promise", @@ -366,7 +366,7 @@ class LocatorInfo finishRequest(ref, wellKnownRefs, proxy, notRegistered) { - if(proxy === null || proxy.__reference().isIndirect()) + if(proxy === null || proxy._getReference().isIndirect()) { // // Remove the cached references of well-known objects for which we tried @@ -380,10 +380,10 @@ class LocatorInfo if(!ref.isWellKnown()) { - if(proxy !== null && !proxy.__reference().isIndirect()) + if(proxy !== null && !proxy._getReference().isIndirect()) { // Cache the adapter endpoints. - this._table.addAdapterEndpoints(ref.getAdapterId(), proxy.__reference().getEndpoints()); + this._table.addAdapterEndpoints(ref.getAdapterId(), proxy._getReference().getEndpoints()); } else if(notRegistered) // If the adapter isn't registered anymore, remove it from the cache. { @@ -395,10 +395,10 @@ class LocatorInfo } else { - if(proxy !== null && !proxy.__reference().isWellKnown()) + if(proxy !== null && !proxy._getReference().isWellKnown()) { // Cache the well-known object reference. - this._table.addObjectReference(ref.getIdentity(), proxy.__reference()); + this._table.addObjectReference(ref.getIdentity(), proxy._getReference()); } else if(notRegistered) // If the well-known object isn't registered anymore, remove it from the cache. { @@ -427,7 +427,7 @@ class RequestCallback let endpoints = null; if(proxy !== null) { - let r = proxy.__reference(); + let r = proxy._getReference(); if(this._ref.isWellKnown() && !Protocol.isSupported(this._ref.getEncoding(), r.getEncoding())) { // diff --git a/js/src/Ice/LocatorManager.js b/js/src/Ice/LocatorManager.js index 53ee66670ec..2c31ef1c8bb 100644 --- a/js/src/Ice/LocatorManager.js +++ b/js/src/Ice/LocatorManager.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/HashMap", "../Ice/LocatorInfo", diff --git a/js/src/Ice/LocatorTable.js b/js/src/Ice/LocatorTable.js index be29ec34528..b63d744b675 100644 --- a/js/src/Ice/LocatorTable.js +++ b/js/src/Ice/LocatorTable.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/HashMap", "../Ice/Debug", "../Ice/IdentityUtil"]); +Ice._ModuleRegistry.require(module, ["../Ice/HashMap", "../Ice/Debug", "../Ice/IdentityUtil"]); const HashMap = Ice.HashMap; const Debug = Ice.Debug; diff --git a/js/src/Ice/ModuleRegistry.js b/js/src/Ice/ModuleRegistry.js index 2ca8f955850..4c9c0e61207 100644 --- a/js/src/Ice/ModuleRegistry.js +++ b/js/src/Ice/ModuleRegistry.js @@ -7,17 +7,17 @@ // // ********************************************************************** -const __modules__ = {}; +const modules = {}; -class __M +class _ModuleRegistry { static module(name) { - let m = __modules__[name]; + let m = modules[name]; if(m === undefined) { m = {}; - __modules__[name] = m; + modules[name] = m; } return m; } @@ -40,7 +40,7 @@ class __M } const components = scoped.split("."); - let T = __modules__; + let T = modules; for(let i = 0; i < components.length; ++i) { @@ -54,7 +54,7 @@ class __M } } -const Ice = __M.module("Ice"); +const Ice = _ModuleRegistry.module("Ice"); Ice.Slice = Ice.Slice || {}; -Ice.__M = __M; +Ice._ModuleRegistry = _ModuleRegistry; exports.Ice = Ice; diff --git a/js/src/Ice/Object.js b/js/src/Ice/Object.js index 60c184c015f..f25dcd8d980 100644 --- a/js/src/Ice/Object.js +++ b/js/src/Ice/Object.js @@ -13,7 +13,7 @@ // Using IceObject in this file to avoid collisions with the native Object. // const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Exception", "../Ice/FormatType", @@ -23,24 +23,24 @@ Ice.__M.require(module, let nextAddress = 0; -const Ice_Object_ids__ = ["::Ice::Object"]; +const ids = ["::Ice::Object"]; Ice.Object = class { constructor() { // Fake Address used as the hashCode for this object instance. - this.__address = nextAddress++; + this._iceAddress = nextAddress++; } hashCode() { - return this.__address; + return this._iceAddress; } ice_isA(s, current) { - return this.__mostDerivedType().__ids.indexOf(s) >= 0; + return this._iceMostDerivedType()._iceIds.indexOf(s) >= 0; } ice_ping(current) @@ -49,12 +49,12 @@ Ice.Object = class ice_ids(current) { - return this.__mostDerivedType().__ids; + return this._iceMostDerivedType()._iceIds; } ice_id(current) { - return this.__mostDerivedType().__id; + return this._iceMostDerivedType()._iceId; } toString() @@ -70,17 +70,17 @@ Ice.Object = class { } - __write(os) + _iceWrite(os) { os.startValue(null); - __writeImpl(this, os, this.__mostDerivedType()); + writeImpl(this, os, this._iceMostDerivedType()); os.endValue(); } - __read(is) + _iceRead(is) { is.startValue(); - __readImpl(this, is, this.__mostDerivedType()); + readImpl(this, is, this._iceMostDerivedType()); is.endValue(false); } @@ -92,23 +92,23 @@ Ice.Object = class { return true; } - return this.__mostDerivedType().__instanceof(T); + return this._iceMostDerivedType()._iceInstanceof(T); } return false; } // - // __mostDerivedType returns the the most derived Ice generated class. This is + // _iceMostDerivedType returns the the most derived Ice generated class. This is // necessary because the user might extend Slice generated classes. The user - // class extensions don't have __id, __ids, __instanceof etc static members so + // class extensions don't have _iceId, _iceIds, _iceInstanceof etc static members so // the implementation of ice_id, ice_ids and ice_instanceof would fail trying // to access those members of the user defined class. Instead, ice_id, ice_ids - // and ice_instanceof call __mostDerivedType to get the most derived Ice class. + // and ice_instanceof call _iceMostDerivedType to get the most derived Ice class. // - // The __mostDerivedType is overriden by each Slice generated class, see the + // The _iceMostDerivedType is overriden by each Slice generated class, see the // Slice.defineObject method implementation for details. // - __mostDerivedType() + _iceMostDerivedType() { return Ice.Object; } @@ -150,39 +150,39 @@ Ice.Object = class static ice_staticId() { - return this.__id; + return this._iceId; } - static __instanceof(T) + static _iceInstanceof(T) { if(T === this) { return true; } - if(this.__implements.some(i => i.__instanceof(T))) + if(this._iceImplements.some(i => i._iceInstanceof(T))) { return true; } - if(this.__parent) + if(this._iceParent) { - return this.__parent.__instanceof(T); + return this._iceParent._iceInstanceof(T); } return false; } - static get __ids() + static get _iceIds() { - return Ice_Object_ids__; + return ids; } - static get __id() + static get _iceId() { - return Ice_Object_ids__[0]; + return ids[0]; } - static get __implements() + static get _iceImplements() { return []; } @@ -192,12 +192,12 @@ Ice.Object = class // Private methods // -const __writeImpl = function(obj, os, type) +const writeImpl = function(obj, os, type) { // - // The __writeImpl method is a recursive method that goes down the + // The writeImpl method is a recursive method that goes down the // class hierarchy to marshal each slice of the class using the - // generated __writeMemberImpl method. + // generated _iceWriteMemberImpl method. // if(type === undefined || type === Ice.Object) @@ -205,23 +205,23 @@ const __writeImpl = function(obj, os, type) return; // Don't marshal anything for Ice.Object } - os.startSlice(type.__id, - Object.prototype.hasOwnProperty.call(type, '__compactId') ? type.__compactId : -1 , - type.__parent === Ice.Object); - if(type.prototype.__writeMemberImpl) + os.startSlice(type._iceId, + Object.prototype.hasOwnProperty.call(type, '_iceCompactId') ? type._iceCompactId : -1 , + type._iceParent === Ice.Object); + if(type.prototype._iceWriteMemberImpl) { - type.prototype.__writeMemberImpl.call(obj, os); + type.prototype._iceWriteMemberImpl.call(obj, os); } os.endSlice(); - __writeImpl(obj, os, type.__parent); + writeImpl(obj, os, type._iceParent); }; -const __readImpl = function(obj, is, type) +const readImpl = function(obj, is, type) { // - // The __readImpl method is a recursive method that goes down the + // The readImpl method is a recursive method that goes down the // class hierarchy to marshal each slice of the class using the - // generated __readMemberImpl method. + // generated _iceReadMemberImpl method. // if(type === undefined || type === Ice.Object) @@ -230,34 +230,34 @@ const __readImpl = function(obj, is, type) } is.startSlice(); - if(type.prototype.__readMemberImpl) + if(type.prototype._iceReadMemberImpl) { - type.prototype.__readMemberImpl.call(obj, is); + type.prototype._iceReadMemberImpl.call(obj, is); } is.endSlice(); - __readImpl(obj, is, type.__parent); + readImpl(obj, is, type._iceParent); }; -const __writePreserved = function(os) +const writePreserved = function(os) { // // For Slice classes which are marked "preserved", the implementation of this method - // replaces the Ice.Object.prototype.__write method. + // replaces the Ice.Object.prototype._iceWrite method. // - os.startValue(this.__slicedData); - __writeImpl(this, os, this.__mostDerivedType()); + os.startValue(this._iceSlicedData); + writeImpl(this, os, this._iceMostDerivedType()); os.endValue(); }; -const __readPreserved = function(is) +const readPreserved = function(is) { // // For Slice classes which are marked "preserved", the implementation of this method - // replaces the Ice.Object.prototype.__read method. + // replaces the Ice.Object.prototype._iceRead method. // is.startValue(); - __readImpl(this, is, this.__mostDerivedType()); - this.__slicedData = is.endValue(true); + readImpl(this, is, this._iceMostDerivedType()); + this._iceSlicedData = is.endValue(true); }; @@ -265,8 +265,8 @@ const Slice = Ice.Slice; Slice.PreservedObject = function(obj) { - obj.prototype.__write = __writePreserved; - obj.prototype.__read = __readPreserved; + obj.prototype._iceWrite = writePreserved; + obj.prototype._iceRead = readPreserved; }; module.exports.Ice = Ice; diff --git a/js/src/Ice/ObjectAdapterFactory.js b/js/src/Ice/ObjectAdapterFactory.js index 619396bf716..0b008838fc4 100644 --- a/js/src/Ice/ObjectAdapterFactory.js +++ b/js/src/Ice/ObjectAdapterFactory.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncResultBase", "../Ice/LocalException", diff --git a/js/src/Ice/ObjectAdapterI.js b/js/src/Ice/ObjectAdapterI.js index 07bdd31cea3..1af76bef4e8 100644 --- a/js/src/Ice/ObjectAdapterI.js +++ b/js/src/Ice/ObjectAdapterI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncResultBase", "../Ice/Debug", @@ -395,7 +395,7 @@ class ObjectAdapterI findByProxy(proxy) { this.checkForDeactivation(); - const ref = proxy.__reference(); + const ref = proxy._getReference(); return this.findFacet(ref.getIdentity(), ref.getFacet()); } diff --git a/js/src/Ice/ObjectPrx.js b/js/src/Ice/ObjectPrx.js index eca66655764..fc4d53cb305 100644 --- a/js/src/Ice/ObjectPrx.js +++ b/js/src/Ice/ObjectPrx.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/ArrayUtil", "../Ice/AsyncResult", @@ -78,7 +78,7 @@ class ObjectPrx else { const proxy = new ObjectPrx(); - proxy.__setup(this._reference.changeIdentity(newIdentity)); + proxy._setup(this._reference.changeIdentity(newIdentity)); return proxy; } } @@ -90,7 +90,7 @@ class ObjectPrx ice_context(newContext) { - return this.__newInstance(this._reference.changeContext(newContext)); + return this._newInstance(this._reference.changeContext(newContext)); } ice_getFacet() @@ -112,7 +112,7 @@ class ObjectPrx else { const proxy = new ObjectPrx(); - proxy.__setup(this._reference.changeFacet(newFacet)); + proxy._setup(this._reference.changeFacet(newFacet)); return proxy; } } @@ -135,7 +135,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeAdapterId(newAdapterId)); + return this._newInstance(this._reference.changeAdapterId(newAdapterId)); } } @@ -157,7 +157,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeEndpoints(newEndpoints)); + return this._newInstance(this._reference.changeEndpoints(newEndpoints)); } } @@ -178,7 +178,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeLocatorCacheTimeout(newTimeout)); + return this._newInstance(this._reference.changeLocatorCacheTimeout(newTimeout)); } } @@ -199,7 +199,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeInvocationTimeout(newTimeout)); + return this._newInstance(this._reference.changeInvocationTimeout(newTimeout)); } } @@ -216,7 +216,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeCacheConnection(newCache)); + return this._newInstance(this._reference.changeCacheConnection(newCache)); } } @@ -233,7 +233,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeEndpointSelection(newType)); + return this._newInstance(this._reference.changeEndpointSelection(newType)); } } @@ -250,7 +250,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeSecure(b)); + return this._newInstance(this._reference.changeSecure(b)); } } @@ -267,7 +267,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeEncoding(e)); + return this._newInstance(this._reference.changeEncoding(e)); } } @@ -284,7 +284,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changePreferSecure(b)); + return this._newInstance(this._reference.changePreferSecure(b)); } } @@ -303,7 +303,7 @@ class ObjectPrx } else { - return this.__newInstance(ref); + return this._newInstance(ref); } } @@ -322,7 +322,7 @@ class ObjectPrx } else { - return this.__newInstance(ref); + return this._newInstance(ref); } } @@ -339,7 +339,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeMode(RefMode.ModeTwoway)); + return this._newInstance(this._reference.changeMode(RefMode.ModeTwoway)); } } @@ -356,7 +356,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeMode(RefMode.ModeOneway)); + return this._newInstance(this._reference.changeMode(RefMode.ModeOneway)); } } @@ -373,7 +373,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeMode(RefMode.ModeBatchOneway)); + return this._newInstance(this._reference.changeMode(RefMode.ModeBatchOneway)); } } @@ -390,7 +390,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeMode(RefMode.ModeDatagram)); + return this._newInstance(this._reference.changeMode(RefMode.ModeDatagram)); } } @@ -407,7 +407,7 @@ class ObjectPrx } else { - return this.__newInstance(this._reference.changeMode(RefMode.ModeBatchDatagram)); + return this._newInstance(this._reference.changeMode(RefMode.ModeBatchDatagram)); } } @@ -420,7 +420,7 @@ class ObjectPrx } else { - return this.__newInstance(ref); + return this._newInstance(ref); } } @@ -437,7 +437,7 @@ class ObjectPrx } else { - return this.__newInstance(ref); + return this._newInstance(ref); } } @@ -455,7 +455,7 @@ class ObjectPrx } else { - return this.__newInstance(ref); + return this._newInstance(ref); } } @@ -464,11 +464,11 @@ class ObjectPrx const r = new ProxyGetConnection(this, "ice_getConnection"); try { - r.__invoke(); + r.invoke(); } catch(ex) { - r.__abort(ex); + r.abort(ex); } return r; } @@ -483,11 +483,11 @@ class ObjectPrx const r = new ProxyFlushBatch(this, "ice_flushBatchRequests"); try { - r.__invoke(); + r.invoke(); } catch(ex) { - r.__abort(ex); + r.abort(ex); } return r; } @@ -507,18 +507,18 @@ class ObjectPrx return false; } - __write(os) + _write(os) { - this._reference.getIdentity().__write(os); + this._reference.getIdentity()._write(os); this._reference.streamWrite(os); } - __reference() + _getReference() { return this._reference; } - __copyFrom(from) + _copyFrom(from) { Debug.assert(this._reference === null); Debug.assert(this._requestHandler === null); @@ -527,9 +527,9 @@ class ObjectPrx this._requestHandler = from._requestHandler; } - __handleException(ex, handler, mode, sent, sleep, cnt) + _handleException(ex, handler, mode, sent, sleep, cnt) { - this.__updateRequestHandler(handler, null); // Clear the request handler + this._updateRequestHandler(handler, null); // Clear the request handler // // We only retry local exception, system exceptions aren't retried. @@ -579,7 +579,7 @@ class ObjectPrx } } - __checkAsyncTwowayOnly(name) + _checkAsyncTwowayOnly(name) { if(!this.ice_isTwoway()) { @@ -587,7 +587,7 @@ class ObjectPrx } } - __getRequestHandler() + _getRequestHandler() { if(this._reference.getCacheConnection()) { @@ -599,7 +599,7 @@ class ObjectPrx return this._reference.getRequestHandler(this); } - __getBatchRequestQueue() + _getBatchRequestQueue() { if(!this._batchRequestQueue) { @@ -608,7 +608,7 @@ class ObjectPrx return this._batchRequestQueue; } - __setRequestHandler(handler) + _setRequestHandler(handler) { if(this._reference.getCacheConnection()) { @@ -621,7 +621,7 @@ class ObjectPrx return handler; } - __updateRequestHandler(previous, handler) + _updateRequestHandler(previous, handler) { if(this._reference.getCacheConnection() && previous !== null) { @@ -635,17 +635,17 @@ class ObjectPrx // // Only for use by IceInternal.ProxyFactory // - __setup(ref) + _setup(ref) { Debug.assert(this._reference === null); this._reference = ref; } - __newInstance(ref) + _newInstance(ref) { const proxy = new this.constructor(); - proxy.__setup(ref); + proxy._setup(ref); return proxy; } @@ -657,7 +657,7 @@ class ObjectPrx { return true; } - return this.constructor.__instanceof(T); + return this.constructor._instanceof(T); } return false; } @@ -665,47 +665,47 @@ class ObjectPrx // // Generic invocation for operations that have input parameters. // - static __invoke(p, name, mode, fmt, ctx, marshalFn, unmarshalFn, userEx, args) + static _invoke(p, name, mode, fmt, ctx, marshalFn, unmarshalFn, userEx, args) { if(unmarshalFn !== null || userEx.length > 0) { - p.__checkAsyncTwowayOnly(name); + p._checkAsyncTwowayOnly(name); } - const __r = new OutgoingAsync(p, name, - __res => + const r = new OutgoingAsync(p, name, + res => { - this.__completed(__res, unmarshalFn, userEx); + this._completed(res, unmarshalFn, userEx); }); try { - __r.__prepare(name, mode, ctx); + r.prepare(name, mode, ctx); if(marshalFn === null) { - __r.__writeEmptyParams(); + r.writeEmptyParams(); } else { - const __os = __r.__startWriteParams(fmt); - marshalFn.call(null, __os, args); - __r.__endWriteParams(); + const ostr = r.startWriteParams(fmt); + marshalFn.call(null, ostr, args); + r.endWriteParams(); } - __r.__invoke(); + r.invoke(); } catch(ex) { - __r.__abort(ex); + r.abort(ex); } - return __r; + return r; } // // Handles the completion of an invocation. // - static __completed(__r, unmarshalFn, userEx) + static _completed(r, unmarshalFn, userEx) { - if(!this.__check(__r, userEx)) + if(!this._check(r, userEx)) { return; } @@ -714,135 +714,54 @@ class ObjectPrx { if(unmarshalFn === null) { - __r.__readEmptyParams(); - __r.resolve(); + r.readEmptyParams(); + r.resolve(); } else { - __r.resolve(unmarshalFn(__r)); + r.resolve(unmarshalFn(r)); } } catch(ex) { - this.__dispatchLocalException(__r, ex); + this.dispatchLocalException(r, ex); return; } } // - // Unmarshal callback for operations that return a bool as the only result. - // - static __returns_bool(__is, __results) - { - __results.push(__is.readBool()); - } - - // - // Unmarshal callback for operations that return a byte as the only result. - // - static __returns_byte(__is, __results) - { - __results.push(__is.readByte()); - } - - // - // Unmarshal callback for operations that return a short as the only result. - // - static __returns_short(__is, __results) - { - __results.push(__is.readShort()); - } - - // - // Unmarshal callback for operations that return an int as the only result. - // - static __returns_int(__is, __results) - { - __results.push(__is.readInt()); - } - - // - // Unmarshal callback for operations that return a long as the only result. - // - static __returns_long(__is, __results) - { - __results.push(__is.readLong()); - } - - // - // Unmarshal callback for operations that return a float as the only result. - // - static __returns_float(__is, __results) - { - __results.push(__is.readFloat()); - } - - // - // Unmarshal callback for operations that return a double as the only result. - // - static __returns_double(__is, __results) - { - __results.push(__is.readDouble()); - } - - // - // Unmarshal callback for operations that return a string as the only result. - // - static __returns_string(__is, __results) - { - __results.push(__is.readString()); - } - - // - // Unmarshal callback for operations that return a proxy as the only result. - // - static __returns_ObjectPrx(__is, __results) - { - __results.push(__is.readProxy()); - } - - // - // Unmarshal callback for operations that return an object as the only result. - // - static __returns_Object(__is, __results) - { - __is.readValue(obj => __results.push(obj), Ice.Object); - __is.readPendingValues(); - } - - // // Handles user exceptions. // - static __check(__r, __uex) + static _check(r, uex) { // - // If __uex is non-null, it must be an array of exception types. + // If uex is non-null, it must be an array of exception types. // try { - __r.__throwUserException(); + r.throwUserException(); } catch(ex) { if(ex instanceof Ice.UserException) { - if(__uex !== null) + if(uex !== null) { - for(let i = 0; i < __uex.length; ++i) + for(let i = 0; i < uex.length; ++i) { - if(ex instanceof __uex[i]) + if(ex instanceof uex[i]) { - __r.reject(ex); + r.reject(ex); return false; } } } - __r.reject(new Ice.UnknownUserException(ex.ice_name())); + r.reject(new Ice.UnknownUserException(ex.ice_name())); return false; } else { - __r.reject(ex); + r.reject(ex); return false; } } @@ -850,19 +769,19 @@ class ObjectPrx return true; } - static __dispatchLocalException(__r, __ex) + static dispatchLocalException(r, ex) { - __r.reject(__ex); + r.reject(ex); } static checkedCast(prx, facet, ctx) { - let __r = null; + let r = null; if(prx === undefined || prx === null) { - __r = new AsyncResultBase(null, "checkedCast", null, null, null); - __r.resolve(null); + r = new AsyncResultBase(null, "checkedCast", null, null, null); + r.resolve(null); } else { @@ -870,35 +789,35 @@ class ObjectPrx { prx = prx.ice_facet(facet); } - __r = new AsyncResultBase(prx.ice_getCommunicator(), "checkedCast", null, prx, null); + r = new AsyncResultBase(prx.ice_getCommunicator(), "checkedCast", null, prx, null); prx.ice_isA(this.ice_staticId(), ctx).then( - __ret => + ret => { - if(__ret) + if(ret) { - const __h = new this(); - __h.__copyFrom(prx); - __r.resolve(__h); + const h = new this(); + h._copyFrom(prx); + r.resolve(h); } else { - __r.resolve(null); + r.resolve(null); } }).catch( - __ex => + ex => { - if(__ex instanceof Ice.FacetNotExistException) + if(ex instanceof Ice.FacetNotExistException) { - __r.resolve(null); + r.resolve(null); } else { - __r.reject(__ex); + r.reject(ex); } }); } - return __r; + return r; } static uncheckedCast(prx, facet) @@ -911,7 +830,7 @@ class ObjectPrx { prx = prx.ice_facet(facet); } - r.__copyFrom(prx); + r._copyFrom(prx); } return r; } @@ -941,25 +860,21 @@ class ObjectPrx return is.readOptionalProxy(tag, this); } - static __instanceof(T) + static _instanceof(T) { if(T === this) { return true; } - for(let i in this.__implements) + for(let i in this._implements) { - if(this.__implements[i].__instanceof(T)) + if(this._implements[i]._instanceof(T)) { return true; } } - if(this.__parent) - { - return this.__parent.__instanceof(T); - } return false; } diff --git a/js/src/Ice/OpaqueEndpointI.js b/js/src/Ice/OpaqueEndpointI.js index 3c63c13bd56..da60a5e4676 100644 --- a/js/src/Ice/OpaqueEndpointI.js +++ b/js/src/Ice/OpaqueEndpointI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Base64", "../Ice/Debug", diff --git a/js/src/Ice/Operation.js b/js/src/Ice/Operation.js index 85b70ee6fac..d78cce00b9f 100644 --- a/js/src/Ice/Operation.js +++ b/js/src/Ice/Operation.js @@ -9,8 +9,8 @@ const Ice = require("../Ice/ModuleRegistry").Ice; -const __M = Ice.__M; -__M.require(module, +const _ModuleRegistry = Ice._ModuleRegistry; +_ModuleRegistry.require(module, [ "../Ice/Current", "../Ice/Exception", @@ -45,7 +45,7 @@ function parseParam(p) } else if(t === 'string') { - type = __M.type(type); + type = _ModuleRegistry.type(type); } return { @@ -272,7 +272,7 @@ function marshalParams(os, params, retvalInfo, paramInfo, optParamInfo, usesClas } } -function __dispatchImpl(servant, op, incomingAsync, current) +function dispatchImpl(servant, op, incomingAsync, current) { // // Check to make sure the servant implements the operation. @@ -365,21 +365,21 @@ function getServantMethodFromInterfaces(interfaces, methodName, all) { all.push(intf); } - if(intf.__implements) + if(intf._iceImplements) { - method = getServantMethodFromInterfaces(intf.__implements, methodName, all); + method = getServantMethodFromInterfaces(intf._iceImplements, methodName, all); } } } return method; } -const dispatchPrefix = "__op_"; +const dispatchPrefix = "_iceD_"; function getServantMethod(servantType, name) { // - // The dispatch method is named __op_<Slice name> and is stored in the type (not the prototype). + // The dispatch method is named _iceD_<Slice name> and is stored in the type (not the prototype). // const methodName = dispatchPrefix + name; @@ -400,11 +400,11 @@ function getServantMethod(servantType, name) let curr = servantType; while(curr && method === undefined) { - if(curr.__implements) + if(curr._iceImplements) { - method = getServantMethodFromInterfaces(curr.__implements, methodName, allInterfaces); + method = getServantMethodFromInterfaces(curr._iceImplements, methodName, allInterfaces); } - curr = curr.__parent; + curr = curr._iceParent; } if(method !== undefined) @@ -422,9 +422,9 @@ function getServantMethod(servantType, name) // Next check the op table for the servant's type. // let op; - if(servantType.__ops) + if(servantType._iceOps) { - op = servantType.__ops.find(name); + op = servantType._iceOps.find(name); } let source; @@ -433,17 +433,17 @@ function getServantMethod(servantType, name) // // Now check the op tables of the base types. // - let parent = servantType.__parent; + let parent = servantType._iceParent; while(op === undefined && parent) { - if(parent.__ops) + if(parent._iceOps) { - if((op = parent.__ops.find(name)) !== undefined) + if((op = parent._iceOps.find(name)) !== undefined) { source = parent; } } - parent = parent.__parent; + parent = parent._iceParent; } // @@ -452,9 +452,9 @@ function getServantMethod(servantType, name) for(let i = 0; op === undefined && i < allInterfaces.length; ++i) { let intf = allInterfaces[i]; - if(intf.__ops) + if(intf._iceOps) { - if((op = intf.__ops.find(name)) !== undefined) + if((op = intf._iceOps.find(name)) !== undefined) { source = intf; } @@ -466,7 +466,7 @@ function getServantMethod(servantType, name) { method = function(servant, incomingAsync, current) { - return __dispatchImpl(servant, op, incomingAsync, current); + return dispatchImpl(servant, op, incomingAsync, current); }; // @@ -548,18 +548,18 @@ function addProxyOperation(proxyType, name, data) // let results = []; - let is = asyncResult.__startReadParams(); + let is = asyncResult.startReadParams(); let retvalInfo; if(op.returns && !op.returns.tag) { retvalInfo = op.returns; } unmarshalParams(is, retvalInfo, op.outParams, op.outParamsOpt, op.returnsClasses, results, 0); - asyncResult.__endReadParams(); + asyncResult.endReadParams(); return results.length == 1 ? results[0] : results; }; } - return Ice.ObjectPrx.__invoke(this, op.name, op.sendMode, op.format, ctx, marshalFn, unmarshalFn, + return Ice.ObjectPrx._invoke(this, op.name, op.sendMode, op.format, ctx, marshalFn, unmarshalFn, op.exceptions, Array.prototype.slice.call(args)); }; } @@ -569,10 +569,10 @@ Slice.defineOperations = function(classType, proxyType, ops) { if(ops) { - classType.__ops = new OpTable(ops); + classType._iceOps = new OpTable(ops); } - classType.prototype.__dispatch = function(incomingAsync, current) + classType.prototype._iceDispatch = function(incomingAsync, current) { // // Retrieve the dispatch method for this operation. @@ -598,11 +598,11 @@ Slice.defineOperations = function(classType, proxyType, ops) // // Copy proxy methods from super-interfaces. // - if(proxyType.__implements) + if(proxyType._implements) { - for(let intf in proxyType.__implements) + for(let intf in proxyType._implements) { - let proto = proxyType.__implements[intf].prototype; + let proto = proxyType._implements[intf].prototype; for(let f in proto) { if(typeof proto[f] == "function" && proxyType.prototype[f] === undefined) diff --git a/js/src/Ice/OutgoingAsync.js b/js/src/Ice/OutgoingAsync.js index 8c426beb2ba..62f14f0f64a 100644 --- a/js/src/Ice/OutgoingAsync.js +++ b/js/src/Ice/OutgoingAsync.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/AsyncStatus", "../Ice/AsyncResult", @@ -41,19 +41,19 @@ class OutgoingAsyncBase extends AsyncResult this._os = new OutputStream(this._instance, Protocol.currentProtocolEncoding); } - __os() + getOs() { return this._os; } - __sent() + sent() { - this.__markSent(true); + this.markSent(true); } - __completedEx(ex) + completedEx(ex) { - this.__markFinishedEx(ex); + this.markFinishedEx(ex); } } @@ -68,54 +68,54 @@ class ProxyOutgoingAsyncBase extends OutgoingAsyncBase this._handler = null; } - __completedEx(ex) + completedEx(ex) { try { - this._instance.retryQueue().add(this, this.__handleException(ex)); + this._instance.retryQueue().add(this, this.handleException(ex)); } catch(ex) { - this.__markFinishedEx(ex); + this.markFinishedEx(ex); } } - __retryException(ex) + retryException(ex) { try { - this._proxy.__updateRequestHandler(this._handler, null); // Clear request handler and always retry. + this._proxy._updateRequestHandler(this._handler, null); // Clear request handler and always retry. this._instance.retryQueue().add(this, 0); } catch(ex) { - this.__completedEx(ex); + this.completedEx(ex); } } - __retry() + retry() { - this.__invokeImpl(false); + this.invokeImpl(false); } - __abort(ex) + abort(ex) { - this.__markFinishedEx(ex); + this.markFinishedEx(ex); } - __invokeImpl(userThread) + invokeImpl(userThread) { try { if(userThread) { - const invocationTimeout = this._proxy.__reference().getInvocationTimeout(); + const invocationTimeout = this._proxy._getReference().getInvocationTimeout(); if(invocationTimeout > 0) { this._timeoutToken = this._instance.timer().schedule( () => { - this.__cancel(new Ice.InvocationTimeoutException()); + this.cancelWithException(new Ice.InvocationTimeoutException()); }, invocationTimeout); } @@ -126,7 +126,7 @@ class ProxyOutgoingAsyncBase extends OutgoingAsyncBase try { this._sent = false; - this._handler = this._proxy.__getRequestHandler(); + this._handler = this._proxy._getRequestHandler(); if((this._handler.sendAsyncRequest(this) & AsyncStatus.Sent) > 0) { if(userThread) @@ -141,11 +141,11 @@ class ProxyOutgoingAsyncBase extends OutgoingAsyncBase if(ex instanceof RetryException) { // Clear request handler and always retry - this._proxy.__updateRequestHandler(this._handler, null); + this._proxy._updateRequestHandler(this._handler, null); } else { - const interval = this.__handleException(ex); + const interval = this.handleException(ex); if(interval > 0) { this._instance.retryQueue().add(this, interval); @@ -157,11 +157,11 @@ class ProxyOutgoingAsyncBase extends OutgoingAsyncBase } catch(ex) { - this.__markFinishedEx(ex); + this.markFinishedEx(ex); } } - __markSent(done) + markSent(done) { this._sent = true; if(done) @@ -171,22 +171,22 @@ class ProxyOutgoingAsyncBase extends OutgoingAsyncBase this._instance.timer().cancel(this._timeoutToken); } } - super.__markSent.call(this, done); + super.markSent.call(this, done); } - __markFinishedEx(ex) + markFinishedEx(ex) { if(this._timeoutToken) { this._instance.timer().cancel(this._timeoutToken); } - super.__markFinishedEx.call(this, ex); + super.markFinishedEx.call(this, ex); } - __handleException(ex) + handleException(ex) { const interval = { value: 0 }; - this._cnt = this._proxy.__handleException(ex, this._handler, this._mode, this._sent, interval, this._cnt); + this._cnt = this._proxy._handleException(ex, this._handler, this._mode, this._sent, interval, this._cnt); return interval.value; } } @@ -196,13 +196,13 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase constructor(prx, operation, completed) { super(prx, operation); - this._encoding = Protocol.getCompatibleEncoding(this._proxy.__reference().getEncoding()); + this._encoding = Protocol.getCompatibleEncoding(this._proxy._getReference().getEncoding()); this._completed = completed; } - __prepare(op, mode, ctx) + prepare(op, mode, ctx) { - Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(this._proxy.__reference().getProtocol())); + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(this._proxy._getReference().getProtocol())); this._mode = mode; if(ctx === null) @@ -212,16 +212,16 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase if(this._proxy.ice_isBatchOneway() || this._proxy.ice_isBatchDatagram()) { - this._proxy.__getBatchRequestQueue().prepareBatchRequest(this._os); + this._proxy._getBatchRequestQueue().prepareBatchRequest(this._os); } else { this._os.writeBlob(Protocol.requestHdr); } - const ref = this._proxy.__reference(); + const ref = this._proxy._getReference(); - ref.getIdentity().__write(this._os); + ref.getIdentity()._write(this._os); // // For compatibility with the old FacetPath. @@ -271,32 +271,32 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase } } - __sent() + sent() { - this.__markSent(!this._proxy.ice_isTwoway()); + this.markSent(!this._proxy.ice_isTwoway()); } - __invokeRemote(connection, compress, response) + invokeRemote(connection, compress, response) { return connection.sendAsyncRequest(this, compress, response, 0); } - __abort(ex) + abort(ex) { if(this._proxy.ice_isBatchOneway() || this._proxy.ice_isBatchDatagram()) { - this._proxy.__getBatchRequestQueue().abortBatchRequest(this._os); + this._proxy._getBatchRequestQueue().abortBatchRequest(this._os); } - super.__abort(ex); + super.abort(ex); } - __invoke() + invoke() { if(this._proxy.ice_isBatchOneway() || this._proxy.ice_isBatchDatagram()) { this._sentSynchronously = true; - this._proxy.__getBatchRequestQueue().finishBatchRequest(this._os, this._proxy, this._operation); - this.__markFinished(true); + this._proxy._getBatchRequestQueue().finishBatchRequest(this._os, this._proxy, this._operation); + this.markFinished(true); return; } @@ -305,10 +305,10 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase // try block with the catch block calling abort() in case of an // exception. // - this.__invokeImpl(true); // userThread = true + this.invokeImpl(true); // userThread = true } - __completed(istr) + completed(istr) { Debug.assert(this._proxy.ice_isTwoway()); // Can only be called for twoways. @@ -335,7 +335,7 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase case Protocol.replyOperationNotExist: { const id = new Identity(); - id.__read(this._is); + id._read(this._is); // // For compatibility with the old FacetPath. @@ -435,69 +435,47 @@ class OutgoingAsync extends ProxyOutgoingAsyncBase } } - this.__markFinished(replyStatus == Protocol.replyOK, this._completed); + this.markFinished(replyStatus == Protocol.replyOK, this._completed); } catch(ex) { - this.__completedEx(ex); + this.completedEx(ex); } } - __startWriteParams(format) + startWriteParams(format) { this._os.startEncapsulation(this._encoding, format); return this._os; } - __endWriteParams() + endWriteParams() { this._os.endEncapsulation(); } - __writeEmptyParams() + writeEmptyParams() { this._os.writeEmptyEncapsulation(this._encoding); } - __writeParamEncaps(encaps) - { - if(encaps === null || encaps.length === 0) - { - this._os.writeEmptyEncapsulation(this._encoding); - } - else - { - this._os.writeEncapsulation(encaps); - } - } - - __is() - { - return this._is; - } - - __startReadParams() + startReadParams() { this._is.startEncapsulation(); return this._is; } - __endReadParams() + endReadParams() { this._is.endEncapsulation(); } - __readEmptyParams() + readEmptyParams() { this._is.skipEmptyEncapsulation(); } - __readParamEncaps() - { - return this._is.readEncapsulation(null); - } - - __throwUserException() + throwUserException() { Debug.assert((this._state & AsyncResult.Done) !== 0); if((this._state & AsyncResult.OK) === 0) @@ -526,23 +504,23 @@ class ProxyFlushBatch extends ProxyOutgoingAsyncBase constructor(prx, operation) { super(prx, operation); - this._batchRequestNum = prx.__getBatchRequestQueue().swap(this._os); + this._batchRequestNum = prx._getBatchRequestQueue().swap(this._os); } - __invokeRemote(connection, compress, response) + invokeRemote(connection, compress, response) { if(this._batchRequestNum === 0) { - this.__sent(); + this.sent(); return AsyncStatus.Sent; } return connection.sendAsyncRequest(this, compress, response, this._batchRequestNum); } - __invoke() + invoke() { - Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(this._proxy.__reference().getProtocol())); - this.__invokeImpl(true); // userThread = true + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(this._proxy._getReference().getProtocol())); + this.invokeImpl(true); // userThread = true } } @@ -553,15 +531,15 @@ class ProxyGetConnection extends ProxyOutgoingAsyncBase super(prx, operation); } - __invokeRemote(connection, compress, response) + invokeRemote(connection, compress, response) { - this.__markFinished(true, r => r.resolve(connection)); + this.markFinished(true, r => r.resolve(connection)); return AsyncStatus.Sent; } - __invoke() + invoke() { - this.__invokeImpl(true); // userThread = true + this.invokeImpl(true); // userThread = true } } @@ -572,7 +550,7 @@ class ConnectionFlushBatch extends OutgoingAsyncBase super(communicator, operation, con, null, null); } - __invoke() + invoke() { try { @@ -580,7 +558,7 @@ class ConnectionFlushBatch extends OutgoingAsyncBase let status; if(batchRequestNum === 0) { - this.__sent(); + this.sent(); status = AsyncStatus.Sent; } else @@ -595,7 +573,7 @@ class ConnectionFlushBatch extends OutgoingAsyncBase } catch(ex) { - this.__completedEx(ex); + this.completedEx(ex); } } } diff --git a/js/src/Ice/OutgoingConnectionFactory.js b/js/src/Ice/OutgoingConnectionFactory.js index 658c8ed868b..860d78fd522 100644 --- a/js/src/Ice/OutgoingConnectionFactory.js +++ b/js/src/Ice/OutgoingConnectionFactory.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/ArrayUtil", "../Ice/AsyncResultBase", diff --git a/js/src/Ice/Properties.js b/js/src/Ice/Properties.js index 79d877f5f43..703b0c1f2ae 100644 --- a/js/src/Ice/Properties.js +++ b/js/src/Ice/Properties.js @@ -9,7 +9,7 @@ const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/StringUtil", "../Ice/PropertyNames", diff --git a/js/src/Ice/Protocol.js b/js/src/Ice/Protocol.js index 2efd0ac3559..139ed4f523b 100644 --- a/js/src/Ice/Protocol.js +++ b/js/src/Ice/Protocol.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/StringUtil", "../Ice/LocalException", diff --git a/js/src/Ice/ProxyFactory.js b/js/src/Ice/ProxyFactory.js index 6cb6e921ea8..fee91c6061c 100644 --- a/js/src/Ice/ProxyFactory.js +++ b/js/src/Ice/ProxyFactory.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/ObjectPrx", @@ -75,7 +75,7 @@ class ProxyFactory proxyToString(proxy) { - return proxy === null ? "" : proxy.__reference().toString(); + return proxy === null ? "" : proxy._getReference().toString(); } propertyToProxy(prefix) @@ -87,13 +87,13 @@ class ProxyFactory proxyToProperty(proxy, prefix) { - return proxy === null ? new Map() : proxy.__reference().toProperty(prefix); + return proxy === null ? new Map() : proxy._getReference().toProperty(prefix); } streamToProxy(s, type) { const ident = new Identity(); - ident.__read(s); + ident._read(s); return this.referenceToProxy(this._instance.referenceFactory().createFromStream(ident, s), type); } @@ -102,7 +102,7 @@ class ProxyFactory if(ref !== null) { const proxy = type ? new type() : new ObjectPrx(); - proxy.__setup(ref); + proxy._setup(ref); return proxy; } else diff --git a/js/src/Ice/Reference.js b/js/src/Ice/Reference.js index 21424413d29..fd2402b8371 100644 --- a/js/src/Ice/Reference.js +++ b/js/src/Ice/Reference.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/ArrayUtil", "../Ice/BatchRequestQueue", @@ -603,9 +603,9 @@ class ReferenceFactory if(!s.getEncoding().equals(Ice.Encoding_1_0)) { protocol = new Ice.ProtocolVersion(); - protocol.__read(s); + protocol._read(s); encoding = new Ice.EncodingVersion(); - encoding.__read(s); + encoding._read(s); } else { @@ -713,7 +713,7 @@ class ReferenceFactory let locatorInfo = null; if(this._defaultLocator !== null) { - if(!this._defaultLocator.__reference().getEncoding().equals(encoding)) + if(!this._defaultLocator._getReference().getEncoding().equals(encoding)) { locatorInfo = this._instance.locatorManager().find( this._defaultLocator.ice_encodingVersion(encoding)); @@ -749,7 +749,7 @@ class ReferenceFactory const locator = LocatorPrx.uncheckedCast(this._communicator.propertyToProxy(property)); if(locator !== null) { - if(!locator.__reference().getEncoding().equals(encoding)) + if(!locator._getReference().getEncoding().equals(encoding)) { locatorInfo = this._instance.locatorManager().find(locator.ice_encodingVersion(encoding)); } @@ -1246,8 +1246,8 @@ class Reference if(!s.getEncoding().equals(Ice.Encoding_1_0)) { - this._protocol.__write(s); - this._encoding.__write(s); + this._protocol._write(s); + this._encoding._write(s); } // Derived class writes the remainder of the reference. @@ -1663,7 +1663,7 @@ class FixedReference extends Reference compress = this._fixedConnection.endpoint().compress(); } - return proxy.__setRequestHandler(new ConnectionRequestHandler(this, this._fixedConnection, compress)); + return proxy._setRequestHandler(new ConnectionRequestHandler(this, this._fixedConnection, compress)); } getBatchRequestQueue() @@ -2001,13 +2001,13 @@ class RoutableReference extends Reference if(this._routerInfo !== null) { - this._routerInfo.getRouter().__reference().toProperty(prefix + ".Router").forEach( + this._routerInfo.getRouter()._getReference().toProperty(prefix + ".Router").forEach( (value, key) => properties.set(key, value)); } if(this._locatorInfo !== null) { - this._locatorInfo.getLocator().__reference().toProperty(prefix + ".Locator").forEach( + this._locatorInfo.getLocator()._getReference().toProperty(prefix + ".Locator").forEach( (value, key) => properties.set(key, value)); } diff --git a/js/src/Ice/RequestHandlerFactory.js b/js/src/Ice/RequestHandlerFactory.js index 955bc5efa9c..fdfbcffb766 100644 --- a/js/src/Ice/RequestHandlerFactory.js +++ b/js/src/Ice/RequestHandlerFactory.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/HashMap", @@ -59,7 +59,7 @@ class RequestHandlerFactory handler.setException(ex); }); } - return proxy.__setRequestHandler(handler.connect(proxy)); + return proxy._setRequestHandler(handler.connect(proxy)); } removeRequestHandler(ref, handler) diff --git a/js/src/Ice/RetryException.js b/js/src/Ice/RetryException.js index 869e162fb91..5bdb59dd2ed 100644 --- a/js/src/Ice/RetryException.js +++ b/js/src/Ice/RetryException.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/Debug", "../Ice/LocalException"]); +Ice._ModuleRegistry.require(module, ["../Ice/Debug", "../Ice/LocalException"]); class RetryException extends Error { diff --git a/js/src/Ice/RetryQueue.js b/js/src/Ice/RetryQueue.js index 6e9af19492d..30f812f9c4f 100644 --- a/js/src/Ice/RetryQueue.js +++ b/js/src/Ice/RetryQueue.js @@ -20,7 +20,7 @@ class RetryTask run() { - this._outAsync.__retry(); + this._outAsync.retry(); this._queue.remove(this); } @@ -28,7 +28,7 @@ class RetryTask { try { - this._outAsync.__abort(new Ice.CommunicatorDestroyedException()); + this._outAsync.abort(new Ice.CommunicatorDestroyedException()); } catch(ex) { @@ -45,7 +45,7 @@ class RetryTask this._instance.initializationData().logger.trace(this._instance.traceLevels().retryCat, "operation retry canceled\n" + ex.toString()); } - this._outAsync.__completedEx(ex); + this._outAsync.completedEx(ex); } } } @@ -65,7 +65,7 @@ class RetryQueue throw new Ice.CommunicatorDestroyedException(); } let task = new RetryTask(this._instance, this, outAsync); - outAsync.__cancelable(task); // This will throw if the request is canceled + outAsync.cancelable(task); // This will throw if the request is canceled task.token = this._instance.timer().schedule(() => task.run(), interval); this._requests.push(task); } diff --git a/js/src/Ice/RouterInfo.js b/js/src/Ice/RouterInfo.js index d382663daa6..6b1ca9d3254 100644 --- a/js/src/Ice/RouterInfo.js +++ b/js/src/Ice/RouterInfo.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/ArrayUtil", "../Ice/Debug", @@ -147,7 +147,7 @@ class RouterInfo // // If getClientProxy() return nil, use router endpoints. // - this._clientEndpoints = this._router.__reference().getEndpoints(); + this._clientEndpoints = this._router._getReference().getEndpoints(); promise.resolve(this._clientEndpoints); } else @@ -162,7 +162,7 @@ class RouterInfo this._router.ice_getConnection().then( con => { - this._clientEndpoints = clientProxy.ice_timeout(con.timeout()).__reference().getEndpoints(); + this._clientEndpoints = clientProxy.ice_timeout(con.timeout())._getReference().getEndpoints(); promise.resolve(this._clientEndpoints); }).catch(promise.reject); } @@ -181,7 +181,7 @@ class RouterInfo } serverProxy = serverProxy.ice_router(null); // The server proxy cannot be routed. - this._serverEndpoints = serverProxy.__reference().getEndpoints(); + this._serverEndpoints = serverProxy._getReference().getEndpoints(); return this._serverEndpoints; } diff --git a/js/src/Ice/RouterManager.js b/js/src/Ice/RouterManager.js index 2faac35ca82..4ea2a3afa08 100644 --- a/js/src/Ice/RouterManager.js +++ b/js/src/Ice/RouterManager.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/HashMap", "../Ice/RouterInfo", "../Ice/Router"]); +Ice._ModuleRegistry.require(module, ["../Ice/HashMap", "../Ice/RouterInfo", "../Ice/Router"]); const HashMap = Ice.HashMap; const RouterInfo = Ice.RouterInfo; diff --git a/js/src/Ice/ServantManager.js b/js/src/Ice/ServantManager.js index dd9d7628edc..3e2c19cd8f1 100644 --- a/js/src/Ice/ServantManager.js +++ b/js/src/Ice/ServantManager.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/LocalException", diff --git a/js/src/Ice/Stream.js b/js/src/Ice/Stream.js index 915a1fdaf0a..f28805ec452 100644 --- a/js/src/Ice/Stream.js +++ b/js/src/Ice/Stream.js @@ -8,8 +8,8 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -const __M = Ice.__M; -__M.require(module, +const _ModuleRegistry = Ice._ModuleRegistry; +_ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/ExUtil", @@ -204,7 +204,7 @@ class EncapsDecoder // // Read the instance. // - v.__read(this._stream); + v._iceRead(this._stream); if(this._patchMap !== null) { @@ -340,7 +340,7 @@ class EncapsDecoder10 extends EncapsDecoder // if(userEx !== null) { - userEx.__read(this._stream); + userEx._read(this._stream); if(usesClasses) { this.readPendingValues(); @@ -609,7 +609,7 @@ class EncapsDecoder11 extends EncapsDecoder // if(userEx !== null) { - userEx.__read(this._stream); + userEx._read(this._stream); throw userEx; // Never reached. @@ -1357,7 +1357,7 @@ class InputStream this._encapsStack.sz = sz; const encoding = new Ice.EncodingVersion(); - encoding.__read(this); + encoding._read(this); Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. this._encapsStack.setEncoding(encoding); @@ -1420,7 +1420,7 @@ class InputStream } const encoding = new Ice.EncodingVersion(); - encoding.__read(this); + encoding._read(this); if(encoding.equals(Ice.Encoding_1_0)) { if(sz != 6) @@ -1453,7 +1453,7 @@ class InputStream if(encoding !== null) { - encoding.__read(this); + encoding._read(this); this._buf.position = this._buf.position - 6; } else @@ -1490,7 +1490,7 @@ class InputStream throw new Ice.UnmarshalOutOfBoundsException(); } const encoding = new Ice.EncodingVersion(); - encoding.__read(this); + encoding._read(this); try { this._buf.position = this._buf.position + sz - 6; @@ -2008,7 +2008,7 @@ class InputStream try { const typeId = id.length > 2 ? id.substr(2).replace(/::/g, ".") : ""; - const Class = __M.type(typeId); + const Class = _ModuleRegistry.type(typeId); if(Class !== undefined) { obj = new Class(); @@ -2029,7 +2029,7 @@ class InputStream try { const typeId = id.length > 2 ? id.substr(2).replace(/::/g, ".") : ""; - const Class = __M.type(typeId); + const Class = _ModuleRegistry.type(typeId); if(Class !== undefined) { userEx = new Class(); @@ -2290,9 +2290,9 @@ class EncapsEncoder10 extends EncapsEncoder // This allows reading the pending instances even if some part of // the exception was sliced. // - const usesClasses = v.__usesClasses(); + const usesClasses = v._usesClasses(); this._stream.writeBool(usesClasses); - v.__write(this._stream); + v._write(this._stream); if(usesClasses) { this.writePendingValues(); @@ -2377,7 +2377,7 @@ class EncapsEncoder10 extends EncapsEncoder this._stream.instance.initializationData().logger.warning( "exception raised by ice_preMarshal:\n" + ex.toString()); } - key.__write(this._stream); + key._iceWrite(this._stream); }; while(this._toBeMarshaledMap.size > 0) @@ -2487,7 +2487,7 @@ class EncapsEncoder11 extends EncapsEncoder writeUserException(v) { Debug.assert(v !== null && v !== undefined); - v.__write(this._stream); + v._write(this._stream); } startInstance(sliceType, data) @@ -2722,7 +2722,7 @@ class EncapsEncoder11 extends EncapsEncoder } this._stream.writeSize(1); // Object instance marker. - v.__write(this._stream); + v._iceWrite(this._stream); } } @@ -2965,7 +2965,7 @@ class OutputStream this._encapsStack.start = this._buf.limit; this.writeInt(0); // Placeholder for the encapsulation length. - this._encapsStack.encoding.__write(this); + this._encapsStack.encoding._write(this); } endEncapsulation() @@ -2988,7 +2988,7 @@ class OutputStream { Protocol.checkSupportedEncoding(encoding); this.writeInt(6); // Size - encoding.__write(this); + encoding._write(this); } writeEncapsulation(v) @@ -3187,12 +3187,12 @@ class OutputStream { if(v !== null) { - v.__write(this); + v._write(this); } else { const ident = new Ice.Identity(); - ident.__write(this); + ident._write(this); } } diff --git a/js/src/Ice/Struct.js b/js/src/Ice/Struct.js index 566a3534981..860f2df5795 100644 --- a/js/src/Ice/Struct.js +++ b/js/src/Ice/Struct.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/HashUtil", "../Ice/ArrayUtil", @@ -115,7 +115,7 @@ function memberHashCode(h, e) function hashCode() { - let __h = 5381; + let h = 5381; for(let key in this) { let e = this[key]; @@ -123,9 +123,9 @@ function hashCode() { continue; } - __h = memberHashCode(__h, e); + h = memberHashCode(h, e); } - return __h; + return h; } Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) @@ -142,7 +142,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) obj.prototype.hashCode = hashCode; } - if(obj.prototype.__write && obj.prototype.__read) + if(obj.prototype._write && obj.prototype._read) { obj.write = function(os, v) { @@ -154,7 +154,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) } v = obj.prototype._nullMarshalValue; } - v.__write(os); + v._write(os); }; obj.read = function(is, v) @@ -163,7 +163,7 @@ Ice.Slice.defineStruct = function(obj, legalKeyType, variableLength) { v = new this(); } - v.__read(is); + v._read(is); return v; }; diff --git a/js/src/Ice/TcpEndpointI.js b/js/src/Ice/TcpEndpointI.js index 82a57feba39..f77d9d32c05 100644 --- a/js/src/Ice/TcpEndpointI.js +++ b/js/src/Ice/TcpEndpointI.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/HashUtil", @@ -19,7 +19,7 @@ Ice.__M.require(module, "../Ice/EndpointInfo" ]); -const IceSSL = Ice.__M.require(module, ["../Ice/EndpointInfo"]).IceSSL; +const IceSSL = Ice._ModuleRegistry.require(module, ["../Ice/EndpointInfo"]).IceSSL; const Debug = Ice.Debug; const HashUtil = Ice.HashUtil; diff --git a/js/src/Ice/TcpTransceiver.js b/js/src/Ice/TcpTransceiver.js index 99950fd8aa3..263673e9fac 100644 --- a/js/src/Ice/TcpTransceiver.js +++ b/js/src/Ice/TcpTransceiver.js @@ -10,7 +10,7 @@ const net = require("net"); const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/ExUtil", diff --git a/js/src/Ice/Timer.js b/js/src/Ice/Timer.js index 67d849c5140..ce443917002 100644 --- a/js/src/Ice/Timer.js +++ b/js/src/Ice/Timer.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/LocalException", "../Ice/TimerUtil"]); +Ice._ModuleRegistry.require(module, ["../Ice/LocalException", "../Ice/TimerUtil"]); const CommunicatorDestroyedException = Ice.CommunicatorDestroyedException; diff --git a/js/src/Ice/TimerUtil.js b/js/src/Ice/TimerUtil.js index d525fa22070..96cf5d795c9 100644 --- a/js/src/Ice/TimerUtil.js +++ b/js/src/Ice/TimerUtil.js @@ -20,4 +20,4 @@ Timer.clearInterval = clearInterval; Timer.setImmediate = setImmediate; Ice.Timer = Timer; -module.exports.Ice = Ice;
\ No newline at end of file +module.exports.Ice = Ice; diff --git a/js/src/Ice/TraceUtil.js b/js/src/Ice/TraceUtil.js index 9d52c297d55..5ff722fc753 100644 --- a/js/src/Ice/TraceUtil.js +++ b/js/src/Ice/TraceUtil.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/Protocol", @@ -46,7 +46,7 @@ function printIdentityFacetOperation(s, stream) } const identity = new Identity(); - identity.__read(stream); + identity._read(stream); s.push("\nidentity = " + Ice.identityToString(identity, toStringMode)); const facet = Ice.StringSeqHelper.read(stream); diff --git a/js/src/Ice/UnknownSlicedValue.js b/js/src/Ice/UnknownSlicedValue.js index f653e715345..0464723b99f 100644 --- a/js/src/Ice/UnknownSlicedValue.js +++ b/js/src/Ice/UnknownSlicedValue.js @@ -68,13 +68,13 @@ class UnknownSlicedValue extends Ice.Object return this._unknownTypeId; } - __write(os) + _iceWrite(os) { os.startValue(this._slicedData); os.endValue(); } - __read(is) + _iceRead(is) { is.startValue(); this._slicedData = is.endValue(true); diff --git a/js/src/Ice/WSEndpoint.js b/js/src/Ice/WSEndpoint.js index 150c2092fcf..f61b8c271f5 100644 --- a/js/src/Ice/WSEndpoint.js +++ b/js/src/Ice/WSEndpoint.js @@ -9,7 +9,7 @@ const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/HashUtil", "../Ice/StringUtil", diff --git a/js/src/Ice/WSEndpointFactory.js b/js/src/Ice/WSEndpointFactory.js index 31dca2a0657..17004f15973 100644 --- a/js/src/Ice/WSEndpointFactory.js +++ b/js/src/Ice/WSEndpointFactory.js @@ -51,4 +51,4 @@ class WSEndpointFactory extends WSEndpoint } Ice.WSEndpointFactory = WSEndpointFactory; -exports.Ice = Ice;
\ No newline at end of file +exports.Ice = Ice; diff --git a/js/src/Ice/browser/Debug.js b/js/src/Ice/browser/Debug.js index abb8a59287c..4430c5365fb 100644 --- a/js/src/Ice/browser/Debug.js +++ b/js/src/Ice/browser/Debug.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, ["../Ice/Class", "../Ice/Exception"]); +Ice._ModuleRegistry.require(module, ["../Ice/Class", "../Ice/Exception"]); class AssertionFailedException extends Error { diff --git a/js/src/Ice/browser/ModuleRegistry.js b/js/src/Ice/browser/ModuleRegistry.js index 53ba91aacec..be578f21812 100644 --- a/js/src/Ice/browser/ModuleRegistry.js +++ b/js/src/Ice/browser/ModuleRegistry.js @@ -8,25 +8,25 @@ // ********************************************************************** /* globals self */ -const __root = typeof(window) !== "undefined" ? window : typeof(global) !== "undefined" ? global : typeof(self) !== "undefined" ? self : {}; +const root = typeof(window) !== "undefined" ? window : typeof(global) !== "undefined" ? global : typeof(self) !== "undefined" ? self : {}; /* globals -self */ -class __M +class _ModuleRegistry { static module(name) { - var m = __root[name]; + var m = root[name]; if(m === undefined) { m = {}; - __root[name] = m; + root[name] = m; } return m; } static require(name) { - return __root; + return root; } static type(scoped) @@ -36,7 +36,7 @@ class __M return undefined; } var components = scoped.split("."); - var T = __root; + var T = root; for(var i = 0, length = components.length; i < length; ++i) { @@ -50,12 +50,12 @@ class __M } } -const Ice = __M.module("Ice"); +const Ice = _ModuleRegistry.module("Ice"); -Ice.__require = function() +Ice._require = function() { - return __root; + return root; }; Ice.Slice = Ice.Slice || {}; -Ice.__M = __M; +Ice._ModuleRegistry = _ModuleRegistry; diff --git a/js/src/Ice/browser/WSTransceiver.js b/js/src/Ice/browser/WSTransceiver.js index f90eafa6b87..512639612e4 100644 --- a/js/src/Ice/browser/WSTransceiver.js +++ b/js/src/Ice/browser/WSTransceiver.js @@ -8,7 +8,7 @@ // ********************************************************************** const Ice = require("../Ice/ModuleRegistry").Ice; -Ice.__M.require(module, +Ice._ModuleRegistry.require(module, [ "../Ice/Debug", "../Ice/ExUtil", @@ -20,7 +20,7 @@ Ice.__M.require(module, "../Ice/Timer", "../Ice/ConnectionInfo" ]); -const IceSSL = Ice.__M.module("IceSSL"); +const IceSSL = Ice._ModuleRegistry.module("IceSSL"); // // With Chrome we don't want to close the socket while connection is in progress, diff --git a/js/src/IceGrid/IceGrid.js b/js/src/IceGrid/IceGrid.js index fd05439b1ec..e8294633871 100644 --- a/js/src/IceGrid/IceGrid.js +++ b/js/src/IceGrid/IceGrid.js @@ -7,9 +7,9 @@ // // ********************************************************************** -var __M = require("../Ice/ModuleRegistry").Ice.__M; +var _ModuleRegistry = require("../Ice/ModuleRegistry").Ice._ModuleRegistry; -module.exports.IceGrid = __M.require(module, +module.exports.IceGrid = _ModuleRegistry.require(module, [ "../IceGrid/Admin", "../IceGrid/Descriptor", diff --git a/js/test/Common/TestRunner.js b/js/test/Common/TestRunner.js index 31fc2c77a3b..dbe96418ec3 100644 --- a/js/test/Common/TestRunner.js +++ b/js/test/Common/TestRunner.js @@ -9,8 +9,8 @@ /* global - __test__ : false, - __testBidir__ : false, + _test : false, + _testBidir : false, Test : false, */ @@ -117,9 +117,9 @@ function runTest(testsuite, language, host, protocol, testcases, out) return Ice.Promise.try( function() { - if(typeof(__runServer__) === "undefined" && typeof(__testBidir__) === "undefined") + if(typeof(_runServer) === "undefined" && typeof(_testBidir) === "undefined") { - return __test__(out, id); + return _test(out, id); } communicator = Ice.initialize(); @@ -137,7 +137,7 @@ function runTest(testsuite, language, host, protocol, testcases, out) return; } - if(typeof(__testBidir__) !== "undefined" && client == __testBidir__) + if(typeof(_testBidir) !== "undefined" && client == _testBidir) { out.writeLine("[ running bidir " + testcase.name + " test]"); runTestCase = function() { return controller.runTestCase("cpp", "Ice/echo", "server", language); }; @@ -191,17 +191,17 @@ function runTest(testsuite, language, host, protocol, testcases, out) } var p = Ice.Promise.resolve(); - if(typeof(__runServer__) !== "undefined") + if(typeof(_runServer) !== "undefined") { testcases.forEach(function(testcase) { - p = p.then(function() { return run(testcase, __test__); }) + p = p.then(function() { return run(testcase, _test); }) }); } - if(typeof(__testBidir__) !== "undefined" && language === "cpp") + if(typeof(_testBidir) !== "undefined" && language === "cpp") { testcases.forEach(function(testcase) { - options = typeof(__runEchoServerOptions__) !== "undefined" ? __runEchoServerOptions__ : [] - p = p.then(function() { return run(testcase, __testBidir__); }) + options = typeof(_runEchoServerOptions) !== "undefined" ? _runEchoServerOptions : [] + p = p.then(function() { return run(testcase, _testBidir); }) }); } return p; diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js index ce2a9c18742..56252ba6ad3 100644 --- a/js/test/Common/TestSuite.js +++ b/js/test/Common/TestSuite.js @@ -8,8 +8,8 @@ // ********************************************************************** /* global - __runEchoServerOptions__ : false, - __test__ : false, + _runEchoServerOptions : false, + _test : false, Test : false, URI : false, current : false, diff --git a/js/test/Common/run.js b/js/test/Common/run.js index 44d74e784cd..9f3b3f4ae4c 100755 --- a/js/test/Common/run.js +++ b/js/test/Common/run.js @@ -29,7 +29,7 @@ var id = new Ice.InitializationData(); id.properties = Ice.createProperties(process.argv); exe = process.argv[2] var test = module.require(exe) -test = exe === "ClientBidir" ? test.__testBidir__ : test.__test__; +test = exe === "ClientBidir" ? test._testBidir : test._test; test({write: write, writeLine: writeLine}, id).catch( ex => diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index 0ca42d37584..cb51976b016 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -405,8 +405,8 @@ }); }); }; - exports.__test__ = run; + exports._test = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index 2c36927ce5f..8560dd16941 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -480,9 +480,9 @@ var c = Ice.initialize(id); return Promise.try(() => allTests(out, c)).finally(() => c.destroy()); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js index a9852c6daaa..d87cbde2c1b 100644 --- a/js/test/Ice/ami/Client.js +++ b/js/test/Ice/ami/Client.js @@ -337,7 +337,7 @@ return promise; } - exports.__test__ = function(out, id) + exports._test = function(out, id) { var communicator = Ice.initialize(id); return Promise.try(() => @@ -354,8 +354,8 @@ } }).finally(() => communicator.destroy()); }; - exports.__runServer__ = true; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js index 10426696d38..ff10661f6a6 100644 --- a/js/test/Ice/binding/Client.js +++ b/js/test/Ice/binding/Client.js @@ -1136,7 +1136,7 @@ // // With Chrome on Windows the Webworker is unexpectelly terminated. // - exports.__test__ = function(out, id) + exports._test = function(out, id) { if(isSafari()) { @@ -1150,10 +1150,10 @@ } else { - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/defaultValue/Client.js b/js/test/Ice/defaultValue/Client.js index 0e626fa90e5..8bb07cc221a 100644 --- a/js/test/Ice/defaultValue/Client.js +++ b/js/test/Ice/defaultValue/Client.js @@ -199,8 +199,8 @@ ).then(p.resolve, p.reject); return p; }; - exports.__test__ = run; + exports._test = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/enums/Client.js b/js/test/Ice/enums/Client.js index 05561a9514c..ea03b3ed861 100644 --- a/js/test/Ice/enums/Client.js +++ b/js/test/Ice/enums/Client.js @@ -208,9 +208,9 @@ var c = Ice.initialize(id); return Promise.try(() => allTests(out, c)).finally(() => c.destroy()); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/exceptions/AMDThrowerI.js b/js/test/Ice/exceptions/AMDThrowerI.js index 0260adaa6b3..5f12263fe47 100644 --- a/js/test/Ice/exceptions/AMDThrowerI.js +++ b/js/test/Ice/exceptions/AMDThrowerI.js @@ -159,5 +159,5 @@ exports.AMDThrowerI = AMDThrowerI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js index 2b2c789b9fc..0a4d08ce627 100644 --- a/js/test/Ice/exceptions/Client.js +++ b/js/test/Ice/exceptions/Client.js @@ -472,10 +472,10 @@ } ).finally(() => c.destroy); }; - exports.__test__ = run; - exports.__clientAllTests__ = allTests; - exports.__runServer__ = true; + exports._test = run; + exports._clientAllTests = allTests; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/exceptions/ClientBidir.js b/js/test/Ice/exceptions/ClientBidir.js index 601437862a0..39611914a61 100644 --- a/js/test/Ice/exceptions/ClientBidir.js +++ b/js/test/Ice/exceptions/ClientBidir.js @@ -38,7 +38,7 @@ function(conn) { conn.setAdapter(adapter); - return Client.__clientAllTests__(out, communicator, Test, true); + return Client._clientAllTests(out, communicator, Test, true); }); }); }); @@ -93,9 +93,9 @@ } ); }; - exports.__testBidir__ = run; - exports.__runEchoServerOptions__ = ["Ice.Warn.Dispatch=0", "Ice.Warn.Connections=0"]; + exports._testBidir = run; + exports._runEchoServerOptions = ["Ice.Warn.Dispatch=0", "Ice.Warn.Connections=0"]; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/exceptions/ThrowerI.js b/js/test/Ice/exceptions/ThrowerI.js index 9d1a3492df7..4adb92d3d23 100644 --- a/js/test/Ice/exceptions/ThrowerI.js +++ b/js/test/Ice/exceptions/ThrowerI.js @@ -163,5 +163,5 @@ exports.ThrowerI = ThrowerI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/facets/Client.js b/js/test/Ice/facets/Client.js index 5441bf6b858..2e882b9681b 100644 --- a/js/test/Ice/facets/Client.js +++ b/js/test/Ice/facets/Client.js @@ -235,10 +235,10 @@ } ); }; - exports.__test__ = run; - exports.__clientAllTests__ = allTests; - exports.__runServer__ = true; + exports._test = run; + exports._clientAllTests = allTests; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/facets/ClientBidir.js b/js/test/Ice/facets/ClientBidir.js index 3741b6f59d5..b6c53918e90 100644 --- a/js/test/Ice/facets/ClientBidir.js +++ b/js/test/Ice/facets/ClientBidir.js @@ -123,7 +123,7 @@ function(conn) { conn.setAdapter(adapter); - return Client.__clientAllTests__(out, communicator); + return Client._clientAllTests(out, communicator); }); } ).then(p.resolve, p.reject); @@ -163,8 +163,8 @@ } ); }; - exports.__testBidir__ = run; + exports._testBidir = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/facets/TestI.js b/js/test/Ice/facets/TestI.js index 90cf8a4fc8c..88b393de0b8 100644 --- a/js/test/Ice/facets/TestI.js +++ b/js/test/Ice/facets/TestI.js @@ -71,5 +71,5 @@ }; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/hold/Client.js b/js/test/Ice/hold/Client.js index 02055490d93..51e3bf70c12 100644 --- a/js/test/Ice/hold/Client.js +++ b/js/test/Ice/hold/Client.js @@ -351,9 +351,9 @@ } ); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/import/main.js b/js/test/Ice/import/main.js index c19a4852c84..e7e0871d7c0 100644 --- a/js/test/Ice/import/main.js +++ b/js/test/Ice/import/main.js @@ -54,4 +54,4 @@ communicator.destroy().then( function() { console.log("ok") - });
\ No newline at end of file + }); diff --git a/js/test/Ice/info/Client.js b/js/test/Ice/info/Client.js index b1f743aa130..43f48a38ae2 100644 --- a/js/test/Ice/info/Client.js +++ b/js/test/Ice/info/Client.js @@ -216,9 +216,9 @@ } ); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js index 50f1aac191b..46a767a594f 100644 --- a/js/test/Ice/inheritance/Client.js +++ b/js/test/Ice/inheritance/Client.js @@ -277,10 +277,10 @@ } ); }; - exports.__test__ = run; - exports.__clientAllTests__ = allTests; - exports.__runServer__ = true; + exports._test = run; + exports._clientAllTests = allTests; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/inheritance/ClientBidir.js b/js/test/Ice/inheritance/ClientBidir.js index b06209be418..db1275a5f8f 100644 --- a/js/test/Ice/inheritance/ClientBidir.js +++ b/js/test/Ice/inheritance/ClientBidir.js @@ -30,7 +30,7 @@ function(conn) { conn.setAdapter(adapter); - return Client.__clientAllTests__(out, communicator); + return Client._clientAllTests(out, communicator); }); }); }); @@ -68,8 +68,8 @@ } ); }; - exports.__testBidir__ = run; + exports._testBidir = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/inheritance/InitialI.js b/js/test/Ice/inheritance/InitialI.js index d373cec8008..b5e1b2df80c 100644 --- a/js/test/Ice/inheritance/InitialI.js +++ b/js/test/Ice/inheritance/InitialI.js @@ -211,5 +211,5 @@ exports.InitialI = InitialI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/location/Client.js b/js/test/Ice/location/Client.js index 401e514f7d0..f39a2027a44 100644 --- a/js/test/Ice/location/Client.js +++ b/js/test/Ice/location/Client.js @@ -1254,9 +1254,9 @@ } ); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/number/Client.js b/js/test/Ice/number/Client.js index e571037b266..e2ef5a1da9d 100644 --- a/js/test/Ice/number/Client.js +++ b/js/test/Ice/number/Client.js @@ -53,8 +53,8 @@ out.writeLine("ok"); }); }; - exports.__test__ = run; + exports._test = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index 984613d6866..b9316790309 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -459,9 +459,9 @@ var c = Ice.initialize(id); return Promise.try(() => allTests(out, c)).finally(() => c.destroy()); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/AMDMyDerivedClassI.js b/js/test/Ice/operations/AMDMyDerivedClassI.js index dfc905c6d2c..304c3977af9 100644 --- a/js/test/Ice/operations/AMDMyDerivedClassI.js +++ b/js/test/Ice/operations/AMDMyDerivedClassI.js @@ -524,5 +524,5 @@ exports.AMDMyDerivedClassI = AMDMyDerivedClassI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/BatchOneways.js b/js/test/Ice/operations/BatchOneways.js index 35b61922f18..d3a66fa51c1 100644 --- a/js/test/Ice/operations/BatchOneways.js +++ b/js/test/Ice/operations/BatchOneways.js @@ -102,5 +102,5 @@ exports.BatchOneways = { run: run }; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/Client.js b/js/test/Ice/operations/Client.js index b99ac8dfa9e..0a540610d8c 100644 --- a/js/test/Ice/operations/Client.js +++ b/js/test/Ice/operations/Client.js @@ -67,10 +67,10 @@ ).then(cl => cl.shutdown() ).finally(() => c.destroy()); }; - exports.__test__ = run; - exports.__clientAllTests__ = allTests; - exports.__runServer__ = true; + exports._test = run; + exports._clientAllTests = allTests; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/ClientBidir.js b/js/test/Ice/operations/ClientBidir.js index 0ed0a1c14c8..6cd399a346e 100644 --- a/js/test/Ice/operations/ClientBidir.js +++ b/js/test/Ice/operations/ClientBidir.js @@ -33,7 +33,7 @@ return base.ice_getConnection().then(conn => { conn.setAdapter(adapter); - return Client.__clientAllTests__(out, communicator, Test, true); + return Client._clientAllTests(out, communicator, Test, true); }); }); }; @@ -63,8 +63,8 @@ ).then(prx => prx.shutdown() ).finally(() => communicator.destroy()); }; - exports.__testBidir__ = run; + exports._testBidir = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/MyDerivedClassI.js b/js/test/Ice/operations/MyDerivedClassI.js index a061a1a1dd2..ec68ac10cd1 100644 --- a/js/test/Ice/operations/MyDerivedClassI.js +++ b/js/test/Ice/operations/MyDerivedClassI.js @@ -517,5 +517,5 @@ exports.MyDerivedClassI = MyDerivedClassI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/Oneways.js b/js/test/Ice/operations/Oneways.js index 7664a52a85d..34e5482524d 100644 --- a/js/test/Ice/operations/Oneways.js +++ b/js/test/Ice/operations/Oneways.js @@ -91,6 +91,6 @@ exports.Oneways = { run: run }; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/operations/Twoways.js b/js/test/Ice/operations/Twoways.js index d6e82e22041..69ef80fc852 100644 --- a/js/test/Ice/operations/Twoways.js +++ b/js/test/Ice/operations/Twoways.js @@ -1617,5 +1617,5 @@ exports.Twoways = { run: run }; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/optional/AMDInitialI.js b/js/test/Ice/optional/AMDInitialI.js index c86014914e2..5f5b84273f0 100644 --- a/js/test/Ice/optional/AMDInitialI.js +++ b/js/test/Ice/optional/AMDInitialI.js @@ -346,5 +346,5 @@ exports.AMDInitialI = AMDInitialI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js index 64c83163943..f814a204879 100644 --- a/js/test/Ice/optional/Client.js +++ b/js/test/Ice/optional/Client.js @@ -1070,10 +1070,10 @@ var c = Ice.initialize(id); return Promise.try(() => allTests(out, c, Test)).finally(() => c.destroy()); }; - exports.__clientAllTests__ = allTests; - exports.__test__ = run; - exports.__runServer__ = true; + exports._clientAllTests = allTests; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/optional/ClientBidir.js b/js/test/Ice/optional/ClientBidir.js index 92ad845369d..21dfb37ab47 100644 --- a/js/test/Ice/optional/ClientBidir.js +++ b/js/test/Ice/optional/ClientBidir.js @@ -39,7 +39,7 @@ return base.ice_getConnection().then(conn => { conn.setAdapter(adapter); - return Client.__clientAllTests__(out, communicator, Test); + return Client._clientAllTests(out, communicator, Test); }); }); }; @@ -76,8 +76,8 @@ } }); }; - exports.__testBidir__ = run; + exports._testBidir = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/optional/InitialI.js b/js/test/Ice/optional/InitialI.js index 99b326a45bd..2e7aed5e5cc 100644 --- a/js/test/Ice/optional/InitialI.js +++ b/js/test/Ice/optional/InitialI.js @@ -341,5 +341,5 @@ exports.InitialI = InitialI; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js index 7e86e7c643a..03bb79ed56d 100644 --- a/js/test/Ice/properties/Client.js +++ b/js/test/Ice/properties/Client.js @@ -97,8 +97,8 @@ } ).then(() => out.writeLine("ok")); }; - exports.__test__ = run; + exports._test = run; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index 1d5c6cc7fec..ab86fc63f1e 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -1116,9 +1116,9 @@ var communicator = Ice.initialize(id); return Promise.try(() => allTests(communicator, out)).finally(() => communicator.destroy()); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/retry/Client.js b/js/test/Ice/retry/Client.js index ee6bd556d83..c0cd7d827cc 100644 --- a/js/test/Ice/retry/Client.js +++ b/js/test/Ice/retry/Client.js @@ -149,9 +149,9 @@ return c.destroy(); }); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/slicing/exceptions/Client.js b/js/test/Ice/slicing/exceptions/Client.js index 061d406fdf8..08dcb276231 100644 --- a/js/test/Ice/slicing/exceptions/Client.js +++ b/js/test/Ice/slicing/exceptions/Client.js @@ -272,9 +272,9 @@ }); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/slicing/objects/Client.js b/js/test/Ice/slicing/objects/Client.js index 6e9c8d9eef4..5cd241029ce 100644 --- a/js/test/Ice/slicing/objects/Client.js +++ b/js/test/Ice/slicing/objects/Client.js @@ -821,9 +821,9 @@ }); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js index ec20772d85e..62790d63f54 100644 --- a/js/test/Ice/timeout/Client.js +++ b/js/test/Ice/timeout/Client.js @@ -332,9 +332,9 @@ } ).finally(() => c.destroy()); }; - exports.__test__ = run; - exports.__runServer__ = true; + exports._test = run; + exports._runServer = true; } (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined, - typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require, + typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice._require, typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? exports : this)); |