diff options
Diffstat (limited to 'cpp/test')
137 files changed, 0 insertions, 16143 deletions
diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile deleted file mode 100644 index edc5fa6c4d2..00000000000 --- a/cpp/test/Freeze/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = dbmap complex evictor fileLock - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Freeze/Makefile.mak b/cpp/test/Freeze/Makefile.mak deleted file mode 100644 index 9348af1d287..00000000000 --- a/cpp/test/Freeze/Makefile.mak +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = dbmap \ - complex \ - evictor \ - fileLock - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/cpp/test/Freeze/complex/.depend.mak b/cpp/test/Freeze/complex/.depend.mak deleted file mode 100755 index bee3aa9b9ae..00000000000 --- a/cpp/test/Freeze/complex/.depend.mak +++ /dev/null @@ -1,633 +0,0 @@ - -Complex.h: \ - Complex.ice - -Complex.obj: \ - Complex.cpp \ - "Complex.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -Grammar.obj: \ - Grammar.cpp \ - "NodeI.h" \ - "Complex.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "Parser.h" \ - -Scanner.obj: \ - Scanner.cpp \ - "$(includedir)\IceUtil\ScannerConfig.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "Parser.h" \ - "Complex.h" \ - "Grammar.h" \ - "NodeI.h" \ - -Parser.obj: \ - Parser.cpp \ - "$(includedir)\IceUtil\DisableWarnings.h" \ - "Parser.h" \ - "Complex.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - -Client.obj: \ - Client.cpp \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "ComplexDict.h" \ - "Complex.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "NodeI.h" \ - "Parser.h" \ - -ComplexDict.obj: \ - ComplexDict.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "ComplexDict.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "Complex.h" \ diff --git a/cpp/test/Freeze/complex/.gitignore b/cpp/test/Freeze/complex/.gitignore deleted file mode 100644 index c1641d6cf02..00000000000 --- a/cpp/test/Freeze/complex/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -Complex.cpp -Complex.h -ComplexDict.h -ComplexDict.cpp -db/* diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp deleted file mode 100644 index f607bc97a56..00000000000 --- a/cpp/test/Freeze/complex/Client.cpp +++ /dev/null @@ -1,185 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Freeze/Freeze.h> -#include <ComplexDict.h> -#include <TestCommon.h> -#include <NodeI.h> -#include <Parser.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; - -// -// Don't use namespace Complex to ensure that the Complex namespace -// exists correctly. -// -// using namespace Complex; -// - -static int -validate(const Complex::ComplexDict& m) -{ - cout << "testing database expressions... " << flush; - Complex::ComplexDict::const_iterator p; - Parser myParser; - for(p = m.begin(); p != m.end(); ++p) - { - // - // Verify the stored record is correct. - // - // COMPILERFIX: VC.NET reports an unhandled - // exception if the test is written this way: - // - //test(p->first.result == p->second->calc()); - // - Complex::NodePtr n = p->second; - test(p->first.result == n->calc()); - - // - // Verify that the expression & result again. - // - Complex::NodePtr root = myParser.parse(p->first.expression); - test(root->calc() == p->first.result); - } - cout << "ok" << endl; - - return EXIT_SUCCESS; -} - -static const char* expressions[] = -{ - "2", - "10", - "2+(5*3)", - "5*(2+3)", - "10+(10+(20+(8*(2*(3*2+4+5+6)))))" -}; -static const size_t nexpressions = sizeof(expressions)/sizeof(expressions[0]); - -static int -populate(Complex::ComplexDict& m) -{ - cout << "populating the database... " << flush; - Parser myParser; - for(size_t i = 0 ; i < nexpressions; ++i) - { - Complex::NodePtr root = myParser.parse(expressions[i]); - assert(root); - Complex::Key k; - k.expression = expressions[i]; - k.result = root->calc(); - m.put(pair<const Complex::Key, const Complex::NodePtr>(k, root)); - } - cout << "ok" << endl; - - return EXIT_SUCCESS; -} - -static void -usage(const char* name) -{ - cerr << "Usage: " << name << " [options] validate|populate\n"; - cerr << - "Options:\n" - "--dbdir Location of the database directory.\n"; -} - -static int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, Complex::ComplexDict& m) -{ - // - // Register a factory for the node types. - // - Ice::ObjectFactoryPtr factory = new Complex::ObjectFactoryI; - communicator->addObjectFactory(factory, "::Complex::NumberNode"); - communicator->addObjectFactory(factory, "::Complex::AddNode"); - communicator->addObjectFactory(factory, "::Complex::MultiplyNode"); - - if(argc > 1 && strcmp(argv[1], "populate") == 0) - { - return populate(m); - } - if(argc > 1 && strcmp(argv[1], "validate") == 0) - { - return validate(m); - } - usage(argv[0]); - - return EXIT_FAILURE; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - try - { - // - // Scan for --dbdir command line argument. - // - int i = 1; - while(i < argc) - { - if(strcmp(argv[i], "--dbdir") == 0) - { - if(i +1 >= argc) - { - usage(argv[0]); - return EXIT_FAILURE; - } - - envName = argv[i+1]; - envName += "/"; - envName += "db"; - - // - // Consume arguments - // - while(i < argc - 2) - { - argv[i] = argv[i+2]; - ++i; - } - argc -= 2; - } - else - { - ++i; - } - } - - communicator = Ice::initialize(argc, argv); - Freeze::ConnectionPtr connection = createConnection(communicator, envName); - Complex::ComplexDict m(connection, "test"); - status = run(argc, argv, communicator, m); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/Freeze/complex/Complex.ice b/cpp/test/Freeze/complex/Complex.ice deleted file mode 100644 index f551bdd63e6..00000000000 --- a/cpp/test/Freeze/complex/Complex.ice +++ /dev/null @@ -1,52 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -module Complex -{ - -// -// The database key (the expression and the result). Naturally, this -// is not a very good key - but this is only a test :) -// -struct Key -{ - string expression; - int result; -}; - -// -// A set of classes that represents a numeric parse tree. -// -class Node -{ - int calc(); -}; - -class NumberNode extends Node -{ - int number; -}; - -class BinaryNode extends Node -{ - Node left; - Node right; -}; - -class AddNode extends BinaryNode -{ -}; - -class MultiplyNode extends BinaryNode -{ -}; - -}; diff --git a/cpp/test/Freeze/complex/Grammar.cpp b/cpp/test/Freeze/complex/Grammar.cpp deleted file mode 100644 index e5b0d6547da..00000000000 --- a/cpp/test/Freeze/complex/Grammar.cpp +++ /dev/null @@ -1,1592 +0,0 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.4.1" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 1 - -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - - - -/* Copy the first part of user declarations. */ - -/* Line 189 of yacc.c */ -#line 1 "Grammar.y" - - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <NodeI.h> -#include <Parser.h> - -#ifdef _MSC_VER -// I get these warnings from some bison versions: -// warning C4102: 'yyoverflowlab' : unreferenced label -# pragma warning( disable : 4102 ) -// warning C4065: switch statement contains 'default' but no 'case' labels -# pragma warning( disable : 4065 ) -#endif - -using namespace std; -using namespace Ice; - -void -yyerror(const char* s) -{ - parser->error(s); -} - - - -/* Line 189 of yacc.c */ -#line 107 "Grammar.tab.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOK_NUMBER = 258 - }; -#endif - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - - -/* Copy the second part of user declarations. */ - - -/* Line 264 of yacc.c */ -#line 152 "Grammar.tab.c" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) -#else -static int -YYID (yyi) - int yyi; -#endif -{ - return yyi; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 6 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 11 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 8 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 3 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 6 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 12 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 258 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 5, 6, 7, 4, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 5, 7, 11, 15 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 9, 0, -1, 10, -1, 3, -1, 10, 4, 10, - -1, 5, 10, 6, -1, 10, 7, 10, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 42, 42, 49, 53, 57, 61 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "TOK_NUMBER", "'+'", "'('", "')'", "'*'", - "$accept", "start", "expr", 0 -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 43, 40, 41, 42 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 8, 9, 10, 10, 10, 10 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 1, 3, 3, 3 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 3, 0, 0, 2, 0, 1, 0, 0, 5, - 4, 6 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 3, 4 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -4 -static const yytype_int8 yypact[] = -{ - 6, -4, 6, 2, 3, -3, -4, 6, 6, -4, - 3, 3 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -4, -4, -2 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 5, 7, 6, 9, 8, 10, 11, 7, 0, 1, - 8, 2 -}; - -static const yytype_int8 yycheck[] = -{ - 2, 4, 0, 6, 7, 7, 8, 4, -1, 3, - 7, 5 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 3, 5, 9, 10, 10, 0, 4, 7, 6, - 10, 10 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval) -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - YYFPRINTF (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif -{ - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void) -#else -int -yyparse () - -#endif -#endif -{ -/* The lookahead symbol. */ -int yychar; - -/* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; - - /* Number of syntax errors so far. */ - int yynerrs; - - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - YYSIZE_T yystacksize; - - int yyn; - int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yystacksize = YYINITDEPTH; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the lookahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - - yystate = yyn; - *++yyvsp = yylval; - - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: - -/* Line 1455 of yacc.c */ -#line 43 "Grammar.y" - { - parser->setResult((yyval)); -;} - break; - - case 3: - -/* Line 1455 of yacc.c */ -#line 50 "Grammar.y" - { - (yyval) = (yyvsp[(1) - (1)]); -;} - break; - - case 4: - -/* Line 1455 of yacc.c */ -#line 54 "Grammar.y" - { - (yyval) = new Complex::AddNodeI((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); -;} - break; - - case 5: - -/* Line 1455 of yacc.c */ -#line 58 "Grammar.y" - { - (yyval) = (yyvsp[(2) - (3)]); -;} - break; - - case 6: - -/* Line 1455 of yacc.c */ -#line 62 "Grammar.y" - { - (yyval) = new Complex::MultiplyNodeI((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); -;} - break; - - - -/* Line 1455 of yacc.c */ -#line 1379 "Grammar.tab.c" - default: break; - } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif - } - - - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - *++yyvsp = yylval; - - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#if !defined(yyoverflow) || YYERROR_VERBOSE -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - - -/* Line 1675 of yacc.c */ -#line 67 "Grammar.y" - - diff --git a/cpp/test/Freeze/complex/Grammar.h b/cpp/test/Freeze/complex/Grammar.h deleted file mode 100644 index b7f7c2131d8..00000000000 --- a/cpp/test/Freeze/complex/Grammar.h +++ /dev/null @@ -1,57 +0,0 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOK_NUMBER = 258 - }; -#endif - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef int YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - - - - diff --git a/cpp/test/Freeze/complex/Grammar.y b/cpp/test/Freeze/complex/Grammar.y deleted file mode 100644 index 45a82babf52..00000000000 --- a/cpp/test/Freeze/complex/Grammar.y +++ /dev/null @@ -1,67 +0,0 @@ -%{ - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <NodeI.h> -#include <Parser.h> - -#ifdef _MSC_VER -// I get these warnings from some bison versions: -// warning C4102: 'yyoverflowlab' : unreferenced label -# pragma warning( disable : 4102 ) -// warning C4065: switch statement contains 'default' but no 'case' labels -# pragma warning( disable : 4065 ) -#endif - -using namespace std; -using namespace Ice; - -void -yyerror(const char* s) -{ - parser->error(s); -} - -%} - -%pure_parser -%expect 4 - -%token TOK_NUMBER - -%% - -start -: expr -{ - parser->setResult($$); -} -; - -expr -: TOK_NUMBER -{ - $$ = $1; -} -| expr '+' expr -{ - $$ = new Complex::AddNodeI($1, $3); -} -| '(' expr ')' -{ - $$ = $2; -} -| expr '*' expr -{ - $$ = new Complex::MultiplyNodeI($1, $3); -} -; - -%% diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile deleted file mode 100644 index a0b03ca8d8e..00000000000 --- a/cpp/test/Freeze/complex/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -SLICE_OBJS = Complex.o - -OBJS = ComplexDict.o \ - Complex.o \ - Grammar.o \ - Scanner.o \ - Parser.o \ - Client.o - -all:: ComplexDict.cpp - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -ComplexDict.h: ComplexDict.cpp -ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f ComplexDict.h ComplexDict.cpp - $(SLICE2FREEZE) -I. -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice - -clean:: - -rm -f ComplexDict.h ComplexDict.cpp - -rm -rf db/* diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak deleted file mode 100644 index f0a86d03515..00000000000 --- a/cpp/test/Freeze/complex/Makefile.mak +++ /dev/null @@ -1,51 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -SLICE_OBJS = .\Complex.obj - -BISON_FLEX_OBJS = .\Grammar.obj \ - .\Scanner.obj - - -OBJS = $(SLICE_OBJS) \ - $(BISON_FLEX_OBJS) \ - .\Parser.obj \ - .\Client.obj \ - .\ComplexDict.obj - -all:: ComplexDict.cpp ComplexDict.h - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -ComplexDict.h ComplexDict.cpp: Complex.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q ComplexDict.h ComplexDict.cpp - "$(SLICE2FREEZE)" -I. -I"$(slicedir)" --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice - -clean:: - del /q Complex.cpp Complex.h - del /q ComplexDict.h ComplexDict.cpp - -if exist db\__Freeze rmdir /q /s db\__Freeze - -for %f in (db\*) do if not %f == db\.gitignore del /q %f diff --git a/cpp/test/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h deleted file mode 100644 index 64d88f8a281..00000000000 --- a/cpp/test/Freeze/complex/NodeI.h +++ /dev/null @@ -1,109 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef NODE_I_H -#define NODE_I_H - -#include <Complex.h> -#include <Ice/ObjectFactory.h> - -namespace Complex -{ - -class NumberNodeI : public NumberNode -{ -public: - - NumberNodeI() - { - } - - NumberNodeI(int n) - { - number = n; - } - - virtual int calc(const Ice::Current&) - { - return number; - } -}; - -class AddNodeI : public AddNode -{ -public: - - AddNodeI() - { - } - - AddNodeI(const NodePtr& l, const NodePtr& r) - { - left = l; - right = r; - } - - virtual int calc(const Ice::Current&) - { - return left->calc() + right->calc(); - } -}; - -class MultiplyNodeI : public MultiplyNode -{ -public: - - MultiplyNodeI() - { - } - - MultiplyNodeI(const NodePtr& l, const NodePtr& r) - { - left = l; - right = r; - } - - virtual int calc(const Ice::Current&) - { - return left->calc() * right->calc(); - } -}; - -class ObjectFactoryI : public Ice::ObjectFactory -{ -public: - - virtual Ice::ObjectPtr create(const std::string& type) - { - if(type == "::Complex::MultiplyNode") - { - return new MultiplyNodeI(); - } - if(type == "::Complex::AddNode") - { - return new AddNodeI(); - } - if(type == "::Complex::NumberNode") - { - return new NumberNodeI(); - } - std::cout << "create: " << type << std::endl; - assert(false); - return 0; - } - - virtual void destroy() - { - // Nothing to do - } -}; - -} // End namespace Complex - -#endif diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp deleted file mode 100644 index 6737cd9065a..00000000000 --- a/cpp/test/Freeze/complex/Parser.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/DisableWarnings.h> -#include <Parser.h> - -using namespace std; - -// -// The current bison/flex parser -// -Parser* parser = 0; - -Parser::Parser() -{ -} - -Parser::~Parser() -{ -} - -Complex::NodePtr -Parser::parse(const string& commands, bool debug) -{ - extern int yydebug; - yydebug = debug ? 1 : 0; - - _result = 0; - _errors = 0; - _buf = commands; - assert(!_buf.empty()); - extern FILE* yyin; - yyin = 0; - - assert(!parser); - parser = this; - yyparse(); - parser = 0; - - if(_errors) - { - return 0; - } - - return _result; -} - -void -Parser::error(const char* s) -{ - cerr << "error: " << s << endl; - _errors++; -} - -void -Parser::error(const std::string& s) -{ - error(s.c_str()); -} - -// -// With older flex version <= 2.5.35 YY_INPUT second -// paramenter is of type int&, in newer versions it -// changes to size_t& -// -void -Parser::getInput(char* buf, int& result, size_t maxSize) -{ - size_t r = static_cast<size_t>(result); - getInput(buf, r, maxSize); - result = static_cast<int>(r); -} - -void -Parser::getInput(char* buf, size_t& result, size_t maxSize) -{ - if(!_buf.empty()) - { - result = min(maxSize, _buf.length()); - strncpy(buf, _buf.c_str(), result); - _buf.erase(0, result); - } - else - { - result = 0; - } -} - -void -Parser::setResult(const Complex::NodePtr& node) -{ - _result = node; -} diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h deleted file mode 100644 index 34f4660a2a8..00000000000 --- a/cpp/test/Freeze/complex/Parser.h +++ /dev/null @@ -1,86 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef PARSER_H -#define PARSER_H - -#include <Complex.h> - -#ifdef _WIN32 -# include <io.h> -# ifdef _MSC_VER -# define isatty _isatty -# define fileno _fileno -// '_isatty' : inconsistent dll linkage. dllexport assumed. -# pragma warning( disable : 4273 ) -# endif -#endif - -// -// Stuff for flex and bison -// - -#define YYSTYPE Complex::NodePtr -#define YY_DECL int yylex(YYSTYPE* yylvalp) -YY_DECL; -int yyparse(); - -// -// I must set the initial stack depth to the maximum stack depth to -// disable bison stack resizing. The bison stack resizing routines use -// simple malloc/alloc/memcpy calls, which do not work for the -// YYSTYPE, since YYSTYPE is a C++ type, with constructor, destructor, -// assignment operator, etc. -// -#define YYMAXDEPTH 10000 -#define YYINITDEPTH YYMAXDEPTH // Initial depth is set to max depth, for the reasons described above. - -// -// Newer bison versions allow to disable stack resizing by defining -// yyoverflow. -// -#define yyoverflow(a, b, c, d, e, f) yyerror(a) - -// -// unput() isn't needed. This prevents the function being defined, and -// the resulting compiler warning. -// -#define YY_NO_UNPUT - -class Parser -{ -public: - - Parser(); - ~Parser(); - - Complex::NodePtr parse(const std::string&, bool = false); - - void error(const char*); - void error(const std::string&); - - // - // With older flex version <= 2.5.35 YY_INPUT second - // paramenter is of type int&, in newer versions it - // changes to size_t& - // - void getInput(char*, int&, size_t); - void getInput(char*, size_t&, size_t); - void setResult(const Complex::NodePtr&); - -private: - - std::string _buf; - Complex::NodePtr _result; - int _errors; -}; - -extern Parser* parser; // Current parser for bison/flex - -#endif diff --git a/cpp/test/Freeze/complex/Scanner.cpp b/cpp/test/Freeze/complex/Scanner.cpp deleted file mode 100644 index 17e652c97f6..00000000000 --- a/cpp/test/Freeze/complex/Scanner.cpp +++ /dev/null @@ -1,1755 +0,0 @@ -#include <IceUtil/ScannerConfig.h> - -#line 3 "lex.yy.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -extern int yyleng; - -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, (yytext_ptr) ) - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; - -typedef int yy_state_type; - -extern int yylineno; - -int yylineno = 1; - -extern char *yytext; -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 4 -#define YY_END_OF_BUFFER 5 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[11] = - { 0, - 0, 0, 5, 4, 3, 1, 4, 1, 2, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 3, 4, 5, 1, 1, 1, 1, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 7, 1, 1, 1, 8, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[9] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int16_t yy_base[11] = - { 0, - 0, 0, 13, 14, 14, 6, 4, 4, 2, 14 - } ; - -static yyconst flex_int16_t yy_def[11] = - { 0, - 10, 1, 10, 10, 10, 10, 10, 10, 10, 0 - } ; - -static yyconst flex_int16_t yy_nxt[23] = - { 0, - 4, 5, 5, 5, 5, 6, 4, 7, 9, 8, - 9, 8, 10, 3, 10, 10, 10, 10, 10, 10, - 10, 10 - } ; - -static yyconst flex_int16_t yy_chk[23] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 9, 8, - 7, 6, 3, 10, 10, 10, 10, 10, 10, 10, - 10, 10 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -extern int yy_flex_debug; -int yy_flex_debug = 0; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "Scanner.l" -#line 2 "Scanner.l" - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Ice.h> -#include <Parser.h> -#include <Grammar.h> -#include <NodeI.h> - -#if defined(_MSC_VER) && defined(ICE_64) -// -// '=' : conversion from 'size_t' to 'int', possible loss of data -// The result of fread() is a size_t and gets inserted into an int -// -# pragma warning( 4 : 4267 ) -// -// 'initializing' : conversion from '__int64' to 'int', possible loss of data -// Puts a pointer-difference into an int -// -# pragma warning( 4 : 4244 ) -#endif - -using namespace std; -using namespace Ice; - -#ifdef _MSC_VER -# ifdef yywrap -# undef yywrap -# define yywrap() 1 -# endif -# define YY_NO_UNISTD_H -#endif - -#ifdef __SUNPRO_CC -# ifdef yywrap -# undef yywrap -# define yywrap() 1 -# endif -# ifdef ICE_64 -# pragma error_messages(off,truncwarn) -# endif -#endif - -#define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) - -#define YY_NO_INPUT 1 -#line 509 "lex.yy.c" - -#define INITIAL 0 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include <unistd.h> -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -static int yy_init_globals (void ); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (void ); - -int yyget_debug (void ); - -void yyset_debug (int debug_flag ); - -YY_EXTRA_TYPE yyget_extra (void ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ); - -FILE *yyget_in (void ); - -void yyset_in (FILE * in_str ); - -FILE *yyget_out (void ); - -void yyset_out (FILE * out_str ); - -int yyget_leng (void ); - -char *yyget_text (void ); - -int yyget_lineno (void ); - -void yyset_lineno (int line_number ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (void ); -#else -extern int yywrap (void ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (void ); -#else -static int input (void ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - unsigned n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - -#line 64 "Scanner.l" - - -#line 692 "lex.yy.c" - - if ( !(yy_init) ) - { - (yy_init) = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_load_buffer_state( ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); - - /* Support of yytext. */ - *yy_cp = (yy_hold_char); - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = (yy_start); -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 11 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 10 ); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 66 "Scanner.l" -{ - *yylvalp = new Complex::NumberNodeI(atoi(yytext)); - return TOK_NUMBER; -} - YY_BREAK -case 2: -YY_RULE_SETUP -#line 71 "Scanner.l" -/* eat whitespace */ - YY_BREAK -case 3: -YY_RULE_SETUP -#line 73 "Scanner.l" -{ return *yytext; } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 75 "Scanner.l" -ECHO; - YY_BREAK -#line 794 "lex.yy.c" -case YY_STATE_EOF(INITIAL): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; - - if ( yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; - int ret_val; - - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (void) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - - yy_current_state = (yy_start); - - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 11 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 11 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 10); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (void) -#else - static int input (void) -#endif - -{ - int c; - - *(yy_c_buf_p) = (yy_hold_char); - - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; - - else - { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); - - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( ) ) - return EOF; - - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } - } - - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; -} - -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); - - yyfree((void *) b ); -} - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - -{ - int oerrno = errno; - - yy_flush_buffer(b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the current line number. - * - */ -int yyget_lineno (void) -{ - - return yylineno; -} - -/** Get the input stream. - * - */ -FILE *yyget_in (void) -{ - return yyin; -} - -/** Get the output stream. - * - */ -FILE *yyget_out (void) -{ - return yyout; -} - -/** Get the length of the current token. - * - */ -int yyget_leng (void) -{ - return yyleng; -} - -/** Get the current token. - * - */ - -char *yyget_text (void) -{ - return yytext; -} - -/** Set the current line number. - * @param line_number - * - */ -void yyset_lineno (int line_number ) -{ - - yylineno = line_number; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) -{ - yyin = in_str ; -} - -void yyset_out (FILE * out_str ) -{ - yyout = out_str ; -} - -int yyget_debug (void) -{ - return yy_flex_debug; -} - -void yyset_debug (int bdebug ) -{ - yy_flex_debug = bdebug ; -} - -static int yy_init_globals (void) -{ - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - (yy_buffer_stack) = 0; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; - (yy_init) = 0; - (yy_start) = 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( ); - - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size ) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size ) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 75 "Scanner.l" - - - diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l deleted file mode 100644 index 17fd8ef8c6c..00000000000 --- a/cpp/test/Freeze/complex/Scanner.l +++ /dev/null @@ -1,75 +0,0 @@ -%{ - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Ice.h> -#include <Parser.h> -#include <Grammar.h> -#include <NodeI.h> - -#if defined(_MSC_VER) && defined(ICE_64) -// -// '=' : conversion from 'size_t' to 'int', possible loss of data -// The result of fread() is a size_t and gets inserted into an int -// -# pragma warning( 4 : 4267 ) -// -// 'initializing' : conversion from '__int64' to 'int', possible loss of data -// Puts a pointer-difference into an int -// -# pragma warning( 4 : 4244 ) -#endif - -using namespace std; -using namespace Ice; - -#ifdef _MSC_VER -# ifdef yywrap -# undef yywrap -# define yywrap() 1 -# endif -# define YY_NO_UNISTD_H -#endif - -#ifdef __SUNPRO_CC -# ifdef yywrap -# undef yywrap -# define yywrap() 1 -# endif -# ifdef ICE_64 -# pragma error_messages(off,truncwarn) -# endif -#endif - -#define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) - -%} - -WS [ \t\v\f\r] -NL [\n] -DIGIT [0-9] - -%option noyywrap -%option never-interactive -%option nounput -%option noinput - -%% - -{DIGIT}+ { - *yylvalp = new Complex::NumberNodeI(atoi(yytext)); - return TOK_NUMBER; -} - -WS+ /* eat whitespace */ - -"("|")"|"+"|"*" { return *yytext; } - -%% diff --git a/cpp/test/Freeze/complex/db/.gitignore b/cpp/test/Freeze/complex/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/cpp/test/Freeze/complex/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py deleted file mode 100755 index 8d003c5d898..00000000000 --- a/cpp/test/Freeze/complex/run.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.path.dirname(os.path.abspath(__file__)) - -# -# Clean the contents of the database directory. -# -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -client = os.path.join(os.getcwd(), "client") - -if TestUtil.appverifier: - TestUtil.setAppVerifierSettings([client]) - -sys.stdout.write("starting populate... ") -sys.stdout.flush() -populateProc = TestUtil.startClient(client, ' --dbdir "%s" populate' % os.getcwd(), startReader = False) -print("ok") -populateProc.startReader() -populateProc.waitTestSuccess() - -sys.stdout.write("starting verification client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, ' --dbdir "%s" validate' % os.getcwd(), startReader = False) -print("ok") -clientProc.startReader() -clientProc.waitTestSuccess() - -if TestUtil.appverifier: - TestUtil.appVerifierAfterTestEnd([client]) diff --git a/cpp/test/Freeze/dbmap/.depend.mak b/cpp/test/Freeze/dbmap/.depend.mak deleted file mode 100755 index 34a36b2156c..00000000000 --- a/cpp/test/Freeze/dbmap/.depend.mak +++ /dev/null @@ -1,796 +0,0 @@ - -ByteIntMap.obj: \ - ByteIntMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "ByteIntMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - -IntIdentityMap.obj: \ - IntIdentityMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "IntIdentityMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - -IntIdentityMapWithIndex.obj: \ - IntIdentityMapWithIndex.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "IntIdentityMapWithIndex.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - -SortedMap.obj: \ - SortedMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "SortedMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - -WstringWstringMap.obj: \ - WstringWstringMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "WstringWstringMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - -Client.obj: \ - Client.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - "ByteIntMap.h" \ - "IntIdentityMap.h" \ - "IntIdentityMapWithIndex.h" \ - "SortedMap.h" \ - "WstringWstringMap.h" \ diff --git a/cpp/test/Freeze/dbmap/.gitignore b/cpp/test/Freeze/dbmap/.gitignore deleted file mode 100644 index ba2bc3536f9..00000000000 --- a/cpp/test/Freeze/dbmap/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -ByteIntMap.h -ByteIntMap.cpp -IntIdentityMap.h -IntIdentityMap.cpp -IntIdentityMapWithIndex.h -IntIdentityMapWithIndex.cpp -SortedMap.h -SortedMap.cpp -WstringWstringMap.h -WstringWstringMap.cpp -db/* diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp deleted file mode 100644 index 845cbdcc913..00000000000 --- a/cpp/test/Freeze/dbmap/Client.cpp +++ /dev/null @@ -1,1047 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> -#include <TestCommon.h> -#include <ByteIntMap.h> -#include <IntIdentityMap.h> -#include <IntIdentityMapWithIndex.h> -#include <SortedMap.h> -#include <WstringWstringMap.h> -#include <Freeze/TransactionHolder.h> - -#include <algorithm> - -using namespace std; -using namespace Ice; -using namespace Freeze; -using namespace Test; - - -// #define SHOW_EXCEPTIONS 1 -#define CONCURRENT_TIME 3 - - -#ifdef __SUNPRO_CC -extern -#else -static -#endif -Byte alphabetChars[] = "abcdefghijklmnopqrstuvwxyz"; - -vector<Byte> alphabet; - -// The extern in the following function is due to a Sun C++ 5.4 template bug -// -extern void -ForEachTest(const pair<const Byte, const Int>&) -{ -} - -extern bool -FindIfTest(const pair<const Byte, const Int>& p) -{ - return p.first == 'b'; -} - -extern bool -FindFirstOfTest(const pair<const Byte, const Int>& p, Byte q) -{ - return p.first == q; -} - - -void -populateDB(const Freeze::ConnectionPtr& connection, ByteIntMap& m) -{ - vector<Byte> localAlphabet; - localAlphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1); - size_t length = localAlphabet.size(); - - for(;;) - { - try - { - TransactionHolder txHolder(connection); - for(size_t j = 0; j < length; ++j) - { - m.put(ByteIntMap::value_type(localAlphabet[j], static_cast<Int>(j))); - } - txHolder.commit(); - break; - } - catch(const DeadlockException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "t" << flush; -#endif - - length = length / 2; - // - // Try again - // - } - } -} - -class ReadThread : public IceUtil::Thread -{ -public: - - ReadThread(const CommunicatorPtr& communicator, const string& envName, const string& dbName) : - _connection(createConnection(communicator, envName)), - _map(_connection, dbName), - _done(false) - { - } - - virtual void - run() - { - bool more = false; - - do - { - for(;;) - { - try - { - for(ByteIntMap::iterator p = _map.begin(); p != _map.end(); ++p) - { - test((p->first == p->second + 'a') || (p->first == p->second + 'A')); - IceUtil::ThreadControl::yield(); - } - break; // for(;;) - } - catch(const DeadlockException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "r" << flush; -#endif - // - // Try again - // - } - catch(const InvalidPositionException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "i" << flush; -#endif - break; - } - } - - { - IceUtil::Mutex::Lock lock(_doneMutex); - more = !_done; - } - - } while(more); - } - - void stop() - { - IceUtil::Mutex::Lock lock(_doneMutex); - _done = true; - } - -private: - - Freeze::ConnectionPtr _connection; - ByteIntMap _map; - bool _done; - IceUtil::Mutex _doneMutex; -}; - -typedef IceUtil::Handle<ReadThread> ReadThreadPtr; - - -class WriteThread : public IceUtil::Thread -{ -public: - - WriteThread(const CommunicatorPtr& communicator, const string& envName, const string& dbName) : - _connection(createConnection(communicator, envName)), - _map(_connection, dbName), - _done(false) - { - } - - virtual void - run() - { - bool more = false; - - // - // Delete an recreate each object - // - do - { - for(;;) - { - try - { - TransactionHolder txHolder(_connection); - for(ByteIntMap::iterator p = _map.begin(); p != _map.end(); ++p) - { - p.set(p->second + 1); - _map.erase(p); - } - txHolder.commit(); - break; // for (;;) - } - catch(const DeadlockException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "w" << flush; -#endif - // - // Try again - // - } - catch(const InvalidPositionException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "I" << flush; -#endif - break; - } - } - populateDB(_connection, _map); - - - // - // Now update without a transaction - // - - for(char c = 'a'; c != 'd'; ++c) - { - for(;;) - { - bool thrownBySet = false; - try - { - ByteIntMap::iterator p = _map.find(c); - try - { - if(p != _map.end()) - { - if(p->first == p->second + 'a') - { - p.set(p->first - 'A'); - } - else - { - p.set(p->first - 'a'); - } - } - } - catch(const DeadlockException&) - { - thrownBySet = true; - throw; - } - break; // for (;;) - } - catch(const DeadlockException&) - { - if(!thrownBySet) - { - cerr << "DeadlockException thrown by destructor!" << endl; - test(false); - } - -#ifdef SHOW_EXCEPTIONS - if(thrownBySet) - { - cerr << "S" << flush; - } - else - { - cerr << "D" << flush; - } -#endif - // Try again - } - catch(const InvalidPositionException&) - { -#ifdef SHOW_EXCEPTIONS - cerr << "I" << flush; -#endif - break; - } - } - } - - { - IceUtil::Mutex::Lock lock(_doneMutex); - more = !_done; - } - } while(more); - } - - void stop() - { - IceUtil::Mutex::Lock lock(_doneMutex); - _done = true; - } - -private: - - Freeze::ConnectionPtr _connection; - ByteIntMap _map; - bool _done; - IceUtil::Mutex _doneMutex; -}; - -typedef IceUtil::Handle<WriteThread> WriteThreadPtr; - - -int -run(const CommunicatorPtr& communicator, const string& envName) -{ - Freeze::ConnectionPtr connection = createConnection(communicator, envName); - const string dbName = "binary"; - - // - // Open/close db within transaction - // - { - TransactionHolder txHolder(connection); - ByteIntMap m1(connection, dbName); - - m1.put((ByteIntMap::value_type('a', 1))); - // rollback in dtor of txHolder - } - - ByteIntMap m1(connection, dbName); - - // - // Populate the database with the alphabet - // - populateDB(connection, m1); - alphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1); - - // - // Test ==, swap and communicator() - // - ByteIntMap m(connection, dbName + "-tmp"); - test(!(m == m1)); - test(m != m1); - m.swap(m1); - test(!(m == m1)); - test(m != m1); - test(m1.size() == 0); - test(m.communicator() == (m1.communicator() == communicator)); - - - vector<Byte>::const_iterator j; - ByteIntMap::iterator p; - ByteIntMap::const_iterator cp; - - cout << "testing populate... " << flush; - // - // First try non-const iterator - // - for(j = alphabet.begin(); j != alphabet.end(); ++j) - { - p = m.find(*j); - test(p != m.end()); - test(p->first == *j && p->second == j - alphabet.begin()); - } - // - // Next try const iterator - // - for(j = alphabet.begin(); j != alphabet.end(); ++j) - { - cp = m.find(*j); - test(cp != m.end()); - test(cp->first == *j && cp->second == j - alphabet.begin()); - } - - test(!m.empty()); - test(m.size() == alphabet.size()); - cout << "ok" << endl; - - cout << "testing map::find... " << flush; - j = find(alphabet.begin(), alphabet.end(), 'n'); - - cp = m.find(*j); - test(cp != m.end()); - test(cp->first == 'n' && cp->second == j - alphabet.begin()); - cout << "ok" << endl; - - cout << "testing erase... " << flush; - - // - // erase first offset characters (first offset characters is - // important for later verification of the correct second value in - // the map). - // - int offset = 3; - vector<Byte> bytes; - bytes.push_back('a'); - bytes.push_back('b'); - bytes.push_back('c'); - for(j = bytes.begin(); j != bytes.end(); ++j) - { - p = m.find(*j); - test(p != m.end()); - m.erase(p); - - // - // Release locks to avoid self deadlock - // - p = m.end(); - - p = m.find(*j); - test(p == m.end()); - vector<Byte>::iterator r = find(alphabet.begin(), alphabet.end(), *j); - test(r != alphabet.end()); - alphabet.erase(r); - } - - for(j = alphabet.begin(); j != alphabet.end(); ++j) - { - cp = m.find(*j); - test(cp != m.end()); - test(cp->first == *j && cp->second == (j - alphabet.begin()) + offset); - } - - cout << "ok" << endl; - - // - // Get an iterator for the deleted element - this should fail. - // - cout << "testing map::find (again)... " << flush; - cp = m.find('a'); - test(cp == m.end()); - cout << "ok" << endl; - - cout << "testing iterators... " << flush; - p = m.begin(); - ByteIntMap::iterator p2 = p; - - // - // Verify both iterators point at the same element, and that - // element is in the map. - // - test(p == p2); - test(p->first == p2->first && p->second == p2->second); - test(find(alphabet.begin(), alphabet.end(), p->first) != alphabet.end()); - - // - // Create iterator that points at 'n' - // - p = m.find('n'); - p2 = p; - - // - // Verify both iterators point at 'n' - // - test(p == p2); - test(p->first == 'n' && p->second == 13); - test(p2->first == 'n' && p2->second == 13); - - // - // Create cursor that points at 'n' - // - p = m.find('n'); - test(p->first == 'n' && p->second == 13); - ++p; - - p2 = p; - - // - // Verify cloned cursors are independent - // - test(p->first != 'n' && p->second != 13); - pair<const Byte, const Int> data = *p; - ++p; - - test(p->first != data.first && p->second != data.second); - ++p; - - test(p2->first == data.first && p2->second == data.second); - - p = m.find('n'); - p2 = ++p; - test(p2->first == p->first); - - char c = p2->first; - p2 = p++; - test(c == p2->first); // p2 should still be the same - test(p2->first != p->first && (++p2)->first == p->first); - - cout << "ok" << endl; - - // - // Test writing into an iterator. - // - cout << "testing iterator.set... " << flush; - - p = m.find('d'); - test(p != m.end() && p->second == 3); - - test(m.find('a') == m.end()); - m.put(ByteIntMap::value_type('a', 1)); - - p = m.find('a'); - test(p != m.end() && p->second == 1); - - - m.put(ByteIntMap::value_type('a', 0)); - - p = m.find('a'); - test(p != m.end() && p->second == 0); - // - // Test inserts - // - - ByteIntMap::value_type i3('a', 7); - pair<ByteIntMap::iterator, bool> insertResult = m.insert(i3); - - test(insertResult.first == m.find('a')); - test(insertResult.first->second == 0); - test(insertResult.second == false); - insertResult.first = m.end(); - - p = m.insert(m.end(), i3); - test(p == m.find('a')); - test(p->second == 0); - - ByteIntMap::value_type i4('b', 7); - - insertResult = m.insert(i4); - test(insertResult.first == m.find('b')); - test(insertResult.first->second == 7); - test(insertResult.second == true); - insertResult.first = m.end(); - - ByteIntMap::value_type i5('c', 8); - - p = m.insert(m.end(), i5); - test(p == m.find('c')); - test(p->second == 8); - - p = m.find('a'); - test(p != m.end() && p->second == 0); - p.set(1); - test(p != m.end() && p->second == 1); - - // - // This is necessary to release the locks held - // by p and avoid a self-deadlock - // - p = m.end(); - - p = m.find('a'); - test(p != m.end() && p->second == 1); - cout << "ok" << endl; - - // - // Re-populate - // - populateDB(connection, m); - alphabet.assign(alphabetChars, alphabetChars + sizeof(alphabetChars) - 1); - - cout << "testing algorithms... " << flush; - - for_each(m.begin(), m.end(), ForEachTest); - - // - // Inefficient, but this is just a test. Ensure that both forms of - // operator== & != are tested. - // - ByteIntMap::value_type toFind('n', 13); - - p = find(m.begin(), m.end(), toFind); - test(p != m.end()); - test(*p == toFind); - test(toFind == *p); - test(!(*p != toFind)); - test(!(toFind != *p)); - - p = find_if(m.begin(), m.end(), FindIfTest); - test(p->first == 'b'); - - // - // find_first_of. First construct a map with keys n, o, p, - // q. The test must find one of the types (it doesn't matter - // which since the container doesn't have to maintain sorted - // order). - // - j = find(alphabet.begin(), alphabet.end(), 'n'); - map<Byte, const Int> pairs; - pairs.insert(pair<const Byte, const Int>(*j, static_cast<Int>(j - alphabet.begin()))); - ++j; - pairs.insert(pair<const Byte, const Int>(*j, static_cast<Int>(j - alphabet.begin()))); - ++j; - pairs.insert(pair<const Byte, const Int>(*j, static_cast<Int>(j - alphabet.begin()))); - ++j; - pairs.insert(pair<const Byte, const Int>(*j, static_cast<Int>(j - alphabet.begin()))); - - p = find_first_of(m.begin(), m.end(), pairs.begin(), pairs.end()); - test(p != m.end()); - test(p->first == 'n' || p->first == 'o' || p->first == 'p' || p->first == 'q'); - - j = find(alphabet.begin(), alphabet.end(), 'n'); - p = find_first_of(m.begin(), m.end(), j, j + 4, FindFirstOfTest); - test(p != m.end()); - test(p->first == 'n' || p->first == 'o' || p->first == 'p' || p->first == 'q'); - - pairs.clear(); - for(p = m.begin(); p != m.end(); ++p) - { - pairs.insert(pair<const Byte, const Int>(p->first, p->second)); - } - test(pairs.size() == m.size()); - - map<Byte, const Int>::const_iterator pit; - for(pit = pairs.begin(); pit != pairs.end(); ++pit) - { - p = m.find(pit->first); - test(p != m.end()); - } - cout << "ok" << endl; - - cout << "testing clear... " << flush; - test(m.size() > 0); - m.clear(); - test(m.size() == 0); - cout << "ok" << endl; - - cout << "testing index ... " << flush; - m.clear(); - populateDB(connection, m); - - // - // Exact match - // - size_t length = alphabet.size(); - for(size_t k = 0; k < length; ++k) - { - p = m.findByValue(static_cast<Int>(k)); - test(p != m.end()); - test(p->first == alphabet[k]); - test(++p == m.end()); - } - - // - // 2 items at 17 - // - m.put(ByteIntMap::value_type(alphabet[21], static_cast<Int>(17))); - - p = m.findByValue(17); - test(p != m.end()); - test(p->first == alphabet[17] || p->first == alphabet[21]); - test(++p != m.end()); - test(p->first == alphabet[17] || p->first == alphabet[21]); - test(++p == m.end()); - test(m.valueCount(17) == 2); - - p = m.findByValue(17); - test(p != m.end()); - m.erase(p); - test(++p != m.end()); - test(p->first == alphabet[17] || p->first == alphabet[21]); - test(++p == m.end()); - test(m.valueCount(17) == 1); - - p = m.findByValue(17); - test(p != m.end()); - test(p->first == alphabet[17] || p->first == alphabet[21]); - - try - { - p.set(18); - test(false); - } - catch(const DatabaseException&) - { - // Expected - } - test(p->first == alphabet[17] || p->first == alphabet[21]); - test(++p == m.end()); - test(m.valueCount(17) == 1); - - m.put(ByteIntMap::value_type(alphabet[21], static_cast<Int>(17))); - - // - // Non-exact match - // - p = m.findByValue(21); - test(p == m.end()); - - test(m.valueCount(21) == 0); - - p = m.findByValue(21, false); - test(p == m.end()); - - p = m.findByValue(22, false); - int previous = 21; - int count = 0; - while(p != m.end()) - { - test(p->second > previous); - previous = p->second; - ++p; - count++; - } - test(count == 4); - cout << "ok " << endl; - - cout << "testing unreferenced connection+transaction... " << flush; - { - Freeze::ConnectionPtr c2 = createConnection(communicator, envName); - ByteIntMap m2(c2, dbName); - - TransactionPtr tx = c2->beginTransaction(); - - p = m2.findByValue(17); - test(p != m2.end()); - - m2.put(ByteIntMap::value_type(alphabet[21], static_cast<Int>(99))); - - p = m2.findByValue(17); - test(p == m2.end()); - - test(c2->currentTransaction() != 0); - test(tx->getConnection() != 0); - } - // - // Should roll back here - // - p = m.findByValue(17); - test(p != m.end()); - cout << "ok " << endl; - - cout << "testing concurrent access... " << flush; - m.clear(); - populateDB(connection, m); - - vector<IceUtil::ThreadControl> controls; - vector<ReadThreadPtr> readThreads; - vector<WriteThreadPtr> writeThreads; - - for(int i = 0; i < 5; ++i) - { - ReadThreadPtr rt = new ReadThread(communicator, envName, dbName); - controls.push_back(rt->start()); - readThreads.push_back(rt); - - WriteThreadPtr wt = new WriteThread(communicator, envName, dbName); - controls.push_back(wt->start()); - writeThreads.push_back(wt); - } - - IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(CONCURRENT_TIME)); - - for(vector<WriteThreadPtr>::iterator q = writeThreads.begin(); q != writeThreads.end(); ++q) - { - (*q)->stop(); - } - - for(vector<ReadThreadPtr>::iterator q = readThreads.begin(); q != readThreads.end(); ++q) - { - (*q)->stop(); - } - - for(vector<IceUtil::ThreadControl>::iterator q = controls.begin(); q != controls.end(); ++q) - { - q->join(); - } - cout << "ok" << endl; - - - cout << "testing index creation... " << flush; - - { - IntIdentityMap iim(connection, "intIdentity"); - - Ice::Identity odd; - odd.name = "foo"; - odd.category = "odd"; - - Ice::Identity even; - even.name = "bar"; - even.category = "even"; - - TransactionHolder txHolder(connection); - for(int i = 0; i < 1000; i++) - { - if(i % 2 == 0) - { - iim.put(IntIdentityMap::value_type(i, even)); - } - else - { - iim.put(IntIdentityMap::value_type(i, odd)); - } - } - txHolder.commit(); - iim.closeDb(); - } - - { - IntIdentityMapWithIndex iim(connection, "intIdentity"); - test(iim.categoryCount("even") == 500); - test(iim.categoryCount("odd") == 500); - - { - int count = 0; - IntIdentityMapWithIndex::iterator p = iim.findByCategory("even"); - while(p != iim.end()) - { - test(p->first % 2 == 0); - ++p; - ++count; - } - test(count == 500); - } - - { - int count = 0; - IntIdentityMapWithIndex::iterator p = iim.findByCategory("odd"); - while(p != iim.end()) - { - test(p->first % 2 == 1); - ++p; - ++count; - } - test(count == 500); - } - iim.destroy(); - } - cout << "ok" << endl; - - cout << "testing sorting... " << flush; - { - SortedMap sm(connection, "sortedMap"); - - TransactionHolder txHolder(connection); - for(int i = 0; i < 1000; i++) - { - int k = rand() % 1000; - - Ice::Identity id; - id.name = "foo"; - id.category = 'a' + static_cast<char>(k % 26); - - sm.put(SortedMap::value_type(k, id)); - } - txHolder.commit(); - } - - { - SortedMap sm(connection, "sortedMap"); - { - for(int i = 0; i < 100; ++i) - { - int k = rand() % 1000; - SortedMap::iterator p = sm.lower_bound(k); - if(p != sm.end()) - { - test(p->first >= k); - SortedMap::iterator q = sm.upper_bound(k); - if(q == sm.end()) - { - test(p->first == k); - } - else - { - test((p->first == k && q->first > k) || - (p->first > k && q->first == p->first)); - } - } - } - } - - { - for(int i = 0; i < 100; ++i) - { - string category; - category = static_cast<char>('a' + rand() % 26); - - SortedMap::iterator p = sm.findByCategory(category); - if(p != sm.end()) - { - SortedMap::iterator q = sm.lowerBoundForCategory(category); - test(p == q); - do - { - q++; - } while(q != sm.end() && q->second.category == category); - - if(q != sm.end()) - { - test(q == sm.upperBoundForCategory(category)); - } - } - else - { - SortedMap::iterator q = sm.lowerBoundForCategory(category); - if(q != sm.end()) - { - test(p != q); - test(q->second.category < category); - category = q->second.category; - - do - { - q++; - } while(q != sm.end() && q->second.category == category); - - if(q != sm.end()) - { - test(q == sm.upperBoundForCategory(category)); - } - } - } - } - } - - { - string category = "z"; - SortedMap::iterator p = sm.lowerBoundForCategory(category); - - while(p != sm.end()) - { - test(p->second.category <= category); - category = p->second.category; - // cerr << category << ":" << p->first << endl; - ++p; - } - } - - sm.clear(); - } - - cout << "ok" << endl; - - cout << "testing wstring... " << flush; - - { - WstringWstringMap wsm(connection, "wstringMap"); - - TransactionHolder txHolder(connection); - wsm.put(WstringWstringMap::value_type(L"AAAAA", L"aaaaa")); - wsm.put(WstringWstringMap::value_type(L"BBBBB", L"bbbbb")); - wsm.put(WstringWstringMap::value_type(L"CCCCC", L"ccccc")); - wsm.put(WstringWstringMap::value_type(L"DDDDD", L"ddddd")); - wsm.put(WstringWstringMap::value_type(L"EEEEE", L"eeeee")); - txHolder.commit(); - } - - { - WstringWstringMap wsm(connection, "wstringMap"); - { - WstringWstringMap::iterator p = wsm.find(L"BBBBB"); - test(p != wsm.end()); - test(p->second == L"bbbbb"); - - p = wsm.findByValue(L"ddddd"); - test(p != wsm.end()); - test(p->first == L"DDDDD"); - } - wsm.clear(); - } - - cout << "ok" << endl; - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - try - { - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/"; - envName += "db"; - } - - status = run(communicator, envName); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - - cout << "testing manual code... " << flush; - - // - // From manual - // - - Freeze::ConnectionPtr connection = - Freeze::createConnection(communicator, envName); - - // Instantiate the map. - // - ByteIntMap map(connection, "simple"); - - // Clear the map. - // - map.clear(); - - Ice::Int i; - ByteIntMap::iterator p; - - // Populate the map. - // - for (i = 0; i < 26; i++) - { - Ice::Byte key = static_cast<Ice::Byte>('a' + i); - map.insert(pair<const Byte, const int>(key, i)); - } - - // Iterate over the map and change the values. - // - for (p = map.begin(); p != map.end(); ++p) - { - p.set(p->second + 1); - } - - // Find and erase the last element. - // - p = map.find(static_cast<Ice::Byte>('z')); - assert(p != map.end()); - map.erase(p); - - // Clean up. - // - connection->close(); - - cout << "ok" << endl; - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile deleted file mode 100644 index c493f05095c..00000000000 --- a/cpp/test/Freeze/dbmap/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -OBJS = Client.o \ - ByteIntMap.o \ - IntIdentityMap.o \ - IntIdentityMapWithIndex.o \ - SortedMap.o \ - WstringWstringMap.o - -all:: ByteIntMap.cpp IntIdentityMap.cpp IntIdentityMapWithIndex.cpp SortedMap.cpp - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -ByteIntMap.h: ByteIntMap.cpp -ByteIntMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f ByteIntMap.h ByteIntMap.cpp - $(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index "Test::ByteIntMap,sort" ByteIntMap - -IntIdentityMap.h: IntIdentityMap.cpp -IntIdentityMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntIdentityMap.h IntIdentityMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(slicedir)/Ice/Identity.ice - -IntIdentityMapWithIndex.h: IntIdentityMapWithIndex.cpp -IntIdentityMapWithIndex.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex $(slicedir)/Ice/Identity.ice - -SortedMap.h: SortedMap.cpp -SortedMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f SortedMap.h SortedMap.cpp - $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater<std::string>" $(slicedir)/Ice/Identity.ice - -WstringWstringMap.h: WstringWstringMap.cpp -WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f WstringWstringMap.h WstringWstringMap.cpp - $(SLICE2FREEZE) --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' --dict-index Test::WstringWstringMap WstringWstringMap - -clean:: - -rm -f ByteIntMap.h ByteIntMap.cpp - -rm -f IntIdentityMap.h IntIdentityMap.cpp - -rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - -rm -f SortedMap.h SortedMap.cpp - -rm -f WstringWstringMap.h WstringWstringMap.cpp - -rm -rf db/* diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak deleted file mode 100644 index 385f5992bf1..00000000000 --- a/cpp/test/Freeze/dbmap/Makefile.mak +++ /dev/null @@ -1,69 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe - -TARGETS = $(CLIENT) - -OBJS = .\ByteIntMap.obj \ - .\IntIdentityMap.obj \ - .\IntIdentityMapWithIndex.obj \ - .\SortedMap.obj \ - .\WstringWstringMap.obj \ - .\Client.obj - -all:: ByteIntMap.cpp ByteIntMap.h \ - IntIdentityMap.cpp IntIdentityMap.h \ - IntIdentityMapWithIndex.cpp IntIdentityMapWithIndex.h \ - SortedMap.cpp SortedMap.h \ - WstringWstringMap.cpp WstringWstringMap.h - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. -I..\..\include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -ByteIntMap.h ByteIntMap.cpp: "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q ByteIntMap.h ByteIntMap.cpp - "$(SLICE2FREEZE)" --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap,sort ByteIntMap - -IntIdentityMap.h IntIdentityMap.cpp: "$(slicedir)\Ice\Identity.ice" "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q IntIdentityMap.h IntIdentityMap.cpp - "$(SLICE2FREEZE)" --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap "$(slicedir)\Ice\Identity.ice" - -IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: "$(slicedir)\Ice\Identity.ice" "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - "$(SLICE2FREEZE)" --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex "$(slicedir)\Ice\Identity.ice" - -SortedMap.h SortedMap.cpp: "$(slicedir)\Ice\Identity.ice" "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q SortedMap.h SortedMap.cpp - "$(SLICE2FREEZE)" --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater<std::string>" "$(slicedir)\Ice\Identity.ice" - -WstringWstringMap.h WstringWstringMap.cpp: "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q WstringWstringMap.h WstringWstringMap.cpp - "$(SLICE2FREEZE)" --dict Test::WstringWstringMap,[\"cpp:type:wstring\"]string,[\"cpp:type:wstring\"]string --dict-index Test::WstringWstringMap WstringWstringMap - -clean:: - del /q ByteIntMap.h ByteIntMap.cpp - del /q IntIdentityMap.h IntIdentityMap.cpp - del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp - del /q SortedMap.h SortedMap.cpp - del /q WstringWstringMap.h WstringWstringMap.cpp - -if exist db\__Freeze rmdir /q /s db\__Freeze - -for %f in (db\*) do if not %f == db\.gitignore del /q %f diff --git a/cpp/test/Freeze/dbmap/db/.gitignore b/cpp/test/Freeze/dbmap/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/cpp/test/Freeze/dbmap/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/cpp/test/Freeze/dbmap/dummy.ice b/cpp/test/Freeze/dbmap/dummy.ice deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/test/Freeze/dbmap/dummy.ice +++ /dev/null diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py deleted file mode 100755 index fe6059a5e74..00000000000 --- a/cpp/test/Freeze/dbmap/run.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -client = os.path.join(os.getcwd(), "client") - -if TestUtil.appverifier: - TestUtil.setAppVerifierSettings([client]) - -clientProc = TestUtil.startClient(client, ' --Freeze.Warn.Rollback=0 "%s"' % os.getcwd()) -clientProc.waitTestSuccess() - -if TestUtil.appverifier: - TestUtil.appVerifierAfterTestEnd([client]) diff --git a/cpp/test/Freeze/evictor/.depend.mak b/cpp/test/Freeze/evictor/.depend.mak deleted file mode 100755 index 403727895f2..00000000000 --- a/cpp/test/Freeze/evictor/.depend.mak +++ /dev/null @@ -1,512 +0,0 @@ - -Test.h: \ - Test.ice \ - "$(slicedir)/Ice/Identity.ice" - -Test.obj: \ - Test.cpp \ - "Test.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -Client.obj: \ - Client.cpp \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\Random.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - "Test.h" \ - -TestI.obj: \ - TestI.cpp \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "TestI.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "Test.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - -Server.obj: \ - Server.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "TestI.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "Test.h" \ diff --git a/cpp/test/Freeze/evictor/.gitignore b/cpp/test/Freeze/evictor/.gitignore deleted file mode 100644 index 5813c1223e3..00000000000 --- a/cpp/test/Freeze/evictor/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Test.cpp -Test.h -db/__catalog -db/__catalogIndexList -db/Test -db/log.* -db/__Freeze diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp deleted file mode 100644 index fc5fa6f37df..00000000000 --- a/cpp/test/Freeze/evictor/Client.cpp +++ /dev/null @@ -1,1031 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Ice.h> -#include <IceUtil/IceUtil.h> -#include <IceUtil/Random.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace IceUtil; - -class ReadThread : public Thread -{ -public: - - ReadThread(vector<Test::ServantPrx>& servants) : - _servants(servants) - { - } - - virtual void - run() - { - int loops = 10; - while(loops-- > 0) - { - try - { - _servants[0]->getValue(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - catch(...) - { - test(false); - } - - for(int i = 1; i < static_cast<int>(_servants.size()); ++i) - { - test(_servants[i]->getValue() == i); - } - } - } - -private: - vector<Test::ServantPrx>& _servants; -}; - -class ReadForeverThread : public Thread, public IceUtil::Monitor<IceUtil::RecMutex> -{ -public: - - enum State { StateRunning, StateDeactivating, StateDeactivated }; - - ReadForeverThread(vector<Test::ServantPrx>& servants) : - _servants(servants), - _state(StateRunning) - { - } - - virtual void - run() - { - for(;;) - { - try - { - for(int i = 0; i < static_cast<int>(_servants.size()); ++i) - { - if(getState() == StateDeactivated) - { - _servants[i]->slowGetValue(); - test(false); - } - else - { - test(_servants[i]->slowGetValue() == i); - } - } - } - catch(const Ice::SocketException&) - { - // - // Expected - // - test(validEx()); - return; - } - catch(const Ice::LocalException& e) - { - cerr << "Caught unexpected : " << e << endl; - test(false); - return; - } - catch(...) - { - test(false); - return; - } - } - } - - State - getState() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - return _state; - } - - bool - validEx() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - return _state == StateDeactivating || _state == StateDeactivated; - } - - void - setState(State s) - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - _state = s; - } - -private: - vector<Test::ServantPrx>& _servants; - State _state; -}; -typedef IceUtil::Handle<ReadForeverThread> ReadForeverThreadPtr; - -class AddForeverThread : public Thread, public IceUtil::Monitor<IceUtil::RecMutex> -{ -public: - - enum State { StateRunning, StateDeactivating, StateDeactivated }; - - AddForeverThread(const Test::RemoteEvictorPrx& evictor, int prefix) : - _evictor(evictor), - _state(StateRunning) - { - ostringstream ostr; - ostr << prefix; - _prefix = ostr.str(); - } - - virtual void - run() - { - int index = 0; - - for(;;) - { - ostringstream ostr; - ostr << _prefix << "-" << index; - index++; - string id = ostr.str(); - try - { - if(getState() == StateDeactivated) - { - _evictor->createServant(id, 0); - test(false); - } - else - { - _evictor->createServant(id, 0); - } - } - catch(const Test::EvictorDeactivatedException&) - { - test(validEx()); - // - // Expected - // - return; - } - catch(const Ice::ObjectNotExistException&) - { - test(validEx()); - // - // Expected - // - return; - } - catch(const Ice::LocalException& e) - { - cerr << "Caught unexpected : " << e << endl; - test(false); - return; - } - catch(const IceUtil::Exception& e) - { - cerr << "Caught IceUtil::Exception : " << e << endl; - cerr << "Index is " << index << endl; - test(false); - return; - } - catch(const std::exception& e) - { - cerr << "Caught std::exception : " << e.what() << endl; - test(false); - return; - } - catch(...) - { - cerr << "Caught unknown exception" << endl; - test(false); - return; - } - } - } - - State - getState() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - return _state; - } - bool - validEx() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - return _state == StateDeactivating || _state == StateDeactivated; - } - - void - setState(State s) - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - _state = s; - } - -private: - Test::RemoteEvictorPrx _evictor; - string _prefix; - State _state; -}; -typedef IceUtil::Handle<AddForeverThread> AddForeverThreadPtr; - -class CreateDestroyThread : public Thread -{ -public: - - CreateDestroyThread(const Test::RemoteEvictorPrx& evictor, int id, int size) : - _evictor(evictor), - _size(size) - { - ostringstream ostr; - ostr << id; - _id = ostr.str(); - } - - virtual void - run() - { - try - { - int loops = 50; - while(loops-- > 0) - { - for(int i = 0; i < _size; i++) - { - ostringstream ostr; - ostr << i; - string id = ostr.str(); - if(id == _id) - { - // - // Create when odd, destroy when even. - // - - if(loops % 2 == 0) - { - Test::ServantPrx servant = _evictor->getServant(id); - servant->destroy(); - - // - // Twice - // - try - { - servant->destroy(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - } - else - { - Test::ServantPrx servant = _evictor->createServant(id, i); - - // - // Twice - // - try - { - servant = _evictor->createServant(id, 0); - test(false); - } - catch(const Test::AlreadyRegisteredException&) - { - // Expected - } - } - } - else - { - // - // Just read/write the value - // - Test::ServantPrx servant = _evictor->getServant(id); - try - { - int val = servant->getValue(); - test(val == i || val == -i); - servant->setValue(-val); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected from time to time - } - } - } - } - } - catch(const std::exception& ex) - { - cout << "Caught unexpected : " << ex.what() << endl; - test(false); - } - catch(...) - { - // - // Unexpected! - // - test(false); - } - } -private: - Test::RemoteEvictorPrx _evictor; - string _id; - int _size; -}; - - -class TransferThread : public Thread -{ -public: - TransferThread(const Test::AccountPrxSeq& accounts) : - _accounts(accounts) - { - } - - void - run() - { - int transferOp = 0; - IceUtil::Time now = IceUtil::Time::now(); - for(int i = 0; i < 500; i++) - { - // - // Limit the time this thread runs. We don't want the test - // to take too long on slow machines/VMs - // - if(IceUtil::Time::now() - now > IceUtil::Time::seconds(60)) - { - cerr << "warning: exiting transfer thread after one minute and " << i << " iterations" << endl; - break; - } - - // - // Transfer 100 at random between two distinct accounts - // - Test::AccountPrx from = _accounts[IceUtilInternal::random(static_cast<int>(_accounts.size()))]; - - Test::AccountPrx to; - do - { - to = _accounts[IceUtilInternal::random(static_cast<int>(_accounts.size()))]; - } - while(from == to); - - - try - { - // - // Alternate between transfer methods - // - switch(transferOp) - { - case 0: - { - from->transfer(100, to); - break; - } - case 1: - { - from->transfer2(100, to); - break; - } - case 2: - { - from->transfer3(100, to); - break; - } - default: - { - test(false); - } - }; - transferOp++; - transferOp = transferOp % 3; - } - catch(const Test::InsufficientFundsException&) - { - // - // Expected from time to time - // - } - catch(const Ice::Exception& e) - { - cerr << "Caught Ice::Exception: " << e << endl; - test(false); - } - catch(...) - { - cerr << "caught some other exception" << endl; - // - // Unexpected - // - test(false); - } - - /* - if(i % 100 == 0) - { - cerr << "." << flush; - } - */ - } - } - -private: - - Test::AccountPrxSeq _accounts; -}; - - - -int -run(int, char**, const Ice::CommunicatorPtr& communicator, bool transactional, bool shutdown) -{ - string ref = "factory:default -p 12010"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base); - - if(transactional) - { - cout << "testing transactional Freeze Evictor... " << flush; - } - else - { - cout << "testing background-save Freeze Evictor... " << flush; - } - - const Ice::Int size = 5; - Ice::Int i; - - Test::RemoteEvictorPrx evictor = factory->createEvictor("Test", transactional); - - evictor->setSize(size); - - // - // Create some servants - // - vector<Test::ServantPrx> servants; - for(i = 0; i < size; i++) - { - ostringstream ostr; - ostr << i; - string id = ostr.str(); - servants.push_back(evictor->createServant(id, i)); - servants[i]->ice_ping(); - - Test::FacetPrx facet1 = Test::FacetPrx::uncheckedCast(servants[i], "facet1"); - try - { - facet1->ice_ping(); - test(false); - } - catch(const Ice::FacetNotExistException&) - { - // Expected - } - - servants[i]->addFacet("facet1", "data"); - facet1->ice_ping(); - facet1 = Test::FacetPrx::checkedCast(servants[i], "facet1"); - test(facet1); - facet1->setValue(10 * i); - facet1->addFacet("facet2", "moreData"); - Test::FacetPrx facet2 = Test::FacetPrx::checkedCast(facet1, "facet2"); - test(facet2); - facet2->setValue(100 * i); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i); - Test::FacetPrx facet1 = Test::FacetPrx::checkedCast(servants[i], "facet1"); - test(facet1); - test(facet1->getValue() == 10 * i); - test(facet1->getData() == "data"); - Test::FacetPrx facet2 = Test::FacetPrx::checkedCast(facet1, "facet2"); - test(facet2); - test(facet2->getData() == "moreData"); - } - - // - // Mutate servants. - // - for(i = 0; i < size; i++) - { - servants[i]->setValue(i + 100); - Test::FacetPrx facet1 = Test::FacetPrx::checkedCast(servants[i], "facet1"); - test(facet1); - facet1->setValue(10 * i + 100); - Test::FacetPrx facet2 = Test::FacetPrx::checkedCast(facet1, "facet2"); - test(facet2); - facet2->setValue(100 * i + 100); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i + 100); - Test::FacetPrx facet1 = Test::FacetPrx::checkedCast(servants[i], "facet1"); - test(facet1); - test(facet1->getValue() == 10 * i + 100); - Test::FacetPrx facet2 = Test::FacetPrx::checkedCast(facet1, "facet2"); - test(facet2); - test(facet2->getValue() == 100 * i + 100); - } - - if(!transactional) - { - // - // Test saving while busy - // - for(i = 0; i < size; i++) - { - // - // Start a mutating operation so that the object is not idle. - // - servants[i]->begin_setValueAsync(i + 300); - - test(servants[i]->getValue() == i + 100); - // - // This operation modifies the object state but is not saved - // because the setValueAsync operation is still pending. - // - servants[i]->setValue(i + 200); - test(servants[i]->getValue() == i + 200); - - // - // Force the response to setValueAsync - // - servants[i]->releaseAsync(); - test(servants[i]->getValue() == i + 300); - } - } - - // - // Add duplicate facet and catch corresponding exception - // - for(i = 0; i < size; i++) - { - try - { - servants[i]->addFacet("facet1", "foobar"); - test(false); - } - catch(const Test::AlreadyRegisteredException&) - { - } - } - - // - // Remove a facet that does not exist - // - try - { - servants[0]->removeFacet("facet3"); - test(false); - } - catch(const Test::NotRegisteredException&) - { - } - - // - // Call an operation that does not exist on the servant - // - try - { - Test::AccountPrx::uncheckedCast(servants[0])->getBalance(); - test(false); - } - catch(const Ice::OperationNotExistException&) - { - } - - // - // Remove all facets - // - for(i = 0; i < size; i++) - { - servants[i]->removeFacet("facet1"); - servants[i]->removeFacet("facet2"); - } - - // - // Check they are all gone - // - for(i = 0; i < size; i++) - { - Test::FacetPrx facet1 = Test::FacetPrx::checkedCast(servants[i], "facet1"); - test(facet1 == 0); - Test::FacetPrx facet2 = Test::FacetPrx::checkedCast(servants[i], "facet2"); - test(facet2 == 0); - } - - evictor->setSize(0); - evictor->setSize(size); - - // - // Destroy servants and verify ObjectNotExistException. - // - for(i = 0; i < size; i++) - { - servants[i]->destroy(); - try - { - servants[i]->getValue(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - - try - { - servants[i]->ice_ping(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - } - - // - // Recreate servants, set transient value - // - servants.clear(); - for(i = 0; i < size; i++) - { - ostringstream ostr; - ostr << i; - string id = ostr.str(); - servants.push_back(evictor->createServant(id, i)); - servants[i]->setTransientValue(i); - } - - // - // Evict all - // - evictor->saveNow(); - evictor->setSize(0); - evictor->setSize(size); - - // - // Check the transient value - // - for(i = 0; i < size; i++) - { - test(servants[i]->getTransientValue() == -1); - } - - if(!transactional) - { - - // - // Now with keep - // - for(i = 0; i < size; i++) - { - servants[i]->keepInCache(); - servants[i]->keepInCache(); - servants[i]->setTransientValue(i); - } - evictor->saveNow(); - evictor->setSize(0); - evictor->setSize(size); - - - // - // Check the transient value - // - for(i = 0; i < size; i++) - { - test(servants[i]->getTransientValue() == i); - } - - // - // Again, after one release - // - for(i = 0; i < size; i++) - { - servants[i]->release(); - } - evictor->saveNow(); - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getTransientValue() == i); - } - - // - // Again, after a second release - // - for(i = 0; i < size; i++) - { - servants[i]->release(); - } - evictor->saveNow(); - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getTransientValue() == -1); - } - - - // - // Release one more time - // - for(i = 0; i < size; i++) - { - try - { - servants[i]->release(); - test(false); - } - catch(const Test::NotRegisteredException&) - { - // Expected - } - } - } - - if(transactional) - { - int totalBalance = servants[0]->getTotalBalance(); - test(totalBalance == 0); - - Test::AccountPrxSeq accounts = servants[0]->getAccounts(); - test(accounts.size() > 0); - - totalBalance = servants[0]->getTotalBalance(); - test(totalBalance > 0); - - const int threadCount = static_cast<int>(accounts.size()); - - vector<ThreadPtr> threads(threadCount); - for(i = 0; i < threadCount; i++) - { - threads[i] = new TransferThread(accounts); - threads[i]->start(); - } - - for(i = 0; i < threadCount; i++) - { - threads[i]->getThreadControl().join(); - } - - // - // Check that the total balance did not change! - // - test(totalBalance == servants[0]->getTotalBalance()); - } - - // - // Deactivate and recreate evictor, to ensure that servants - // are restored properly after database close and reopen. - // - evictor->deactivate(); - - evictor = factory->createEvictor("Test", transactional); - - evictor->setSize(size); - for(i = 0; i < size; i++) - { - ostringstream ostr; - ostr << i; - string id = ostr.str(); - - servants[i] = evictor->getServant(id); - test(servants[i]->getValue() == i); - } - - // - // Test concurrent lookups with a smaller evictor - // size and one missing servant - // - evictor->setSize(size / 2); - servants[0]->destroy(); - - { - const int threadCount = size * 2; - - ThreadPtr threads[threadCount]; - for(i = 0; i < threadCount; i++) - { - threads[i] = new ReadThread(servants); - threads[i]->start(); - } - - for(i = 0; i < threadCount; i++) - { - threads[i]->getThreadControl().join(); - } - } - - // - // Clean up. - // - evictor->destroyAllServants(""); - evictor->destroyAllServants("facet1"); - evictor->destroyAllServants("facet2"); - - // - // CreateDestroy threads - // - { - const int threadCount = size;; - - ThreadPtr threads[threadCount]; - for(i = 0; i < threadCount; i++) - { - threads[i] = new CreateDestroyThread(evictor, i, size); - threads[i]->start(); - } - - for(i = 0; i < threadCount; i++) - { - threads[i]->getThreadControl().join(); - } - - // - // Verify all destroyed - // - for(i = 0; i < size; i++) - { - try - { - servants[i]->getValue(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - } - } - - // - // Recreate servants. - // - servants.clear(); - for(i = 0; i < size; i++) - { - ostringstream ostr; - ostr << i; - string id = ostr.str(); - servants.push_back(evictor->createServant(id, i)); - } - - // - // Deactivate in the middle of remote AMD operations - // (really testing Ice here) - // - { - const int threadCount = size; - - ReadForeverThreadPtr threads[threadCount]; - for(i = 0; i < threadCount; i++) - { - threads[i] = new ReadForeverThread(servants); - threads[i]->start(); - } - - ThreadControl::sleep(Time::milliSeconds(500)); - for(i = 0; i < threadCount; i++) - { - threads[i]->setState(ReadForeverThread::StateDeactivating); - } - evictor->deactivate(); - for(i = 0; i < threadCount; i++) - { - threads[i]->setState(ReadForeverThread::StateDeactivated); - } - - for(i = 0; i < threadCount; i++) - { - threads[i]->getThreadControl().join(); - } - } - - // - // Resurrect - // - evictor = factory->createEvictor("Test", transactional); - evictor->destroyAllServants(""); - - // - // Deactivate in the middle of adds - // - { - const int threadCount = size; - - AddForeverThreadPtr threads[threadCount]; - for(i = 0; i < threadCount; i++) - { - threads[i] = new AddForeverThread(evictor, i); - threads[i]->start(); - } - - ThreadControl::sleep(Time::milliSeconds(500)); - for(i = 0; i < threadCount; i++) - { - threads[i]->setState(AddForeverThread::StateDeactivating); - } - evictor->deactivate(); - for(i = 0; i < threadCount; i++) - { - threads[i]->setState(AddForeverThread::StateDeactivated); - } - - for(i = 0; i < threadCount; i++) - { - threads[i]->getThreadControl().join(); - } - } - - - // - // Clean up. - // - evictor = factory->createEvictor("Test", transactional); - evictor->destroyAllServants(""); - evictor->deactivate(); - - cout << "ok" << endl; - - if(shutdown) - { - factory->shutdown(); - } - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - try - { - communicator = Ice::initialize(argc, argv); - status = run(argc, argv, communicator, false, false); - if(status == 0) - { - status = run(argc, argv, communicator, true, true); - } - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - if(communicator) - { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - } - - return status; -} diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile deleted file mode 100644 index 63e5dfb058d..00000000000 --- a/cpp/test/Freeze/evictor/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/__catalog db/__catalogIndexList db/Test db/log.* db/__Freeze diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak deleted file mode 100644 index a09b22fd64e..00000000000 --- a/cpp/test/Freeze/evictor/Makefile.mak +++ /dev/null @@ -1,51 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -SERVER = server.exe - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = .\Test.obj - -COBJS = $(SLICE_OBJS) \ - .\Client.obj - -SOBJS = $(SLICE_OBJS) \ - .\TestI.obj \ - .\Server.obj - -OBJS = $(COBJS) \ - $(SOBJS) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SERVER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q Test.cpp Test.h - -if exist db\__Freeze rmdir /q /s db\__Freeze - -for %f in (db\*) do if not %f == db\DB_CONFIG del /q %f diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp deleted file mode 100644 index 1e1e5a815ac..00000000000 --- a/cpp/test/Freeze/evictor/Server.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/IceUtil.h> -#include <TestI.h> -#include <Ice/Ice.h> - -using namespace std; - -class AccountFactory : public Ice::ObjectFactory -{ -public: - - virtual Ice::ObjectPtr -#ifndef NDEBUG - create(const string& type) -#else - create(const string&) -#endif - { - assert(type == "::Test::Account"); - return new Test::AccountI; - } - - virtual void - destroy() - { - } -}; - - -class ServantFactory : public Ice::ObjectFactory -{ -public: - - virtual Ice::ObjectPtr -#ifndef NDEBUG - create(const string& type) -#else - create(const string&) -#endif - { - assert(type == "::Test::Servant"); - return new Test::ServantI; - } - - virtual void - destroy() - { - } -}; - - -class FacetFactory : public Ice::ObjectFactory -{ -public: - - virtual Ice::ObjectPtr -#ifndef NDEBUG - create(const string& type) -#else - create(const string&) -#endif - { - assert(type == "::Test::Facet"); - return new Test::FacetI; - } - - virtual void - destroy() - { - } -}; -int -run(int, char**, const Ice::CommunicatorPtr& communicator, const string& envName) -{ - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010"); - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); - - communicator->addObjectFactory(new ServantFactory, "::Test::Servant"); - communicator->addObjectFactory(new FacetFactory, "::Test::Facet"); - communicator->addObjectFactory(new AccountFactory, "::Test::Account"); - - Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(envName); - adapter->add(factory, communicator->stringToIdentity("factory")); - - adapter->activate(); - - communicator->waitForShutdown(); - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - string envName = "db"; - - try - { - communicator = Ice::initialize(argc, argv); - status = run(argc, argv, communicator, envName); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - if(communicator) - { - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - } - - return status; -} diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice deleted file mode 100644 index 611390e2e9c..00000000000 --- a/cpp/test/Freeze/evictor/Test.ice +++ /dev/null @@ -1,116 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once - -#include <Ice/Identity.ice> - -module Test -{ - -exception AlreadyRegisteredException -{ -}; - -exception NotRegisteredException -{ -}; - -exception EvictorDeactivatedException -{ -}; - - -exception InsufficientFundsException -{ -}; - -["cpp:virtual"]class Account -{ - int getBalance(); - ["freeze:write"] void transfer(int amount, Account* toAccount) throws InsufficientFundsException; - - // - // Other implementations of transfer that we want to test as well - // - ["freeze:write", "amd"] void transfer2(int amount, Account* toAccount) throws InsufficientFundsException; - ["freeze:write", "amd"] void transfer3(int amount, Account* toAccount) throws InsufficientFundsException; - - - - // - // "Internal" operation - // - ["freeze:write:mandatory"] void deposit(int amount) throws InsufficientFundsException; - - int balance; -}; - -sequence<Account*> AccountPrxSeq; -sequence<Ice::Identity> AccountIdSeq; - -["freeze:write", "cpp:virtual"] class Servant -{ - ["freeze:read", "cpp:const"] idempotent int getValue(); - ["amd", "freeze:read", "cpp:const"] idempotent int slowGetValue(); - - idempotent void setValue(int value); - - ["amd"] void setValueAsync(int value); - ["freeze:read", "cpp:const"] void releaseAsync(); - - ["freeze:read", "cpp:const"] void addFacet(string name, string data) throws AlreadyRegisteredException; - ["freeze:read", "cpp:const"] void removeFacet(string name) throws NotRegisteredException; - - ["freeze:read", "cpp:const"] int getTransientValue(); - idempotent void setTransientValue(int value); - idempotent void keepInCache(); - void release() throws NotRegisteredException; - - ["freeze:write"] AccountPrxSeq getAccounts(); - ["freeze:read"] int getTotalBalance(); - - void destroy(); - - int value; - AccountIdSeq accounts; -}; - -["freeze:write", "cpp:virtual"] class Facet extends Servant -{ - ["freeze:read", "cpp:const"] idempotent string getData(); - idempotent void setData(string data); - - string data; -}; - - -interface RemoteEvictor -{ - idempotent void setSize(int size); - - Servant* createServant(string id, int value) - throws AlreadyRegisteredException, EvictorDeactivatedException; - - idempotent Servant* getServant(string id); - - void saveNow(); - - void deactivate(); - idempotent void destroyAllServants(string facet); -}; - -interface RemoteEvictorFactory -{ - RemoteEvictor* createEvictor(string name, bool transactional); - void shutdown(); -}; - -}; - diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp deleted file mode 100644 index 09a6e579a8d..00000000000 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ /dev/null @@ -1,641 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Freeze/Freeze.h> -#include <TestI.h> -#include <TestCommon.h> - -using namespace std; -using namespace Ice; -using namespace IceUtil; - - -int -Test::AccountI::getBalance(const Current&) -{ - return balance; -} - -void -Test::AccountI::deposit(int amount, const Current&) -{ - // - // No need to synchronize since everything occurs within its own transaction - // - int newBalance = balance + amount; - if(newBalance < 0) - { - throw Test::InsufficientFundsException(); - } - balance = newBalance; -} - -void -Test::AccountI::transfer(int amount, const Test::AccountPrx& toAccount, const Current& current) -{ - test(_evictor->getCurrentTransaction() != 0); - - toAccount->deposit(amount); // collocated call - deposit(-amount, current); // direct call -} - -void -Test::AccountI::transfer2_async(const AMD_Account_transfer2Ptr& cb, int amount, const Test::AccountPrx& toAccount, const Current& current) -{ - // - // Here the dispatch thread does everything - // - test(_evictor->getCurrentTransaction() != 0); - - try - { - toAccount->deposit(amount); // collocated call - deposit(-amount, current); // direct call - } - catch(const InsufficientFundsException& ex) - { - cb->ice_exception(ex); - return; - } - - cb->ice_response(); -} - -class ResponseThread : public IceUtil::Thread, private IceUtil::Monitor<IceUtil::Mutex> -{ -public: - - ResponseThread(const Test::AMD_Account_transfer3Ptr& cb) : - _cb(cb), - _response(false), - _cancelled(false) - { - } - - void response() - { - Lock sync(*this); - _response = true; - notify(); - } - - void exception(const Ice::UserException& e) - { - Lock sync(*this); - _exception.reset(e.ice_clone()); - notify(); - } - - void cancel() - { - Lock sync(*this); - _cancelled = true; - notify(); - } - - - virtual void run() - { - Lock sync(*this); - - bool timedOut = false; - - while(!timedOut && _response == false && _cancelled == false && _exception.get() == 0) - { - timedOut = !timedWait(IceUtil::Time::seconds(1)); - } - - if(_cancelled) - { - return; - } - - if(_response) - { - _cb->ice_response(); - } - else if(_exception.get() != 0) - { - _cb->ice_exception(*_exception.get()); - } - else - { - _cb->ice_exception(Ice::TimeoutException(__FILE__, __LINE__)); - } - } - -private: - Test::AMD_Account_transfer3Ptr _cb; - bool _response; - bool _cancelled; - IceUtil::UniquePtr<Ice::UserException> _exception; -}; -typedef IceUtil::Handle<ResponseThread> ResponseThreadPtr; - - - - - -void -Test::AccountI::transfer3_async(const AMD_Account_transfer3Ptr& cb, int amount, const Test::AccountPrx& toAccount, const Current& current) -{ - // - // Here the dispatch thread does the actual work, but a separate thread sends the response - // - - ResponseThreadPtr thread = new ResponseThread(cb); - IceUtil::ThreadControl tc = thread->start(33000); - - test(_evictor->getCurrentTransaction() != 0); - - try - { - toAccount->deposit(amount); // collocated call - deposit(-amount, current); // direct call - } - catch(const Ice::UserException& e) - { - tc.detach(); - - // - // Need to rollback here -- "rollback on user exception" does not work - // when the dispatch commits before it gets any response! - // - _evictor->getCurrentTransaction()->rollback(); - - thread->exception(e); - - return; - } - catch(...) - { - thread->cancel(); - tc.join(); - throw; - } - - tc.detach(); - thread->response(); -} - - -Test::AccountI::AccountI(int initialBalance, const Freeze::TransactionalEvictorPtr& evictor) : - Account(initialBalance), - _evictor(evictor) -{ -} - - -Test::AccountI::AccountI() : - Account(0) -{ -} - -void -Test::AccountI::init(const Freeze::TransactionalEvictorPtr& evictor) -{ - test(_evictor == 0); - _evictor = evictor; -} - - -class DelayedResponse : public Thread -{ -public: - - DelayedResponse(const Test::AMD_Servant_slowGetValuePtr& cb, int val) : - _cb(cb), - _val(val) - { - } - - virtual void - run() - { - ThreadControl::sleep(Time::milliSeconds(500)); - _cb->ice_response(_val); - } - -private: - Test::AMD_Servant_slowGetValuePtr _cb; - int _val; -}; - - -Test::ServantI::ServantI() : - _transientValue(-1) -{ -} - -Test::ServantI::ServantI(const RemoteEvictorIPtr& remoteEvictor, const Freeze::EvictorPtr& evictor, Ice::Int val) : - _transientValue(-1), - _remoteEvictor(remoteEvictor), - _evictor(evictor) -{ - this->value = val; -} - -void -Test::ServantI::init(const RemoteEvictorIPtr& remoteEvictor, const Freeze::EvictorPtr& evictor) -{ - _remoteEvictor = remoteEvictor; - _evictor = evictor; -} - -Int -Test::ServantI::getValue(const Current&) const -{ - Monitor<Mutex>::Lock sync(*this); - return value; -} - -Int -Test::ServantI::slowGetValue(const Current&) const -{ - IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1)); - Monitor<Mutex>::Lock sync(*this); - return value; -} - -void -Test::ServantI::slowGetValue_async(const AMD_Servant_slowGetValuePtr& cb, - const Current&) const -{ - IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1)); - Monitor<Mutex>::Lock sync(*this); - (new DelayedResponse(cb, value))->start().detach(); -} - - -void -Test::ServantI::setValue(Int val, const Current&) -{ - Monitor<Mutex>::Lock sync(*this); - value = val; -} - - -void -Test::ServantI::setValueAsync_async(const AMD_Servant_setValueAsyncPtr& __cb, Int value, const Current&) -{ - Monitor<Mutex>::Lock sync(*this); - _setValueAsyncCB = __cb; - _setValueAsyncValue = value; - notify(); -} - -void -Test::ServantI::releaseAsync(const Current&) const -{ - Monitor<Mutex>::Lock sync(*this); - // - // Wait until the previous _async has been dispatched - // - while(_setValueAsyncCB == 0) - { - wait(); - } - const_cast<Int&>(value) = _setValueAsyncValue; - _setValueAsyncCB->ice_response(); - const_cast<AMD_Servant_setValueAsyncPtr&>(_setValueAsyncCB) = 0; -} - -void -Test::ServantI::addFacet(const string& name, const string& data, const Current& current) const -{ - FacetPtr facet = new FacetI(_remoteEvictor, _evictor, value, data); - - try - { - _evictor->addFacet(facet, current.id, name); - } - catch(const Ice::AlreadyRegisteredException&) - { - throw Test::AlreadyRegisteredException(); - } -} - -void -Test::ServantI::removeFacet(const string& name, const Current& current) const -{ - try - { - _evictor->removeFacet(current.id, name); - } - catch(const Ice::NotRegisteredException&) - { - throw Test::NotRegisteredException(); - } -} - - -Ice::Int -Test::ServantI::getTransientValue(const Current&) const -{ - Monitor<Mutex>::Lock sync(*this); - return _transientValue; -} - -void -Test::ServantI::setTransientValue(Ice::Int val, const Current&) -{ - Monitor<Mutex>::Lock sync(*this); - _transientValue = val; -} - -void -Test::ServantI::keepInCache(const Current& current) -{ - Freeze::BackgroundSaveEvictorPtr::dynamicCast(_evictor)->keep(current.id); -} - -void -Test::ServantI::release(const Current& current) -{ - try - { - Freeze::BackgroundSaveEvictorPtr::dynamicCast(_evictor)->release(current.id); - } - catch(const Ice::NotRegisteredException&) - { - throw NotRegisteredException(); - } -} - - -Test::AccountPrxSeq -Test::ServantI::getAccounts(const Current& current) -{ - Freeze::TransactionalEvictorPtr te = Freeze::TransactionalEvictorPtr::dynamicCast(_evictor); - - if(te->getCurrentTransaction() != 0) - { - if(accounts.empty()) - { - for(int i = 0; i < 10; ++i) - { - Ice::Identity ident; - ident.name = current.id.name + "-account#" + char('0' + i); - ident.category = current.id.category; - accounts.push_back(ident); - _evictor->add(new AccountI(1000, te), ident); - } - } - else - { - te->getCurrentTransaction()->rollback(); // not need to re-write this servant - } - } - - Test::AccountPrxSeq result; - for(size_t i = 0; i < accounts.size(); ++i) - { - result.push_back(Test::AccountPrx::uncheckedCast(current.adapter->createProxy(accounts[i]))); - } - return result; -} - -int -Test::ServantI::getTotalBalance(const Current& current) -{ - Test::AccountPrxSeq proxies = getAccounts(current); - - // - // Need to start a transaction to ensure a consistent result - // - Freeze::TransactionalEvictorPtr te = Freeze::TransactionalEvictorPtr::dynamicCast(_evictor); - - for(;;) - { - test(te->getCurrentTransaction() == 0); - Freeze::ConnectionPtr con = Freeze::createConnection(current.adapter->getCommunicator(), _remoteEvictor->envName()); - te->setCurrentTransaction(con->beginTransaction()); - int total = 0; - try - { - for(size_t i = 0; i < proxies.size(); ++i) - { - total += proxies[i]->getBalance(); - } - te->getCurrentTransaction()->rollback(); - te->setCurrentTransaction(0); - return total; - } - catch(const Freeze::TransactionalEvictorDeadlockException&) - { - te->getCurrentTransaction()->rollback(); - te->setCurrentTransaction(0); - // retry - } - catch(...) - { - te->getCurrentTransaction()->rollback(); - te->setCurrentTransaction(0); - throw; - } - } - return -1; -} - - -void -Test::ServantI::destroy(const Current& current) -{ - try - { - _evictor->remove(current.id); - } - catch(const Ice::NotRegisteredException&) - { - throw Ice::ObjectNotExistException(__FILE__, __LINE__); - } -} - - -Test::FacetI::FacetI() -{ -} - -Test::FacetI::FacetI(const RemoteEvictorIPtr& remoteEvictor, const Freeze::EvictorPtr& evictor, Ice::Int val, - const string& d) : - ServantI(remoteEvictor, evictor, val) -{ - data = d; -} - -string -Test::FacetI::getData(const Current&) const -{ - Monitor<Mutex>::Lock sync(*this); - return data; -} - -void -Test::FacetI::setData(const string& d, const Current&) -{ - Monitor<Mutex>::Lock sync(*this); - data = d; -} - - -class Initializer : public Freeze::ServantInitializer -{ -public: - - void init(const Test::RemoteEvictorIPtr& remoteEvictor, const Freeze::EvictorPtr& evictor) - { - _remoteEvictor = remoteEvictor; - _evictor = evictor; - } - - virtual void - initialize(const ObjectAdapterPtr&, const Identity&, const string&, const ObjectPtr& servant) - { - Test::ServantI* servantI = dynamic_cast<Test::ServantI*>(servant.get()); - if(servantI != 0) - { - servantI->init(_remoteEvictor, _evictor); - } - else - { - Test::AccountI* account = dynamic_cast<Test::AccountI*>(servant.get()); - test(account != 0); - account->init(Freeze::TransactionalEvictorPtr::dynamicCast(_evictor)); - } - } - -private: - - Test::RemoteEvictorIPtr _remoteEvictor; - Freeze::EvictorPtr _evictor; -}; - - -Test::RemoteEvictorI::RemoteEvictorI(const CommunicatorPtr& communicator, const string& envName, - const string& category, bool transactional) : - _envName(envName), - _category(category) -{ - _evictorAdapter = communicator->createObjectAdapterWithEndpoints(IceUtil::generateUUID(), "default"); - - Initializer* initializer = new Initializer; - - if(transactional) - { - _evictor = Freeze::createTransactionalEvictor(_evictorAdapter, envName, category, Freeze::FacetTypeMap(), initializer); - } - else - { - _evictor = Freeze::createBackgroundSaveEvictor(_evictorAdapter, envName, category, initializer); - } - - // - // Check that we can get an iterator on a non-existing facet - // - Freeze::EvictorIteratorPtr p = _evictor->getIterator("foo", 1); - test(p->hasNext() == false); - - - initializer->init(this, _evictor); - - _evictorAdapter->addServantLocator(_evictor, category); - _evictorAdapter->activate(); -} - - -void -Test::RemoteEvictorI::setSize(Int size, const Current&) -{ - _evictor->setSize(size); -} - -Test::ServantPrx -Test::RemoteEvictorI::createServant(const string& id, Int value, const Current&) -{ - Identity ident; - ident.category = _category; - ident.name = id; - ServantPtr servant = new ServantI(this, _evictor, value); - try - { - return ServantPrx::uncheckedCast(_evictor->add(servant, ident)); - } - catch(const Ice::AlreadyRegisteredException&) - { - throw Test::AlreadyRegisteredException(); - } - catch(const Ice::ObjectAdapterDeactivatedException&) - { - throw EvictorDeactivatedException(); - } - catch(const Freeze::EvictorDeactivatedException&) - { - throw EvictorDeactivatedException(); - } - -} - -Test::ServantPrx -Test::RemoteEvictorI::getServant(const string& id, const Current&) -{ - Identity ident; - ident.category = _category; - ident.name = id; - return ServantPrx::uncheckedCast(_evictorAdapter->createProxy(ident)); -} - - -void -Test::RemoteEvictorI::saveNow(const Current&) -{ - _evictor->getIterator("", 1); -} - -void -Test::RemoteEvictorI::deactivate(const Current& current) -{ - _evictorAdapter->destroy(); - current.adapter->remove(current.adapter->getCommunicator()->stringToIdentity(_category)); -} - - -void -Test::RemoteEvictorI::destroyAllServants(const string& facetName, const Current&) -{ - // - // Don't use such a small value in real applications! - // - Ice::Int batchSize = 1; - - Freeze::EvictorIteratorPtr p = _evictor->getIterator(facetName, batchSize); - while(p->hasNext()) - { - _evictor->remove(p->next()); - } -} - -Test::RemoteEvictorFactoryI::RemoteEvictorFactoryI(const std::string& envName) : - _envName(envName) -{ -} - -::Test::RemoteEvictorPrx -Test::RemoteEvictorFactoryI::createEvictor(const string& name, bool transactional, const Current& current) -{ - RemoteEvictorIPtr remoteEvictor = - new RemoteEvictorI(current.adapter->getCommunicator(), _envName, name, transactional); - return RemoteEvictorPrx::uncheckedCast( - current.adapter->add(remoteEvictor, current.adapter->getCommunicator()->stringToIdentity(name))); -} - -void -Test::RemoteEvictorFactoryI::shutdown(const Current& current) -{ - current.adapter->getCommunicator()->shutdown(); -} diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h deleted file mode 100644 index 0bbbc3d18c9..00000000000 --- a/cpp/test/Freeze/evictor/TestI.h +++ /dev/null @@ -1,166 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Freeze/Freeze.h> -#include <IceUtil/IceUtil.h> -#include <Test.h> - -namespace Test -{ - -class ServantI; -typedef IceUtil::Handle<ServantI> ServantIPtr; - -class RemoteEvictorI; -typedef IceUtil::Handle<RemoteEvictorI> RemoteEvictorIPtr; - -class AccountI : public Account -{ -public: - - virtual int getBalance(const Ice::Current&); - - virtual void deposit(int, const Ice::Current&); - - virtual void transfer(int, const Test::AccountPrx&, const Ice::Current&); - - virtual void transfer2_async(const AMD_Account_transfer2Ptr&, int, const Test::AccountPrx&, const Ice::Current&); - - virtual void transfer3_async(const AMD_Account_transfer3Ptr&, int, const Test::AccountPrx&, const Ice::Current&); - - AccountI(int, const Freeze::TransactionalEvictorPtr&); - AccountI(); - - void init(const Freeze::TransactionalEvictorPtr&); - -private: - - Freeze::TransactionalEvictorPtr _evictor; -}; - - -class ServantI : public virtual Servant, public IceUtil::AbstractMutexI<IceUtil::Monitor<IceUtil::Mutex> > -{ -public: - - ServantI(); - ServantI(const RemoteEvictorIPtr&, const Freeze::EvictorPtr&, Ice::Int); - - void init(const RemoteEvictorIPtr&, const Freeze::EvictorPtr&); - - virtual ::Ice::Int getValue(const Ice::Current& = Ice::Current()) const; - - // - // Used only if you remove ["amd"] from Test.ice - // - virtual ::Ice::Int slowGetValue(const Ice::Current& = Ice::Current()) const; - - - virtual void slowGetValue_async(const AMD_Servant_slowGetValuePtr&, - const Ice::Current& = Ice::Current()) const; - - virtual void setValue(::Ice::Int, const Ice::Current& = Ice::Current()); - - virtual void setValueAsync_async(const AMD_Servant_setValueAsyncPtr&, Ice::Int, - const Ice::Current& = Ice::Current()); - - virtual void releaseAsync(const Ice::Current& = Ice::Current()) const; - - virtual void addFacet(const std::string&, const std::string&, const Ice::Current& = Ice::Current()) const; - - virtual void removeFacet(const std::string&, const Ice::Current& = Ice::Current()) const; - - - virtual Ice::Int getTransientValue(const Ice::Current& = Ice::Current()) const; - virtual void setTransientValue(Ice::Int, const Ice::Current& = Ice::Current()); - virtual void keepInCache(const Ice::Current& = Ice::Current()); - virtual void release(const Ice::Current& = Ice::Current()); - - virtual Test::AccountPrxSeq getAccounts(const Ice::Current&); - virtual int getTotalBalance(const Ice::Current&); - - virtual void destroy(const Ice::Current& = Ice::Current()); - -protected: - - Ice::Int _transientValue; - RemoteEvictorIPtr _remoteEvictor; - Freeze::EvictorPtr _evictor; - AMD_Servant_setValueAsyncPtr _setValueAsyncCB; - Ice::Int _setValueAsyncValue; -}; - - -class FacetI : public virtual Facet, public ServantI -{ -public: - - FacetI(); - - FacetI(const RemoteEvictorIPtr&, const Freeze::EvictorPtr&, Ice::Int, const std::string&); - - virtual std::string getData(const Ice::Current& = Ice::Current()) const; - - virtual void setData(const std::string&, const Ice::Current& = Ice::Current()); - -}; - -class RemoteEvictorI : virtual public RemoteEvictor -{ -public: - - RemoteEvictorI(const Ice::CommunicatorPtr&, const std::string&, const std::string&, bool); - - virtual void setSize(::Ice::Int, const Ice::Current&); - - virtual ::Test::ServantPrx createServant(const std::string&, ::Ice::Int, const Ice::Current&); - - virtual ::Test::ServantPrx getServant(const std::string&, const Ice::Current&); - - virtual void saveNow(const Ice::Current&); - - virtual void deactivate(const Ice::Current&); - - virtual void destroyAllServants(const std::string&, const Ice::Current&); - - const std::string& - envName() const - { - return _envName; - } - -private: - - std::string _envName; - std::string _category; - Freeze::EvictorPtr _evictor; - Ice::ObjectAdapterPtr _evictorAdapter; -}; - -class RemoteEvictorFactoryI : virtual public RemoteEvictorFactory -{ -public: - - RemoteEvictorFactoryI(const std::string&); - - virtual ::Test::RemoteEvictorPrx createEvictor(const ::std::string&, bool, const Ice::Current&); - - virtual void shutdown(const Ice::Current&); - -private: - - const std::string _envName; -}; - -} - -#endif diff --git a/cpp/test/Freeze/evictor/config b/cpp/test/Freeze/evictor/config deleted file mode 100644 index 2681299fea8..00000000000 --- a/cpp/test/Freeze/evictor/config +++ /dev/null @@ -1,12 +0,0 @@ -Freeze.Evictor.db.Test.SaveSizeTrigger=6 -Freeze.Evictor.db.Test.SavePeriod=2 - -#Freeze.Trace.Evictor=1 -#Freeze.Trace.DbEnv=3 -#Freeze.Trace.Transaction=1 -#Freeze.Warn.Deadlocks=1 - -Ice.ThreadPool.Server.SizeMax=20 -Ice.ThreadPool.Server.SizeWarn=0 - -Freeze.Evictor.db.Test.RollbackOnUserException=1 diff --git a/cpp/test/Freeze/evictor/db/DB_CONFIG b/cpp/test/Freeze/evictor/db/DB_CONFIG deleted file mode 100644 index b275b2b2a26..00000000000 --- a/cpp/test/Freeze/evictor/db/DB_CONFIG +++ /dev/null @@ -1,3 +0,0 @@ -set_flags DB_TXN_NOSYNC - - diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py deleted file mode 100755 index d3b21305ba4..00000000000 --- a/cpp/test/Freeze/evictor/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -testOptions = ' --Freeze.DbEnv.db.DbHome="%s" --Ice.Config="%s"' % (dbdir, os.path.join(os.getcwd(), "config")) - -TestUtil.clientServerTest(additionalServerOptions= testOptions, additionalClientOptions= testOptions) diff --git a/cpp/test/Freeze/fileLock/.depend.mak b/cpp/test/Freeze/fileLock/.depend.mak deleted file mode 100755 index eac4c2effbf..00000000000 --- a/cpp/test/Freeze/fileLock/.depend.mak +++ /dev/null @@ -1,292 +0,0 @@ - -Client.obj: \ - Client.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - -ClientFail.obj: \ - ClientFail.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Freeze/fileLock/.gitignore b/cpp/test/Freeze/fileLock/.gitignore deleted file mode 100644 index e58e5b6b798..00000000000 --- a/cpp/test/Freeze/fileLock/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -clientFail -db/* diff --git a/cpp/test/Freeze/fileLock/Client.cpp b/cpp/test/Freeze/fileLock/Client.cpp deleted file mode 100644 index fc3a0ffa54c..00000000000 --- a/cpp/test/Freeze/fileLock/Client.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> -#include <TestCommon.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; - -int -main(int argc, char* argv[]) -{ - int status = EXIT_SUCCESS; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/db"; - } - - { - Freeze::ConnectionPtr connection; - try - { - connection = Freeze::createConnection(communicator, envName); - test(true); - } - catch(const exception& ex) - { - cerr << "excetpion:\n" << ex.what() << endl; - test(false); - } - catch(...) - { - test(false); - } - - cout << "File lock acquired.\n" - << "Enter some input and press enter, to release the lock and terminate the program." << endl; - // - // Block the test waiting for IO, so the file lock is preserved. - // - string foo; - cin >> foo; - - // - // Clean up. - // - if(connection) - { - connection->close(); - } - } - cout << "File lock released." << endl; - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - return status; -} diff --git a/cpp/test/Freeze/fileLock/ClientFail.cpp b/cpp/test/Freeze/fileLock/ClientFail.cpp deleted file mode 100644 index ee21e038058..00000000000 --- a/cpp/test/Freeze/fileLock/ClientFail.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> -#include <TestCommon.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; - -int -main(int argc, char* argv[]) -{ - int status = EXIT_SUCCESS; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/db"; - } - - { - Freeze::ConnectionPtr connection; - try - { - connection = Freeze::createConnection(communicator, envName); - test(false); - } - catch(const IceUtil::FileLockException&) - { - cout << "File lock not acquired." << endl; - test(true); - } - catch(const exception& ex) - { - cerr << "excetpion:\n" << ex.what() << endl; - test(false); - } - catch(...) - { - test(false); - } - } - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/Freeze/fileLock/Makefile b/cpp/test/Freeze/fileLock/Makefile deleted file mode 100644 index 441e1feb90b..00000000000 --- a/cpp/test/Freeze/fileLock/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -CLIENTF = clientFail - -TARGETS = $(CLIENT) $(CLIENTF) - -COBJS = Client.o - -CFOBJS = ClientFail.o - -OBJS = $(COBJS) $(CFOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -$(CLIENTF): $(CFOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(CFOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - - -clean:: - -rm -rf db/* diff --git a/cpp/test/Freeze/fileLock/Makefile.mak b/cpp/test/Freeze/fileLock/Makefile.mak deleted file mode 100644 index 2eb1c5b37e0..00000000000 --- a/cpp/test/Freeze/fileLock/Makefile.mak +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = client.exe -CLIENTF = clientFail.exe -TARGETS = $(CLIENT) $(CLIENTF) - -COBJS = .\Client.obj - -CFOBJS = .\ClientFail.obj - -OBJS = $(COBJS) \ - $(CFOBJS) - -!include $(top_srcdir)\config\Make.rules.mak - -CPPFLAGS = -I. -I..\..\include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(COBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(CLIENTF): $(CFOBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(CFOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - -if exist db\__Freeze rmdir /q /s db\__Freeze - -for %f in (db\*) do if not %f == db\.gitignore del /q %f diff --git a/cpp/test/Freeze/fileLock/db/.gitignore b/cpp/test/Freeze/fileLock/db/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cpp/test/Freeze/fileLock/db/.gitignore +++ /dev/null diff --git a/cpp/test/Freeze/fileLock/run.py b/cpp/test/Freeze/fileLock/run.py deleted file mode 100755 index 0314efa090f..00000000000 --- a/cpp/test/Freeze/fileLock/run.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -sys.stdout.write("testing Freeze file lock... ") -sys.stdout.flush() - -client = os.path.join(os.getcwd(), "client") - -clientExe = TestUtil.startClient(client, "", None, None, False) -clientExe.expect('File lock acquired.\.*') - -clientFail = os.path.join(os.getcwd(), "clientFail") -clientFailExe = TestUtil.startClient(clientFail, "", None, None, False) -clientFailExe.expect('File lock not acquired') - -clientFailExe.waitTestSuccess() - -# send some output to client to terminate it. -clientExe.sendline('go') -clientExe.expect('File lock released.') -clientExe.waitTestSuccess() - -# The lock is gone try to acquire it again. -clientExe = TestUtil.startClient(client, "", None, None, False) -clientExe.expect('File lock acquired.\.*') -clientExe.sendline('go') -clientExe.expect('File lock released.') -clientExe.waitTestSuccess() - -print("ok") diff --git a/cpp/test/FreezeScript/Makefile b/cpp/test/FreezeScript/Makefile deleted file mode 100644 index afc43ba0965..00000000000 --- a/cpp/test/FreezeScript/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = dbmap evictor - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/FreezeScript/Makefile.mak b/cpp/test/FreezeScript/Makefile.mak deleted file mode 100644 index 958527cbc28..00000000000 --- a/cpp/test/FreezeScript/Makefile.mak +++ /dev/null @@ -1,19 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\.. - -!include $(top_srcdir)\config\Make.rules.mak - -SUBDIRS = dbmap evictor - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/cpp/test/FreezeScript/dbmap/.depend.mak b/cpp/test/FreezeScript/dbmap/.depend.mak deleted file mode 100755 index a1e2b5f67f4..00000000000 --- a/cpp/test/FreezeScript/dbmap/.depend.mak +++ /dev/null @@ -1,360 +0,0 @@ - -TestOld.h: \ - TestOld.ice - -TestOld.obj: \ - TestOld.cpp \ - "TestOld.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -IntSMap.obj: \ - IntSMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "IntSMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "TestOld.h" \ - -makedb.obj: \ - makedb.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "IntSMap.h" \ - "TestOld.h" \ diff --git a/cpp/test/FreezeScript/dbmap/.gitignore b/cpp/test/FreezeScript/dbmap/.gitignore deleted file mode 100644 index 2e986d77bf8..00000000000 --- a/cpp/test/FreezeScript/dbmap/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -makedb -TestOld.cpp -TestOld.h -IntSMap.h -IntSMap.cpp -db/* -db_init -db_check -db_tmp diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile deleted file mode 100644 index 51ddcf7ad33..00000000000 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = makedb - -TARGETS = $(CLIENT) - -SLICE_OBJS = TestOld.o - -OBJS = $(SLICE_OBJS) \ - makedb.o \ - IntSMap.o - -all:: IntSMap.cpp - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -IntSMap.h: IntSMap.cpp -IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntSMap.h IntSMap.cpp - $(SLICE2FREEZE) -I. --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - -rm -f IntSMap.h IntSMap.cpp - -rm -rf db/* db_init db_check db_tmp diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak deleted file mode 100644 index 662a9214da4..00000000000 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ /dev/null @@ -1,52 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = makedb.exe - -TARGETS = $(CLIENT) - -SLICE_OBJS = .\TestOld.obj - -OBJS = $(SLICE_OBJS) \ - .\IntSMap.obj \ - .\makedb.obj - -all:: IntSMap.cpp IntSMap.h - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -IntSMap.h IntSMap.cpp: TestOld.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q IntSMap.h IntSMap.cpp - "$(SLICE2FREEZE)" -I. --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - del /q IntSMap.h IntSMap.cpp - -clean:: - del /q TestOld.cpp TestOld.h - -clean:: - if exist db\__Freeze rmdir /s /q db\__Freeze - del /q db\*.db db\log.* db\__catalog db\__catalogIndexList - if exist db_init rmdir /s /q db_init - if exist db_check rmdir /s /q db_check - if exist db_tmp rmdir /s /q db_tmp diff --git a/cpp/test/FreezeScript/dbmap/TestNew.ice b/cpp/test/FreezeScript/dbmap/TestNew.ice deleted file mode 100644 index 9d47f303b1f..00000000000 --- a/cpp/test/FreezeScript/dbmap/TestNew.ice +++ /dev/null @@ -1,236 +0,0 @@ -module Test -{ - -enum E { E3, E1, E2 }; - -sequence<string> BoolStringSeq; - -sequence<byte> ByteByteSeq; -sequence<short> ByteShortSeq; -sequence<int> ByteIntSeq; -sequence<long> ByteLongSeq; -sequence<string> ByteStringSeq; - -sequence<byte> ShortByteSeq; -sequence<short> ShortShortSeq; -sequence<int> ShortIntSeq; -sequence<long> ShortLongSeq; -sequence<string> ShortStringSeq; - -sequence<byte> IntByteSeq; -sequence<short> IntShortSeq; -sequence<int> IntIntSeq; -sequence<long> IntLongSeq; -sequence<string> IntStringSeq; - -sequence<byte> LongByteSeq; -sequence<short> LongShortSeq; -sequence<int> LongIntSeq; -sequence<long> LongLongSeq; -sequence<string> LongStringSeq; - -sequence<float> FloatFloatSeq; -sequence<double> FloatDoubleSeq; -sequence<string> FloatStringSeq; - -sequence<float> DoubleFloatSeq; -sequence<double> DoubleDoubleSeq; -sequence<string> DoubleStringSeq; - -sequence<bool> StringBoolSeq; -sequence<byte> StringByteSeq; -sequence<short> StringShortSeq; -sequence<int> StringIntSeq; -sequence<long> StringLongSeq; -sequence<float> StringFloatSeq; -sequence<double> StringDoubleSeq; -sequence<string> StringStringSeq; -sequence<E> StringEnumSeq; -sequence<Object*> StringProxySeq; - -dictionary<int, string> BoolStringDict; - -dictionary<int, byte> LongByteDict; -dictionary<int, short> LongShortDict; -dictionary<int, int> LongIntDict; -dictionary<int, string> LongStringDict; - -dictionary<int, float> DoubleFloatDict; -dictionary<int, string> DoubleStringDict; - -dictionary<int, bool> StringBoolDict; -dictionary<int, long> StringLongDict; -dictionary<int, double> StringDoubleDict; -dictionary<int, E> StringEnumDict; - -class C -{ - BoolStringDict boolToStringDict; -}; - -class D extends C -{ - StringByteSeq stringToByteSeq; - Object obj; -}; - -class F -{ - StringEnumSeq stringToEnumSeq; -}; - -class Small1 -{ - byte b; - string intToString; -}; -sequence<Small1> Small1Seq; -dictionary<int, Small1> IntSmall1Dict; - -struct Small2 -{ - Small1Seq seq; -}; -sequence<Small2> Small2Seq; -dictionary<int, Small2> IntSmall2Dict; - -class Small3(100) -{ - string name; -}; - -struct S -{ - // - // Primitive transformations. - // - string boolToString; - - byte byteToByte; - short byteToShort; - int byteToInt; - long byteToLong; - string byteToString; - - byte shortToByte; - short shortToShort; - int shortToInt; - long shortToLong; - string shortToString; - - byte intToByte; - short intToShort; - int intToInt; - long intToLong; - string intToString; - - byte longToByte; - short longToShort; - int longToInt; - long longToLong; - string longToString; - - float floatToFloat; - double floatToDouble; - string floatToString; - - float doubleToFloat; - double doubleToDouble; - string doubleToString; - - bool stringToBool; - byte stringToByte; - short stringToShort; - int stringToInt; - long stringToLong; - float stringToFloat; - double stringToDouble; - string stringToString; - E stringToEnum; - Object* stringToProxy; - - // - // Sequence transformations. - // - BoolStringSeq boolSeqToStringSeq; - - ByteByteSeq byteSeqToByteSeq; - ByteShortSeq byteSeqToShortSeq; - ByteIntSeq byteSeqToIntSeq; - ByteLongSeq byteSeqToLongSeq; - ByteStringSeq byteSeqToStringSeq; - - ShortByteSeq shortSeqToByteSeq; - ShortShortSeq shortSeqToShortSeq; - ShortIntSeq shortSeqToIntSeq; - ShortLongSeq shortSeqToLongSeq; - ShortStringSeq shortSeqToStringSeq; - - IntByteSeq intSeqToByteSeq; - IntShortSeq intSeqToShortSeq; - IntIntSeq intSeqToIntSeq; - IntLongSeq intSeqToLongSeq; - IntStringSeq intSeqToStringSeq; - - LongByteSeq longSeqToByteSeq; - LongShortSeq longSeqToShortSeq; - LongIntSeq longSeqToIntSeq; - LongLongSeq longSeqToLongSeq; - LongStringSeq longSeqToStringSeq; - - FloatFloatSeq floatSeqToFloatSeq; - FloatDoubleSeq floatSeqToDoubleSeq; - FloatStringSeq floatSeqToStringSeq; - - DoubleFloatSeq doubleSeqToFloatSeq; - DoubleDoubleSeq doubleSeqToDoubleSeq; - DoubleStringSeq doubleSeqToStringSeq; - - StringBoolSeq stringSeqToBoolSeq; - StringByteSeq stringSeqToByteSeq; - StringShortSeq stringSeqToShortSeq; - StringIntSeq stringSeqToIntSeq; - StringLongSeq stringSeqToLongSeq; - StringFloatSeq stringSeqToFloatSeq; - StringDoubleSeq stringSeqToDoubleSeq; - StringStringSeq stringSeqToStringSeq; - StringEnumSeq stringSeqToEnumSeq; - StringProxySeq stringSeqToProxySeq; - - // - // Dictionary transformations. - // - BoolStringDict boolToStringDict; - - LongByteDict longToByteDict; - LongShortDict longToShortDict; - LongIntDict longToIntDict; - LongStringDict longToStringDict; - - DoubleFloatDict doubleToFloatDict; - DoubleStringDict doubleToStringDict; - - StringBoolDict stringToBoolDict; - StringLongDict stringToLongDict; - StringDoubleDict stringToDoubleDict; - StringEnumDict stringToEnumDict; - - // - // Struct<->class transformations. - // - Small2Seq classToStructSeq; - IntSmall1Dict small1Dict; - IntSmall2Dict small2Dict; - - // - // Object transformations. - // - Object nilObject; - Object baseObject; - C cObject; - C dAsCObject; - D dObject; - Small3 compactObject; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/TestOld.ice b/cpp/test/FreezeScript/dbmap/TestOld.ice deleted file mode 100644 index 52ac93e3136..00000000000 --- a/cpp/test/FreezeScript/dbmap/TestOld.ice +++ /dev/null @@ -1,236 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -sequence<bool> BoolStringSeq; - -sequence<byte> ByteByteSeq; -sequence<byte> ByteShortSeq; -sequence<byte> ByteIntSeq; -sequence<byte> ByteLongSeq; -sequence<byte> ByteStringSeq; - -sequence<short> ShortByteSeq; -sequence<short> ShortShortSeq; -sequence<short> ShortIntSeq; -sequence<short> ShortLongSeq; -sequence<short> ShortStringSeq; - -sequence<int> IntByteSeq; -sequence<int> IntShortSeq; -sequence<int> IntIntSeq; -sequence<int> IntLongSeq; -sequence<int> IntStringSeq; - -sequence<long> LongByteSeq; -sequence<long> LongShortSeq; -sequence<long> LongIntSeq; -sequence<long> LongLongSeq; -sequence<long> LongStringSeq; - -sequence<float> FloatFloatSeq; -sequence<float> FloatDoubleSeq; -sequence<float> FloatStringSeq; - -sequence<double> DoubleFloatSeq; -sequence<double> DoubleDoubleSeq; -sequence<double> DoubleStringSeq; - -sequence<string> StringBoolSeq; -sequence<string> StringByteSeq; -sequence<string> StringShortSeq; -sequence<string> StringIntSeq; -sequence<string> StringLongSeq; -sequence<string> StringFloatSeq; -sequence<string> StringDoubleSeq; -sequence<string> StringStringSeq; -sequence<string> StringEnumSeq; -sequence<string> StringProxySeq; - -dictionary<int, bool> BoolStringDict; - -dictionary<int, long> LongByteDict; -dictionary<int, long> LongShortDict; -dictionary<int, long> LongIntDict; -dictionary<int, long> LongStringDict; - -dictionary<int, double> DoubleFloatDict; -dictionary<int, double> DoubleStringDict; - -dictionary<int, string> StringBoolDict; -dictionary<int, string> StringLongDict; -dictionary<int, string> StringDoubleDict; -dictionary<int, string> StringEnumDict; - -class C -{ - BoolStringDict boolToStringDict; -}; - -class D extends C -{ - StringByteSeq stringToByteSeq; - Object obj; -}; - -class F -{ - StringEnumSeq stringToEnumSeq; -}; - -struct Small1 -{ - byte b; - int intToString; -}; -sequence<Small1> Small1Seq; -dictionary<int, Small1> IntSmall1Dict; - -class Small2 -{ - Small1Seq seq; -}; -sequence<Small2> Small2Seq; -dictionary<int, Small2> IntSmall2Dict; - -class Small3(99) -{ - string name; -}; - -struct S -{ - // - // Primitive transformations. - // - bool boolToString; - - byte byteToByte; - byte byteToShort; - byte byteToInt; - byte byteToLong; - byte byteToString; - - short shortToByte; - short shortToShort; - short shortToInt; - short shortToLong; - short shortToString; - - int intToByte; - int intToShort; - int intToInt; - int intToLong; - int intToString; - - long longToByte; - long longToShort; - long longToInt; - long longToLong; - long longToString; - - float floatToFloat; - float floatToDouble; - float floatToString; - - double doubleToFloat; - double doubleToDouble; - double doubleToString; - - string stringToBool; - string stringToByte; - string stringToShort; - string stringToInt; - string stringToLong; - string stringToFloat; - string stringToDouble; - string stringToString; - string stringToEnum; - string stringToProxy; - - // - // Sequence transformations. - // - BoolStringSeq boolSeqToStringSeq; - - ByteByteSeq byteSeqToByteSeq; - ByteShortSeq byteSeqToShortSeq; - ByteIntSeq byteSeqToIntSeq; - ByteLongSeq byteSeqToLongSeq; - ByteStringSeq byteSeqToStringSeq; - - ShortByteSeq shortSeqToByteSeq; - ShortShortSeq shortSeqToShortSeq; - ShortIntSeq shortSeqToIntSeq; - ShortLongSeq shortSeqToLongSeq; - ShortStringSeq shortSeqToStringSeq; - - IntByteSeq intSeqToByteSeq; - IntShortSeq intSeqToShortSeq; - IntIntSeq intSeqToIntSeq; - IntLongSeq intSeqToLongSeq; - IntStringSeq intSeqToStringSeq; - - LongByteSeq longSeqToByteSeq; - LongShortSeq longSeqToShortSeq; - LongIntSeq longSeqToIntSeq; - LongLongSeq longSeqToLongSeq; - LongStringSeq longSeqToStringSeq; - - FloatFloatSeq floatSeqToFloatSeq; - FloatDoubleSeq floatSeqToDoubleSeq; - FloatStringSeq floatSeqToStringSeq; - - DoubleFloatSeq doubleSeqToFloatSeq; - DoubleDoubleSeq doubleSeqToDoubleSeq; - DoubleStringSeq doubleSeqToStringSeq; - - StringBoolSeq stringSeqToBoolSeq; - StringByteSeq stringSeqToByteSeq; - StringShortSeq stringSeqToShortSeq; - StringIntSeq stringSeqToIntSeq; - StringLongSeq stringSeqToLongSeq; - StringFloatSeq stringSeqToFloatSeq; - StringDoubleSeq stringSeqToDoubleSeq; - StringStringSeq stringSeqToStringSeq; - StringEnumSeq stringSeqToEnumSeq; - StringProxySeq stringSeqToProxySeq; - - // - // Dictionary transformations. - // - BoolStringDict boolToStringDict; - - LongByteDict longToByteDict; - LongShortDict longToShortDict; - LongIntDict longToIntDict; - LongStringDict longToStringDict; - - DoubleFloatDict doubleToFloatDict; - DoubleStringDict doubleToStringDict; - - StringBoolDict stringToBoolDict; - StringLongDict stringToLongDict; - StringDoubleDict stringToDoubleDict; - StringEnumDict stringToEnumDict; - - // - // Struct<->class transformations. - // - Small2Seq classToStructSeq; - IntSmall1Dict small1Dict; - IntSmall2Dict small2Dict; - - // - // Object transformations. - // - Object nilObject; - Object baseObject; - C cObject; - C dAsCObject; - D dObject; - Small3 compactObject; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/check.xml b/cpp/test/FreezeScript/dbmap/check.xml deleted file mode 100644 index 7c7040a0b04..00000000000 --- a/cpp/test/FreezeScript/dbmap/check.xml +++ /dev/null @@ -1,362 +0,0 @@ -<transformdb> - <database key="int" value="::Test::S"> - <record> - </record> - </database> - - <!-- enum ::E --> - <transform type="::Test::E"/> - - <!-- struct ::S --> - <transform type="::Test::S"> - - <!-- Primitives --> - - <fail test="new.boolToString != 'true'"/> - - <fail test="new.byteToByte != 255"/> - <fail test="new.byteToShort != 255"/> - <fail test="new.byteToInt != 255"/> - <fail test="new.byteToLong != 255"/> - <fail test="new.byteToString != '255'"/> - - <fail test="new.shortToByte != 0"/> - <fail test="new.shortToShort != 32767"/> - <fail test="new.shortToInt != -32768"/> - <fail test="new.shortToLong != 32767"/> - <fail test="new.shortToString != '255'"/> - - <fail test="new.intToByte != 0"/> - <fail test="new.intToShort != 0"/> - <fail test="new.intToInt != 2147483647"/> - <fail test="new.intToLong != -2147483648"/> - <fail test="new.intToString != '255'"/> - - <fail test="new.longToByte != 0"/> - <fail test="new.longToShort != 0"/> - <fail test="new.longToInt != 0"/> - <fail test="new.longToLong != 9223372036854775807"/> - <fail test="new.longToString != '255'"/> - - <fail test="new.floatToFloat - 2920.1 > 0.001"/> - <fail test="new.floatToDouble - 2920.1 > 0.001"/> - <fail test="new.floatToString != '2920.1'"/> - - <fail test="new.doubleToFloat - 9290.9 > 0.001"/> - <fail test="new.doubleToDouble - 9290.9 > 0.001"/> - <fail test="new.doubleToString != '9290.9'"/> - - <fail test="new.stringToBool != false"/> - <fail test="new.stringToByte != 255"/> - <fail test="new.stringToShort != 32767"/> - <fail test="new.stringToInt != 2147483647"/> - <fail test="new.stringToLong != 9223372036854775807"/> - <fail test="new.stringToFloat - 2920.1 > 0.001"/> - <fail test="new.stringToDouble - 9290.9 > 0.001"/> - <fail test="new.stringToString != 'hello world'"/> - <fail test="new.stringToString.length != 11"/> - <fail test="new.stringToString.replace(new.stringToString.length, 0, '!') != 'hello world!'"/> - <fail test="new.stringToString.replace(0, 6, '') != 'world'"/> - <fail test="'hello' + 'world' != 'helloworld'"/> - <fail test="new.stringToEnum != ::New::Test::E1"/> - - <!-- Sequences --> - - <fail test="new.boolSeqToStringSeq.length != 2"/> - <fail test="new.boolSeqToStringSeq[0] != 'false'"/> - <fail test="new.boolSeqToStringSeq[1] != 'true'"/> - - <fail test="new.byteSeqToByteSeq.length != 2"/> - <fail test="new.byteSeqToByteSeq[0] != 0"/> - <fail test="new.byteSeqToByteSeq[1] != 255"/> - - <fail test="new.byteSeqToShortSeq.length != 2"/> - <fail test="new.byteSeqToShortSeq[0] != 0"/> - <fail test="new.byteSeqToShortSeq[1] != 255"/> - - <fail test="new.byteSeqToIntSeq.length != 2"/> - <fail test="new.byteSeqToIntSeq[0] != 0"/> - <fail test="new.byteSeqToIntSeq[1] != 255"/> - - <fail test="new.byteSeqToLongSeq.length != 2"/> - <fail test="new.byteSeqToLongSeq[0] != 0"/> - <fail test="new.byteSeqToLongSeq[1] != 255"/> - - <fail test="new.byteSeqToStringSeq.length != 2"/> - <fail test="new.byteSeqToStringSeq[0] != '0'"/> - <fail test="new.byteSeqToStringSeq[1] != '255'"/> - - <fail test="new.shortSeqToByteSeq.length != 4"/> - <fail test="new.shortSeqToByteSeq[0] != 0"/> - <fail test="new.shortSeqToByteSeq[1] != 255"/> - <fail test="new.shortSeqToByteSeq[2] != 0"/> - <fail test="new.shortSeqToByteSeq[3] != 0"/> - - <fail test="new.shortSeqToShortSeq.length != 2"/> - <fail test="new.shortSeqToShortSeq[0] != -32768"/> - <fail test="new.shortSeqToShortSeq[1] != 32767"/> - - <fail test="new.shortSeqToIntSeq.length != 2"/> - <fail test="new.shortSeqToIntSeq[0] != -32768"/> - <fail test="new.shortSeqToIntSeq[1] != 32767"/> - - <fail test="new.shortSeqToLongSeq.length != 2"/> - <fail test="new.shortSeqToLongSeq[0] != -32768"/> - <fail test="new.shortSeqToLongSeq[1] != 32767"/> - - <fail test="new.shortSeqToStringSeq.length != 2"/> - <fail test="new.shortSeqToStringSeq[0] != '-32768'"/> - <fail test="new.shortSeqToStringSeq[1] != '32767'"/> - - <fail test="new.intSeqToByteSeq.length != 4"/> - <fail test="new.intSeqToByteSeq[0] != 0"/> - <fail test="new.intSeqToByteSeq[1] != 255"/> - <fail test="new.intSeqToByteSeq[2] != 0"/> - <fail test="new.intSeqToByteSeq[3] != 0"/> - - <fail test="new.intSeqToShortSeq.length != 4"/> - <fail test="new.intSeqToShortSeq[0] != -32768"/> - <fail test="new.intSeqToShortSeq[1] != 32767"/> - <fail test="new.intSeqToShortSeq[2] != 0"/> - <fail test="new.intSeqToShortSeq[3] != 0"/> - - <fail test="new.intSeqToIntSeq.length != 2"/> - <fail test="new.intSeqToIntSeq[0] != -2147483648"/> - <fail test="new.intSeqToIntSeq[1] != 2147483647"/> - - <fail test="new.intSeqToLongSeq.length != 2"/> - <fail test="new.intSeqToLongSeq[0] != -2147483648"/> - <fail test="new.intSeqToLongSeq[1] != 2147483647"/> - - <fail test="new.intSeqToStringSeq.length != 2"/> - <fail test="new.intSeqToStringSeq[0] != '-2147483648'"/> - <fail test="new.intSeqToStringSeq[1] != '2147483647'"/> - - <fail test="new.longSeqToByteSeq.length != 4"/> - <fail test="new.longSeqToByteSeq[0] != 0"/> - <fail test="new.longSeqToByteSeq[1] != 255"/> - <fail test="new.longSeqToByteSeq[2] != 0"/> - <fail test="new.longSeqToByteSeq[3] != 0"/> - - <fail test="new.longSeqToShortSeq.length != 4"/> - <fail test="new.longSeqToShortSeq[0] != -32768"/> - <fail test="new.longSeqToShortSeq[1] != 32767"/> - <fail test="new.longSeqToShortSeq[2] != 0"/> - <fail test="new.longSeqToShortSeq[3] != 0"/> - - <fail test="new.longSeqToIntSeq.length != 4"/> - <fail test="new.longSeqToIntSeq[0] != -2147483648"/> - <fail test="new.longSeqToIntSeq[1] != 2147483647"/> - <fail test="new.longSeqToIntSeq[2] != 0"/> - <fail test="new.longSeqToIntSeq[3] != 0"/> - - <fail test="new.longSeqToLongSeq.length != 2"/> - <fail test="new.longSeqToLongSeq[0] != -9223372036854775808"/> - <fail test="new.longSeqToLongSeq[1] != 9223372036854775807"/> - - <fail test="new.longSeqToStringSeq.length != 2"/> - <fail test="new.longSeqToStringSeq[0] != '-9223372036854775808'"/> - <fail test="new.longSeqToStringSeq[1] != '9223372036854775807'"/> - - <fail test="new.floatSeqToFloatSeq.length != 2"/> - <fail test="new.floatSeqToFloatSeq[0] - 2920.1 > 0.001"/> - <fail test="new.floatSeqToFloatSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.floatSeqToDoubleSeq.length != 2"/> - <fail test="new.floatSeqToDoubleSeq[0] - 2920.1 > 0.001"/> - <fail test="new.floatSeqToDoubleSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.floatSeqToStringSeq.length != 2"/> - <fail test="new.floatSeqToStringSeq[0] != '2920.1'"/> - <fail test="new.floatSeqToStringSeq[1] != '2920.2'"/> - - <fail test="new.doubleSeqToFloatSeq.length != 2"/> - <fail test="new.doubleSeqToFloatSeq[0] - 9290.8 > 0.001"/> - <fail test="new.doubleSeqToFloatSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleSeqToDoubleSeq.length != 2"/> - <fail test="new.doubleSeqToDoubleSeq[0] - 9290.8 > 0.001"/> - <fail test="new.doubleSeqToDoubleSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleSeqToStringSeq.length != 2"/> - <fail test="new.doubleSeqToStringSeq[0] != '9290.8'"/> - <fail test="new.doubleSeqToStringSeq[1] != '9290.9'"/> - - <fail test="new.stringSeqToBoolSeq.length != 2"/> - <fail test="new.stringSeqToBoolSeq[0] != false"/> - <fail test="new.stringSeqToBoolSeq[1] != true"/> - - <fail test="new.stringSeqToByteSeq.length != 4"/> - <fail test="new.stringSeqToByteSeq[0] != 0"/> - <fail test="new.stringSeqToByteSeq[1] != 255"/> - <fail test="new.stringSeqToByteSeq[2] != 0"/> - <fail test="new.stringSeqToByteSeq[3] != 0"/> - - <fail test="new.stringSeqToShortSeq.length != 4"/> - <fail test="new.stringSeqToShortSeq[0] != -32768"/> - <fail test="new.stringSeqToShortSeq[1] != 32767"/> - <fail test="new.stringSeqToShortSeq[2] != 0"/> - <fail test="new.stringSeqToShortSeq[3] != 0"/> - - <fail test="new.stringSeqToIntSeq.length != 4"/> - <fail test="new.stringSeqToIntSeq[0] != -2147483648"/> - <fail test="new.stringSeqToIntSeq[1] != 2147483647"/> - <fail test="new.stringSeqToIntSeq[2] != 0"/> - <fail test="new.stringSeqToIntSeq[3] != 0"/> - - <fail test="new.stringSeqToLongSeq.length != 2"/> - <fail test="new.stringSeqToLongSeq[0] != -9223372036854775808"/> - <fail test="new.stringSeqToLongSeq[1] != 9223372036854775807"/> - - <fail test="new.stringSeqToFloatSeq.length != 2"/> - <fail test="new.stringSeqToFloatSeq[0] - 2920.1 > 0.001"/> - <fail test="new.stringSeqToFloatSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.stringSeqToDoubleSeq.length != 2"/> - <fail test="new.stringSeqToDoubleSeq[0] - 9290.8 > 0.001"/> - <fail test="new.stringSeqToDoubleSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.stringSeqToStringSeq.length != 2"/> - <fail test="new.stringSeqToStringSeq[0] != 'hello'"/> - <fail test="new.stringSeqToStringSeq[1] != 'world'"/> - - <fail test="new.stringSeqToEnumSeq.length != 2"/> - <fail test="new.stringSeqToEnumSeq[0] != ::New::Test::E2"/> - <fail test="new.stringSeqToEnumSeq[1] != ::New::Test::E3"/> - - <!-- Dictionaries --> - - <fail test="new.boolToStringDict.length != 2"/> - <fail test="new.boolToStringDict[0] != 'false'"/> - <fail test="new.boolToStringDict[1] != 'true'"/> - - <fail test="new.longToByteDict.length != 4"/> - <fail test="new.longToByteDict[0] != 0"/> - <fail test="new.longToByteDict[1] != 255"/> - <fail test="new.longToByteDict[2] != 0"/> - <fail test="new.longToByteDict[3] != 0"/> - - <fail test="new.longToShortDict.length != 4"/> - <fail test="new.longToShortDict[0] != -32768"/> - <fail test="new.longToShortDict[1] != 32767"/> - <fail test="new.longToShortDict[2] != 0"/> - <fail test="new.longToShortDict[3] != 0"/> - - <fail test="new.longToIntDict.length != 4"/> - <fail test="new.longToIntDict[0] != -2147483648"/> - <fail test="new.longToIntDict[1] != 2147483647"/> - <fail test="new.longToIntDict[2] != 0"/> - <fail test="new.longToIntDict[3] != 0"/> - - <fail test="new.longToStringDict.length != 2"/> - <fail test="new.longToStringDict[0] != '-9223372036854775808'"/> - <fail test="new.longToStringDict[1] != '9223372036854775807'"/> - - <fail test="new.doubleToFloatDict.length != 2"/> - <fail test="new.doubleToFloatDict[0] - 9290.8 > 0.001"/> - <fail test="new.doubleToFloatDict[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleToStringDict.length != 2"/> - <fail test="new.doubleToStringDict[0] != '9290.8'"/> - <fail test="new.doubleToStringDict[1] != '9290.9'"/> - - <fail test="new.stringToBoolDict.length != 2"/> - <fail test="new.stringToBoolDict[0] != false"/> - <fail test="new.stringToBoolDict[1] != true"/> - - <fail test="new.stringToLongDict.length != 2"/> - <fail test="new.stringToLongDict[0] != -9223372036854775808"/> - <fail test="new.stringToLongDict[1] != 9223372036854775807"/> - - <fail test="new.stringToDoubleDict.length != 2"/> - <fail test="new.stringToDoubleDict[0] - 9290.8 > 0.001"/> - <fail test="new.stringToDoubleDict[1] - 9290.9 > 0.001"/> - - <fail test="new.stringToEnumDict.length != 2"/> - <fail test="new.stringToEnumDict[0] != ::New::Test::E2"/> - <fail test="new.stringToEnumDict[1] != ::New::Test::E3"/> - - <!-- Struct <-> class transformations --> - - <fail test="new.classToStructSeq.length != 3"/> - <fail test="new.classToStructSeq[0].seq.length != 2"/> - <fail test="new.classToStructSeq[0].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[0].seq[0].b != 100"/> - <fail test="new.classToStructSeq[0].seq[0].intToString != '101'"/> - <fail test="new.classToStructSeq[0].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[0].seq[1].b != 102"/> - <fail test="new.classToStructSeq[0].seq[1].intToString != '103'"/> - <fail test="new.classToStructSeq[1].seq.length != 2"/> - <fail test="new.classToStructSeq[1].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[1].seq[0].b != 110"/> - <fail test="new.classToStructSeq[1].seq[0].intToString != '111'"/> - <fail test="new.classToStructSeq[1].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[1].seq[1].b != 112"/> - <fail test="new.classToStructSeq[1].seq[1].intToString != '113'"/> - <fail test="new.classToStructSeq[2].seq.length != 2"/> - <fail test="new.classToStructSeq[2].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[2].seq[0].b != 120"/> - <fail test="new.classToStructSeq[2].seq[0].intToString != '121'"/> - <fail test="new.classToStructSeq[2].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[2].seq[1].b != 122"/> - <fail test="new.classToStructSeq[2].seq[1].intToString != '123'"/> - - <fail test="new.small1Dict.length != 3"/> - <fail test="new.small1Dict[0].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[0].b != 120"/> - <fail test="new.small1Dict[0].intToString != '121'"/> - <fail test="new.small1Dict[10].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[10].b != 122"/> - <fail test="new.small1Dict[10].intToString != '123'"/> - <fail test="new.small1Dict[100].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[100].b != 124"/> - <fail test="new.small1Dict[100].intToString != '125'"/> - - <fail test="new.small2Dict.length != 3"/> - <fail test="new.small2Dict[0].seq.length != 1"/> - <fail test="new.small2Dict[0].seq[0].b != 220"/> - <fail test="new.small2Dict[0].seq[0].intToString != '221'"/> - <fail test="new.small2Dict[10].seq.length != 1"/> - <fail test="new.small2Dict[10].seq[0].b != 222"/> - <fail test="new.small2Dict[10].seq[0].intToString != '223'"/> - <fail test="new.small2Dict[100].seq.length != 1"/> - <fail test="new.small2Dict[100].seq[0].b != 224"/> - <fail test="new.small2Dict[100].seq[0].intToString != '225'"/> - - <!-- Objects --> - - <fail test="new.nilObject != nil"/> - - <fail test="new.baseObject.ice_id != '::Test::F'"/> - <fail test="new.baseObject.stringToEnumSeq.length != 2"/> - <fail test="new.baseObject.stringToEnumSeq[0] != ::New::Test::E1"/> - <fail test="new.baseObject.stringToEnumSeq[1] != ::New::Test::E3"/> - - <fail test="new.cObject.ice_id != '::Test::C'"/> - <fail test="new.cObject.boolToStringDict.length != 2"/> - <fail test="new.cObject.boolToStringDict[0] != 'false'"/> - <fail test="new.cObject.boolToStringDict[1] != 'true'"/> - - <fail test="new.dAsCObject.ice_id != '::Test::D'"/> - <fail test="new.dAsCObject.boolToStringDict.length != 2"/> - <fail test="new.dAsCObject.boolToStringDict[0] != 'false'"/> - <fail test="new.dAsCObject.boolToStringDict[1] != 'true'"/> - <fail test="new.dAsCObject.stringToByteSeq.length != 2"/> - <fail test="new.dAsCObject.stringToByteSeq[0] != 0"/> - <fail test="new.dAsCObject.stringToByteSeq[1] != 255"/> - <fail test="new.dAsCObject.obj.ice_id != '::Test::F'"/> - - <fail test="new.dObject.ice_id != '::Test::D'"/> - <fail test="new.dObject.boolToStringDict.length != 2"/> - <fail test="new.dObject.boolToStringDict[0] != 'false'"/> - <fail test="new.dObject.boolToStringDict[1] != 'true'"/> - <fail test="new.dObject.stringToByteSeq.length != 2"/> - <fail test="new.dObject.stringToByteSeq[0] != 0"/> - <fail test="new.dObject.stringToByteSeq[1] != 255"/> - <fail test="new.dObject.obj.ice_id != '::Test::C'"/> - - <fail test="new.compactObject.ice_id != '::Test::Small3'"/> - <fail test="new.compactObject.name != 'compactObject'"/> - - </transform> -</transformdb> diff --git a/cpp/test/FreezeScript/dbmap/db/.gitignore b/cpp/test/FreezeScript/dbmap/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/cpp/test/FreezeScript/dbmap/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/cpp/test/FreezeScript/dbmap/fail/01.err b/cpp/test/FreezeScript/dbmap/fail/01.err deleted file mode 100644 index 1249c9b14d4..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m2 from bool to byte -transformdb: unsupported type change in c1m3 from bool to short -transformdb: unsupported type change in c1m4 from bool to int -transformdb: unsupported type change in c1m5 from bool to long -transformdb: unsupported type change in c1m6 from bool to float -transformdb: unsupported type change in c1m7 from bool to double -transformdb: unsupported type change in c1m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from bool to Object* -transformdb: unsupported type change in c1m14 from bool to Object -transformdb: unsupported type change in c1m15 from bool to ::Test::C1* -transformdb: unsupported type change in c1m16 from bool to class ::Test::C1 -transformdb: unsupported type change in c2m2 from bool to byte -transformdb: unsupported type change in c2m3 from bool to short -transformdb: unsupported type change in c2m4 from bool to int -transformdb: unsupported type change in c2m5 from bool to long -transformdb: unsupported type change in c2m6 from bool to float -transformdb: unsupported type change in c2m7 from bool to double -transformdb: unsupported type change in c2m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from bool to Object* -transformdb: unsupported type change in c2m14 from bool to Object -transformdb: unsupported type change in c2m15 from bool to ::Test::C1* -transformdb: unsupported type change in c2m16 from bool to class ::Test::C1 -transformdb: unsupported type change in m2 from bool to byte -transformdb: unsupported type change in m3 from bool to short -transformdb: unsupported type change in m4 from bool to int -transformdb: unsupported type change in m5 from bool to long -transformdb: unsupported type change in m6 from bool to float -transformdb: unsupported type change in m7 from bool to double -transformdb: unsupported type change in m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from bool to Object* -transformdb: unsupported type change in m14 from bool to Object -transformdb: unsupported type change in m15 from bool to ::Test::C1* -transformdb: unsupported type change in m16 from bool to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/01_new.ice b/cpp/test/FreezeScript/dbmap/fail/01_new.ice deleted file mode 100644 index 1d8f02a9946..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/01_old.ice b/cpp/test/FreezeScript/dbmap/fail/01_old.ice deleted file mode 100644 index 547335926a7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; - bool c1m2; - bool c1m3; - bool c1m4; - bool c1m5; - bool c1m6; - bool c1m7; - bool c1m8; - bool c1m9; - bool c1m10; - bool c1m11; - bool c1m12; - bool c1m13; - bool c1m14; - bool c1m15; - bool c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; - bool c2m2; - bool c2m3; - bool c2m4; - bool c2m5; - bool c2m6; - bool c2m7; - bool c2m8; - bool c2m9; - bool c2m10; - bool c2m11; - bool c2m12; - bool c2m13; - bool c2m14; - bool c2m15; - bool c2m16; -}; - -struct S2 -{ - bool m1; - bool m2; - bool m3; - bool m4; - bool m5; - bool m6; - bool m7; - bool m8; - bool m9; - bool m10; - bool m11; - bool m12; - bool m13; - bool m14; - bool m15; - bool m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/02.err b/cpp/test/FreezeScript/dbmap/fail/02.err deleted file mode 100644 index 67d9d397708..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from byte to bool -transformdb: unsupported type change in ::Test::D1 value type from byte to bool -transformdb: unsupported type change in c1m1 from byte to bool -transformdb: unsupported type change in c1m6 from byte to float -transformdb: unsupported type change in c1m7 from byte to double -transformdb: unsupported type change in c1m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from byte to Object* -transformdb: unsupported type change in c1m14 from byte to Object -transformdb: unsupported type change in c1m15 from byte to ::Test::C1* -transformdb: unsupported type change in c1m16 from byte to class ::Test::C1 -transformdb: unsupported type change in c2m1 from byte to bool -transformdb: unsupported type change in c2m6 from byte to float -transformdb: unsupported type change in c2m7 from byte to double -transformdb: unsupported type change in c2m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from byte to Object* -transformdb: unsupported type change in c2m14 from byte to Object -transformdb: unsupported type change in c2m15 from byte to ::Test::C1* -transformdb: unsupported type change in c2m16 from byte to class ::Test::C1 -transformdb: unsupported type change in m1 from byte to bool -transformdb: unsupported type change in m6 from byte to float -transformdb: unsupported type change in m7 from byte to double -transformdb: unsupported type change in m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from byte to Object* -transformdb: unsupported type change in m14 from byte to Object -transformdb: unsupported type change in m15 from byte to ::Test::C1* -transformdb: unsupported type change in m16 from byte to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/02_new.ice b/cpp/test/FreezeScript/dbmap/fail/02_new.ice deleted file mode 100644 index a558a573d28..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; // FAIL -dictionary<int, bool> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/02_old.ice b/cpp/test/FreezeScript/dbmap/fail/02_old.ice deleted file mode 100644 index 516c2c4ed6b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; -dictionary<byte, byte> D1; - -interface I {}; - -class C1 implements I -{ - byte c1m1; - byte c1m2; - byte c1m3; - byte c1m4; - byte c1m5; - byte c1m6; - byte c1m7; - byte c1m8; - byte c1m9; - byte c1m10; - byte c1m11; - byte c1m12; - byte c1m13; - byte c1m14; - byte c1m15; - byte c1m16; -}; - -class C2 extends C1 -{ - byte c2m1; - byte c2m2; - byte c2m3; - byte c2m4; - byte c2m5; - byte c2m6; - byte c2m7; - byte c2m8; - byte c2m9; - byte c2m10; - byte c2m11; - byte c2m12; - byte c2m13; - byte c2m14; - byte c2m15; - byte c2m16; -}; - -struct S2 -{ - byte m1; - byte m2; - byte m3; - byte m4; - byte m5; - byte m6; - byte m7; - byte m8; - byte m9; - byte m10; - byte m11; - byte m12; - byte m13; - byte m14; - byte m15; - byte m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/03.err b/cpp/test/FreezeScript/dbmap/fail/03.err deleted file mode 100644 index 7d7bfd7c595..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from short to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from short to struct ::Test::S1 -transformdb: unsupported type change in c1m1 from short to bool -transformdb: unsupported type change in c1m6 from short to float -transformdb: unsupported type change in c1m7 from short to double -transformdb: unsupported type change in c1m9 from short to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from short to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from short to Object* -transformdb: unsupported type change in c1m14 from short to Object -transformdb: unsupported type change in c1m15 from short to ::Test::C1* -transformdb: unsupported type change in c1m16 from short to class ::Test::C1 -transformdb: unsupported type change in c2m1 from short to bool -transformdb: unsupported type change in c2m6 from short to float -transformdb: unsupported type change in c2m7 from short to double -transformdb: unsupported type change in c2m9 from short to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from short to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from short to Object* -transformdb: unsupported type change in c2m14 from short to Object -transformdb: unsupported type change in c2m15 from short to ::Test::C1* -transformdb: unsupported type change in c2m16 from short to class ::Test::C1 -transformdb: unsupported type change in m1 from short to bool -transformdb: unsupported type change in m6 from short to float -transformdb: unsupported type change in m7 from short to double -transformdb: unsupported type change in m9 from short to enumeration ::Test::E -transformdb: unsupported type change in m10 from short to struct ::Test::S1 -transformdb: unsupported type change in m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from short to Object* -transformdb: unsupported type change in m14 from short to Object -transformdb: unsupported type change in m15 from short to ::Test::C1* -transformdb: unsupported type change in m16 from short to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/03_new.ice b/cpp/test/FreezeScript/dbmap/fail/03_new.ice deleted file mode 100644 index 9ef0b7f7b5a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<short, S1> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/03_old.ice b/cpp/test/FreezeScript/dbmap/fail/03_old.ice deleted file mode 100644 index 4c3a877c0fd..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<short> Seq1; -dictionary<string, short> D1; - -interface I {}; - -class C1 implements I -{ - short c1m1; - short c1m2; - short c1m3; - short c1m4; - short c1m5; - short c1m6; - short c1m7; - short c1m8; - short c1m9; - short c1m10; - short c1m11; - short c1m12; - short c1m13; - short c1m14; - short c1m15; - short c1m16; -}; - -class C2 extends C1 -{ - short c2m1; - short c2m2; - short c2m3; - short c2m4; - short c2m5; - short c2m6; - short c2m7; - short c2m8; - short c2m9; - short c2m10; - short c2m11; - short c2m12; - short c2m13; - short c2m14; - short c2m15; - short c2m16; -}; - -struct S2 -{ - short m1; - short m2; - short m3; - short m4; - short m5; - short m6; - short m7; - short m8; - short m9; - short m10; - short m11; - short m12; - short m13; - short m14; - short m15; - short m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/04.err b/cpp/test/FreezeScript/dbmap/fail/04.err deleted file mode 100644 index b969d55d395..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04.err +++ /dev/null @@ -1,34 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from int to float -transformdb: unsupported type change in c1m1 from int to bool -transformdb: unsupported type change in c1m6 from int to float -transformdb: unsupported type change in c1m7 from int to double -transformdb: unsupported type change in c1m9 from int to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from int to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from int to Object* -transformdb: unsupported type change in c1m14 from int to Object -transformdb: unsupported type change in c1m15 from int to ::Test::C1* -transformdb: unsupported type change in c1m16 from int to class ::Test::C1 -transformdb: unsupported type change in c2m1 from int to bool -transformdb: unsupported type change in c2m6 from int to float -transformdb: unsupported type change in c2m7 from int to double -transformdb: unsupported type change in c2m9 from int to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from int to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from int to Object* -transformdb: unsupported type change in c2m14 from int to Object -transformdb: unsupported type change in c2m15 from int to ::Test::C1* -transformdb: unsupported type change in c2m16 from int to class ::Test::C1 -transformdb: unsupported type change in m1 from int to bool -transformdb: unsupported type change in m6 from int to float -transformdb: unsupported type change in m7 from int to double -transformdb: unsupported type change in m9 from int to enumeration ::Test::E -transformdb: unsupported type change in m10 from int to struct ::Test::S1 -transformdb: unsupported type change in m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from int to Object* -transformdb: unsupported type change in m14 from int to Object -transformdb: unsupported type change in m15 from int to ::Test::C1* -transformdb: unsupported type change in m16 from int to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/04_new.ice b/cpp/test/FreezeScript/dbmap/fail/04_new.ice deleted file mode 100644 index 154d617593b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<float> Seq1; // FAIL -dictionary<short, string> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/04_old.ice b/cpp/test/FreezeScript/dbmap/fail/04_old.ice deleted file mode 100644 index 31eedb0409d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<int> Seq1; -dictionary<byte, int> D1; - -interface I {}; - -class C1 implements I -{ - int c1m1; - int c1m2; - int c1m3; - int c1m4; - int c1m5; - int c1m6; - int c1m7; - int c1m8; - int c1m9; - int c1m10; - int c1m11; - int c1m12; - int c1m13; - int c1m14; - int c1m15; - int c1m16; -}; - -class C2 extends C1 -{ - int c2m1; - int c2m2; - int c2m3; - int c2m4; - int c2m5; - int c2m6; - int c2m7; - int c2m8; - int c2m9; - int c2m10; - int c2m11; - int c2m12; - int c2m13; - int c2m14; - int c2m15; - int c2m16; -}; - -struct S2 -{ - int m1; - int m2; - int m3; - int m4; - int m5; - int m6; - int m7; - int m8; - int m9; - int m10; - int m11; - int m12; - int m13; - int m14; - int m15; - int m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/05.err b/cpp/test/FreezeScript/dbmap/fail/05.err deleted file mode 100644 index ebd2b6ee32d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from long to enumeration ::Test::E -transformdb: unsupported type change in ::Test::D1 value type from long to enumeration ::Test::E -transformdb: unsupported type change in c1m1 from long to bool -transformdb: unsupported type change in c1m6 from long to float -transformdb: unsupported type change in c1m7 from long to double -transformdb: unsupported type change in c1m9 from long to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from long to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from long to Object* -transformdb: unsupported type change in c1m14 from long to Object -transformdb: unsupported type change in c1m15 from long to ::Test::C1* -transformdb: unsupported type change in c1m16 from long to class ::Test::C1 -transformdb: unsupported type change in c2m1 from long to bool -transformdb: unsupported type change in c2m6 from long to float -transformdb: unsupported type change in c2m7 from long to double -transformdb: unsupported type change in c2m9 from long to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from long to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from long to Object* -transformdb: unsupported type change in c2m14 from long to Object -transformdb: unsupported type change in c2m15 from long to ::Test::C1* -transformdb: unsupported type change in c2m16 from long to class ::Test::C1 -transformdb: unsupported type change in m1 from long to bool -transformdb: unsupported type change in m6 from long to float -transformdb: unsupported type change in m7 from long to double -transformdb: unsupported type change in m9 from long to enumeration ::Test::E -transformdb: unsupported type change in m10 from long to struct ::Test::S1 -transformdb: unsupported type change in m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from long to Object* -transformdb: unsupported type change in m14 from long to Object -transformdb: unsupported type change in m15 from long to ::Test::C1* -transformdb: unsupported type change in m16 from long to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/05_new.ice b/cpp/test/FreezeScript/dbmap/fail/05_new.ice deleted file mode 100644 index 51bfa043e9f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; // FAIL -dictionary<short, E> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/05_old.ice b/cpp/test/FreezeScript/dbmap/fail/05_old.ice deleted file mode 100644 index 2afcb8233d7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<long> Seq1; -dictionary<int, long> D1; - -interface I {}; - -class C1 implements I -{ - long c1m1; - long c1m2; - long c1m3; - long c1m4; - long c1m5; - long c1m6; - long c1m7; - long c1m8; - long c1m9; - long c1m10; - long c1m11; - long c1m12; - long c1m13; - long c1m14; - long c1m15; - long c1m16; -}; - -class C2 extends C1 -{ - long c2m1; - long c2m2; - long c2m3; - long c2m4; - long c2m5; - long c2m6; - long c2m7; - long c2m8; - long c2m9; - long c2m10; - long c2m11; - long c2m12; - long c2m13; - long c2m14; - long c2m15; - long c2m16; -}; - -struct S2 -{ - long m1; - long m2; - long m3; - long m4; - long m5; - long m6; - long m7; - long m8; - long m9; - long m10; - long m11; - long m12; - long m13; - long m14; - long m15; - long m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/06.err b/cpp/test/FreezeScript/dbmap/fail/06.err deleted file mode 100644 index 43eb0059c1f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from float to byte -transformdb: unsupported type change in ::Test::D1 value type from float to byte -transformdb: unsupported type change in c1m1 from float to bool -transformdb: unsupported type change in c1m2 from float to byte -transformdb: unsupported type change in c1m3 from float to short -transformdb: unsupported type change in c1m4 from float to int -transformdb: unsupported type change in c1m5 from float to long -transformdb: unsupported type change in c1m9 from float to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from float to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from float to Object* -transformdb: unsupported type change in c1m14 from float to Object -transformdb: unsupported type change in c1m15 from float to ::Test::C1* -transformdb: unsupported type change in c1m16 from float to class ::Test::C1 -transformdb: unsupported type change in c2m1 from float to bool -transformdb: unsupported type change in c2m2 from float to byte -transformdb: unsupported type change in c2m3 from float to short -transformdb: unsupported type change in c2m4 from float to int -transformdb: unsupported type change in c2m5 from float to long -transformdb: unsupported type change in c2m9 from float to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from float to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from float to Object* -transformdb: unsupported type change in c2m14 from float to Object -transformdb: unsupported type change in c2m15 from float to ::Test::C1* -transformdb: unsupported type change in c2m16 from float to class ::Test::C1 -transformdb: unsupported type change in m1 from float to bool -transformdb: unsupported type change in m2 from float to byte -transformdb: unsupported type change in m3 from float to short -transformdb: unsupported type change in m4 from float to int -transformdb: unsupported type change in m5 from float to long -transformdb: unsupported type change in m9 from float to enumeration ::Test::E -transformdb: unsupported type change in m10 from float to struct ::Test::S1 -transformdb: unsupported type change in m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from float to Object* -transformdb: unsupported type change in m14 from float to Object -transformdb: unsupported type change in m15 from float to ::Test::C1* -transformdb: unsupported type change in m16 from float to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/06_new.ice b/cpp/test/FreezeScript/dbmap/fail/06_new.ice deleted file mode 100644 index 54f29f94c83..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/06_old.ice b/cpp/test/FreezeScript/dbmap/fail/06_old.ice deleted file mode 100644 index 0dd9413081e..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<float> Seq1; -dictionary<byte, float> D1; - -interface I {}; - -class C1 implements I -{ - float c1m1; - float c1m2; - float c1m3; - float c1m4; - float c1m5; - float c1m6; - float c1m7; - float c1m8; - float c1m9; - float c1m10; - float c1m11; - float c1m12; - float c1m13; - float c1m14; - float c1m15; - float c1m16; -}; - -class C2 extends C1 -{ - float c2m1; - float c2m2; - float c2m3; - float c2m4; - float c2m5; - float c2m6; - float c2m7; - float c2m8; - float c2m9; - float c2m10; - float c2m11; - float c2m12; - float c2m13; - float c2m14; - float c2m15; - float c2m16; -}; - -struct S2 -{ - float m1; - float m2; - float m3; - float m4; - float m5; - float m6; - float m7; - float m8; - float m9; - float m10; - float m11; - float m12; - float m13; - float m14; - float m15; - float m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/07.err b/cpp/test/FreezeScript/dbmap/fail/07.err deleted file mode 100644 index 9e14990bb14..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from double to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from double to byte -transformdb: unsupported type change in c1m1 from double to bool -transformdb: unsupported type change in c1m2 from double to byte -transformdb: unsupported type change in c1m3 from double to short -transformdb: unsupported type change in c1m4 from double to int -transformdb: unsupported type change in c1m5 from double to long -transformdb: unsupported type change in c1m9 from double to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from double to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from double to Object* -transformdb: unsupported type change in c1m14 from double to Object -transformdb: unsupported type change in c1m15 from double to ::Test::C1* -transformdb: unsupported type change in c1m16 from double to class ::Test::C1 -transformdb: unsupported type change in c2m1 from double to bool -transformdb: unsupported type change in c2m2 from double to byte -transformdb: unsupported type change in c2m3 from double to short -transformdb: unsupported type change in c2m4 from double to int -transformdb: unsupported type change in c2m5 from double to long -transformdb: unsupported type change in c2m9 from double to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from double to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from double to Object* -transformdb: unsupported type change in c2m14 from double to Object -transformdb: unsupported type change in c2m15 from double to ::Test::C1* -transformdb: unsupported type change in c2m16 from double to class ::Test::C1 -transformdb: unsupported type change in m1 from double to bool -transformdb: unsupported type change in m2 from double to byte -transformdb: unsupported type change in m3 from double to short -transformdb: unsupported type change in m4 from double to int -transformdb: unsupported type change in m5 from double to long -transformdb: unsupported type change in m9 from double to enumeration ::Test::E -transformdb: unsupported type change in m10 from double to struct ::Test::S1 -transformdb: unsupported type change in m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from double to Object* -transformdb: unsupported type change in m14 from double to Object -transformdb: unsupported type change in m15 from double to ::Test::C1* -transformdb: unsupported type change in m16 from double to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/07_new.ice b/cpp/test/FreezeScript/dbmap/fail/07_new.ice deleted file mode 100644 index 61727809723..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<string, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/07_old.ice b/cpp/test/FreezeScript/dbmap/fail/07_old.ice deleted file mode 100644 index 83b79f3ed7a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<double> Seq1; -dictionary<byte, double> D1; - -interface I {}; - -class C1 implements I -{ - double c1m1; - double c1m2; - double c1m3; - double c1m4; - double c1m5; - double c1m6; - double c1m7; - double c1m8; - double c1m9; - double c1m10; - double c1m11; - double c1m12; - double c1m13; - double c1m14; - double c1m15; - double c1m16; -}; - -class C2 extends C1 -{ - double c2m1; - double c2m2; - double c2m3; - double c2m4; - double c2m5; - double c2m6; - double c2m7; - double c2m8; - double c2m9; - double c2m10; - double c2m11; - double c2m12; - double c2m13; - double c2m14; - double c2m15; - double c2m16; -}; - -struct S2 -{ - double m1; - double m2; - double m3; - double m4; - double m5; - double m6; - double m7; - double m8; - double m9; - double m10; - double m11; - double m12; - double m13; - double m14; - double m15; - double m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/08.err b/cpp/test/FreezeScript/dbmap/fail/08.err deleted file mode 100644 index 3f0853d4e93..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08.err +++ /dev/null @@ -1,17 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from string to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from string to struct ::Test::S1 -transformdb: unsupported type change in c1m10 from string to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from string to Object -transformdb: unsupported type change in c1m16 from string to class ::Test::C1 -transformdb: unsupported type change in c2m10 from string to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from string to Object -transformdb: unsupported type change in c2m16 from string to class ::Test::C1 -transformdb: unsupported type change in m10 from string to struct ::Test::S1 -transformdb: unsupported type change in m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from string to Object -transformdb: unsupported type change in m16 from string to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/08_new.ice b/cpp/test/FreezeScript/dbmap/fail/08_new.ice deleted file mode 100644 index 5255ff12862..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<short, S1> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; - byte m2; - short m3; - int m4; - long m5; - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/08_old.ice b/cpp/test/FreezeScript/dbmap/fail/08_old.ice deleted file mode 100644 index 7b0052eef79..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<byte, string> D1; - -interface I {}; - -class C1 implements I -{ - string c1m1; - string c1m2; - string c1m3; - string c1m4; - string c1m5; - string c1m6; - string c1m7; - string c1m8; - string c1m9; - string c1m10; - string c1m11; - string c1m12; - string c1m13; - string c1m14; - string c1m15; - string c1m16; -}; - -class C2 extends C1 -{ - string c2m1; - string c2m2; - string c2m3; - string c2m4; - string c2m5; - string c2m6; - string c2m7; - string c2m8; - string c2m9; - string c2m10; - string c2m11; - string c2m12; - string c2m13; - string c2m14; - string c2m15; - string c2m16; -}; - -struct S2 -{ - string m1; - string m2; - string m3; - string m4; - string m5; - string m6; - string m7; - string m8; - string m9; - string m10; - string m11; - string m12; - string m13; - string m14; - string m15; - string m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/09.err b/cpp/test/FreezeScript/dbmap/fail/09.err deleted file mode 100644 index 65eaeba3209..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from enumeration ::Test::E to byte -transformdb: unsupported type change in ::Test::D1 value type from enumeration ::Test::E to byte -transformdb: unsupported type change in c1m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in c1m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in c1m3 from enumeration ::Test::E to short -transformdb: unsupported type change in c1m4 from enumeration ::Test::E to int -transformdb: unsupported type change in c1m5 from enumeration ::Test::E to long -transformdb: unsupported type change in c1m6 from enumeration ::Test::E to float -transformdb: unsupported type change in c1m7 from enumeration ::Test::E to double -transformdb: unsupported type change in c1m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in c1m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in c1m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in c1m16 from enumeration ::Test::E to class ::Test::C1 -transformdb: unsupported type change in c2m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in c2m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in c2m3 from enumeration ::Test::E to short -transformdb: unsupported type change in c2m4 from enumeration ::Test::E to int -transformdb: unsupported type change in c2m5 from enumeration ::Test::E to long -transformdb: unsupported type change in c2m6 from enumeration ::Test::E to float -transformdb: unsupported type change in c2m7 from enumeration ::Test::E to double -transformdb: unsupported type change in c2m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in c2m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in c2m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in c2m16 from enumeration ::Test::E to class ::Test::C1 -transformdb: unsupported type change in m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in m3 from enumeration ::Test::E to short -transformdb: unsupported type change in m4 from enumeration ::Test::E to int -transformdb: unsupported type change in m5 from enumeration ::Test::E to long -transformdb: unsupported type change in m6 from enumeration ::Test::E to float -transformdb: unsupported type change in m7 from enumeration ::Test::E to double -transformdb: unsupported type change in m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in m16 from enumeration ::Test::E to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/09_new.ice b/cpp/test/FreezeScript/dbmap/fail/09_new.ice deleted file mode 100644 index aaabe65fc70..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/09_old.ice b/cpp/test/FreezeScript/dbmap/fail/09_old.ice deleted file mode 100644 index d90ba6f4ad4..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; -dictionary<byte, E> D1; - -interface I {}; - -class C1 implements I -{ - E c1m1; - E c1m2; - E c1m3; - E c1m4; - E c1m5; - E c1m6; - E c1m7; - E c1m8; - E c1m9; - E c1m10; - E c1m11; - E c1m12; - E c1m13; - E c1m14; - E c1m15; - E c1m16; -}; - -class C2 extends C1 -{ - E c2m1; - E c2m2; - E c2m3; - E c2m4; - E c2m5; - E c2m6; - E c2m7; - E c2m8; - E c2m9; - E c2m10; - E c2m11; - E c2m12; - E c2m13; - E c2m14; - E c2m15; - E c2m16; -}; - -struct S2 -{ - E m1; - E m2; - E m3; - E m4; - E m5; - E m6; - E m7; - E m8; - E m9; - E m10; - E m11; - E m12; - E m13; - E m14; - E m15; - E m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/10.err b/cpp/test/FreezeScript/dbmap/fail/10.err deleted file mode 100644 index 107746d757a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from struct ::Test::S1 to bool -transformdb: unsupported type change in ::Test::D1 value type from struct ::Test::S1 to bool -transformdb: unsupported type change in c1m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in c1m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in c1m3 from struct ::Test::S1 to short -transformdb: unsupported type change in c1m4 from struct ::Test::S1 to int -transformdb: unsupported type change in c1m5 from struct ::Test::S1 to long -transformdb: unsupported type change in c1m6 from struct ::Test::S1 to float -transformdb: unsupported type change in c1m7 from struct ::Test::S1 to double -transformdb: unsupported type change in c1m8 from struct ::Test::S1 to string -transformdb: unsupported type change in c1m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in c1m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in c1m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in c1m15 from struct ::Test::S1 to ::Test::C1* -transformdb: unsupported type change in c2m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in c2m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in c2m3 from struct ::Test::S1 to short -transformdb: unsupported type change in c2m4 from struct ::Test::S1 to int -transformdb: unsupported type change in c2m5 from struct ::Test::S1 to long -transformdb: unsupported type change in c2m6 from struct ::Test::S1 to float -transformdb: unsupported type change in c2m7 from struct ::Test::S1 to double -transformdb: unsupported type change in c2m8 from struct ::Test::S1 to string -transformdb: unsupported type change in c2m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in c2m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in c2m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in c2m15 from struct ::Test::S1 to ::Test::C1* -transformdb: unsupported type change in m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in m3 from struct ::Test::S1 to short -transformdb: unsupported type change in m4 from struct ::Test::S1 to int -transformdb: unsupported type change in m5 from struct ::Test::S1 to long -transformdb: unsupported type change in m6 from struct ::Test::S1 to float -transformdb: unsupported type change in m7 from struct ::Test::S1 to double -transformdb: unsupported type change in m8 from struct ::Test::S1 to string -transformdb: unsupported type change in m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in m15 from struct ::Test::S1 to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/10_new.ice b/cpp/test/FreezeScript/dbmap/fail/10_new.ice deleted file mode 100644 index 7aaed40a5c3..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; // FAIL -dictionary<short, bool> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/10_old.ice b/cpp/test/FreezeScript/dbmap/fail/10_old.ice deleted file mode 100644 index a50f3bd94b7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; -dictionary<byte, S1> D1; - -interface I {}; - -class C1 implements I -{ - S1 c1m1; - S1 c1m2; - S1 c1m3; - S1 c1m4; - S1 c1m5; - S1 c1m6; - S1 c1m7; - S1 c1m8; - S1 c1m9; - S1 c1m10; - S1 c1m11; - S1 c1m12; - S1 c1m13; - S1 c1m14; - S1 c1m15; - S1 c1m16; -}; - -class C2 extends C1 -{ - S1 c2m1; - S1 c2m2; - S1 c2m3; - S1 c2m4; - S1 c2m5; - S1 c2m6; - S1 c2m7; - S1 c2m8; - S1 c2m9; - S1 c2m10; - S1 c2m11; - S1 c2m12; - S1 c2m13; - S1 c2m14; - S1 c2m15; - S1 c2m16; -}; - -struct S2 -{ - S1 m1; - S1 m2; - S1 m3; - S1 m4; - S1 m5; - S1 m6; - S1 m7; - S1 m8; - S1 m9; - S1 m10; - S1 m11; - S1 m12; - S1 m13; - S1 m14; - S1 m15; - S1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/11.err b/cpp/test/FreezeScript/dbmap/fail/11.err deleted file mode 100644 index 2b22dc60fd5..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11.err +++ /dev/null @@ -1,46 +0,0 @@ -transformdb: unsupported type change in ::Test::D1 value type from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c1m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in c1m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in c1m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in c1m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in c1m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in c1m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in c1m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in c1m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c1m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in c1m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in c1m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in c1m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in c1m16 from sequence ::Test::Seq1 to class ::Test::C1 -transformdb: unsupported type change in c2m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in c2m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in c2m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in c2m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in c2m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in c2m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in c2m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in c2m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c2m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in c2m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in c2m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in c2m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in c2m16 from sequence ::Test::Seq1 to class ::Test::C1 -transformdb: unsupported type change in m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in m16 from sequence ::Test::Seq1 to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/11_new.ice b/cpp/test/FreezeScript/dbmap/fail/11_new.ice deleted file mode 100644 index 3c77ad44d07..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; -dictionary<short, string> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/11_old.ice b/cpp/test/FreezeScript/dbmap/fail/11_old.ice deleted file mode 100644 index 1a4fa770d08..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<byte, Seq1> D1; - -interface I {}; - -class C1 implements I -{ - Seq1 c1m1; - Seq1 c1m2; - Seq1 c1m3; - Seq1 c1m4; - Seq1 c1m5; - Seq1 c1m6; - Seq1 c1m7; - Seq1 c1m8; - Seq1 c1m9; - Seq1 c1m10; - Seq1 c1m11; - Seq1 c1m12; - Seq1 c1m13; - Seq1 c1m14; - Seq1 c1m15; - Seq1 c1m16; -}; - -class C2 extends C1 -{ - Seq1 c2m1; - Seq1 c2m2; - Seq1 c2m3; - Seq1 c2m4; - Seq1 c2m5; - Seq1 c2m6; - Seq1 c2m7; - Seq1 c2m8; - Seq1 c2m9; - Seq1 c2m10; - Seq1 c2m11; - Seq1 c2m12; - Seq1 c2m13; - Seq1 c2m14; - Seq1 c2m15; - Seq1 c2m16; -}; - -struct S2 -{ - Seq1 m1; - Seq1 m2; - Seq1 m3; - Seq1 m4; - Seq1 m5; - Seq1 m6; - Seq1 m7; - Seq1 m8; - Seq1 m9; - Seq1 m10; - Seq1 m11; - Seq1 m12; - Seq1 m13; - Seq1 m14; - Seq1 m15; - Seq1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/12.err b/cpp/test/FreezeScript/dbmap/fail/12.err deleted file mode 100644 index 6cbc47fb7ed..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12.err +++ /dev/null @@ -1,47 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in c1m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in c1m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in c1m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in c1m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in c1m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in c1m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in c1m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in c1m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in c1m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in c1m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in c1m16 from dictionary ::Test::D1 to class ::Test::C1 -transformdb: unsupported type change in c2m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in c2m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in c2m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in c2m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in c2m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in c2m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in c2m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in c2m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in c2m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in c2m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in c2m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in c2m16 from dictionary ::Test::D1 to class ::Test::C1 -transformdb: unsupported type change in m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in m16 from dictionary ::Test::D1 to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/12_new.ice b/cpp/test/FreezeScript/dbmap/fail/12_new.ice deleted file mode 100644 index 1ef129cb68c..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/12_old.ice b/cpp/test/FreezeScript/dbmap/fail/12_old.ice deleted file mode 100644 index 5800fa3aebf..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - D1 c1m1; - D1 c1m2; - D1 c1m3; - D1 c1m4; - D1 c1m5; - D1 c1m6; - D1 c1m7; - D1 c1m8; - D1 c1m9; - D1 c1m10; - D1 c1m11; - D1 c1m12; - D1 c1m13; - D1 c1m14; - D1 c1m15; - D1 c1m16; -}; - -class C2 extends C1 -{ - D1 c2m1; - D1 c2m2; - D1 c2m3; - D1 c2m4; - D1 c2m5; - D1 c2m6; - D1 c2m7; - D1 c2m8; - D1 c2m9; - D1 c2m10; - D1 c2m11; - D1 c2m12; - D1 c2m13; - D1 c2m14; - D1 c2m15; - D1 c2m16; -}; - -struct S2 -{ - D1 m1; - D1 m2; - D1 m3; - D1 m4; - D1 m5; - D1 m6; - D1 m7; - D1 m8; - D1 m9; - D1 m10; - D1 m11; - D1 m12; - D1 m13; - D1 m14; - D1 m15; - D1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/13.err b/cpp/test/FreezeScript/dbmap/fail/13.err deleted file mode 100644 index ca23c5d18a1..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13.err +++ /dev/null @@ -1,39 +0,0 @@ -transformdb: unsupported type change in c1m1 from Object* to bool -transformdb: unsupported type change in c1m2 from Object* to byte -transformdb: unsupported type change in c1m3 from Object* to short -transformdb: unsupported type change in c1m4 from Object* to int -transformdb: unsupported type change in c1m5 from Object* to long -transformdb: unsupported type change in c1m6 from Object* to float -transformdb: unsupported type change in c1m7 from Object* to double -transformdb: unsupported type change in c1m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from Object* to Object -transformdb: unsupported type change in c1m16 from Object* to class ::Test::C1 -transformdb: unsupported type change in c2m1 from Object* to bool -transformdb: unsupported type change in c2m2 from Object* to byte -transformdb: unsupported type change in c2m3 from Object* to short -transformdb: unsupported type change in c2m4 from Object* to int -transformdb: unsupported type change in c2m5 from Object* to long -transformdb: unsupported type change in c2m6 from Object* to float -transformdb: unsupported type change in c2m7 from Object* to double -transformdb: unsupported type change in c2m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from Object* to Object -transformdb: unsupported type change in c2m16 from Object* to class ::Test::C1 -transformdb: unsupported type change in m1 from Object* to bool -transformdb: unsupported type change in m2 from Object* to byte -transformdb: unsupported type change in m3 from Object* to short -transformdb: unsupported type change in m4 from Object* to int -transformdb: unsupported type change in m5 from Object* to long -transformdb: unsupported type change in m6 from Object* to float -transformdb: unsupported type change in m7 from Object* to double -transformdb: unsupported type change in m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from Object* to Object -transformdb: unsupported type change in m16 from Object* to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/13_new.ice b/cpp/test/FreezeScript/dbmap/fail/13_new.ice deleted file mode 100644 index 904702a48cd..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<short, string> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/13_old.ice b/cpp/test/FreezeScript/dbmap/fail/13_old.ice deleted file mode 100644 index 6acd628d942..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<Object*> Seq1; -dictionary<byte, Object*> D1; - -interface I {}; - -class C1 implements I -{ - Object* c1m1; - Object* c1m2; - Object* c1m3; - Object* c1m4; - Object* c1m5; - Object* c1m6; - Object* c1m7; - Object* c1m8; - Object* c1m9; - Object* c1m10; - Object* c1m11; - Object* c1m12; - Object* c1m13; - Object* c1m14; - Object* c1m15; - Object* c1m16; -}; - -class C2 extends C1 -{ - Object* c2m1; - Object* c2m2; - Object* c2m3; - Object* c2m4; - Object* c2m5; - Object* c2m6; - Object* c2m7; - Object* c2m8; - Object* c2m9; - Object* c2m10; - Object* c2m11; - Object* c2m12; - Object* c2m13; - Object* c2m14; - Object* c2m15; - Object* c2m16; -}; - -struct S2 -{ - Object* m1; - Object* m2; - Object* m3; - Object* m4; - Object* m5; - Object* m6; - Object* m7; - Object* m8; - Object* m9; - Object* m10; - Object* m11; - Object* m12; - Object* m13; - Object* m14; - Object* m15; - Object* m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/14.err b/cpp/test/FreezeScript/dbmap/fail/14.err deleted file mode 100644 index 58cddc7461b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from Object to byte -transformdb: unsupported type change in ::Test::D1 value type from Object to byte -transformdb: unsupported type change in c1m1 from Object to bool -transformdb: unsupported type change in c1m2 from Object to byte -transformdb: unsupported type change in c1m3 from Object to short -transformdb: unsupported type change in c1m4 from Object to int -transformdb: unsupported type change in c1m5 from Object to long -transformdb: unsupported type change in c1m6 from Object to float -transformdb: unsupported type change in c1m7 from Object to double -transformdb: unsupported type change in c1m8 from Object to string -transformdb: unsupported type change in c1m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from Object to Object* -transformdb: unsupported type change in c1m15 from Object to ::Test::C1* -transformdb: unsupported type change in c2m1 from Object to bool -transformdb: unsupported type change in c2m2 from Object to byte -transformdb: unsupported type change in c2m3 from Object to short -transformdb: unsupported type change in c2m4 from Object to int -transformdb: unsupported type change in c2m5 from Object to long -transformdb: unsupported type change in c2m6 from Object to float -transformdb: unsupported type change in c2m7 from Object to double -transformdb: unsupported type change in c2m8 from Object to string -transformdb: unsupported type change in c2m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from Object to Object* -transformdb: unsupported type change in c2m15 from Object to ::Test::C1* -transformdb: unsupported type change in m1 from Object to bool -transformdb: unsupported type change in m2 from Object to byte -transformdb: unsupported type change in m3 from Object to short -transformdb: unsupported type change in m4 from Object to int -transformdb: unsupported type change in m5 from Object to long -transformdb: unsupported type change in m6 from Object to float -transformdb: unsupported type change in m7 from Object to double -transformdb: unsupported type change in m8 from Object to string -transformdb: unsupported type change in m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from Object to Object* -transformdb: unsupported type change in m15 from Object to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/14_new.ice b/cpp/test/FreezeScript/dbmap/fail/14_new.ice deleted file mode 100644 index c4a2aa6ab2f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; - C1* c1m15; // FAIL - C1 c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; - C1* c2m15; // FAIL - C1 c2m16; -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; - C1* m15; // FAIL - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/14_old.ice b/cpp/test/FreezeScript/dbmap/fail/14_old.ice deleted file mode 100644 index a34384f82eb..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<Object> Seq1; -dictionary<byte, Object> D1; - -interface I {}; - -class C1 implements I -{ - Object c1m1; - Object c1m2; - Object c1m3; - Object c1m4; - Object c1m5; - Object c1m6; - Object c1m7; - Object c1m8; - Object c1m9; - Object c1m10; - Object c1m11; - Object c1m12; - Object c1m13; - Object c1m14; - Object c1m15; - Object c1m16; -}; - -class C2 extends C1 -{ - Object c2m1; - Object c2m2; - Object c2m3; - Object c2m4; - Object c2m5; - Object c2m6; - Object c2m7; - Object c2m8; - Object c2m9; - Object c2m10; - Object c2m11; - Object c2m12; - Object c2m13; - Object c2m14; - Object c2m15; - Object c2m16; -}; - -struct S2 -{ - Object m1; - Object m2; - Object m3; - Object m4; - Object m5; - Object m6; - Object m7; - Object m8; - Object m9; - Object m10; - Object m11; - Object m12; - Object m13; - Object m14; - Object m15; - Object m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/15.err b/cpp/test/FreezeScript/dbmap/fail/15.err deleted file mode 100644 index 1cde3f2f390..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from ::Test::C1* to bool -transformdb: unsupported type change in c1m2 from ::Test::C1* to byte -transformdb: unsupported type change in c1m3 from ::Test::C1* to short -transformdb: unsupported type change in c1m4 from ::Test::C1* to int -transformdb: unsupported type change in c1m5 from ::Test::C1* to long -transformdb: unsupported type change in c1m6 from ::Test::C1* to float -transformdb: unsupported type change in c1m7 from ::Test::C1* to double -transformdb: unsupported type change in c1m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from ::Test::C1* to Object -transformdb: unsupported type change in c1m16 from ::Test::C1* to class ::Test::C1 -transformdb: unsupported type change in c2m1 from ::Test::C1* to bool -transformdb: unsupported type change in c2m2 from ::Test::C1* to byte -transformdb: unsupported type change in c2m3 from ::Test::C1* to short -transformdb: unsupported type change in c2m4 from ::Test::C1* to int -transformdb: unsupported type change in c2m5 from ::Test::C1* to long -transformdb: unsupported type change in c2m6 from ::Test::C1* to float -transformdb: unsupported type change in c2m7 from ::Test::C1* to double -transformdb: unsupported type change in c2m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from ::Test::C1* to Object -transformdb: unsupported type change in c2m16 from ::Test::C1* to class ::Test::C1 -transformdb: unsupported type change in m1 from ::Test::C1* to bool -transformdb: unsupported type change in m2 from ::Test::C1* to byte -transformdb: unsupported type change in m3 from ::Test::C1* to short -transformdb: unsupported type change in m4 from ::Test::C1* to int -transformdb: unsupported type change in m5 from ::Test::C1* to long -transformdb: unsupported type change in m6 from ::Test::C1* to float -transformdb: unsupported type change in m7 from ::Test::C1* to double -transformdb: unsupported type change in m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from ::Test::C1* to Object -transformdb: unsupported type change in m16 from ::Test::C1* to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/15_new.ice b/cpp/test/FreezeScript/dbmap/fail/15_new.ice deleted file mode 100644 index e82c9ca9485..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/15_old.ice b/cpp/test/FreezeScript/dbmap/fail/15_old.ice deleted file mode 100644 index d4ff7d1ab74..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - C1* c1m1; - C1* c1m2; - C1* c1m3; - C1* c1m4; - C1* c1m5; - C1* c1m6; - C1* c1m7; - C1* c1m8; - C1* c1m9; - C1* c1m10; - C1* c1m11; - C1* c1m12; - C1* c1m13; - C1* c1m14; - C1* c1m15; - C1* c1m16; -}; - -class C2 extends C1 -{ - C1* c2m1; - C1* c2m2; - C1* c2m3; - C1* c2m4; - C1* c2m5; - C1* c2m6; - C1* c2m7; - C1* c2m8; - C1* c2m9; - C1* c2m10; - C1* c2m11; - C1* c2m12; - C1* c2m13; - C1* c2m14; - C1* c2m15; - C1* c2m16; -}; - -struct S2 -{ - C1* m1; - C1* m2; - C1* m3; - C1* m4; - C1* m5; - C1* m6; - C1* m7; - C1* m8; - C1* m9; - C1* m10; - C1* m11; - C1* m12; - C1* m13; - C1* m14; - C1* m15; - C1* m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/16.err b/cpp/test/FreezeScript/dbmap/fail/16.err deleted file mode 100644 index 219d0d6c90e..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from class ::Test::C1 to bool -transformdb: unsupported type change in c1m2 from class ::Test::C1 to byte -transformdb: unsupported type change in c1m3 from class ::Test::C1 to short -transformdb: unsupported type change in c1m4 from class ::Test::C1 to int -transformdb: unsupported type change in c1m5 from class ::Test::C1 to long -transformdb: unsupported type change in c1m6 from class ::Test::C1 to float -transformdb: unsupported type change in c1m7 from class ::Test::C1 to double -transformdb: unsupported type change in c1m8 from class ::Test::C1 to string -transformdb: unsupported type change in c1m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in c1m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in c1m15 from class ::Test::C1 to ::Test::C1* -transformdb: unsupported type change in c2m1 from class ::Test::C1 to bool -transformdb: unsupported type change in c2m2 from class ::Test::C1 to byte -transformdb: unsupported type change in c2m3 from class ::Test::C1 to short -transformdb: unsupported type change in c2m4 from class ::Test::C1 to int -transformdb: unsupported type change in c2m5 from class ::Test::C1 to long -transformdb: unsupported type change in c2m6 from class ::Test::C1 to float -transformdb: unsupported type change in c2m7 from class ::Test::C1 to double -transformdb: unsupported type change in c2m8 from class ::Test::C1 to string -transformdb: unsupported type change in c2m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in c2m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in c2m15 from class ::Test::C1 to ::Test::C1* -transformdb: unsupported type change in m1 from class ::Test::C1 to bool -transformdb: unsupported type change in m2 from class ::Test::C1 to byte -transformdb: unsupported type change in m3 from class ::Test::C1 to short -transformdb: unsupported type change in m4 from class ::Test::C1 to int -transformdb: unsupported type change in m5 from class ::Test::C1 to long -transformdb: unsupported type change in m6 from class ::Test::C1 to float -transformdb: unsupported type change in m7 from class ::Test::C1 to double -transformdb: unsupported type change in m8 from class ::Test::C1 to string -transformdb: unsupported type change in m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in m15 from class ::Test::C1 to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/16_new.ice b/cpp/test/FreezeScript/dbmap/fail/16_new.ice deleted file mode 100644 index c4a2aa6ab2f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; - C1* c1m15; // FAIL - C1 c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; - C1* c2m15; // FAIL - C1 c2m16; -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; - C1* m15; // FAIL - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/16_old.ice b/cpp/test/FreezeScript/dbmap/fail/16_old.ice deleted file mode 100644 index 072f9d2a84d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - C1 c1m1; - C1 c1m2; - C1 c1m3; - C1 c1m4; - C1 c1m5; - C1 c1m6; - C1 c1m7; - C1 c1m8; - C1 c1m9; - C1 c1m10; - C1 c1m11; - C1 c1m12; - C1 c1m13; - C1 c1m14; - C1 c1m15; - C1 c1m16; -}; - -class C2 extends C1 -{ - C1 c2m1; - C1 c2m2; - C1 c2m3; - C1 c2m4; - C1 c2m5; - C1 c2m6; - C1 c2m7; - C1 c2m8; - C1 c2m9; - C1 c2m10; - C1 c2m11; - C1 c2m12; - C1 c2m13; - C1 c2m14; - C1 c2m15; - C1 c2m16; -}; - -struct S2 -{ - C1 m1; - C1 m2; - C1 m3; - C1 m4; - C1 m5; - C1 m6; - C1 m7; - C1 m8; - C1 m9; - C1 m10; - C1 m11; - C1 m12; - C1 m13; - C1 m14; - C1 m15; - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/17.err b/cpp/test/FreezeScript/dbmap/fail/17.err deleted file mode 100644 index 9a02673a722..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17.err +++ /dev/null @@ -1,4 +0,0 @@ -transformdb: class ::Test::C declared but not defined - -The following types had no matching definitions in the new Slice: - ::Test::C diff --git a/cpp/test/FreezeScript/dbmap/fail/17_new.ice b/cpp/test/FreezeScript/dbmap/fail/17_new.ice deleted file mode 100644 index 528d8cc0dde..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17_new.ice +++ /dev/null @@ -1,11 +0,0 @@ -module Test -{ - -class C; - -struct S -{ - C m1; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/17_old.ice b/cpp/test/FreezeScript/dbmap/fail/17_old.ice deleted file mode 100644 index 05ade822347..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17_old.ice +++ /dev/null @@ -1,11 +0,0 @@ -module Test -{ - -class C {}; - -struct S -{ - C m1; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/18.err b/cpp/test/FreezeScript/dbmap/fail/18.err deleted file mode 100644 index 7ff719dba42..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18.err +++ /dev/null @@ -1 +0,0 @@ -transformdb: unsupported type change in m2 from class ::Test::C1 to class ::Test::C2 diff --git a/cpp/test/FreezeScript/dbmap/fail/18_new.ice b/cpp/test/FreezeScript/dbmap/fail/18_new.ice deleted file mode 100644 index dfad7f8981b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18_new.ice +++ /dev/null @@ -1,16 +0,0 @@ -module Test -{ - -class C1 {}; -class C2 extends C1 {}; -class C3 {}; - -struct S -{ - C3 m1; - C2 m2; // FAIL - C1 m3; - Object m4; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/18_old.ice b/cpp/test/FreezeScript/dbmap/fail/18_old.ice deleted file mode 100644 index 6ed6b829dd5..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18_old.ice +++ /dev/null @@ -1,16 +0,0 @@ -module Test -{ - -class C1 {}; -class C2 extends C1 {}; -class C3 {}; - -struct S -{ - Object m1; - C1 m2; - C2 m3; - C3 m4; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/19.err b/cpp/test/FreezeScript/dbmap/fail/19.err deleted file mode 100644 index 66b6adb11bc..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19.err +++ /dev/null @@ -1 +0,0 @@ -transformdb: database value has changed to a local type diff --git a/cpp/test/FreezeScript/dbmap/fail/19_new.ice b/cpp/test/FreezeScript/dbmap/fail/19_new.ice deleted file mode 100644 index 4c3bebb60c8..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19_new.ice +++ /dev/null @@ -1,6 +0,0 @@ -module Test -{ - -local class C {}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/19_old.ice b/cpp/test/FreezeScript/dbmap/fail/19_old.ice deleted file mode 100644 index f52e8c9f09f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19_old.ice +++ /dev/null @@ -1,6 +0,0 @@ -module Test -{ - -class C {}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/init.xml b/cpp/test/FreezeScript/dbmap/init.xml deleted file mode 100644 index 994d75b0a23..00000000000 --- a/cpp/test/FreezeScript/dbmap/init.xml +++ /dev/null @@ -1,345 +0,0 @@ -<transformdb> - <database key="int" value="::Test::S"> - <record> - </record> - </database> - - <!-- enum ::E --> - <transform type="::Test::E"/> - - <!-- struct ::S --> - <transform type="::Test::S"> - - <!-- Primitives --> - - <set target="new.boolToString" value="true"/> - - <set target="new.byteToByte" value="255"/> - <set target="new.byteToShort" value="255"/> - <set target="new.byteToInt" value="255"/> - <set target="new.byteToLong" value="255"/> - <set target="new.byteToString" value="255"/> - - <set target="new.shortToByte" value="256"/> - <set target="new.shortToShort" value="32767"/> - <set target="new.shortToInt" value="-32768"/> - <set target="new.shortToLong" value="32767"/> - <set target="new.shortToString" value="255"/> - - <set target="new.intToByte" value="256"/> - <set target="new.intToShort" value="32768"/> - <set target="new.intToInt" value="2147483647"/> - <set target="new.intToLong" value="-2147483648"/> - <set target="new.intToString" value="255"/> - - <set target="new.longToByte" value="256"/> - <set target="new.longToShort" value="32768"/> - <set target="new.longToInt" value="2147483648"/> - <set target="new.longToLong" value="9223372036854775807"/> - <set target="new.longToString" value="255"/> - - <set target="new.floatToFloat" value="2920.1"/> - <set target="new.floatToDouble" value="2920.1"/> - <set target="new.floatToString" value="2920.1"/> - - <set target="new.doubleToFloat" value="9290.9"/> - <set target="new.doubleToDouble" value="9290.9"/> - <set target="new.doubleToString" value="9290.9"/> - - <set target="new.stringToBool" value="'false'"/> - <set target="new.stringToByte" value="'255'"/> - <set target="new.stringToShort" value="'32767'"/> - <set target="new.stringToInt" value="'2147483647'"/> - <set target="new.stringToLong" value="'9223372036854775807'"/> - <set target="new.stringToFloat" value="'2920.1'"/> - <set target="new.stringToDouble" value="'9290.9'"/> - <set target="new.stringToString" value="'hello world'"/> - <set target="new.stringToEnum" value="'E1'"/> - <set target="new.stringToProxy" value="'foo:tcp -p 1000'"/> - - <!-- Sequences --> - - <set target="new.boolSeqToStringSeq" length="2"/> - <set target="new.boolSeqToStringSeq[0]" value="false"/> - <set target="new.boolSeqToStringSeq[1]" value="true"/> - - <set target="new.byteSeqToByteSeq" length="2"/> - <set target="new.byteSeqToByteSeq[0]" value="0"/> - <set target="new.byteSeqToByteSeq[1]" value="255"/> - - <set target="new.byteSeqToShortSeq" length="2"/> - <set target="new.byteSeqToShortSeq[0]" value="0"/> - <set target="new.byteSeqToShortSeq[1]" value="255"/> - - <set target="new.byteSeqToIntSeq" length="2"/> - <set target="new.byteSeqToIntSeq[0]" value="0"/> - <set target="new.byteSeqToIntSeq[1]" value="255"/> - - <set target="new.byteSeqToLongSeq" length="2"/> - <set target="new.byteSeqToLongSeq[0]" value="0"/> - <set target="new.byteSeqToLongSeq[1]" value="255"/> - - <set target="new.byteSeqToStringSeq" length="2"/> - <set target="new.byteSeqToStringSeq[0]" value="0"/> - <set target="new.byteSeqToStringSeq[1]" value="255"/> - - <set target="new.shortSeqToByteSeq" length="4"/> - <set target="new.shortSeqToByteSeq[0]" value="0"/> - <set target="new.shortSeqToByteSeq[1]" value="255"/> - <set target="new.shortSeqToByteSeq[2]" value="256"/> - <set target="new.shortSeqToByteSeq[3]" value="-127"/> - - <set target="new.shortSeqToShortSeq" length="2"/> - <set target="new.shortSeqToShortSeq[0]" value="-32768"/> - <set target="new.shortSeqToShortSeq[1]" value="32767"/> - - <set target="new.shortSeqToIntSeq" length="2"/> - <set target="new.shortSeqToIntSeq[0]" value="-32768"/> - <set target="new.shortSeqToIntSeq[1]" value="32767"/> - - <set target="new.shortSeqToLongSeq" length="2"/> - <set target="new.shortSeqToLongSeq[0]" value="-32768"/> - <set target="new.shortSeqToLongSeq[1]" value="32767"/> - - <set target="new.shortSeqToStringSeq" length="2"/> - <set target="new.shortSeqToStringSeq[0]" value="-32768"/> - <set target="new.shortSeqToStringSeq[1]" value="32767"/> - - <set target="new.intSeqToByteSeq" length="4"/> - <set target="new.intSeqToByteSeq[0]" value="0"/> - <set target="new.intSeqToByteSeq[1]" value="255"/> - <set target="new.intSeqToByteSeq[2]" value="256"/> - <set target="new.intSeqToByteSeq[3]" value="-127"/> - - <set target="new.intSeqToShortSeq" length="4"/> - <set target="new.intSeqToShortSeq[0]" value="-32768"/> - <set target="new.intSeqToShortSeq[1]" value="32767"/> - <set target="new.intSeqToShortSeq[2]" value="-32769"/> - <set target="new.intSeqToShortSeq[3]" value="32768"/> - - <set target="new.intSeqToIntSeq" length="2"/> - <set target="new.intSeqToIntSeq[0]" value="-2147483648"/> - <set target="new.intSeqToIntSeq[1]" value="2147483647"/> - - <set target="new.intSeqToLongSeq" length="2"/> - <set target="new.intSeqToLongSeq[0]" value="-2147483648"/> - <set target="new.intSeqToLongSeq[1]" value="2147483647"/> - - <set target="new.intSeqToStringSeq" length="2"/> - <set target="new.intSeqToStringSeq[0]" value="-2147483648"/> - <set target="new.intSeqToStringSeq[1]" value="2147483647"/> - - <set target="new.longSeqToByteSeq" length="4"/> - <set target="new.longSeqToByteSeq[0]" value="0"/> - <set target="new.longSeqToByteSeq[1]" value="255"/> - <set target="new.longSeqToByteSeq[2]" value="256"/> - <set target="new.longSeqToByteSeq[3]" value="-127"/> - - <set target="new.longSeqToShortSeq" length="4"/> - <set target="new.longSeqToShortSeq[0]" value="-32768"/> - <set target="new.longSeqToShortSeq[1]" value="32767"/> - <set target="new.longSeqToShortSeq[2]" value="-32769"/> - <set target="new.longSeqToShortSeq[3]" value="32768"/> - - <set target="new.longSeqToIntSeq" length="4"/> - <set target="new.longSeqToIntSeq[0]" value="-2147483648"/> - <set target="new.longSeqToIntSeq[1]" value="2147483647"/> - <set target="new.longSeqToIntSeq[2]" value="-2147483649"/> - <set target="new.longSeqToIntSeq[3]" value="2147483648"/> - - <set target="new.longSeqToLongSeq" length="2"/> - <set target="new.longSeqToLongSeq[0]" value="-9223372036854775808"/> - <set target="new.longSeqToLongSeq[1]" value="9223372036854775807"/> - - <set target="new.longSeqToStringSeq" length="2"/> - <set target="new.longSeqToStringSeq[0]" value="-9223372036854775808"/> - <set target="new.longSeqToStringSeq[1]" value="9223372036854775807"/> - - <set target="new.floatSeqToFloatSeq" length="2"/> - <set target="new.floatSeqToFloatSeq[0]" value="2920.1"/> - <set target="new.floatSeqToFloatSeq[1]" value="2920.2"/> - - <set target="new.floatSeqToDoubleSeq" length="2"/> - <set target="new.floatSeqToDoubleSeq[0]" value="2920.1"/> - <set target="new.floatSeqToDoubleSeq[1]" value="2920.2"/> - - <set target="new.floatSeqToStringSeq" length="2"/> - <set target="new.floatSeqToStringSeq[0]" value="2920.1"/> - <set target="new.floatSeqToStringSeq[1]" value="2920.2"/> - - <set target="new.doubleSeqToFloatSeq" length="2"/> - <set target="new.doubleSeqToFloatSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToFloatSeq[1]" value="9290.9"/> - - <set target="new.doubleSeqToDoubleSeq" length="2"/> - <set target="new.doubleSeqToDoubleSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToDoubleSeq[1]" value="9290.9"/> - - <set target="new.doubleSeqToStringSeq" length="2"/> - <set target="new.doubleSeqToStringSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToStringSeq[1]" value="9290.9"/> - - <set target="new.stringSeqToBoolSeq" length="2"/> - <set target="new.stringSeqToBoolSeq[0]" value="'false'"/> - <set target="new.stringSeqToBoolSeq[1]" value="'true'"/> - - <set target="new.stringSeqToByteSeq" length="4"/> - <set target="new.stringSeqToByteSeq[0]" value="'0'"/> - <set target="new.stringSeqToByteSeq[1]" value="'255'"/> - <set target="new.stringSeqToByteSeq[2]" value="'256'"/> - <set target="new.stringSeqToByteSeq[3]" value="'-127'"/> - - <set target="new.stringSeqToShortSeq" length="4"/> - <set target="new.stringSeqToShortSeq[0]" value="'-32768'"/> - <set target="new.stringSeqToShortSeq[1]" value="'32767'"/> - <set target="new.stringSeqToShortSeq[2]" value="'-32769'"/> - <set target="new.stringSeqToShortSeq[3]" value="'32768'"/> - - <set target="new.stringSeqToIntSeq" length="4"/> - <set target="new.stringSeqToIntSeq[0]" value="'-2147483648'"/> - <set target="new.stringSeqToIntSeq[1]" value="'2147483647'"/> - <set target="new.stringSeqToIntSeq[2]" value="'-2147483649'"/> - <set target="new.stringSeqToIntSeq[3]" value="'2147483648'"/> - - <set target="new.stringSeqToLongSeq" length="2"/> - <set target="new.stringSeqToLongSeq[0]" value="'-9223372036854775808'"/> - <set target="new.stringSeqToLongSeq[1]" value="'9223372036854775807'"/> - - <set target="new.stringSeqToFloatSeq" length="2"/> - <set target="new.stringSeqToFloatSeq[0]" value="'2920.1'"/> - <set target="new.stringSeqToFloatSeq[1]" value="'2920.2'"/> - - <set target="new.stringSeqToDoubleSeq" length="2"/> - <set target="new.stringSeqToDoubleSeq[0]" value="'9290.8'"/> - <set target="new.stringSeqToDoubleSeq[1]" value="'9290.9'"/> - - <set target="new.stringSeqToStringSeq" length="2"/> - <set target="new.stringSeqToStringSeq[0]" value="'hello'"/> - <set target="new.stringSeqToStringSeq[1]" value="'world'"/> - - <set target="new.stringSeqToEnumSeq" length="2"/> - <set target="new.stringSeqToEnumSeq[0]" value="'E2'"/> - <set target="new.stringSeqToEnumSeq[1]" value="'E3'"/> - - <set target="new.stringSeqToProxySeq" length="2"/> - <set target="new.stringSeqToProxySeq[0]" value="'foo1:tcp -p 1000'"/> - <set target="new.stringSeqToProxySeq[1]" value="'foo2:tcp -p 1001'"/> - - <!-- Dictionaries --> - - <add target="new.boolToStringDict" key="0" value="false"/> - <add target="new.boolToStringDict" key="1" value="true"/> - - <add target="new.longToByteDict" key="0" value="0"/> - <add target="new.longToByteDict" key="1" value="255"/> - <add target="new.longToByteDict" key="2" value="256"/> - <add target="new.longToByteDict" key="3" value="-127"/> - - <add target="new.longToShortDict" key="0" value="-32768"/> - <add target="new.longToShortDict" key="1" value="32767"/> - <add target="new.longToShortDict" key="2" value="-32769"/> - <add target="new.longToShortDict" key="3" value="32768"/> - - <add target="new.longToIntDict" key="0" value="-2147483648"/> - <add target="new.longToIntDict" key="1" value="2147483647"/> - <add target="new.longToIntDict" key="2" value="-2147483649"/> - <add target="new.longToIntDict" key="3" value="2147483648"/> - - <add target="new.longToStringDict" key="0" value="-9223372036854775808"/> - <add target="new.longToStringDict" key="1" value="9223372036854775807"/> - - <add target="new.doubleToFloatDict" key="0" value="9290.8"/> - <add target="new.doubleToFloatDict" key="1" value="9290.9"/> - - <add target="new.doubleToStringDict" key="0" value="9290.8"/> - <add target="new.doubleToStringDict" key="1" value="9290.9"/> - - <add target="new.stringToBoolDict" key="0" value="'false'"/> - <add target="new.stringToBoolDict" key="1" value="'true'"/> - - <add target="new.stringToLongDict" key="0" value="'-9223372036854775808'"/> - <add target="new.stringToLongDict" key="1" value="'9223372036854775807'"/> - - <add target="new.stringToDoubleDict" key="0" value="'9290.8'"/> - <add target="new.stringToDoubleDict" key="1" value="'9290.9'"/> - - <add target="new.stringToEnumDict" key="0" value="'E2'"/> - <add target="new.stringToEnumDict" key="1" value="'E3'"/> - - <!-- Struct <-> class transformations --> - - <set target="new.classToStructSeq" length="3"/> - <set target="new.classToStructSeq[0]" type="::Test::Small2"/> - <set target="new.classToStructSeq[0].seq" length="2"/> - <set target="new.classToStructSeq[0].seq[0].b" value="100"/> - <set target="new.classToStructSeq[0].seq[0].intToString" value="101"/> - <set target="new.classToStructSeq[0].seq[1].b" value="102"/> - <set target="new.classToStructSeq[0].seq[1].intToString" value="103"/> - <set target="new.classToStructSeq[1]" type="::Test::Small2"/> - <set target="new.classToStructSeq[1].seq" length="2"/> - <set target="new.classToStructSeq[1].seq[0].b" value="110"/> - <set target="new.classToStructSeq[1].seq[0].intToString" value="111"/> - <set target="new.classToStructSeq[1].seq[1].b" value="112"/> - <set target="new.classToStructSeq[1].seq[1].intToString" value="113"/> - <set target="new.classToStructSeq[2]" type="::Test::Small2"/> - <set target="new.classToStructSeq[2].seq" length="2"/> - <set target="new.classToStructSeq[2].seq[0].b" value="120"/> - <set target="new.classToStructSeq[2].seq[0].intToString" value="121"/> - <set target="new.classToStructSeq[2].seq[1].b" value="122"/> - <set target="new.classToStructSeq[2].seq[1].intToString" value="123"/> - - <add target="new.small1Dict" key="0"/> - <set target="new.small1Dict[0].b" value="120"/> - <set target="new.small1Dict[0].intToString" value="121"/> - <add target="new.small1Dict" key="10"/> - <set target="new.small1Dict[10].b" value="122"/> - <set target="new.small1Dict[10].intToString" value="123"/> - <add target="new.small1Dict" key="100"/> - <set target="new.small1Dict[100].b" value="124"/> - <set target="new.small1Dict[100].intToString" value="125"/> - - <add target="new.small2Dict" key="0" type="::Test::Small2"/> - <set target="new.small2Dict[0].seq" length="1"/> - <set target="new.small2Dict[0].seq[0].b" value="220"/> - <set target="new.small2Dict[0].seq[0].intToString" value="221"/> - <add target="new.small2Dict" key="10" type="::Test::Small2"/> - <set target="new.small2Dict[10].seq" length="1"/> - <set target="new.small2Dict[10].seq[0].b" value="222"/> - <set target="new.small2Dict[10].seq[0].intToString" value="223"/> - <add target="new.small2Dict" key="100" type="::Test::Small2"/> - <set target="new.small2Dict[100].seq" length="1"/> - <set target="new.small2Dict[100].seq[0].b" value="224"/> - <set target="new.small2Dict[100].seq[0].intToString" value="225"/> - - <!-- Objects --> - - <set target="new.baseObject" type="::Test::F"/> - <set target="new.baseObject.stringToEnumSeq" length="2"/> - <set target="new.baseObject.stringToEnumSeq[0]" value="'E1'"/> - <set target="new.baseObject.stringToEnumSeq[1]" value="'E3'"/> - - <set target="new.cObject" type="::Test::C"/> - <add target="new.cObject.boolToStringDict" key="0" value="false"/> - <add target="new.cObject.boolToStringDict" key="1" value="true"/> - - <set target="new.dAsCObject" type="::Test::D"/> - <add target="new.dAsCObject.boolToStringDict" key="0" value="false"/> - <add target="new.dAsCObject.boolToStringDict" key="1" value="true"/> - <set target="new.dAsCObject.stringToByteSeq" length="2"/> - <set target="new.dAsCObject.stringToByteSeq[0]" value="'0'"/> - <set target="new.dAsCObject.stringToByteSeq[1]" value="'255'"/> - <set target="new.dAsCObject.obj" type="::Test::F"/> - - <set target="new.dObject" type="::Test::D"/> - <add target="new.dObject.boolToStringDict" key="0" value="false"/> - <add target="new.dObject.boolToStringDict" key="1" value="true"/> - <set target="new.dObject.stringToByteSeq" length="2"/> - <set target="new.dObject.stringToByteSeq[0]" value="'0'"/> - <set target="new.dObject.stringToByteSeq[1]" value="'255'"/> - <set target="new.dObject.obj" value="new.cObject"/> - - <set target="new.compactObject" type="::Test::Small3"/> - <set target="new.compactObject.name" value="'compactObject'"/> - - </transform> -</transformdb> diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp deleted file mode 100644 index 894bf134a62..00000000000 --- a/cpp/test/FreezeScript/dbmap/makedb.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> -#include <IntSMap.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; -using namespace Test; - -int -run(const CommunicatorPtr& communicator, const string& envName, const string& dbName) -{ - Freeze::ConnectionPtr connection = createConnection(communicator, envName); - IntSMap m(connection, dbName); - - m.put(IntSMap::value_type(0, S())); - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - try - { - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/"; - envName += "db"; - } - - status = run(communicator, envName, "default.db"); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py deleted file mode 100755 index e2fdcbb72cb..00000000000 --- a/cpp/test/FreezeScript/dbmap/run.py +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys, re, shutil - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -transformdb = '%s' % os.path.join(TestUtil.getCppBinDir(), "transformdb") - -if TestUtil.appverifier: - TestUtil.setAppVerifierSettings([transformdb]) - -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -init_dbdir = os.path.join(os.getcwd(), "db_init") -if os.path.exists(init_dbdir): - shutil.rmtree(init_dbdir) -os.mkdir(init_dbdir) - -check_dbdir = os.path.join(os.getcwd(), "db_check") -if os.path.exists(check_dbdir): - shutil.rmtree(check_dbdir) -os.mkdir(check_dbdir) - -tmp_dbdir = os.path.join(os.getcwd(), "db_tmp") -if os.path.exists(tmp_dbdir): - shutil.rmtree(tmp_dbdir) -os.mkdir(tmp_dbdir) - -regex1 = re.compile(r"_old\.ice$", re.IGNORECASE) -files = [] -for file in os.listdir(os.path.join(os.getcwd(), "fail")): - if(regex1.search(file)): - files.append(file) - -regex2 = re.compile(r"^.*transf(ormdb|~1)(\.exe)?", re.IGNORECASE) - -sys.stdout.write("testing error detection... ") -sys.stdout.flush() -if TestUtil.debug: - sys.stdout.write("\n") - -files.sort() -for oldfile in files: - - newfile = oldfile.replace("old", "new") - - if oldfile.find("19") == 0: - value = "::Test::C" - else: - value = "int" - - command = '"' + transformdb + '" --old "' + os.path.join(os.getcwd(), "fail", oldfile) + '" --new "' + \ - os.path.join(os.getcwd(), "fail", newfile) + '" -o tmp.xml --key string --value ' + value - - if TestUtil.debug: - print(command) - - p = TestUtil.runCommand(command) - (stdin, stdout, stderr) = (p.stdin, p.stdout, p.stderr) - - lines1 = stderr.readlines() - lines2 = open(os.path.join(os.getcwd(), "fail", oldfile.replace("_old.ice", ".err")), "r").readlines() - if len(lines1) != len(lines2): - print("failed! (1)") - sys.exit(1) - - i = 0 - while i < len(lines1): - if sys.version_info[0] == 2: - line1 = regex2.sub("", lines1[i]).strip() - line2 = regex2.sub("", lines2[i]).strip() - else: - line1 = regex2.sub("", lines1[i].decode("utf-8")).strip() - line2 = regex2.sub("", lines2[i]).strip() - if line1 != line2: - print("failed! (2)") - print("line1 = " + line1) - print("line2 = " + line2) - # sys.exit(1) - i = i + 1 - -print("ok") - -sys.stdout.write("creating test database... ") -sys.stdout.flush() - -makedb = '"%s" "%s"'% (os.path.join(os.getcwd(), "makedb"), os.getcwd()) -proc = TestUtil.spawn(makedb) -proc.waitTestSuccess() -print("ok") - -testold = os.path.join(os.getcwd(), "TestOld.ice") -testnew = os.path.join(os.getcwd(), "TestNew.ice") -initxml = os.path.join(os.getcwd(), "init.xml") -checkxml = os.path.join(os.getcwd(), "check.xml") - -sys.stdout.write("initializing test database... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testold + '" --new "' + testold + '" -f "' + initxml + '" "' + dbdir + \ - '" default.db "' + init_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -sys.stdout.write("executing default transformations... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testold + '" --new "' + testnew + '" --key int --value ::Test::S "' + \ - init_dbdir + '" default.db "' + check_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -sys.stdout.write("validating database... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testnew + '" --new "' + testnew + '" -f "' + checkxml + '" "' + \ - check_dbdir + '" default.db "' + tmp_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -if TestUtil.appverifier: - TestUtil.appVerifierAfterTestEnd([transformdb]) diff --git a/cpp/test/FreezeScript/evictor/.depend.mak b/cpp/test/FreezeScript/evictor/.depend.mak deleted file mode 100755 index 1e8235b35e9..00000000000 --- a/cpp/test/FreezeScript/evictor/.depend.mak +++ /dev/null @@ -1,223 +0,0 @@ - -TestOld.h: \ - TestOld.ice - -TestOld.obj: \ - TestOld.cpp \ - "TestOld.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -makedb.obj: \ - makedb.cpp \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "TestOld.h" \ diff --git a/cpp/test/FreezeScript/evictor/.gitignore b/cpp/test/FreezeScript/evictor/.gitignore deleted file mode 100644 index 9ebd9157ec2..00000000000 --- a/cpp/test/FreezeScript/evictor/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -makedb -TestOld.cpp -TestOld.h -db/* -db_tmp -db_check diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile deleted file mode 100644 index 238cbfc374e..00000000000 --- a/cpp/test/FreezeScript/evictor/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = makedb - -TARGETS = $(CLIENT) - -SLICE_OBJS = TestOld.o - -OBJS = $(SLICE_OBJS) \ - makedb.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -clean:: - -rm -rf db/* db_tmp db_check diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak deleted file mode 100644 index 9ed338d6548..00000000000 --- a/cpp/test/FreezeScript/evictor/Makefile.mak +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -CLIENT = makedb.exe - -TARGETS = $(CLIENT) - -SLICE_OBJS = .\TestOld.obj - -OBJS = $(SLICE_OBJS) \ - .\makedb.obj - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -clean:: - del /q TestOld.cpp TestOld.h - -clean:: - if exist db\__Freeze rmdir /s /q db\__Freeze - del /q db\*.db db\log.* db\__catalog db\__catalogIndexList - if exist db_check rmdir /s /q db_check - if exist db_tmp rmdir /s /q db_tmp diff --git a/cpp/test/FreezeScript/evictor/TestNew.ice b/cpp/test/FreezeScript/evictor/TestNew.ice deleted file mode 100644 index 216127d5f32..00000000000 --- a/cpp/test/FreezeScript/evictor/TestNew.ice +++ /dev/null @@ -1,45 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3}; - -class MainObject -{ - string boolToString; - short byteToShort; - byte shortToByte; - short intToShort; - int longToInt; - string floatToString; - float doubleToFloat; - E stringToEnum; - E newname; -}; - -/* - * DerivedMainObject has been removed. - * -class DerivedMainObject extends MainObject -{ - string name; -}; - */ - -/* - * FacetObject has been renamed to RenamedFacetObject. - */ -class RenamedFacetObject -{ - string doubleToString; -}; - -/* - * DerivedFacetObject has been removed. - * -class DerivedFacetObject extends FacetObject -{ - long count; -}; - */ - -}; diff --git a/cpp/test/FreezeScript/evictor/TestOld.ice b/cpp/test/FreezeScript/evictor/TestOld.ice deleted file mode 100644 index 25d74db4396..00000000000 --- a/cpp/test/FreezeScript/evictor/TestOld.ice +++ /dev/null @@ -1,34 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3}; - -class MainObject -{ - bool boolToString; - byte byteToShort; - short shortToByte; - int intToShort; - long longToInt; - float floatToString; - double doubleToFloat; - string stringToEnum; - E renamed; -}; - -class DerivedMainObject extends MainObject -{ - string name; -}; - -class FacetObject -{ - double doubleToString; -}; - -class DerivedFacetObject extends FacetObject -{ - long count; -}; - -}; diff --git a/cpp/test/FreezeScript/evictor/check.xml b/cpp/test/FreezeScript/evictor/check.xml deleted file mode 100644 index 877895e3dcf..00000000000 --- a/cpp/test/FreezeScript/evictor/check.xml +++ /dev/null @@ -1,40 +0,0 @@ -<transformdb> - -<!-- - <database key="::Ice::Identity" value="::Freeze::ObjectRecord"> - <record> - <fail test="newvalue.servant.ice_id == '::Test::DerivedMainObject'"/> - <fail test="newvalue.servant.ice_id == '::Test::DerivedFacetObject'"/> - </record> - </database> ---> - - <database key="::Ice::Identity" value="Object"> - <record> - <fail test="newvalue.ice_id == '::Test::DerivedMainObject'"/> - <fail test="newvalue.ice_id == '::Test::DerivedFacetObject'"/> - </record> - </database> - - - <!-- enum ::Test::E --> - <transform type="::Test::E"/> - - <!-- class ::Test::MainObject --> - <transform type="::Test::MainObject"> - <fail test="new.boolToString != 'true'"/> - <fail test="new.byteToShort != 0"/> - <fail test="new.shortToByte != 255"/> - <fail test="new.intToShort != 32767"/> - <fail test="new.longToInt != 2147483647"/> - <fail test="new.floatToString != '4567.8'"/> - <fail test="new.doubleToFloat - 8765.4 > 0.001"/> - <fail test="new.stringToEnum != ::New::Test::E1"/> - <fail test="new.newname != ::New::Test::E2"/> - </transform> - - <!-- class ::Test::RenamedFacetObject --> - <transform type="::Test::RenamedFacetObject"> - <fail test="new.doubleToString != '901235' and new.doubleToString != '901234'"/> - </transform> -</transformdb> diff --git a/cpp/test/FreezeScript/evictor/db/.gitignore b/cpp/test/FreezeScript/evictor/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/cpp/test/FreezeScript/evictor/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/cpp/test/FreezeScript/evictor/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp deleted file mode 100644 index f02f8a2a2f6..00000000000 --- a/cpp/test/FreezeScript/evictor/makedb.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Freeze/Freeze.h> -#include <IceUtil/AbstractMutex.h> -#include <TestOld.h> - -using namespace std; -using namespace Test; - -#ifdef __SUNPRO_CC -# pragma error_messages(off,hidef) -#endif - -class MainObjectI : public MainObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> -{ -}; - -class DerivedMainObjectI : public DerivedMainObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> -{ -}; - -class FacetObjectI : public FacetObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> -{ -}; - -class DerivedFacetObjectI : public DerivedFacetObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> -{ -}; - -class Factory : public Ice::ObjectFactory -{ -public: - - virtual Ice::ObjectPtr - create(const string& type) - { - if(type == "::Test::MainObject") - { - return new MainObjectI; - } - else if(type == "::Test::DerivedMainObject") - { - return new DerivedMainObjectI; - } - else if(type == "::Test::FacetObject") - { - return new FacetObjectI; - } - else if(type == "::Test::DerivedFacetObject") - { - return new DerivedFacetObjectI; - } - assert(false); - return 0; - } - - virtual void - destroy() - { - } -}; - -int -run(const Ice::CommunicatorPtr& communicator, const string& envName, const string& dbName) -{ - Ice::ObjectFactoryPtr factory = new Factory; - communicator->addObjectFactory(factory, ""); - - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(""); - Freeze::EvictorPtr evictor = Freeze::createBackgroundSaveEvictor(adapter, envName, dbName); - - for(int i = 0; i < 10; ++i) - { - string facetName = "theFacet"; - - Ice::Identity id; - ostringstream ostr; - ostr << "mainObject" << i; - id.name = ostr.str(); - - if((i % 2) == 0) - { - MainObjectPtr obj = new MainObjectI; - obj->boolToString = true; - obj->byteToShort = 0; - obj->shortToByte = 255; - obj->intToShort = 32767; - obj->longToInt = 2147483647; - obj->floatToString = 4567.8f; - obj->doubleToFloat = 8765.4; - obj->stringToEnum = "E1"; - obj->renamed = E2; - evictor->add(obj, id); - FacetObjectPtr facet = new FacetObjectI; - facet->doubleToString = 901234.5; - evictor->addFacet(facet, id, facetName); - } - else - { - DerivedMainObjectPtr obj = new DerivedMainObjectI; - obj->boolToString = false; - obj->byteToShort = 0; - obj->shortToByte = -1; - obj->intToShort = -32768; - obj->longToInt = -2147483647 - 1; - obj->floatToString = -4567.8f; - obj->doubleToFloat = -8765.4; - obj->stringToEnum = "E3"; - obj->renamed = E1; - obj->name = id.name; - evictor->add(obj, id); - DerivedFacetObjectPtr facet = new DerivedFacetObjectI; - facet->doubleToString = -901234.5; - facet->count = i; - evictor->addFacet(facet, id, facetName); - } - } - - evictor->deactivate(""); - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - try - { - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/"; - envName += "db"; - } - - status = run(communicator, envName, "evictor.db"); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py deleted file mode 100755 index 2a9cf557a3d..00000000000 --- a/cpp/test/FreezeScript/evictor/run.py +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys, re, shutil - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel os.getcwd()!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -transformdb = os.path.join(TestUtil.getCppBinDir(), "transformdb") - -if TestUtil.appverifier: - TestUtil.setAppVerifierSettings([transformdb]) - -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -check_dbdir = os.path.join(os.getcwd(), "db_check") -if os.path.exists(check_dbdir): - shutil.rmtree(check_dbdir) -os.mkdir(check_dbdir) - -tmp_dbdir = os.path.join(os.getcwd(), "db_tmp") -if os.path.exists(tmp_dbdir): - shutil.rmtree(tmp_dbdir) -os.mkdir(tmp_dbdir) - -sys.stdout.write("creating test database... ") -sys.stdout.flush() - -makedb = '"%s" "%s"' % (os.path.join(os.getcwd(), "makedb"), os.getcwd()) -proc = TestUtil.spawn(makedb) -proc.waitTestSuccess() -print("ok") - -testold = os.path.join(os.getcwd(), "TestOld.ice") -testnew = os.path.join(os.getcwd(), "TestNew.ice") -transformxml = os.path.join(os.getcwd(), "transform.xml") -checkxml = os.path.join(os.getcwd(), "check.xml") - -sys.stdout.write("executing evictor transformations... ") -sys.stdout.flush() - -command = '"' + transformdb + '" -e -p --old "' + testold + '" --new "' + testnew + '" -f "' + transformxml + '" "' + dbdir + \ - '" evictor.db "' + check_dbdir + '" ' -proc = TestUtil.spawn(command) -proc.waitTestSuccess() -print("ok") - -sys.stdout.write("validating database... ") -sys.stdout.flush() - -command = '"' + transformdb + '" -e --old "' + testnew + '" --new "' + testnew + '" -f "' + checkxml + '" "' + check_dbdir + \ - '" evictor.db "' + tmp_dbdir + '"' -proc = TestUtil.spawn(command) -proc.waitTestSuccess() -print("ok") - -if TestUtil.appverifier: - TestUtil.appVerifierAfterTestEnd([transformdb]) diff --git a/cpp/test/FreezeScript/evictor/transform.xml b/cpp/test/FreezeScript/evictor/transform.xml deleted file mode 100644 index b6cb74d1562..00000000000 --- a/cpp/test/FreezeScript/evictor/transform.xml +++ /dev/null @@ -1,26 +0,0 @@ -<transformdb> - - <database key="::Ice::Identity" value="Object"> - <record/> - </database> - -<!-- - <database key="::Ice::Identity" value="::Freeze::ObjectRecord"> - <record/> - </database> ---> - - - <!-- enum ::Test::E --> - <transform type="::Test::E"/> - - <!-- class ::Test::MainObject --> - <transform type="::Test::MainObject"> - <!-- NOTICE: renamed has been removed --> - <!-- NOTICE: newname has been added --> - <set target="new.newname" value="old.renamed"/> - </transform> - - <!-- class ::Test::RenamedFacetObject --> - <transform type="::Test::RenamedFacetObject" rename="::Test::FacetObject"/> -</transformdb> diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index f76dd911f0e..9a7847a18c1 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -737,21 +737,5 @@ Service.obj: \ "$(includedir)\Ice\RegisterPlugins.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp index 636ab88a881..20f9f3ca96c 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp @@ -9,7 +9,6 @@ #include <Ice/Ice.h> #include <IceBox/IceBox.h> -#include <Freeze/Freeze.h> #include <TestI.h> using namespace std; diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index 25cf6c4c957..2da363ec02f 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -60,11 +60,7 @@ clean:: del /q build.txt del /q Event.cpp Event.h del /q db\topicmanager db\log.* - -if exist db\__Freeze rmdir /q /s db\__Freeze -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak index 3f9cdd58a7e..18e2ebd8055 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mak +++ b/cpp/test/IceStorm/federation2/Makefile.mak @@ -60,19 +60,11 @@ all:: clean:: del /q build.txt del /q Event.cpp Event.h - -if exist db\__Freeze rmdir /q /s db\__Freeze -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -if exist db2\__Freeze rmdir /q /s db2\__Freeze -for %f in (db2\*) do if not %f == db2\.gitignore del /q %f - -if exist 0.db2\__Freeze rmdir /q /s 0.db2\__Freeze -for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f - -if exist 1.db2\__Freeze rmdir /q /s 1.db2\__Freeze -for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f - -if exist 2.db2\__Freeze rmdir /q /s 2.db2\__Freeze -for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak index 809e445e919..90449719f6b 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mak +++ b/cpp/test/IceStorm/rep1/Makefile.mak @@ -71,9 +71,6 @@ all:: clean:: del /q build.txt del /q Single.cpp Single.h - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f diff --git a/cpp/test/IceStorm/repstress/Makefile.mak b/cpp/test/IceStorm/repstress/Makefile.mak index cd77563bbee..330380aa198 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mak +++ b/cpp/test/IceStorm/repstress/Makefile.mak @@ -74,9 +74,6 @@ clean:: del /q build.txt del /q Single.cpp Single.h del /q Controller.cpp Controller.h - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak index 85368aa9297..b7b5b510191 100644 --- a/cpp/test/IceStorm/single/Makefile.mak +++ b/cpp/test/IceStorm/single/Makefile.mak @@ -61,11 +61,7 @@ all:: clean:: del /q build.txt del /q Single.cpp Single.h - -if exist db\__Freeze rmdir /q /s db\__Freeze -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak index cd9ac09854d..405b70db171 100644 --- a/cpp/test/IceStorm/stress/Makefile.mak +++ b/cpp/test/IceStorm/stress/Makefile.mak @@ -60,19 +60,11 @@ all:: clean:: del /q build.txt del /q Event.cpp Event.h - -if exist db\__Freeze rmdir /q /s db\__Freeze -for %f in (db\*) do if not %f == db\.gitignore del /q %f - -if exist 0.db\__Freeze rmdir /q /s 0.db\__Freeze -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -if exist 1.db\__Freeze rmdir /q /s 1.db\__Freeze -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -if exist 2.db\__Freeze rmdir /q /s 2.db\__Freeze -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f - -if exist db2\__Freeze rmdir /q /s db2\__Freeze -for %f in (db2\*) do if not %f == db2\.gitignore del /q %f - -if exist 0.db2\__Freeze rmdir /q /s 0.db2\__Freeze -for %f in (0.db2\*) do if not %f == 0.db2\.gitignore del /q %f - -if exist 1.db2\__Freeze rmdir /q /s 1.db2\__Freeze -for %f in (1.db2\*) do if not %f == 1.db2\.gitignore del /q %f - -if exist 2.db2\__Freeze rmdir /q /s 2.db2\__Freeze -for %f in (2.db2\*) do if not %f == 2.db2\.gitignore del /q %f diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 4266282d66b..83555938843 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -21,8 +21,6 @@ ifeq ($(findstring MINGW,$(UNAME)),) SUBDIRS := $(SUBDIRS) \ IceBox \ IceStorm \ - Freeze \ - FreezeScript \ Glacier2 \ IceGrid endif diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak index 4f41eb7f445..ecd60946b01 100644 --- a/cpp/test/Makefile.mak +++ b/cpp/test/Makefile.mak @@ -27,9 +27,7 @@ SUBDIRS = IceUtil \ Ice \ IceSSL \ Glacier2 \ - Freeze \ IceStorm \ - FreezeScript \ IceGrid \ IceBox \ IceDiscovery |