diff options
27 files changed, 244 insertions, 240 deletions
diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp index 70ed6d28960..376eb8d3e7d 100644 --- a/cpp/src/slice2matlab/Main.cpp +++ b/cpp/src/slice2matlab/Main.cpp @@ -65,7 +65,7 @@ lookupKwd(const string& name) bool found = binary_search(&keywordList[0], &keywordList[sizeof(keywordList) / sizeof(*keywordList)], name); - return found ? "slice_" + name : name; + return found ? name + "_" : name; } // @@ -144,6 +144,29 @@ fixIdent(const string& ident) } string +fixOp(const string& name) +{ + assert(name[0] != ':'); + + // + // An operation name must be escaped if it matches any of the identifiers in this list, in addition to the + // MATLAB language keywords. The identifiers below represent the names of methods inherited from ObjectPrx + // and handle. + // + // *Must* be kept in alphabetical order. + // + static const string idList[] = + { + "addlistener", "checkedCast", "delete", "eq", "findobj", "findprop", "ge", "gt", "isvalid", "le", "listener", + "lt", "ne", "notify", "uncheckedCast" + }; + bool found = binary_search(&idList[0], + &idList[sizeof(idList) / sizeof(*idList)], + name); + return found ? name + "_" : fixIdent(name); +} + +string fixExceptionMemberIdent(const string& ident) { // @@ -990,17 +1013,17 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) if(preserved && !basePreserved) { - out << nl << "function iceWrite_(obj, os)"; + out << nl << "function iceWrite(obj, os)"; out.inc(); out << nl << "os.startValue(obj.iceSlicedData_);"; - out << nl << "obj.iceWriteImpl_(os);"; + out << nl << "obj.iceWriteImpl(os);"; out << nl << "os.endValue();"; out.dec(); out << nl << "end"; - out << nl << "function iceRead_(obj, is)"; + out << nl << "function iceRead(obj, is)"; out.inc(); out << nl << "is.startValue();"; - out << nl << "obj.iceReadImpl_(is);"; + out << nl << "obj.iceReadImpl(is);"; out << nl << "obj.iceSlicedData_ = is.endValue(true);"; out.dec(); out << nl << "end"; @@ -1008,12 +1031,12 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) if(!convertMembers.empty()) { - out << nl << "function r = iceDelayPostUnmarshal_(obj)"; + out << nl << "function r = iceDelayPostUnmarshal(obj)"; out.inc(); out << nl << "r = true;"; out.dec(); out << nl << "end"; - out << nl << "function icePostUnmarshal_(obj)"; + out << nl << "function icePostUnmarshal(obj)"; out.inc(); for(DataMemberList::const_iterator d = convertMembers.begin(); d != convertMembers.end(); ++d) { @@ -1022,7 +1045,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } if(base) { - out << nl << "icePostUnmarshal_@" << getAbsolute(base) << "(obj);"; + out << nl << "icePostUnmarshal@" << getAbsolute(base) << "(obj);"; } out.dec(); out << nl << "end"; @@ -1037,7 +1060,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) const DataMemberList optionalMembers = p->orderedOptionalDataMembers(); - out << nl << "function iceWriteImpl_(obj, os)"; + out << nl << "function iceWriteImpl(obj, os)"; out.inc(); out << nl << "os.startSlice('" << scoped << "', " << p->compactId() << (!base ? ", true" : ", false") << ");"; @@ -1055,11 +1078,11 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "os.endSlice();"; if(base) { - out << nl << "iceWriteImpl_@" << getAbsolute(base) << "(obj, os);"; + out << nl << "iceWriteImpl@" << getAbsolute(base) << "(obj, os);"; } out.dec(); out << nl << "end"; - out << nl << "function iceReadImpl_(obj, is)"; + out << nl << "function iceReadImpl(obj, is)"; out.inc(); out << nl << "is.startSlice();"; for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) @@ -1068,8 +1091,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { if(isClass((*d)->type())) { - unmarshal(out, "is", "@obj.iceSetMember_" + fixIdent((*d)->name()) + "_", (*d)->type(), false, - 0); + unmarshal(out, "is", "@obj.iceSetMember_" + fixIdent((*d)->name()), (*d)->type(), false, 0); } else { @@ -1081,7 +1103,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { if(isClass((*d)->type())) { - unmarshal(out, "is", "@obj.iceSetMember_" + fixIdent((*d)->name()) + "_", (*d)->type(), true, + unmarshal(out, "is", "@obj.iceSetMember_" + fixIdent((*d)->name()), (*d)->type(), true, (*d)->tag()); } else @@ -1092,7 +1114,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "is.endSlice();"; if(base) { - out << nl << "iceReadImpl_@" << getAbsolute(base) << "(obj, is);"; + out << nl << "iceReadImpl@" << getAbsolute(base) << "(obj, is);"; } out.dec(); out << nl << "end"; @@ -1101,13 +1123,13 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) if(!classMembers.empty()) { // - // For each class data member, we generate a "set_<name>_" method that is called when the instance - // is eventually unmarshaled. + // For each class data member, we generate an "iceSetMember_<name>" method that is called when the + // instance is eventually unmarshaled. // for(DataMemberList::const_iterator d = classMembers.begin(); d != classMembers.end(); ++d) { string m = fixIdent((*d)->name()); - out << nl << "function iceSetMember_" << m << "_(obj, v)"; + out << nl << "function iceSetMember_" << m << "(obj, v)"; out.inc(); out << nl << "obj." << m << " = v;"; out.dec(); @@ -1166,7 +1188,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << outParams.begin()->fixedName << " = "; } - out << fixIdent(op->name()) << spar << "obj_"; + out << fixOp(op->name()) << spar << "obj_"; const ParamInfoList inParams = getAllInParams(op); for(ParamInfoList::const_iterator r = inParams.begin(); r != inParams.end(); ++r) { @@ -1314,7 +1336,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << allOutParams.begin()->fixedName << " = "; } - out << fixIdent(op->name()) << spar; + out << fixOp(op->name()) << spar; out << self; for(ParamInfoList::const_iterator r = allInParams.begin(); r != allInParams.end(); ++r) @@ -1329,11 +1351,11 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { if(op->format() == DefaultFormat) { - out << nl << "os_ = " << self << ".startWriteParams_([]);"; + out << nl << "os_ = " << self << ".iceStartWriteParams([]);"; } else { - out << nl << "os_ = " << self << ".startWriteParams_(" << getFormatType(op->format()) << ");"; + out << nl << "os_ = " << self << ".iceStartWriteParams(" << getFormatType(op->format()) << ");"; } for(ParamInfoList::const_iterator r = requiredInParams.begin(); r != requiredInParams.end(); ++r) { @@ -1347,7 +1369,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << nl << "os_.writePendingValues();"; } - out << nl << self << ".endWriteParams_(os_);"; + out << nl << self << ".iceEndWriteParams(os_);"; } out << nl; @@ -1355,7 +1377,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << "is_ = "; } - out << self << ".invoke_('" << op->name() << "', " + out << self << ".iceInvoke('" << op->name() << "', " << getOperationMode(op->sendMode()) << ", " << (twowayOnly ? "true" : "false") << ", " << (allInParams.empty() ? "[]" : "os_") << ", " << (!allOutParams.empty() ? "true" : "false"); if(exceptions.empty()) @@ -1364,7 +1386,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } else { - out << ", " << prxAbs << "." << op->name() << "__ex"; + out << ", " << prxAbs << "." << op->name() << "_ex_"; } out << ", varargin{:});"; @@ -1476,7 +1498,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) // // Asynchronous method. // - out << nl << "function r_ = " << fixIdent(op->name()) << "Async" << spar; + out << nl << "function r_ = " << op->name() << "Async" << spar; out << self; for(ParamInfoList::const_iterator r = allInParams.begin(); r != allInParams.end(); ++r) { @@ -1490,11 +1512,11 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { if(op->format() == DefaultFormat) { - out << nl << "os_ = " << self << ".startWriteParams_([]);"; + out << nl << "os_ = " << self << ".iceStartWriteParams([]);"; } else { - out << nl << "os_ = " << self << ".startWriteParams_(" << getFormatType(op->format()) << ");"; + out << nl << "os_ = " << self << ".iceStartWriteParams(" << getFormatType(op->format()) << ");"; } for(ParamInfoList::const_iterator r = requiredInParams.begin(); r != requiredInParams.end(); ++r) { @@ -1508,7 +1530,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << nl << "os_.writePendingValues();"; } - out << nl << self << ".endWriteParams_(os_);"; + out << nl << self << ".iceEndWriteParams(os_);"; } if(twowayOnly && !allOutParams.empty()) @@ -1618,7 +1640,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "end"; } - out << nl << "r_ = " << self << ".invokeAsync_('" << op->name() << "', " + out << nl << "r_ = " << self << ".iceInvokeAsync('" << op->name() << "', " << getOperationMode(op->sendMode()) << ", " << (twowayOnly ? "true" : "false") << ", " << (allInParams.empty() ? "[]" : "os_") << ", " << allOutParams.size() << ", " << (twowayOnly && !allOutParams.empty() ? "@unmarshal" : "[]"); @@ -1628,7 +1650,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } else { - out << ", " << prxAbs << "." << op->name() << "__ex"; + out << ", " << prxAbs << "." << op->name() << "_ex_"; } out << ", varargin{:});"; @@ -1653,13 +1675,13 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "end"; out << nl << "function r = checkedCast(p, varargin)"; out.inc(); - out << nl << "r = Ice.ObjectPrx.checkedCast_(p, " << prxAbs << ".ice_staticId(), '" << prxAbs + out << nl << "r = Ice.ObjectPrx.iceCheckedCast(p, " << prxAbs << ".ice_staticId(), '" << prxAbs << "', varargin{:});"; out.dec(); out << nl << "end"; out << nl << "function r = uncheckedCast(p, varargin)"; out.inc(); - out << nl << "r = Ice.ObjectPrx.uncheckedCast_(p, '" << prxAbs << "', varargin{:});"; + out << nl << "r = Ice.ObjectPrx.iceUncheckedCast(p, '" << prxAbs << "', varargin{:});"; out.dec(); out << nl << "end"; out.dec(); @@ -1717,7 +1739,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) if(!exceptions.empty()) { - out << nl << op->name() << "__ex = { "; + out << nl << op->name() << "_ex_ = { "; for(ExceptionList::const_iterator e = exceptions.begin(); e != exceptions.end(); ++e) { if(e != exceptions.begin()) @@ -1795,7 +1817,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p) { out << outParams.begin()->fixedName << " = "; } - out << fixIdent(op->name()) << spar; + out << fixOp(op->name()) << spar; string self = "obj"; const ParamInfoList inParams = getAllInParams(op); for(ParamInfoList::const_iterator r = outParams.begin(); r != outParams.end(); ++r) @@ -1998,10 +2020,10 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p) // // Override read_ for the first exception in the hierarchy that has the "preserve-slice" metadata. // - out << nl << "function obj = read_(obj, is)"; + out << nl << "function obj = iceRead(obj, is)"; out.inc(); out << nl << "is.startException();"; - out << nl << "obj = obj.readImpl_(is);"; + out << nl << "obj = obj.iceReadImpl(is);"; out << nl << "obj.iceSlicedData_ = is.endException(true);"; out.dec(); out << nl << "end"; @@ -2009,7 +2031,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p) if(!classMembers.empty() || !convertMembers.empty()) { - out << nl << "function obj = postUnmarshal_(obj)"; + out << nl << "function obj = icePostUnmarshal(obj)"; out.inc(); for(DataMemberList::const_iterator q = classMembers.begin(); q != classMembers.end(); ++q) { @@ -2023,7 +2045,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p) } if(base && base->usesClasses(true)) { - out << nl << "obj = postUnmarshal_@" << getAbsolute(base) << "(obj);"; + out << nl << "obj = icePostUnmarshal@" << getAbsolute(base) << "(obj);"; } out.dec(); out << nl << "end"; @@ -2036,7 +2058,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p) out << nl << "methods(Access=protected)"; out.inc(); - out << nl << "function obj = readImpl_(obj, is)"; + out << nl << "function obj = iceReadImpl(obj, is)"; out.inc(); out << nl << "is.startSlice();"; for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q) @@ -2072,7 +2094,7 @@ CodeVisitor::visitExceptionStart(const ExceptionPtr& p) out << nl << "is.endSlice();"; if(base) { - out << nl << "obj = readImpl_@" << getAbsolute(base) << "(obj, is);"; + out << nl << "obj = iceReadImpl@" << getAbsolute(base) << "(obj, is);"; } out.dec(); out << nl << "end"; diff --git a/matlab/lib/+Ice/Communicator.m b/matlab/lib/+Ice/Communicator.m index c79c70cb7a0..f608e5b7b9c 100644 --- a/matlab/lib/+Ice/Communicator.m +++ b/matlab/lib/+Ice/Communicator.m @@ -30,17 +30,17 @@ classdef Communicator < IceInternal.WrapperObject end end function destroy(obj) - obj.call_('destroy'); + obj.iceCall('destroy'); end function f = destroyAsync(obj) future = libpointer('voidPtr'); - obj.call_('destroyAsync', future); + obj.iceCall('destroyAsync', future); assert(~isNull(future)); - f = Ice.Future(future, 'destroy', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check')); + f = Ice.Future(future, 'destroy', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check')); end function r = stringToProxy(obj, str) impl = libpointer('voidPtr'); - obj.call_('stringToProxy', str, impl); + obj.iceCall('stringToProxy', str, impl); if isNull(impl) r = []; else @@ -58,7 +58,7 @@ classdef Communicator < IceInternal.WrapperObject end function r = propertyToProxy(obj, prop) impl = libpointer('voidPtr'); - obj.call_('propertyToProxy', prop, impl); + obj.iceCall('propertyToProxy', prop, impl); if isNull(impl) r = []; else @@ -71,16 +71,16 @@ classdef Communicator < IceInternal.WrapperObject elseif ~isa(proxy, 'Ice.ObjectPrx') throw(MException('Ice:ArgumentException', 'expecting a proxy')); else - r = obj.callWithResult_('proxyToProperty', proxy.getImpl_(), prop); + r = obj.iceCallWithResult('proxyToProperty', proxy.iceGetImpl(), prop); end end function r = identityToString(obj, id) - r = obj.callWithResult_('identityToString', id); + r = obj.iceCallWithResult('identityToString', id); end function r = getProperties(obj) if isempty(obj.properties_) impl = libpointer('voidPtr'); - obj.call_('getProperties', impl); + obj.iceCall('getProperties', impl); obj.properties_ = Ice.Properties(impl); end r = obj.properties_; @@ -88,14 +88,14 @@ classdef Communicator < IceInternal.WrapperObject function r = getLogger(obj) if isempty(obj.logger) impl = libpointer('voidPtr'); - obj.call_('getLogger', impl); + obj.iceCall('getLogger', impl); obj.logger = Ice.Logger(impl); end r = obj.logger; end function r = getDefaultRouter(obj) impl = libpointer('voidPtr'); - obj.call_('getDefaultRouter', impl); + obj.iceCall('getDefaultRouter', impl); if ~isNull(impl) r = Ice.RouterPrx(impl, obj); else @@ -108,13 +108,13 @@ classdef Communicator < IceInternal.WrapperObject elseif ~isa(proxy, 'Ice.RouterPrx') throw(MException('Ice:ArgumentException', 'expecting a router proxy')); else - impl = proxy.getImpl_(); + impl = proxy.iceGetImpl(); end - obj.call_('setDefaultRouter', impl); + obj.iceCall('setDefaultRouter', impl); end function r = getDefaultLocator(obj) impl = libpointer('voidPtr'); - obj.call_('getDefaultLocator', impl); + obj.iceCall('getDefaultLocator', impl); if ~isNull(impl) r = Ice.LocatorPrx(impl, obj); else @@ -127,21 +127,21 @@ classdef Communicator < IceInternal.WrapperObject elseif ~isa(proxy, 'Ice.LocatorPrx') throw(MException('Ice:ArgumentException', 'expecting a locator proxy')); else - impl = proxy.getImpl_(); + impl = proxy.iceGetImpl(); end - obj.call_('setDefaultLocator', impl); + obj.iceCall('setDefaultLocator', impl); end function r = getValueFactoryManager(obj) r = obj.initData.valueFactoryManager; end function flushBatchRequests(obj, mode) - obj.call_('flushBatchRequests', mode); + obj.iceCall('flushBatchRequests', mode); end function f = flushBatchRequestsAsync(obj, mode) future = libpointer('voidPtr'); - obj.call_('flushBatchRequestsAsync', mode, future); + obj.iceCall('flushBatchRequestsAsync', mode, future); assert(~isNull(future)); - r = Ice.Future(future, 'flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check')); + r = Ice.Future(future, 'flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check')); end function r = getClassResolver(obj) if isempty(obj.classResolver) % Lazy initialization. diff --git a/matlab/lib/+Ice/Connection.m b/matlab/lib/+Ice/Connection.m index 7d747d9a2fa..1162c7e3853 100755 --- a/matlab/lib/+Ice/Connection.m +++ b/matlab/lib/+Ice/Connection.m @@ -31,45 +31,45 @@ classdef Connection < IceInternal.WrapperObject %
% Call into C++ to compare the two objects.
%
- r = obj.callWithResult_('equals', other.impl_);
+ r = obj.iceCallWithResult('equals', other.impl_);
end
end
function close(obj, mode)
- obj.call_('close', mode);
+ obj.iceCall('close', mode);
end
function f = closeAsync(obj)
future = libpointer('voidPtr');
- obj.call_('closeAsync', future);
+ obj.iceCall('closeAsync', future);
assert(~isNull(future));
- f = Ice.Future(future, 'close', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check'));
+ f = Ice.Future(future, 'close', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check'));
end
function r = createProxy(obj, id)
proxy = libpointer('voidPtr');
- obj.call_('createProxy', id, proxy);
+ obj.iceCall('createProxy', id, proxy);
r = Ice.ObjectPrx(obj.communicator, obj.communicator.getEncoding(), proxy);
end
function r = getEndpoint(obj)
endpoint = libpointer('voidPtr');
- obj.call_('getEndpoint', endpoint);
+ obj.iceCall('getEndpoint', endpoint);
r = Ice.Endpoint(endpoint);
end
function flushBatchRequests(obj, compress)
- obj.call_('flushBatchRequests', compress);
+ obj.iceCall('flushBatchRequests', compress);
end
function r = flushBatchRequestsAsync(obj)
future = libpointer('voidPtr');
- obj.call_('flushBatchRequestsAsync', future);
+ obj.iceCall('flushBatchRequestsAsync', future);
assert(~isNull(future));
- r = Ice.Future(future, 'flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check'));
+ r = Ice.Future(future, 'flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check'));
end
function heartbeat(obj)
- obj.call_('heartbeat');
+ obj.iceCall('heartbeat');
end
function r = heartbeatAsync(obj)
future = libpointer('voidPtr');
- obj.call_('heartbeatAsync', future);
+ obj.iceCall('heartbeatAsync', future);
assert(~isNull(future));
- r = Ice.Future(future, 'heartbeat', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check'));
+ r = Ice.Future(future, 'heartbeat', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check'));
end
function setACM(obj, timeout, close, heartbeat)
if timeout == Ice.Unset
@@ -81,10 +81,10 @@ classdef Connection < IceInternal.WrapperObject if heartbeat == Ice.Unset
heartbeat = [];
end
- obj.call_('setACM', timeout, close, heartbeat);
+ obj.iceCall('setACM', timeout, close, heartbeat);
end
function r = getACM(obj)
- r = obj.callWithResult_('getACM');
+ r = obj.iceCallWithResult('getACM');
if isempty(r.timeout)
r.timeout = Ice.Unset;
end
@@ -96,23 +96,23 @@ classdef Connection < IceInternal.WrapperObject end
end
function r = type(obj)
- r = obj.callWithResult_('type');
+ r = obj.iceCallWithResult('type');
end
function r = timeout(obj)
- r = obj.callWithResult_('timeout');
+ r = obj.iceCallWithResult('timeout');
end
function r = toString(obj)
- r = obj.callWithResult_('toString');
+ r = obj.iceCallWithResult('toString');
end
function r = getInfo(obj)
- info = obj.callWithResult_('getInfo');
+ info = obj.iceCallWithResult('getInfo');
r = obj.createConnectionInfo(info);
end
function setBufferSize(obj, rcvSize, sndSize)
- obj.call_('setBufferSize', rcvSize, sndSize);
+ obj.iceCall('setBufferSize', rcvSize, sndSize);
end
function throwException(obj)
- obj.call_('throwException');
+ obj.iceCall('throwException');
end
end
diff --git a/matlab/lib/+Ice/Endpoint.m b/matlab/lib/+Ice/Endpoint.m index 4bf46ea2c82..51771a29d46 100755 --- a/matlab/lib/+Ice/Endpoint.m +++ b/matlab/lib/+Ice/Endpoint.m @@ -27,14 +27,14 @@ classdef Endpoint < IceInternal.WrapperObject %
% Call into C++ to compare the two objects.
%
- r = obj.callWithResult_('equals', other.impl_);
+ r = obj.iceCallWithResult('equals', other.impl_);
end
end
function r = toString(obj)
- r = obj.callWithResult_('toString');
+ r = obj.iceCallWithResult('toString');
end
function r = getInfo(obj)
- info = obj.callWithResult_('getInfo');
+ info = obj.iceCallWithResult('getInfo');
r = obj.createEndpointInfo(info);
end
end
diff --git a/matlab/lib/+Ice/Future.m b/matlab/lib/+Ice/Future.m index 10575e0fc5f..1e788f08f5b 100644 --- a/matlab/lib/+Ice/Future.m +++ b/matlab/lib/+Ice/Future.m @@ -41,14 +41,14 @@ classdef Future < IceInternal.WrapperObject end function delete(obj) if ~isempty(obj.impl_) - obj.call_('_release'); + obj.iceCall('unref'); end obj.impl_ = []; end function ok = wait(obj) if ~isempty(obj.impl_) okPtr = libpointer('uint8Ptr', 0); % Output param - obj.call_('wait', okPtr); + obj.iceCall('wait', okPtr); ok = okPtr.Value == 1; else ok = true; @@ -75,12 +75,12 @@ classdef Future < IceInternal.WrapperObject end function cancel(obj) if ~isempty(obj.impl_) - obj.call_('cancel'); + obj.iceCall('cancel'); end end function r = get.State(obj) if ~isempty(obj.impl_) - obj.State = obj.callWithResult_('state'); + obj.State = obj.iceCallWithResult('state'); r = obj.State; else r = 'finished'; diff --git a/matlab/lib/+Ice/InterfaceByValue.m b/matlab/lib/+Ice/InterfaceByValue.m index dd79318cb35..4c79fa8e0b0 100644 --- a/matlab/lib/+Ice/InterfaceByValue.m +++ b/matlab/lib/+Ice/InterfaceByValue.m @@ -19,11 +19,11 @@ classdef InterfaceByValue < Ice.Value end end methods(Access=protected) - function iceWriteImpl_(obj, os) + function iceWriteImpl(obj, os) os.startSlice(obj.id, -1, true); os.endSlice(); end - function iceReadImpl_(obj, is) + function iceReadImpl(obj, is) is.startSlice(); is.endSlice(); end diff --git a/matlab/lib/+Ice/Logger.m b/matlab/lib/+Ice/Logger.m index e5ce7a357c1..5dc5facc0e3 100644 --- a/matlab/lib/+Ice/Logger.m +++ b/matlab/lib/+Ice/Logger.m @@ -18,23 +18,23 @@ classdef Logger < IceInternal.WrapperObject obj = obj@IceInternal.WrapperObject(impl); end function print(obj, message) - obj.call_('print', message); + obj.iceCall('print', message); end function trace(obj, category, message) - obj.call_('trace', category, message); + obj.iceCall('trace', category, message); end function warning(obj, message) - obj.call_('warning', message); + obj.iceCall('warning', message); end function error(obj, message) - obj.call_('error', message); + obj.iceCall('error', message); end function r = getPrefix(obj) - r = obj.callWithResult_('getPrefix'); + r = obj.iceCallWithResult('getPrefix'); end function r = cloneWithPrefix(obj, prefix) impl = libpointer('voidPtr'); - obj.call_('cloneWithPrefix', prefix, impl); + obj.iceCall('cloneWithPrefix', prefix, impl); if isNull(impl) r = obj; else diff --git a/matlab/lib/+Ice/ObjectPrx.m b/matlab/lib/+Ice/ObjectPrx.m index fa41016b7e5..a92027f2218 100644 --- a/matlab/lib/+Ice/ObjectPrx.m +++ b/matlab/lib/+Ice/ObjectPrx.m @@ -20,13 +20,13 @@ classdef ObjectPrx < IceInternal.WrapperObject end if ~isempty(impl) - obj.isTwoway = obj.callWithResult_('ice_isTwoway'); + obj.isTwoway = obj.iceCallWithResult('ice_isTwoway'); end end function delete(obj) if ~isempty(obj.impl_) - obj.call_('_release'); + obj.iceCall('unref'); obj.impl_ = []; end end @@ -48,7 +48,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % obj.instantiate_(); other.instantiate_(); - r = obj.callWithResult_('equals', other.impl_); + r = obj.iceCallWithResult('equals', other.impl_); end end @@ -58,7 +58,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_toString(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_toString'); + r = obj.iceCallWithResult('ice_toString'); end function r = ice_getCommunicator(obj) @@ -66,37 +66,37 @@ classdef ObjectPrx < IceInternal.WrapperObject end function ice_ping(obj, varargin) - obj.invoke_('ice_ping', 1, false, [], false, {}, varargin{:}); + obj.iceInvoke('ice_ping', 1, false, [], false, {}, varargin{:}); end function r = ice_pingAsync(obj, varargin) - r = obj.invokeAsync_('ice_ping', 1, false, [], 0, [], {}, varargin{:}); + r = obj.iceInvokeAsync('ice_ping', 1, false, [], 0, [], {}, varargin{:}); end function r = ice_isA(obj, id, varargin) - os = obj.startWriteParams_([]); + os = obj.iceStartWriteParams([]); os.writeString(id); - obj.endWriteParams_(os); - is = obj.invoke_('ice_isA', 1, true, os, true, {}, varargin{:}); + obj.iceEndWriteParams(os); + is = obj.iceInvoke('ice_isA', 1, true, os, true, {}, varargin{:}); is.startEncapsulation(); r = is.readBool(); is.endEncapsulation(); end function r = ice_isAAsync(obj, id, varargin) - os = obj.startWriteParams_([]); + os = obj.iceStartWriteParams([]); os.writeString(id); - obj.endWriteParams_(os); + obj.iceEndWriteParams(os); function varargout = unmarshal(is) is.startEncapsulation(); varargout{1} = is.readBool(); is.endEncapsulation(); end - r = obj.invokeAsync_('ice_isA', 1, true, os, 1, @unmarshal, {}, varargin{:}); + r = obj.iceInvokeAsync('ice_isA', 1, true, os, 1, @unmarshal, {}, varargin{:}); end function r = ice_id(obj, varargin) - is = obj.invoke_('ice_id', 1, true, [], true, {}, varargin{:}); + is = obj.iceInvoke('ice_id', 1, true, [], true, {}, varargin{:}); is.startEncapsulation(); r = is.readString(); is.endEncapsulation(); @@ -108,11 +108,11 @@ classdef ObjectPrx < IceInternal.WrapperObject varargout{1} = is.readString(); is.endEncapsulation(); end - r = obj.invokeAsync_('ice_id', 1, true, [], 1, @unmarshal, {}, varargin{:}); + r = obj.iceInvokeAsync('ice_id', 1, true, [], 1, @unmarshal, {}, varargin{:}); end function r = ice_ids(obj, varargin) - is = obj.invoke_('ice_ids', 1, true, [], true, {}, varargin{:}); + is = obj.iceInvoke('ice_ids', 1, true, [], true, {}, varargin{:}); is.startEncapsulation(); r = is.readStringSeq(); is.endEncapsulation(); @@ -124,12 +124,12 @@ classdef ObjectPrx < IceInternal.WrapperObject varargout{1} = is.readStringSeq(); is.endEncapsulation(); end - r = obj.invokeAsync_('ice_ids', 1, true, [], 1, @unmarshal, {}, varargin{:}); + r = obj.iceInvokeAsync('ice_ids', 1, true, [], 1, @unmarshal, {}, varargin{:}); end function r = ice_getIdentity(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getIdentity'); + r = obj.iceCallWithResult('ice_getIdentity'); end function r = ice_identity(obj, id) @@ -138,7 +138,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getContext(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getContext'); + r = obj.iceCallWithResult('ice_getContext'); end function r = ice_context(obj, ctx) @@ -147,7 +147,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getFacet(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getFacet'); + r = obj.iceCallWithResult('ice_getFacet'); end function r = ice_facet(obj, f) @@ -156,7 +156,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getAdapterId(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getAdapterId'); + r = obj.iceCallWithResult('ice_getAdapterId'); end function r = ice_adapterId(obj, id) @@ -165,11 +165,11 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getEndpoints(obj) obj.instantiate_(); - num = obj.callWithResult_('ice_getNumEndpoints'); + num = obj.iceCallWithResult('ice_getNumEndpoints'); r = {}; for i = 1:num impl = libpointer('voidPtr'); - e = obj.callWithResult_('ice_getEndpoint', i - 1, impl); % C-style index + e = obj.iceCallWithResult('ice_getEndpoint', i - 1, impl); % C-style index assert(~isNull(impl)); r{i} = Ice.Endpoint(impl); end @@ -187,16 +187,16 @@ classdef ObjectPrx < IceInternal.WrapperObject end end arr = libpointer('voidPtr'); - obj.call_('ice_createEndpointList', length(endpts), arr); + obj.iceCall('ice_createEndpointList', length(endpts), arr); for i = 1:length(endpts) - obj.call_('ice_setEndpoint', arr, i - 1, endpts{i}.impl_); % C-style index + obj.iceCall('ice_setEndpoint', arr, i - 1, endpts{i}.impl_); % C-style index end r = obj.factory_('ice_endpoints', true, arr); % The C function also destroys the temporary array. end function r = ice_getLocatorCacheTimeout(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getLocatorCacheTimeout'); + r = obj.iceCallWithResult('ice_getLocatorCacheTimeout'); end function r = ice_locatorCacheTimeout(obj, t) @@ -205,7 +205,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getInvocationTimeout(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getInvocationTimeout'); + r = obj.iceCallWithResult('ice_getInvocationTimeout'); end function r = ice_invocationTimeout(obj, t) @@ -214,7 +214,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getConnectionId(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getConnectionId'); + r = obj.iceCallWithResult('ice_getConnectionId'); end function r = ice_connectionId(obj, id) @@ -222,7 +222,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isConnectionCached(obj) - r = obj.callWithResult_('ice_isConnectionCached'); + r = obj.iceCallWithResult('ice_isConnectionCached'); end function r = ice_connectionCached(obj, b) @@ -236,7 +236,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getEndpointSelection(obj) obj.instantiate_(); - r = obj.callWithResult_('ice_getEndpointSelection'); + r = obj.iceCallWithResult('ice_getEndpointSelection'); end function r = ice_endpointSelection(obj, t) @@ -255,7 +255,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getRouter(obj) obj.instantiate_(); v = libpointer('voidPtr'); - obj.call_('ice_getRouter', v); + obj.iceCall('ice_getRouter', v); if isNull(v) r = []; else @@ -275,7 +275,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getLocator(obj) obj.instantiate_(); v = libpointer('voidPtr'); - obj.call_('ice_getLocator', v); + obj.iceCall('ice_getLocator', v); if isNull(v) r = []; else @@ -293,7 +293,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isSecure(obj) - r = obj.callWithResult_('ice_isSecure'); + r = obj.iceCallWithResult('ice_isSecure'); end function r = ice_secure(obj, b) @@ -306,7 +306,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isPreferSecure(obj) - r = obj.callWithResult_('ice_isPreferSecure'); + r = obj.iceCallWithResult('ice_isPreferSecure'); end function r = ice_preferSecure(obj, b) @@ -327,7 +327,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isOneway(obj) - r = obj.callWithResult_('ice_isOneway'); + r = obj.iceCallWithResult('ice_isOneway'); end function r = ice_oneway(obj) @@ -335,7 +335,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isBatchOneway(obj) - r = obj.callWithResult_('ice_isBatchOneway'); + r = obj.iceCallWithResult('ice_isBatchOneway'); end function r = ice_batchOneway(obj) @@ -343,7 +343,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isDatagram(obj) - r = obj.callWithResult_('ice_isDatagram'); + r = obj.iceCallWithResult('ice_isDatagram'); end function r = ice_datagram(obj) @@ -351,7 +351,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end function r = ice_isBatchDatagram(obj) - r = obj.callWithResult_('ice_isBatchDatagram'); + r = obj.iceCallWithResult('ice_isBatchDatagram'); end function r = ice_batchDatagram(obj) @@ -374,7 +374,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getConnection(obj) obj.instantiate_(); v = libpointer('voidPtr'); - obj.call_('ice_getConnection', v); + obj.iceCall('ice_getConnection', v); if isNull(v) r = []; else @@ -385,11 +385,11 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getConnectionAsync(obj) obj.instantiate_(); future = libpointer('voidPtr'); - obj.call_('ice_getConnectionAsync', future); + obj.iceCall('ice_getConnectionAsync', future); assert(~isNull(future)); function varargout = fetch(f) con = libpointer('voidPtr', 0); % Output param - f.call_('fetch', con); + f.iceCall('fetch', con); assert(~isNull(con)); varargout{1} = Ice.Connection(con); end @@ -399,7 +399,7 @@ classdef ObjectPrx < IceInternal.WrapperObject function r = ice_getCachedConnection(obj) obj.instantiate_(); v = libpointer('voidPtr'); - obj.call_('ice_getCachedConnection', v); + obj.iceCall('ice_getCachedConnection', v); if isNull(v) r = []; else @@ -409,46 +409,46 @@ classdef ObjectPrx < IceInternal.WrapperObject function ice_flushBatchRequests(obj) obj.instantiate_(); - obj.call_('ice_flushBatchRequests'); + obj.iceCall('ice_flushBatchRequests'); end function r = ice_flushBatchRequestsAsync(obj) obj.instantiate_(); future = libpointer('voidPtr'); - obj.call_('ice_flushBatchRequestsAsync', future); + obj.iceCall('ice_flushBatchRequestsAsync', future); assert(~isNull(future)); - r = Ice.Future(future, 'ice_flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.call_('check')); + r = Ice.Future(future, 'ice_flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check')); end end methods(Hidden=true) - function write_(obj, os, encoding) + function iceWrite(obj, os, encoding) % % If we don't yet have a byte buffer representing the marshaled form of the proxy, then call into % C++ to marshal the proxy and then cache the bytes. % if isempty(obj.bytes) - obj.bytes = obj.callWithResult_('write', obj.communicator.impl_, encoding); + obj.bytes = obj.iceCallWithResult('write', obj.communicator.impl_, encoding); end os.writeBlob(obj.bytes); end - function r = getImpl_(obj) + function r = iceGetImpl(obj) obj.instantiate_(); r = obj.impl_; end end methods(Access=protected) - function os = startWriteParams_(obj, format) + function os = iceStartWriteParams(obj, format) os = obj.ice_createOutputStream(); os.startEncapsulation(format); end - function endWriteParams_(obj, os) + function iceEndWriteParams(obj, os) os.endEncapsulation(); end - function is = invoke_(obj, op, mode, twowayOnly, os, hasOutParams, exceptions, varargin) + function is = iceInvoke(obj, op, mode, twowayOnly, os, hasOutParams, exceptions, varargin) if isempty(obj.impl_) obj.instantiate_(); end @@ -475,7 +475,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % res = obj.callWithResult_('ice_invoke', op, mode, buf, size, varargin{1}); + % res = obj.iceCallWithResult('ice_invoke', op, mode, buf, size, varargin{1}); % res = IceInternal.Util.callWithResult('Ice_ObjectPrx_ice_invoke', obj.impl_, op, mode, buf, ... size, varargin{1}); @@ -483,7 +483,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % res = obj.callWithResult_('ice_invokeNC', op, mode, buf, size); + % res = obj.iceCallWithResult('ice_invokeNC', op, mode, buf, size); % res = IceInternal.Util.callWithResult('Ice_ObjectPrx_ice_invokeNC', obj.impl_, op, mode, buf, size); end @@ -501,7 +501,7 @@ classdef ObjectPrx < IceInternal.WrapperObject if obj.isTwoway if ~res.ok - obj.throwUserException_(is, exceptions{:}); + obj.iceThrowUserException(is, exceptions{:}); elseif ~hasOutParams is.skipEmptyEncapsulation(); end @@ -511,7 +511,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end end - function fut = invokeAsync_(obj, op, mode, twowayOnly, os, numOutArgs, unmarshalFunc, exceptions, varargin) + function fut = iceInvokeAsync(obj, op, mode, twowayOnly, os, numOutArgs, unmarshalFunc, exceptions, varargin) if isempty(obj.impl_) obj.instantiate_(); end @@ -529,12 +529,12 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % res = f.callWithResult_('results'); + % res = f.iceCallWithResult('results'); % res = IceInternal.Util.callWithResult('Ice_InvocationFuture_results', f.impl_); is = Ice.InputStream(obj.communicator, obj.encoding, IceInternal.Buffer(res.params)); if ~res.ok - obj.throwUserException_(is, exceptions{:}); + obj.iceThrowUserException(is, exceptions{:}); end if isempty(unmarshalFunc) is.skipEmptyEncapsulation(); @@ -547,7 +547,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % f.call_('check'); + % f.iceCall('check'); % IceInternal.Util.call('Ice_InvocationFuture_check', f.impl_); end @@ -576,7 +576,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % obj.call_('ice_invokeAsync', op, mode, buf, size, varargin{1}, futPtr); + % obj.iceCall('ice_invokeAsync', op, mode, buf, size, varargin{1}, futPtr); % IceInternal.Util.call('Ice_ObjectPrx_ice_invokeAsync', obj.impl_, op, mode, buf, size, ... varargin{1}, futPtr); @@ -584,7 +584,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % % Avoid the string concatenation % - % obj.call_('ice_invokeAsyncNC', op, mode, buf, size, futPtr); + % obj.iceCall('ice_invokeAsyncNC', op, mode, buf, size, futPtr); % IceInternal.Util.call('Ice_ObjectPrx_ice_invokeAsyncNC', obj.impl_, op, mode, buf, size, futPtr); end @@ -595,7 +595,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end end - function throwUserException_(obj, is, varargin) % Varargs are user exception type names + function iceThrowUserException(obj, is, varargin) % Varargs are user exception type names try is.startEncapsulation(); is.throwException(); @@ -625,7 +625,7 @@ classdef ObjectPrx < IceInternal.WrapperObject if length(varargin) == 0 r = p; else - r = Ice.ObjectPrx.checkedCast_(p, Ice.ObjectPrx.ice_staticId(), 'Ice.ObjectPrx', varargin{:}); + r = Ice.ObjectPrx.iceCheckedCast(p, Ice.ObjectPrx.ice_staticId(), 'Ice.ObjectPrx', varargin{:}); end end @@ -645,7 +645,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end methods(Static,Access=protected) - function r = checkedCast_(p, id, cls, varargin) + function r = iceCheckedCast(p, id, cls, varargin) try hasFacet = false; facet = []; @@ -686,7 +686,7 @@ classdef ObjectPrx < IceInternal.WrapperObject end end - function r = uncheckedCast_(p, cls, varargin) + function r = iceUncheckedCast(p, cls, varargin) hasFacet = false; facet = []; if length(varargin) == 1 @@ -732,7 +732,7 @@ classdef ObjectPrx < IceInternal.WrapperObject obj.impl_ = impl; % Cache the twoway status - obj.isTwoway = obj.callWithResult_('ice_isTwoway'); + obj.isTwoway = obj.iceCallWithResult('ice_isTwoway'); end end @@ -745,7 +745,7 @@ classdef ObjectPrx < IceInternal.WrapperObject obj.instantiate_(); newImpl = libpointer('voidPtr'); - obj.call_(op, newImpl, varargin{:}); + obj.iceCall(op, newImpl, varargin{:}); if isNull(newImpl) r = obj; elseif keepType @@ -772,7 +772,7 @@ classdef ObjectPrx < IceInternal.WrapperObject % obj.instantiate_(); implPtr = libpointer('voidPtr'); % Output param - obj.call_('clone', implPtr); + obj.iceCall('clone', implPtr); r = implPtr; end end diff --git a/matlab/lib/+Ice/OutputStream.m b/matlab/lib/+Ice/OutputStream.m index 4e5c0512694..1cca8041697 100644 --- a/matlab/lib/+Ice/OutputStream.m +++ b/matlab/lib/+Ice/OutputStream.m @@ -301,7 +301,7 @@ classdef OutputStream < handle % Ice.Identity.ice_write(obj, []); else - v.write_(obj, obj.getEncoding()); + v.iceWrite(obj, obj.getEncoding()); end end function writeProxyOpt(obj, tag, v) diff --git a/matlab/lib/+Ice/Properties.m b/matlab/lib/+Ice/Properties.m index 0975ca25b7b..9710004a4f3 100644 --- a/matlab/lib/+Ice/Properties.m +++ b/matlab/lib/+Ice/Properties.m @@ -18,48 +18,48 @@ classdef Properties < IceInternal.WrapperObject obj = obj@IceInternal.WrapperObject(impl); end function r = getProperty(obj, key) - r = obj.callWithResult_('getProperty', key); + r = obj.iceCallWithResult('getProperty', key); end function r = getPropertyWithDefault(obj, key, def) - r = obj.callWithResult_('getPropertyWithDefault', key, def); + r = obj.iceCallWithResult('getPropertyWithDefault', key, def); end function r = getPropertyAsInt(obj, key) v = libpointer('int32Ptr', 0); - obj.call_('getPropertyAsInt', key, v); + obj.iceCall('getPropertyAsInt', key, v); r = v.Value; end function r = getPropertyAsIntWithDefault(obj, key, def) v = libpointer('int32Ptr', 0); - obj.call_('getPropertyAsIntWithDefault', key, def, v); + obj.iceCall('getPropertyAsIntWithDefault', key, def, v); r = v.Value; end function r = getPropertyAsList(obj, key) - r = obj.callWithResult_('getPropertyAsList', key); + r = obj.iceCallWithResult('getPropertyAsList', key); end function r = getPropertyAsListWithDefault(obj, key, def) - r = obj.callWithResult_('getPropertyAsListWithDefault', key, def); + r = obj.iceCallWithResult('getPropertyAsListWithDefault', key, def); end function r = getPropertiesForPrefix(obj, prefix) - r = obj.callWithResult_('getPropertiesForPrefix', prefix); + r = obj.iceCallWithResult('getPropertiesForPrefix', prefix); end function setProperty(obj, key, value) - obj.call_('setProperty', key, value); + obj.iceCall('setProperty', key, value); end function r = getCommandLineOptions(obj) - r = obj.callWithResult_('getCommandLineOptions'); + r = obj.iceCallWithResult('getCommandLineOptions'); end function r = parseCommandLineOptions(obj, prefix, options) - r = obj.callWithResult_('parseCommandLineOptions', prefix, options); + r = obj.iceCallWithResult('parseCommandLineOptions', prefix, options); end function r = parseIceCommandLineOptions(obj, options) - r = obj.callWithResult_('parseIceCommandLineOptions', options); + r = obj.iceCallWithResult('parseIceCommandLineOptions', options); end function load(obj, file) - obj.call_('load', file); + obj.iceCall('load', file); end function r = clone(obj) impl = libpointer('voidPtr'); - obj.call_('clone', impl); + obj.iceCall('clone', impl); r = Ice.Properties(impl); end end diff --git a/matlab/lib/+Ice/UnknownSlicedValue.m b/matlab/lib/+Ice/UnknownSlicedValue.m index c945dfa2417..684651e018c 100644 --- a/matlab/lib/+Ice/UnknownSlicedValue.m +++ b/matlab/lib/+Ice/UnknownSlicedValue.m @@ -20,11 +20,11 @@ classdef UnknownSlicedValue < Ice.Value function r = ice_getSlicedData(obj) r = obj.slicedData; end - function iceWrite_(obj, os) + function iceWrite(obj, os) os.startValue(obj.slicedData); os.endValue(); end - function obj = iceRead_(obj, is) + function obj = iceRead(obj, is) is.startValue(); obj.slicedData = is.endValue(true); end @@ -33,9 +33,9 @@ classdef UnknownSlicedValue < Ice.Value end end methods(Access=protected) - function iceWriteImpl_(obj, os) + function iceWriteImpl(obj, os) end - function obj = iceReadImpl_(obj, is) + function obj = iceReadImpl(obj, is) end end properties(Access=private) diff --git a/matlab/lib/+Ice/UserException.m b/matlab/lib/+Ice/UserException.m index 169ffd4f120..d44603f550e 100644 --- a/matlab/lib/+Ice/UserException.m +++ b/matlab/lib/+Ice/UserException.m @@ -19,18 +19,18 @@ classdef (Abstract) UserException < Ice.Exception end end methods(Hidden=true) - function obj = read_(obj, is) + function obj = iceRead(obj, is) is.startException(); - obj = obj.readImpl_(is); + obj = obj.iceReadImpl(is); is.endException(false); end - function obj = postUnmarshal_(obj) + function obj = icePostUnmarshal(obj) % % Overridden by subclasses that have class members. % end end methods(Abstract,Access=protected) - obj = readImpl_(obj, is) + obj = iceReadImpl(obj, is) end end diff --git a/matlab/lib/+Ice/Value.m b/matlab/lib/+Ice/Value.m index 4c3aee4d61e..480e653cebb 100644 --- a/matlab/lib/+Ice/Value.m +++ b/matlab/lib/+Ice/Value.m @@ -45,24 +45,24 @@ classdef (Abstract) Value < matlab.mixin.Copyable end end methods(Hidden=true) - function iceWrite_(obj, os) + function iceWrite(obj, os) os.startValue([]); - obj.iceWriteImpl_(os); + obj.iceWriteImpl(os); os.endValue(); end - function iceRead_(obj, is) + function iceRead(obj, is) is.startValue(); - obj.iceReadImpl_(is); + obj.iceReadImpl(is); is.endValue(false); end - function r = iceDelayPostUnmarshal_(obj) + function r = iceDelayPostUnmarshal(obj) % % Overridden by subclasses that need to do some post-processing after the initial round of % unmarshaling is complete. % r = false; end - function icePostUnmarshal_(obj) + function icePostUnmarshal(obj) % % Overridden by subclasses that need to do some post-processing after the initial round of % unmarshaling is complete. @@ -70,8 +70,8 @@ classdef (Abstract) Value < matlab.mixin.Copyable end end methods(Abstract,Access=protected) - iceWriteImpl_(obj, os) - iceReadImpl_(obj, is) + iceWriteImpl(obj, os) + iceReadImpl(obj, is) end properties(Hidden, NonCopyable) iceInternal_ int32 diff --git a/matlab/lib/+IceInternal/EncapsDecoder.m b/matlab/lib/+IceInternal/EncapsDecoder.m index 5431ef4bb5f..bf6d2d108bb 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder.m +++ b/matlab/lib/+IceInternal/EncapsDecoder.m @@ -39,11 +39,11 @@ classdef (Abstract) EncapsDecoder < handle % if ~isempty(obj.delayedPostUnmarshal) % - % First call icePostUnmarshal_ on every instance. This allows the generated code to finish its tasks. + % First call icePostUnmarshal on every instance. This allows the generated code to finish its tasks. % for i = 1:length(obj.delayedPostUnmarshal) v = obj.delayedPostUnmarshal{i}; - v.icePostUnmarshal_(); + v.icePostUnmarshal(); end % % Then call ice_postUnmarshal on every instance. This is the application's interception point. @@ -176,7 +176,7 @@ classdef (Abstract) EncapsDecoder < handle % % Read the instance. % - v.iceRead_(obj.is); + v.iceRead(obj.is); if ~isempty(obj.patchMap) && obj.patchMap.isKey(index) % @@ -201,7 +201,7 @@ classdef (Abstract) EncapsDecoder < handle end if (isempty(obj.patchMap) || obj.patchMap.Count == 0) && isempty(obj.valueList) - if v.iceDelayPostUnmarshal_() + if v.iceDelayPostUnmarshal() obj.delayedPostUnmarshal{end + 1} = v; % See finish() else try @@ -223,7 +223,7 @@ classdef (Abstract) EncapsDecoder < handle % for i = 1:length(obj.valueList) p = obj.valueList{i}; - if p.iceDelayPostUnmarshal_() + if p.iceDelayPostUnmarshal() obj.delayedPostUnmarshal{end + 1} = p; % See finish() else try diff --git a/matlab/lib/+IceInternal/EncapsDecoder10.m b/matlab/lib/+IceInternal/EncapsDecoder10.m index eac0a7b5ee6..8723687fcb0 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder10.m +++ b/matlab/lib/+IceInternal/EncapsDecoder10.m @@ -101,11 +101,11 @@ classdef EncapsDecoder10 < IceInternal.EncapsDecoder % % Exceptions are value types so we have to replace 'ex' with its new value after calling methods. % - ex = ex.read_(obj.is); + ex = ex.iceRead(obj.is); if usesClasses obj.readPendingValues(); end - ex = ex.postUnmarshal_(); + ex = ex.icePostUnmarshal(); throw(ex); else % diff --git a/matlab/lib/+IceInternal/EncapsDecoder11.m b/matlab/lib/+IceInternal/EncapsDecoder11.m index 31e9c91458d..21675d20538 100644 --- a/matlab/lib/+IceInternal/EncapsDecoder11.m +++ b/matlab/lib/+IceInternal/EncapsDecoder11.m @@ -97,8 +97,8 @@ classdef EncapsDecoder11 < IceInternal.EncapsDecoder % % Exceptions are value types so we have to replace 'ex' with its new value after calling methods. % - ex = ex.read_(obj.is); - ex = ex.postUnmarshal_(); + ex = ex.iceRead(obj.is); + ex = ex.icePostUnmarshal(); throw(ex); else % diff --git a/matlab/lib/+IceInternal/EncapsEncoder10.m b/matlab/lib/+IceInternal/EncapsEncoder10.m index 5ba9178db3c..6a356e6c2ac 100644 --- a/matlab/lib/+IceInternal/EncapsEncoder10.m +++ b/matlab/lib/+IceInternal/EncapsEncoder10.m @@ -109,7 +109,7 @@ classdef EncapsEncoder10 < IceInternal.EncapsEncoder obj.os.getCommunicator().getLogger().warning(msg); end - v.iceWrite_(obj.os); + v.iceWrite(obj.os); end end obj.os.writeSize(0); % Zero marker indicates end of sequence of sequences of instances. diff --git a/matlab/lib/+IceInternal/EncapsEncoder11.m b/matlab/lib/+IceInternal/EncapsEncoder11.m index b85f8887d18..0eacc9c3439 100644 --- a/matlab/lib/+IceInternal/EncapsEncoder11.m +++ b/matlab/lib/+IceInternal/EncapsEncoder11.m @@ -248,7 +248,7 @@ classdef EncapsEncoder11 < IceInternal.EncapsEncoder end obj.os.writeSize(1); % Class instance marker. - v.iceWrite_(obj.os); + v.iceWrite(obj.os); end end properties(Access=private) diff --git a/matlab/lib/+IceInternal/WrapperObject.m b/matlab/lib/+IceInternal/WrapperObject.m index 125c879958d..81f762bc51a 100644 --- a/matlab/lib/+IceInternal/WrapperObject.m +++ b/matlab/lib/+IceInternal/WrapperObject.m @@ -26,17 +26,17 @@ classdef (Abstract) WrapperObject < handle methods(Hidden) function delete(obj) if ~isempty(obj.impl_) - obj.call_('_release'); + obj.iceCall('unref'); end end - function call_(obj, fn, varargin) + function iceCall(obj, fn, varargin) name = strcat(obj.type_, '_', fn); ex = calllib('icematlab', name, obj.impl_, varargin{:}); if ~isempty(ex) ex.throwAsCaller(); end end - function r = callWithResult_(obj, fn, varargin) + function r = iceCallWithResult(obj, fn, varargin) name = strcat(obj.type_, '_', fn); result = calllib('icematlab', name, obj.impl_, varargin{:}); if isempty(result) @@ -47,24 +47,6 @@ classdef (Abstract) WrapperObject < handle r = result.result; end end - function callOnType_(obj, type, fn, varargin) - name = strcat(type, '_', fn); - ex = calllib('icematlab', name, obj.impl_, varargin{:}); - if ~isempty(ex) - ex.throwAsCaller(); - end - end - function r = callOnTypeWithResult_(obj, type, fn, varargin) - name = strcat(type, '_', fn); - result = calllib('icematlab', name, obj.impl_, varargin{:}); - if isempty(result) - r = result; - elseif ~isempty(result.exception) - result.exception.throwAsCaller(); - else - r = result.result; - end - end end properties(Hidden,SetAccess=protected) impl_ diff --git a/matlab/src/IceMatlab/Communicator.cpp b/matlab/src/IceMatlab/Communicator.cpp index efc87bcdf8b..04a194eee6b 100644 --- a/matlab/src/IceMatlab/Communicator.cpp +++ b/matlab/src/IceMatlab/Communicator.cpp @@ -34,7 +34,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_Communicator__release(void* self) +Ice_Communicator_unref(void* self) { delete &SELF; return 0; diff --git a/matlab/src/IceMatlab/Connection.cpp b/matlab/src/IceMatlab/Connection.cpp index 117254fcb71..d6cf2a1bd2f 100644 --- a/matlab/src/IceMatlab/Connection.cpp +++ b/matlab/src/IceMatlab/Connection.cpp @@ -136,7 +136,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_Connection__release(void* self) +Ice_Connection_unref(void* self) { delete &SELF; return 0; diff --git a/matlab/src/IceMatlab/Endpoint.cpp b/matlab/src/IceMatlab/Endpoint.cpp index 27020714961..a2ac79891a7 100644 --- a/matlab/src/IceMatlab/Endpoint.cpp +++ b/matlab/src/IceMatlab/Endpoint.cpp @@ -151,7 +151,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_Endpoint__release(void* self) +Ice_Endpoint_unref(void* self) { delete &SELF; return 0; diff --git a/matlab/src/IceMatlab/Future.cpp b/matlab/src/IceMatlab/Future.cpp index ce46e2f084e..dc439d0cd34 100644 --- a/matlab/src/IceMatlab/Future.cpp +++ b/matlab/src/IceMatlab/Future.cpp @@ -108,7 +108,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_SimpleFuture__release(void* self) +Ice_SimpleFuture_unref(void* self) { delete &SFSELF; return 0; diff --git a/matlab/src/IceMatlab/Logger.cpp b/matlab/src/IceMatlab/Logger.cpp index 72d2f72a8e9..a558ca2488a 100644 --- a/matlab/src/IceMatlab/Logger.cpp +++ b/matlab/src/IceMatlab/Logger.cpp @@ -29,7 +29,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_Logger__release(void* self) +Ice_Logger_unref(void* self) { delete &SELF; return 0; diff --git a/matlab/src/IceMatlab/ObjectPrx.cpp b/matlab/src/IceMatlab/ObjectPrx.cpp index 36069b7693c..c2ef3d0b89b 100644 --- a/matlab/src/IceMatlab/ObjectPrx.cpp +++ b/matlab/src/IceMatlab/ObjectPrx.cpp @@ -227,7 +227,7 @@ extern "C" { EXPORTED_FUNCTION mxArray* -Ice_ObjectPrx__release(void* self) +Ice_ObjectPrx_unref(void* self) { delete &SELF; return 0; @@ -1132,7 +1132,7 @@ Ice_ObjectPrx_clone(void* self, void** r) } EXPORTED_FUNCTION mxArray* -Ice_InvocationFuture__release(void* self) +Ice_InvocationFuture_unref(void* self) { delete &IFSELF; return 0; @@ -1236,7 +1236,7 @@ Ice_InvocationFuture_check(void* self) } EXPORTED_FUNCTION mxArray* -Ice_GetConnectionFuture__release(void* self) +Ice_GetConnectionFuture_unref(void* self) { delete &GCFSELF; return 0; diff --git a/matlab/src/IceMatlab/Properties.cpp b/matlab/src/IceMatlab/Properties.cpp index c8992c7dd18..be3a4cf679a 100644 --- a/matlab/src/IceMatlab/Properties.cpp +++ b/matlab/src/IceMatlab/Properties.cpp @@ -50,7 +50,7 @@ Ice_createProperties(mxArray* args, void* defaultsImpl, void** r) } EXPORTED_FUNCTION mxArray* -Ice_Properties__release(void* self) +Ice_Properties_unref(void* self) { delete &SELF; return 0; diff --git a/matlab/src/IceMatlab/icematlab.h b/matlab/src/IceMatlab/icematlab.h index facdc81364e..7cce7365eb9 100644 --- a/matlab/src/IceMatlab/icematlab.h +++ b/matlab/src/IceMatlab/icematlab.h @@ -33,7 +33,7 @@ EXPORTED_FUNCTION mxArray* Ice_currentEncoding(); EXPORTED_FUNCTION mxArray* Ice_currentProtocol(); EXPORTED_FUNCTION mxArray* Ice_currentProtocolEncoding(); -EXPORTED_FUNCTION mxArray* Ice_Communicator__release(void*); +EXPORTED_FUNCTION mxArray* Ice_Communicator_unref(void*); EXPORTED_FUNCTION mxArray* Ice_Communicator_destroy(void*); EXPORTED_FUNCTION mxArray* Ice_Communicator_destroyAsync(void*, void**); EXPORTED_FUNCTION mxArray* Ice_Communicator_stringToProxy(void*, const char*, void**); @@ -50,7 +50,7 @@ EXPORTED_FUNCTION mxArray* Ice_Communicator_setDefaultLocator(void*, void*); EXPORTED_FUNCTION mxArray* Ice_Communicator_flushBatchRequests(void*, mxArray*); EXPORTED_FUNCTION mxArray* Ice_Communicator_flushBatchRequestsAsync(void*, mxArray*, void**); -EXPORTED_FUNCTION mxArray* Ice_ObjectPrx__release(void*); +EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_unref(void*); EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_equals(void*, void*); EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_read(void*, mxArray*, mxArray*, int, int, void**); EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_write(void*, void*, mxArray*); @@ -112,27 +112,27 @@ EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_ice_flushBatchRequests(void*); EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_ice_flushBatchRequestsAsync(void*, void**); EXPORTED_FUNCTION mxArray* Ice_ObjectPrx_clone(void*, void**); -EXPORTED_FUNCTION mxArray* Ice_InvocationFuture__release(void*); +EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_unref(void*); EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_wait(void*, unsigned char*); EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_results(void*); EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_state(void*); EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_cancel(void*); EXPORTED_FUNCTION mxArray* Ice_InvocationFuture_check(void*); -EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture__release(void*); +EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_unref(void*); EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_wait(void*, unsigned char*); EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_fetch(void*, void**); EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_state(void*); EXPORTED_FUNCTION mxArray* Ice_GetConnectionFuture_cancel(void*); -EXPORTED_FUNCTION mxArray* Ice_SimpleFuture__release(void*); +EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_unref(void*); EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_wait(void*, unsigned char*); EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_state(void*); EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_cancel(void*); EXPORTED_FUNCTION mxArray* Ice_SimpleFuture_check(void*); EXPORTED_FUNCTION mxArray* Ice_createProperties(mxArray*, void*, void**); -EXPORTED_FUNCTION mxArray* Ice_Properties__release(void*); +EXPORTED_FUNCTION mxArray* Ice_Properties_unref(void*); EXPORTED_FUNCTION mxArray* Ice_Properties_getProperty(void*, const char*); EXPORTED_FUNCTION mxArray* Ice_Properties_getPropertyWithDefault(void*, const char*, const char*); EXPORTED_FUNCTION mxArray* Ice_Properties_getPropertyAsInt(void*, const char*, int*); @@ -147,7 +147,7 @@ EXPORTED_FUNCTION mxArray* Ice_Properties_parseIceCommandLineOptions(void*, mxAr EXPORTED_FUNCTION mxArray* Ice_Properties_load(void*, const char*); EXPORTED_FUNCTION mxArray* Ice_Properties_clone(void*, void**); -EXPORTED_FUNCTION mxArray* Ice_Connection__release(void*); +EXPORTED_FUNCTION mxArray* Ice_Connection_unref(void*); EXPORTED_FUNCTION mxArray* Ice_Connection_equals(void*, void*); EXPORTED_FUNCTION mxArray* Ice_Connection_close(void*, mxArray*); EXPORTED_FUNCTION mxArray* Ice_Connection_closeAsync(void*, mxArray*, void**); @@ -166,7 +166,7 @@ EXPORTED_FUNCTION mxArray* Ice_Connection_getInfo(void*); EXPORTED_FUNCTION mxArray* Ice_Connection_setBufferSize(void*, int, int); EXPORTED_FUNCTION mxArray* Ice_Connection_throwException(void*); -EXPORTED_FUNCTION mxArray* Ice_Logger__release(void*); +EXPORTED_FUNCTION mxArray* Ice_Logger_unref(void*); EXPORTED_FUNCTION mxArray* Ice_Logger_print(void*, mxArray*); EXPORTED_FUNCTION mxArray* Ice_Logger_trace(void*, mxArray*, mxArray*); EXPORTED_FUNCTION mxArray* Ice_Logger_warning(void*, mxArray*); @@ -174,7 +174,7 @@ EXPORTED_FUNCTION mxArray* Ice_Logger_error(void*, mxArray*); EXPORTED_FUNCTION mxArray* Ice_Logger_getPrefix(void*); EXPORTED_FUNCTION mxArray* Ice_Logger_cloneWithPrefix(void*, mxArray*, void**); -EXPORTED_FUNCTION mxArray* Ice_Endpoint__release(void*); +EXPORTED_FUNCTION mxArray* Ice_Endpoint_unref(void*); EXPORTED_FUNCTION mxArray* Ice_Endpoint_equals(void*, void*); EXPORTED_FUNCTION mxArray* Ice_Endpoint_toString(void*); EXPORTED_FUNCTION mxArray* Ice_Endpoint_getInfo(void*); |