zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,17 +1,13 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef SLICE_PARSER_H
|
11
6
|
#define SLICE_PARSER_H
|
12
7
|
|
13
8
|
#include <IceUtil/Shared.h>
|
14
9
|
#include <IceUtil/Handle.h>
|
10
|
+
#include <IceUtil/Exception.h>
|
15
11
|
#include <string>
|
16
12
|
#include <vector>
|
17
13
|
#include <list>
|
@@ -20,36 +16,31 @@
|
|
20
16
|
#include <set>
|
21
17
|
#include <stdio.h>
|
22
18
|
|
23
|
-
|
24
|
-
|
25
|
-
//
|
19
|
+
namespace Slice
|
20
|
+
{
|
26
21
|
|
27
|
-
|
28
|
-
|
29
|
-
|
22
|
+
class CompilerException : public ::IceUtil::Exception
|
23
|
+
{
|
24
|
+
public:
|
30
25
|
|
31
|
-
|
32
|
-
#
|
33
|
-
|
34
|
-
# pragma comment(lib, "SliceD.lib")
|
35
|
-
# else
|
36
|
-
# pragma comment(lib, "Slice.lib")
|
37
|
-
# endif
|
38
|
-
# endif
|
26
|
+
CompilerException(const char*, int, const std::string&);
|
27
|
+
#ifndef ICE_CPP11_COMPILER
|
28
|
+
~CompilerException() throw();
|
39
29
|
#endif
|
40
|
-
|
41
|
-
|
42
|
-
#
|
43
|
-
|
44
|
-
# elif defined(ICE_STATIC_LIBS)
|
45
|
-
# define SLICE_API /**/
|
46
|
-
# else
|
47
|
-
# define SLICE_API ICE_DECLSPEC_IMPORT
|
48
|
-
# endif
|
30
|
+
virtual std::string ice_id() const;
|
31
|
+
virtual void ice_print(std::ostream&) const;
|
32
|
+
#ifndef ICE_CPP11_MAPPING
|
33
|
+
virtual CompilerException* ice_clone() const;
|
49
34
|
#endif
|
35
|
+
virtual void ice_throw() const;
|
50
36
|
|
51
|
-
|
52
|
-
|
37
|
+
std::string reason() const;
|
38
|
+
|
39
|
+
private:
|
40
|
+
|
41
|
+
static const char* _name;
|
42
|
+
const std::string _reason;
|
43
|
+
};
|
53
44
|
|
54
45
|
#if defined(_WIN32) && !defined(__MINGW32__)
|
55
46
|
|
@@ -77,12 +68,6 @@ const IceUtil::Int64 Int16Min = -Int16Max - 1;
|
|
77
68
|
const IceUtil::Int64 ByteMax = 0xff;
|
78
69
|
const IceUtil::Int64 ByteMin = 0x00;
|
79
70
|
|
80
|
-
enum FeatureProfile
|
81
|
-
{
|
82
|
-
Ice,
|
83
|
-
IceE
|
84
|
-
};
|
85
|
-
|
86
71
|
enum NodeType
|
87
72
|
{
|
88
73
|
Dummy,
|
@@ -99,6 +84,13 @@ enum FormatType
|
|
99
84
|
SlicedFormat // Full format.
|
100
85
|
};
|
101
86
|
|
87
|
+
enum WarningCategory
|
88
|
+
{
|
89
|
+
All,
|
90
|
+
Deprecated,
|
91
|
+
InvalidMetaData
|
92
|
+
};
|
93
|
+
|
102
94
|
class GrammarBase;
|
103
95
|
class SyntaxTreeBase;
|
104
96
|
class Type;
|
@@ -189,7 +181,7 @@ struct OptionalDef
|
|
189
181
|
// CICompare -- function object to do case-insensitive string comparison.
|
190
182
|
// ----------------------------------------------------------------------
|
191
183
|
|
192
|
-
class
|
184
|
+
class CICompare : public std::binary_function<std::string, std::string, bool>
|
193
185
|
{
|
194
186
|
public:
|
195
187
|
|
@@ -197,7 +189,7 @@ public:
|
|
197
189
|
};
|
198
190
|
|
199
191
|
#if defined(__SUNPRO_CC)
|
200
|
-
|
192
|
+
bool cICompare(const std::string&, const std::string&);
|
201
193
|
#endif
|
202
194
|
|
203
195
|
// ----------------------------------------------------------------------
|
@@ -205,7 +197,7 @@ SLICE_API bool cICompare(const std::string&, const std::string&);
|
|
205
197
|
// most-derived to least-derived order.
|
206
198
|
// ----------------------------------------------------------------------
|
207
199
|
|
208
|
-
class
|
200
|
+
class DerivedToBaseCompare : public std::binary_function<std::string, std::string, bool>
|
209
201
|
{
|
210
202
|
public:
|
211
203
|
|
@@ -213,14 +205,14 @@ public:
|
|
213
205
|
};
|
214
206
|
|
215
207
|
#if defined(__SUNPRO_CC)
|
216
|
-
|
208
|
+
bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&);
|
217
209
|
#endif
|
218
210
|
|
219
211
|
// ----------------------------------------------------------------------
|
220
212
|
// ParserVisitor
|
221
213
|
// ----------------------------------------------------------------------
|
222
214
|
|
223
|
-
class
|
215
|
+
class ParserVisitor
|
224
216
|
{
|
225
217
|
public:
|
226
218
|
|
@@ -249,7 +241,7 @@ public:
|
|
249
241
|
// DefinitionContext
|
250
242
|
// ----------------------------------------------------------------------
|
251
243
|
|
252
|
-
class
|
244
|
+
class DefinitionContext : public ::IceUtil::SimpleShared
|
253
245
|
{
|
254
246
|
public:
|
255
247
|
|
@@ -267,20 +259,70 @@ public:
|
|
267
259
|
std::string findMetaData(const std::string&) const;
|
268
260
|
StringList getMetaData() const;
|
269
261
|
|
262
|
+
//
|
263
|
+
// Emit warning unless filtered out by [["suppress-warning"]]
|
264
|
+
//
|
265
|
+
void warning(WarningCategory, const std::string&, int, const std::string&) const;
|
266
|
+
void warning(WarningCategory, const std::string&, const std::string&, const std::string&) const;
|
267
|
+
|
268
|
+
void error(const std::string&, int, const std::string&) const;
|
269
|
+
void error(const std::string&, const std::string&, const std::string&) const;
|
270
|
+
|
270
271
|
private:
|
271
272
|
|
273
|
+
bool suppressWarning(WarningCategory) const;
|
274
|
+
void initSuppressedWarnings();
|
275
|
+
|
272
276
|
int _includeLevel;
|
273
277
|
StringList _metaData;
|
274
278
|
std::string _filename;
|
275
279
|
bool _seenDefinition;
|
280
|
+
std::set<WarningCategory> _suppressedWarnings;
|
276
281
|
};
|
277
282
|
typedef ::IceUtil::Handle<DefinitionContext> DefinitionContextPtr;
|
278
283
|
|
284
|
+
// ----------------------------------------------------------------------
|
285
|
+
// Comment
|
286
|
+
// ----------------------------------------------------------------------
|
287
|
+
|
288
|
+
class Comment : public ::IceUtil::SimpleShared
|
289
|
+
{
|
290
|
+
public:
|
291
|
+
|
292
|
+
bool isDeprecated() const;
|
293
|
+
StringList deprecated() const;
|
294
|
+
|
295
|
+
StringList overview() const; // Contains all introductory lines up to the first tag.
|
296
|
+
StringList misc() const; // Contains unrecognized tags.
|
297
|
+
StringList seeAlso() const; // Targets of @see tags.
|
298
|
+
|
299
|
+
StringList returns() const; // Description of an operation's return value.
|
300
|
+
std::map<std::string, StringList> parameters() const; // Parameter descriptions for an op. Key is parameter name.
|
301
|
+
std::map<std::string, StringList> exceptions() const; // Exception descriptions for an op. Key is exception name.
|
302
|
+
|
303
|
+
private:
|
304
|
+
|
305
|
+
Comment();
|
306
|
+
|
307
|
+
bool _isDeprecated;
|
308
|
+
StringList _deprecated;
|
309
|
+
StringList _overview;
|
310
|
+
StringList _misc;
|
311
|
+
StringList _seeAlso;
|
312
|
+
|
313
|
+
StringList _returns;
|
314
|
+
std::map<std::string, StringList> _parameters;
|
315
|
+
std::map<std::string, StringList> _exceptions;
|
316
|
+
|
317
|
+
friend class Contained;
|
318
|
+
};
|
319
|
+
typedef ::IceUtil::Handle<Comment> CommentPtr;
|
320
|
+
|
279
321
|
// ----------------------------------------------------------------------
|
280
322
|
// GrammarBase
|
281
323
|
// ----------------------------------------------------------------------
|
282
324
|
|
283
|
-
class
|
325
|
+
class GrammarBase : public ::IceUtil::SimpleShared
|
284
326
|
{
|
285
327
|
};
|
286
328
|
|
@@ -288,7 +330,7 @@ class SLICE_API GrammarBase : public ::IceUtil::SimpleShared
|
|
288
330
|
// SyntaxTreeBase
|
289
331
|
// ----------------------------------------------------------------------
|
290
332
|
|
291
|
-
class
|
333
|
+
class SyntaxTreeBase : public GrammarBase
|
292
334
|
{
|
293
335
|
public:
|
294
336
|
|
@@ -299,7 +341,7 @@ public:
|
|
299
341
|
|
300
342
|
protected:
|
301
343
|
|
302
|
-
SyntaxTreeBase(const UnitPtr&);
|
344
|
+
SyntaxTreeBase(const UnitPtr&, const DefinitionContextPtr& = 0);
|
303
345
|
|
304
346
|
UnitPtr _unit;
|
305
347
|
DefinitionContextPtr _definitionContext;
|
@@ -309,7 +351,7 @@ protected:
|
|
309
351
|
// Type
|
310
352
|
// ----------------------------------------------------------------------
|
311
353
|
|
312
|
-
class
|
354
|
+
class Type : public virtual SyntaxTreeBase
|
313
355
|
{
|
314
356
|
public:
|
315
357
|
|
@@ -328,7 +370,7 @@ protected:
|
|
328
370
|
// Builtin
|
329
371
|
// ----------------------------------------------------------------------
|
330
372
|
|
331
|
-
class
|
373
|
+
class Builtin : public virtual Type
|
332
374
|
{
|
333
375
|
public:
|
334
376
|
|
@@ -344,7 +386,8 @@ public:
|
|
344
386
|
KindString,
|
345
387
|
KindObject,
|
346
388
|
KindObjectProxy,
|
347
|
-
KindLocalObject
|
389
|
+
KindLocalObject,
|
390
|
+
KindValue
|
348
391
|
};
|
349
392
|
|
350
393
|
virtual bool isLocal() const;
|
@@ -370,7 +413,7 @@ protected:
|
|
370
413
|
// Contained
|
371
414
|
// ----------------------------------------------------------------------
|
372
415
|
|
373
|
-
class
|
416
|
+
class Contained : public virtual SyntaxTreeBase
|
374
417
|
{
|
375
418
|
public:
|
376
419
|
|
@@ -382,6 +425,7 @@ public:
|
|
382
425
|
std::string file() const;
|
383
426
|
std::string line() const;
|
384
427
|
std::string comment() const;
|
428
|
+
CommentPtr parseComment(bool) const;
|
385
429
|
|
386
430
|
int includeLevel() const;
|
387
431
|
void updateIncludeLevel();
|
@@ -416,7 +460,6 @@ public:
|
|
416
460
|
|
417
461
|
bool operator<(const Contained&) const;
|
418
462
|
bool operator==(const Contained&) const;
|
419
|
-
bool operator!=(const Contained&) const;
|
420
463
|
|
421
464
|
protected:
|
422
465
|
|
@@ -437,14 +480,14 @@ protected:
|
|
437
480
|
// Container
|
438
481
|
// ----------------------------------------------------------------------
|
439
482
|
|
440
|
-
class
|
483
|
+
class Container : public virtual SyntaxTreeBase
|
441
484
|
{
|
442
485
|
public:
|
443
486
|
|
444
487
|
virtual void destroy();
|
445
488
|
ModulePtr createModule(const std::string&);
|
446
489
|
ClassDefPtr createClassDef(const std::string&, int, bool, const ClassList&, bool);
|
447
|
-
ClassDeclPtr createClassDecl(const std::string&, bool, bool
|
490
|
+
ClassDeclPtr createClassDecl(const std::string&, bool, bool);
|
448
491
|
ExceptionPtr createException(const std::string&, const ExceptionPtr&, bool, NodeType = Real);
|
449
492
|
StructPtr createStruct(const std::string&, bool, NodeType = Real);
|
450
493
|
SequencePtr createSequence(const std::string&, const TypePtr&, const StringList&, bool, NodeType = Real);
|
@@ -456,7 +499,7 @@ public:
|
|
456
499
|
ConstPtr createConst(const std::string, const TypePtr&, const StringList&, const SyntaxTreeBasePtr&,
|
457
500
|
const std::string&, const std::string&, NodeType = Real);
|
458
501
|
TypeList lookupType(const std::string&, bool = true);
|
459
|
-
TypeList lookupTypeNoBuiltin(const std::string&, bool = true);
|
502
|
+
TypeList lookupTypeNoBuiltin(const std::string&, bool = true, bool = false);
|
460
503
|
ContainedList lookupContained(const std::string&, bool = true);
|
461
504
|
ExceptionPtr lookupException(const std::string&, bool = true);
|
462
505
|
UnitPtr unit() const;
|
@@ -467,6 +510,8 @@ public:
|
|
467
510
|
SequenceList sequences() const;
|
468
511
|
DictionaryList dictionaries() const;
|
469
512
|
EnumList enums() const;
|
513
|
+
EnumeratorList enumerators() const;
|
514
|
+
EnumeratorList enumerators(const std::string&) const;
|
470
515
|
ConstList consts() const;
|
471
516
|
ContainedList contents() const;
|
472
517
|
bool hasNonLocalClassDecls() const;
|
@@ -474,12 +519,18 @@ public:
|
|
474
519
|
bool hasLocalClassDefsWithAsync() const;
|
475
520
|
bool hasNonLocalSequences() const;
|
476
521
|
bool hasNonLocalExceptions() const;
|
522
|
+
bool hasStructs() const;
|
523
|
+
bool hasExceptions() const;
|
477
524
|
bool hasDictionaries() const;
|
478
525
|
bool hasOnlyDictionaries(DictionaryList&) const;
|
479
526
|
bool hasClassDecls() const;
|
480
527
|
bool hasClassDefs() const;
|
528
|
+
bool hasLocalClassDefs() const;
|
529
|
+
bool hasNonLocalInterfaceDefs() const;
|
530
|
+
bool hasValueDefs() const;
|
481
531
|
bool hasOnlyClassDecls() const;
|
482
|
-
bool
|
532
|
+
bool hasOperations() const; // interfaces or classes with operations
|
533
|
+
bool hasNonLocalAbstractClassDefs() const; // interfaces or abstract classes
|
483
534
|
bool hasNonLocalDataOnlyClasses() const;
|
484
535
|
bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
|
485
536
|
bool hasContentsWithMetaData(const std::string&) const;
|
@@ -500,10 +551,9 @@ protected:
|
|
500
551
|
|
501
552
|
Container(const UnitPtr&);
|
502
553
|
|
503
|
-
void checkIdentifier(const std::string&) const;
|
504
554
|
bool checkInterfaceAndLocal(const std::string&, bool, bool, bool, bool, bool);
|
505
555
|
bool checkGlobalMetaData(const StringList&, const StringList&);
|
506
|
-
bool validateConstant(const std::string&, const TypePtr&,
|
556
|
+
bool validateConstant(const std::string&, const TypePtr&, SyntaxTreeBasePtr&, const std::string&, bool);
|
507
557
|
EnumeratorPtr validateEnumerator(const std::string&);
|
508
558
|
|
509
559
|
ContainedList _contents;
|
@@ -514,7 +564,7 @@ protected:
|
|
514
564
|
// Module
|
515
565
|
// ----------------------------------------------------------------------
|
516
566
|
|
517
|
-
class
|
567
|
+
class Module : public virtual Container, public virtual Contained
|
518
568
|
{
|
519
569
|
public:
|
520
570
|
|
@@ -533,7 +583,7 @@ protected:
|
|
533
583
|
// Constructed
|
534
584
|
// ----------------------------------------------------------------------
|
535
585
|
|
536
|
-
class
|
586
|
+
class Constructed : public virtual Type, public virtual Contained
|
537
587
|
{
|
538
588
|
public:
|
539
589
|
|
@@ -554,7 +604,7 @@ protected:
|
|
554
604
|
// ClassDecl
|
555
605
|
// ----------------------------------------------------------------------
|
556
606
|
|
557
|
-
class
|
607
|
+
class ClassDecl : public virtual Constructed
|
558
608
|
{
|
559
609
|
public:
|
560
610
|
|
@@ -596,7 +646,7 @@ private:
|
|
596
646
|
// Operation
|
597
647
|
// ----------------------------------------------------------------------
|
598
648
|
|
599
|
-
class
|
649
|
+
class Operation : public virtual Contained, public virtual Container
|
600
650
|
{
|
601
651
|
public:
|
602
652
|
|
@@ -616,8 +666,13 @@ public:
|
|
616
666
|
int returnTag() const;
|
617
667
|
Mode mode() const;
|
618
668
|
Mode sendMode() const;
|
669
|
+
bool hasMarshaledResult() const;
|
619
670
|
ParamDeclPtr createParamDecl(const std::string&, const TypePtr&, bool, bool, int);
|
620
671
|
ParamDeclList parameters() const;
|
672
|
+
ParamDeclList inParameters() const;
|
673
|
+
void inParameters(ParamDeclList&, ParamDeclList&) const;
|
674
|
+
ParamDeclList outParameters() const;
|
675
|
+
void outParameters(ParamDeclList&, ParamDeclList&) const;
|
621
676
|
ExceptionList throws() const;
|
622
677
|
void setExceptionList(const ExceptionList&);
|
623
678
|
virtual ContainedType containedType() const;
|
@@ -625,6 +680,7 @@ public:
|
|
625
680
|
bool sendsClasses(bool) const;
|
626
681
|
bool returnsClasses(bool) const;
|
627
682
|
bool returnsData() const;
|
683
|
+
bool returnsMultipleValues() const;
|
628
684
|
bool sendsOptionals() const;
|
629
685
|
int attributes() const;
|
630
686
|
FormatType format() const;
|
@@ -654,7 +710,7 @@ protected:
|
|
654
710
|
// so if you need the class as a "constructed type", use the
|
655
711
|
// declaration() operation to navigate to the class declaration.
|
656
712
|
//
|
657
|
-
class
|
713
|
+
class ClassDef : public virtual Container, public virtual Contained
|
658
714
|
{
|
659
715
|
public:
|
660
716
|
|
@@ -681,11 +737,13 @@ public:
|
|
681
737
|
bool hasOperations() const;
|
682
738
|
bool hasDefaultValues() const;
|
683
739
|
bool inheritsMetaData(const std::string&) const;
|
740
|
+
bool hasBaseDataMembers() const;
|
684
741
|
virtual ContainedType containedType() const;
|
685
742
|
virtual bool uses(const ContainedPtr&) const;
|
686
743
|
virtual std::string kindOf() const;
|
687
744
|
virtual void visit(ParserVisitor*, bool);
|
688
745
|
int compactId() const;
|
746
|
+
bool isDelegate() const;
|
689
747
|
|
690
748
|
protected:
|
691
749
|
|
@@ -705,7 +763,7 @@ protected:
|
|
705
763
|
// Proxy
|
706
764
|
// ----------------------------------------------------------------------
|
707
765
|
|
708
|
-
class
|
766
|
+
class Proxy : public virtual Type
|
709
767
|
{
|
710
768
|
public:
|
711
769
|
|
@@ -721,7 +779,7 @@ public:
|
|
721
779
|
|
722
780
|
protected:
|
723
781
|
|
724
|
-
ClassDeclPtr
|
782
|
+
ClassDeclPtr _classDecl;
|
725
783
|
};
|
726
784
|
|
727
785
|
// ----------------------------------------------------------------------
|
@@ -729,7 +787,7 @@ protected:
|
|
729
787
|
// ----------------------------------------------------------------------
|
730
788
|
|
731
789
|
// No inheritance from Constructed, as this is not a Type
|
732
|
-
class
|
790
|
+
class Exception : public virtual Container, public virtual Contained
|
733
791
|
{
|
734
792
|
public:
|
735
793
|
|
@@ -750,6 +808,7 @@ public:
|
|
750
808
|
bool usesClasses(bool) const;
|
751
809
|
bool hasDefaultValues() const;
|
752
810
|
bool inheritsMetaData(const std::string&) const;
|
811
|
+
bool hasBaseDataMembers() const;
|
753
812
|
virtual std::string kindOf() const;
|
754
813
|
virtual void visit(ParserVisitor*, bool);
|
755
814
|
|
@@ -766,7 +825,7 @@ protected:
|
|
766
825
|
// Struct
|
767
826
|
// ----------------------------------------------------------------------
|
768
827
|
|
769
|
-
class
|
828
|
+
class Struct : public virtual Container, public virtual Constructed
|
770
829
|
{
|
771
830
|
public:
|
772
831
|
|
@@ -794,7 +853,7 @@ protected:
|
|
794
853
|
// Sequence
|
795
854
|
// ----------------------------------------------------------------------
|
796
855
|
|
797
|
-
class
|
856
|
+
class Sequence : public virtual Constructed
|
798
857
|
{
|
799
858
|
public:
|
800
859
|
|
@@ -822,7 +881,7 @@ protected:
|
|
822
881
|
// Dictionary
|
823
882
|
// ----------------------------------------------------------------------
|
824
883
|
|
825
|
-
class
|
884
|
+
class Dictionary : public virtual Constructed
|
826
885
|
{
|
827
886
|
public:
|
828
887
|
|
@@ -857,13 +916,11 @@ protected:
|
|
857
916
|
// Enum
|
858
917
|
// ----------------------------------------------------------------------
|
859
918
|
|
860
|
-
class
|
919
|
+
class Enum : public virtual Container, public virtual Constructed
|
861
920
|
{
|
862
921
|
public:
|
863
922
|
|
864
923
|
virtual void destroy();
|
865
|
-
EnumeratorList getEnumerators();
|
866
|
-
void setEnumerators(const EnumeratorList&);
|
867
924
|
bool explicitValue() const;
|
868
925
|
int minValue() const;
|
869
926
|
int maxValue() const;
|
@@ -879,19 +936,22 @@ public:
|
|
879
936
|
protected:
|
880
937
|
|
881
938
|
Enum(const ContainerPtr&, const std::string&, bool);
|
939
|
+
int newEnumerator(const EnumeratorPtr&);
|
940
|
+
|
882
941
|
friend class Container;
|
942
|
+
friend class Enumerator;
|
883
943
|
|
884
|
-
EnumeratorList _enumerators;
|
885
944
|
bool _explicitValue;
|
886
945
|
IceUtil::Int64 _minValue;
|
887
946
|
IceUtil::Int64 _maxValue;
|
947
|
+
int _lastValue;
|
888
948
|
};
|
889
949
|
|
890
950
|
// ----------------------------------------------------------------------
|
891
951
|
// Enumerator
|
892
952
|
// ----------------------------------------------------------------------
|
893
953
|
|
894
|
-
class
|
954
|
+
class Enumerator : public virtual Contained
|
895
955
|
{
|
896
956
|
public:
|
897
957
|
|
@@ -908,9 +968,7 @@ protected:
|
|
908
968
|
Enumerator(const ContainerPtr&, const std::string&);
|
909
969
|
Enumerator(const ContainerPtr&, const std::string&, int);
|
910
970
|
friend class Container;
|
911
|
-
friend class Enum;
|
912
971
|
|
913
|
-
EnumPtr _type;
|
914
972
|
bool _explicitValue;
|
915
973
|
int _value;
|
916
974
|
};
|
@@ -919,7 +977,7 @@ protected:
|
|
919
977
|
// Const
|
920
978
|
// ----------------------------------------------------------------------
|
921
979
|
|
922
|
-
class
|
980
|
+
class Const : public virtual Contained
|
923
981
|
{
|
924
982
|
public:
|
925
983
|
|
@@ -950,7 +1008,7 @@ protected:
|
|
950
1008
|
// ParamDecl
|
951
1009
|
// ----------------------------------------------------------------------
|
952
1010
|
|
953
|
-
class
|
1011
|
+
class ParamDecl : public virtual Contained
|
954
1012
|
{
|
955
1013
|
public:
|
956
1014
|
|
@@ -978,7 +1036,7 @@ protected:
|
|
978
1036
|
// DataMember
|
979
1037
|
// ----------------------------------------------------------------------
|
980
1038
|
|
981
|
-
class
|
1039
|
+
class DataMember : public virtual Contained
|
982
1040
|
{
|
983
1041
|
public:
|
984
1042
|
|
@@ -993,7 +1051,6 @@ public:
|
|
993
1051
|
virtual std::string kindOf() const;
|
994
1052
|
virtual void visit(ParserVisitor*, bool);
|
995
1053
|
|
996
|
-
|
997
1054
|
protected:
|
998
1055
|
|
999
1056
|
DataMember(const ContainerPtr&, const std::string&, const TypePtr&, bool, int, const SyntaxTreeBasePtr&,
|
@@ -1014,7 +1071,7 @@ protected:
|
|
1014
1071
|
// Unit
|
1015
1072
|
// ----------------------------------------------------------------------
|
1016
1073
|
|
1017
|
-
class
|
1074
|
+
class Unit : public virtual Container
|
1018
1075
|
{
|
1019
1076
|
public:
|
1020
1077
|
|
@@ -1038,11 +1095,8 @@ public:
|
|
1038
1095
|
|
1039
1096
|
void setSeenDefinition();
|
1040
1097
|
|
1041
|
-
void error(const
|
1042
|
-
void
|
1043
|
-
|
1044
|
-
void warning(const char*) const;
|
1045
|
-
void warning(const std::string&) const;
|
1098
|
+
void error(const std::string&); // Not const because error count is increased
|
1099
|
+
void warning(WarningCategory, const std::string&) const;
|
1046
1100
|
|
1047
1101
|
ContainerPtr currentContainer() const;
|
1048
1102
|
void pushContainer(const ContainerPtr&);
|
@@ -1061,13 +1115,12 @@ public:
|
|
1061
1115
|
ContainedList findUsedBy(const ContainedPtr&) const;
|
1062
1116
|
|
1063
1117
|
void addTypeId(int, const std::string&);
|
1064
|
-
std::string getTypeId(int);
|
1118
|
+
std::string getTypeId(int) const;
|
1119
|
+
bool hasCompactTypeId() const;
|
1065
1120
|
|
1066
1121
|
bool usesNonLocals() const;
|
1067
1122
|
bool usesConsts() const;
|
1068
1123
|
|
1069
|
-
FeatureProfile profile() const;
|
1070
|
-
|
1071
1124
|
//
|
1072
1125
|
// Returns the path names of the files included directly by the top-level file.
|
1073
1126
|
//
|
@@ -1078,7 +1131,7 @@ public:
|
|
1078
1131
|
//
|
1079
1132
|
StringList allFiles() const;
|
1080
1133
|
|
1081
|
-
int parse(const std::string&, FILE*, bool
|
1134
|
+
int parse(const std::string&, FILE*, bool);
|
1082
1135
|
|
1083
1136
|
virtual void destroy();
|
1084
1137
|
virtual void visit(ParserVisitor*, bool);
|
@@ -1109,13 +1162,12 @@ private:
|
|
1109
1162
|
std::stack<ContainerPtr> _containerStack;
|
1110
1163
|
std::map<Builtin::Kind, BuiltinPtr> _builtins;
|
1111
1164
|
std::map<std::string, ContainedList> _contentMap;
|
1112
|
-
FeatureProfile _featureProfile;
|
1113
1165
|
std::map<std::string, DefinitionContextPtr> _definitionContextMap;
|
1114
1166
|
std::map<int, std::string> _typeIds;
|
1115
1167
|
std::map< std::string, std::set<std::string> > _fileTopLevelModules;
|
1116
1168
|
};
|
1117
1169
|
|
1118
|
-
extern
|
1170
|
+
extern Unit* unit; // The current parser for bison/flex
|
1119
1171
|
|
1120
1172
|
}
|
1121
1173
|
|