diff options
Diffstat (limited to 'cpp/test/Slice')
| -rw-r--r-- | cpp/test/Slice/Makefile | 3 | ||||
| -rw-r--r-- | cpp/test/Slice/Makefile.mak | 3 | ||||
| -rw-r--r-- | cpp/test/Slice/keyword/Key.ice | 1 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/.depend | 6 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/.gitignore | 7 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/CircularA.ice | 25 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/CircularB.ice | 25 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/Makefile | 27 | ||||
| -rw-r--r-- | cpp/test/Slice/parser/Makefile.mak | 28 |
9 files changed, 123 insertions, 2 deletions
diff --git a/cpp/test/Slice/Makefile b/cpp/test/Slice/Makefile index 5abb0e85b0f..a633485971d 100644 --- a/cpp/test/Slice/Makefile +++ b/cpp/test/Slice/Makefile @@ -11,7 +11,8 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules -SUBDIRS = keyword +SUBDIRS = keyword \ + parser $(EVERYTHING):: @for subdir in $(SUBDIRS); \ diff --git a/cpp/test/Slice/Makefile.mak b/cpp/test/Slice/Makefile.mak index ccb852a2b71..4d77051eed1 100644 --- a/cpp/test/Slice/Makefile.mak +++ b/cpp/test/Slice/Makefile.mak @@ -11,7 +11,8 @@ top_srcdir = ..\.. !include $(top_srcdir)\config\Make.rules.mak
-SUBDIRS = keyword
+SUBDIRS = keyword \
+ parser
$(EVERYTHING)::
@for %i in ( $(SUBDIRS) ) do \
diff --git a/cpp/test/Slice/keyword/Key.ice b/cpp/test/Slice/keyword/Key.ice index bb1d0a8e311..ebddfdbbc21 100644 --- a/cpp/test/Slice/keyword/Key.ice +++ b/cpp/test/Slice/keyword/Key.ice @@ -37,6 +37,7 @@ interface char class switch { + int if; ["ami"] void foo(char* export, out int volatile); }; diff --git a/cpp/test/Slice/parser/.depend b/cpp/test/Slice/parser/.depend new file mode 100644 index 00000000000..6c0b6adb069 --- /dev/null +++ b/cpp/test/Slice/parser/.depend @@ -0,0 +1,6 @@ +CircularA$(OBJEXT): CircularA.cpp ./CircularA.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/LoggerF.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ./CircularB.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h +CircularB$(OBJEXT): CircularB.cpp ./CircularB.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/LoggerF.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ./CircularA.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h +CircularA.cpp: CircularA.ice ./CircularB.ice +CircularB.cpp: CircularB.ice ./CircularA.ice +CircularA.ice: $(SLICE2CPP) $(SLICEPARSERLIB) +CircularB.ice: $(SLICE2CPP) $(SLICEPARSERLIB) diff --git a/cpp/test/Slice/parser/.gitignore b/cpp/test/Slice/parser/.gitignore new file mode 100644 index 00000000000..ff6e00c37ce --- /dev/null +++ b/cpp/test/Slice/parser/.gitignore @@ -0,0 +1,7 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +CircularA.cpp +CircularA.h +CircularB.cpp +CircularB.h diff --git a/cpp/test/Slice/parser/CircularA.ice b/cpp/test/Slice/parser/CircularA.ice new file mode 100644 index 00000000000..1346daf1112 --- /dev/null +++ b/cpp/test/Slice/parser/CircularA.ice @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2009 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 CIRCULARA_ICE +#define CIRCULARA_ICE + +#include <CircularB.ice> + +module Test +{ + +class A +{ + void shutdown(); +}; + +}; + +#endif diff --git a/cpp/test/Slice/parser/CircularB.ice b/cpp/test/Slice/parser/CircularB.ice new file mode 100644 index 00000000000..3367becf87f --- /dev/null +++ b/cpp/test/Slice/parser/CircularB.ice @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2009 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 CIRCULARB_ICE +#define CIRCULARB_ICE + +#include <CircularA.ice> + +module Test +{ + +class B +{ + void shutdown(); +}; + +}; + +#endif diff --git a/cpp/test/Slice/parser/Makefile b/cpp/test/Slice/parser/Makefile new file mode 100644 index 00000000000..c8c0862bc84 --- /dev/null +++ b/cpp/test/Slice/parser/Makefile @@ -0,0 +1,27 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2009 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 = ../../.. + +TARGETS = $(OBJS) + +OBJS = CircularA.o \ + CircularB.o + +SRCS = $(OBJS:.o=.cpp) + +SLICE_SRCS = CircularA.ice \ + CircularB.ice + +include $(top_srcdir)/config/Make.rules + +SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) +CPPFLAGS := -I. $(CPPFLAGS) + +include .depend diff --git a/cpp/test/Slice/parser/Makefile.mak b/cpp/test/Slice/parser/Makefile.mak new file mode 100644 index 00000000000..bfd4dfb6cd4 --- /dev/null +++ b/cpp/test/Slice/parser/Makefile.mak @@ -0,0 +1,28 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2009 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 = ..\..\.. + +TARGETS = $(OBJS) + +OBJS = CircularA.obj \ + CircularB.obj + +SRCS = $(OBJS:.obj=.cpp) + +!include $(top_srcdir)/config/Make.rules.mak + +SLICE2CPPFLAGS = -I. $(SLICE2CPPFLAGS) +CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN + +clean:: + del /q CircularA.cpp CircularA.h + del /q CircularB.cpp CircularB.h + +!include .depend |