diff options
463 files changed, 3001 insertions, 4168 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index 4916af36aa4..b334a301b11 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -1,6 +1,21 @@ Changes since version 1.5.1 --------------------------- +- The documentation has always stated that same-named constructs + cannot be directly nested inside each other. (For example, a + module `M' cannot contain a constant named `M'. The slice2cpp + compiler did not enforce this correctly up to now for modules + containing constructs with the same name as the enclosing module. + This has been fixed and now results in a diagnostic. + +- The slice2cpp compiler now deprecates Slice definitions at global scope: + only modules can be defined at global scope. Everything else + (constants, classes, interfaces, etc.) must be defined inside a module. + + For the time being, the compiler issues a warning for each global definition + but continues to compile the code. Global non-module definitions will + elicit a hard error two releases from now. + - Several demos used Slice classes where interface were more appropriate. This has been fixed. diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 13d1dfbd460..7f4c7586da5 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -15,7 +15,7 @@ using namespace Freeze; using namespace Ice; using namespace std; - +using namespace Demo; static void testFailed(const char* expr, const char* file, unsigned int line) diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index c45861c9b42..9233f920a74 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -29,9 +29,9 @@ $(CLIENT): $(OBJS) $(COBJS) BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) rm -f BenchTypes.h BenchTypes.cpp - $(SLICE2FREEZE) -I$(slicedir) --dict IntIntMap,int,int --dict Struct1Struct2Map,Struct1,Struct2 \ - --dict Struct1Class1Map,Struct1,Class1 \ - --dict Struct1ObjectMap,Struct1,Object BenchTypes Test.ice + $(SLICE2FREEZE) -I$(slicedir) --dict IntIntMap,int,int --dict Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \ + --dict Struct1Class1Map,Demo::Struct1,Demo::Class1 \ + --dict Struct1ObjectMap,Demo::Struct1,Object BenchTypes Test.ice clean:: rm -f BenchTypes.h BenchTypes.cpp diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice index 40dfef6a96e..23d76da8ab1 100644 --- a/cpp/demo/Freeze/bench/Test.ice +++ b/cpp/demo/Freeze/bench/Test.ice @@ -7,6 +7,9 @@ // // ********************************************************************** +module Demo +{ + struct Struct1 { long l; @@ -27,3 +30,5 @@ class Class2 extends Class1 Object obj; Object rec; }; + +}; diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice index 915aa6bff4c..b571d3d66fc 100644 --- a/cpp/demo/Freeze/library/Library.ice +++ b/cpp/demo/Freeze/library/Library.ice @@ -10,6 +10,9 @@ #ifndef LIBRARY_ICE #define LIBRARY_ICE +module Demo +{ + /** * * This exception is raised in the case of a database failure. @@ -227,4 +230,6 @@ interface Library idempotent void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp index e5188714bd7..75f36548c20 100644 --- a/cpp/demo/Freeze/library/LibraryI.cpp +++ b/cpp/demo/Freeze/library/LibraryI.cpp @@ -11,6 +11,7 @@ #include <LibraryI.h> using namespace std; +using namespace Demo; BookI::BookI(const LibraryIPtr& library) : _library(library), _destroyed(false) diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h index 5eb2c8c34d6..46d17f94900 100644 --- a/cpp/demo/Freeze/library/LibraryI.h +++ b/cpp/demo/Freeze/library/LibraryI.h @@ -16,7 +16,7 @@ #include <LibraryTypes.h> #include <IceUtil/AbstractMutex.h> -class LibraryI : public Library, public IceUtil::RWRecMutex +class LibraryI : public Demo::Library, public IceUtil::RWRecMutex { public: @@ -25,13 +25,13 @@ public: const Freeze::EvictorPtr& evictor); virtual ~LibraryI(); - virtual ::BookPrx createBook(const ::BookDescription&, const Ice::Current&); - virtual ::BookPrx findByIsbn(const ::std::string&, const Ice::Current&) const; - virtual ::BookPrxSeq findByAuthors(const ::std::string&, const Ice::Current&) const; + virtual ::Demo::BookPrx createBook(const ::Demo::BookDescription&, const Ice::Current&); + virtual ::Demo::BookPrx findByIsbn(const ::std::string&, const Ice::Current&) const; + virtual ::Demo::BookPrxSeq findByAuthors(const ::std::string&, const Ice::Current&) const; virtual void setEvictorSize(::Ice::Int, const Ice::Current&); virtual void shutdown(const Ice::Current&); - void remove(const BookDescription&); + void remove(const Demo::BookDescription&); private: @@ -47,14 +47,14 @@ private: typedef IceUtil::Handle<LibraryI> LibraryIPtr; -class BookI : public Book, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex> +class BookI : public Demo::Book, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex> { public: BookI(const LibraryIPtr&); virtual ~BookI(); - virtual ::BookDescription getBookDescription(const Ice::Current&) const; + virtual ::Demo::BookDescription getBookDescription(const Ice::Current&) const; virtual void destroy(const Ice::Current&); virtual void rentBook(const ::std::string&, const Ice::Current&); virtual ::std::string getRenterName(const Ice::Current&) const; diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp index 14cce4c9550..264dc489e35 100644 --- a/cpp/demo/Freeze/library/Parser.cpp +++ b/cpp/demo/Freeze/library/Parser.cpp @@ -17,6 +17,7 @@ using namespace std; using namespace Ice; +using namespace Demo; extern FILE* yyin; diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h index dbeb64016db..e58a77ce474 100644 --- a/cpp/demo/Freeze/library/Parser.h +++ b/cpp/demo/Freeze/library/Parser.h @@ -55,7 +55,7 @@ class Parser : public ::IceUtil::SimpleShared { public: - static ParserPtr createParser(const Ice::CommunicatorPtr&, const LibraryPrx&); + static ParserPtr createParser(const Ice::CommunicatorPtr&, const Demo::LibraryPrx&); void usage(); @@ -86,13 +86,13 @@ public: private: - Parser(const Ice::CommunicatorPtr&, const LibraryPrx&); + Parser(const Ice::CommunicatorPtr&, const Demo::LibraryPrx&); - BookPrxSeq _foundBooks; - BookPrxSeq::iterator _current; + Demo::BookPrxSeq _foundBooks; + Demo::BookPrxSeq::iterator _current; std::string _commands; - LibraryPrx _library; + Demo::LibraryPrx _library; bool _continue; int _errors; int _currentLine; diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp index 25b938858df..053b7803962 100644 --- a/cpp/demo/Freeze/library/RunParser.cpp +++ b/cpp/demo/Freeze/library/RunParser.cpp @@ -11,6 +11,7 @@ #include <Parser.h> using namespace std; +using namespace Demo; void usage(const char* appName) diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index 4d3809a6a48..b14d87553cc 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -63,7 +63,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS) NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) rm -f NameIndex.h NameIndex.cpp - $(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice + $(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice clean:: rm -f NameIndex.h NameIndex.cpp diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp index b029e5e24f4..ecb772f8a04 100644 --- a/cpp/demo/Freeze/phonebook/Parser.cpp +++ b/cpp/demo/Freeze/phonebook/Parser.cpp @@ -17,6 +17,7 @@ using namespace std; using namespace Ice; +using namespace Demo; extern FILE* yyin; diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h index 138524b1548..b52b5c2d1c8 100644 --- a/cpp/demo/Freeze/phonebook/Parser.h +++ b/cpp/demo/Freeze/phonebook/Parser.h @@ -55,7 +55,7 @@ class Parser : public ::IceUtil::SimpleShared { public: - static ParserPtr createParser(const Ice::CommunicatorPtr&, const PhoneBookPrx&); + static ParserPtr createParser(const Ice::CommunicatorPtr&, const Demo::PhoneBookPrx&); void usage(); @@ -86,13 +86,13 @@ public: private: - Parser(const Ice::CommunicatorPtr&, const PhoneBookPrx&); + Parser(const Ice::CommunicatorPtr&, const Demo::PhoneBookPrx&); - Contacts _foundContacts; - Contacts::iterator _current; + Demo::Contacts _foundContacts; + Demo::Contacts::iterator _current; std::string _commands; - PhoneBookPrx _phoneBook; + Demo::PhoneBookPrx _phoneBook; bool _continue; int _errors; int _currentLine; diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice index 06fc5a4b33a..8d4975d1377 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBook.ice +++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice @@ -12,6 +12,9 @@ #include <Ice/Identity.ice> +module Demo +{ + exception DatabaseException { string message; @@ -45,4 +48,6 @@ interface PhoneBook nonmutating void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp index 1cb31d9fabf..32a27f63fad 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; ContactI::ContactI(const ContactFactoryPtr& contactFactory) : _factory(contactFactory) diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h index 66594a2efc8..074a416d04d 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.h +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h @@ -23,7 +23,7 @@ typedef IceUtil::Handle<PhoneBookI> PhoneBookIPtr; class ContactI; typedef IceUtil::Handle<ContactI> ContactIPtr; -class ContactI : public Contact, +class ContactI : public Demo::Contact, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex> { public: @@ -46,14 +46,14 @@ private: ContactFactoryPtr _factory; }; -class PhoneBookI : public PhoneBook +class PhoneBookI : public Demo::PhoneBook { public: PhoneBookI(const Freeze::EvictorPtr& evictor, const ContactFactoryPtr& factory, const NameIndexPtr& index); - virtual ContactPrx createContact(const Ice::Current&); - virtual Contacts findContacts(const std::string&, const Ice::Current&) const; + virtual Demo::ContactPrx createContact(const Ice::Current&); + virtual Demo::Contacts findContacts(const std::string&, const Ice::Current&) const; virtual void setEvictorSize(Ice::Int, const Ice::Current&); virtual void shutdown(const Ice::Current&) const; diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp index 96e227607ac..cfdef15069d 100644 --- a/cpp/demo/Freeze/phonebook/RunParser.cpp +++ b/cpp/demo/Freeze/phonebook/RunParser.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; void usage(const char* appName) diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp index 0e58773220f..a0184adea70 100644 --- a/cpp/demo/Glacier/session/Client.cpp +++ b/cpp/demo/Glacier/session/Client.cpp @@ -15,6 +15,7 @@ #include <HelloSession.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice index b4c1723bd94..140ee60222d 100644 --- a/cpp/demo/Glacier/session/HelloSession.ice +++ b/cpp/demo/Glacier/session/HelloSession.ice @@ -12,9 +12,14 @@ #include <Glacier/Session.ice> +module Demo +{ + interface HelloSession extends Glacier::Session { void hello(); }; +}; + #endif diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h index 107d05d56df..3c2d8d30dfd 100644 --- a/cpp/demo/Glacier/session/HelloSessionI.h +++ b/cpp/demo/Glacier/session/HelloSessionI.h @@ -29,7 +29,7 @@ private: }; typedef IceUtil::Handle<HelloSessionManagerI> HelloSessionManagerIPtr; -class HelloSessionI : public HelloSession +class HelloSessionI : public Demo::HelloSession { public: diff --git a/cpp/demo/Glacier2/callback/Callback.ice b/cpp/demo/Glacier2/callback/Callback.ice index 6138731b5c0..5041acad7c2 100644 --- a/cpp/demo/Glacier2/callback/Callback.ice +++ b/cpp/demo/Glacier2/callback/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Demo +{ + interface CallbackReceiver { void callback(); @@ -21,4 +24,6 @@ interface Callback void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Glacier2/callback/CallbackI.cpp b/cpp/demo/Glacier2/callback/CallbackI.cpp index 9946c2bd0b9..67fa18ca671 100644 --- a/cpp/demo/Glacier2/callback/CallbackI.cpp +++ b/cpp/demo/Glacier2/callback/CallbackI.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; void CallbackReceiverI::callback(const Current&) diff --git a/cpp/demo/Glacier2/callback/CallbackI.h b/cpp/demo/Glacier2/callback/CallbackI.h index 539ab05c588..7a8d71187eb 100644 --- a/cpp/demo/Glacier2/callback/CallbackI.h +++ b/cpp/demo/Glacier2/callback/CallbackI.h @@ -12,18 +12,18 @@ #include <Callback.h> -class CallbackReceiverI : public CallbackReceiver +class CallbackReceiverI : public Demo::CallbackReceiver { public: virtual void callback(const Ice::Current&); }; -class CallbackI : public Callback +class CallbackI : public Demo::Callback { public: - virtual void initiateCallback(const CallbackReceiverPrx&, const Ice::Current&); + virtual void initiateCallback(const Demo::CallbackReceiverPrx&, const Ice::Current&); virtual void shutdown(const Ice::Current&); }; diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index 0a0fc40fce1..3b07e161f5e 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -13,6 +13,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class CallbackClient : public Application { diff --git a/cpp/demo/Glacier2/callback/Server.cpp b/cpp/demo/Glacier2/callback/Server.cpp index 096ab730cf6..5b9149190d0 100644 --- a/cpp/demo/Glacier2/callback/Server.cpp +++ b/cpp/demo/Glacier2/callback/Server.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class CallbackServer : public Application { diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice index 6138731b5c0..5041acad7c2 100644 --- a/cpp/demo/Ice/callback/Callback.ice +++ b/cpp/demo/Ice/callback/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Demo +{ + interface CallbackReceiver { void callback(); @@ -21,4 +24,6 @@ interface Callback void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp index e8cd9053ab8..f748889a8b0 100644 --- a/cpp/demo/Ice/callback/CallbackI.cpp +++ b/cpp/demo/Ice/callback/CallbackI.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; void CallbackReceiverI::callback(const Current&) diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h index 539ab05c588..7a8d71187eb 100644 --- a/cpp/demo/Ice/callback/CallbackI.h +++ b/cpp/demo/Ice/callback/CallbackI.h @@ -12,18 +12,18 @@ #include <Callback.h> -class CallbackReceiverI : public CallbackReceiver +class CallbackReceiverI : public Demo::CallbackReceiver { public: virtual void callback(const Ice::Current&); }; -class CallbackI : public Callback +class CallbackI : public Demo::Callback { public: - virtual void initiateCallback(const CallbackReceiverPrx&, const Ice::Current&); + virtual void initiateCallback(const Demo::CallbackReceiverPrx&, const Ice::Current&); virtual void shutdown(const Ice::Current&); }; diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp index eadafce336f..ab0bedd7ab9 100644 --- a/cpp/demo/Ice/callback/Client.cpp +++ b/cpp/demo/Ice/callback/Client.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class CallbackClient : public Application { diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp index a9616993727..53f27975527 100644 --- a/cpp/demo/Ice/callback/Server.cpp +++ b/cpp/demo/Ice/callback/Server.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class CallbackServer : public Application { diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index 18aab0bb1b9..71d9a7a0bd4 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -11,6 +11,7 @@ #include <Hello.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice index 9b532a2e9a8..4ce83cbc4c1 100644 --- a/cpp/demo/Ice/hello/Hello.ice +++ b/cpp/demo/Ice/hello/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h index b3ca691c7e0..c3391f86903 100644 --- a/cpp/demo/Ice/hello/HelloI.h +++ b/cpp/demo/Ice/hello/HelloI.h @@ -12,7 +12,7 @@ #include <Hello.h> -class HelloI : public Hello +class HelloI : public ::Demo::Hello { public: diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp index 4cfbea32ef0..0e304efdedb 100644 --- a/cpp/demo/Ice/latency/Client.cpp +++ b/cpp/demo/Ice/latency/Client.cpp @@ -11,6 +11,7 @@ #include <Latency.h> using namespace std; +using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice index 04c9673ec48..ba5af7216c7 100644 --- a/cpp/demo/Ice/latency/Latency.ice +++ b/cpp/demo/Ice/latency/Latency.ice @@ -10,8 +10,13 @@ #ifndef LATENCY_ICE #define LATENCY_ICE +module Demo +{ + class Ping { }; +}; + #endif diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index 99de254a0f7..b6dbe3a922a 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -11,6 +11,7 @@ #include <Latency.h> using namespace std; +using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index 872c71436bc..6d02cd01cbb 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class NestedClient : public Application { diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice index 916d80d0a12..4216d412f11 100644 --- a/cpp/demo/Ice/nested/Nested.ice +++ b/cpp/demo/Ice/nested/Nested.ice @@ -10,9 +10,14 @@ #ifndef NESTED_ICE #define NESTED_ICE +module Demo +{ + interface Nested { void nestedCall(int level, Nested* proxy); }; +}; + #endif diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp index 55b84e6e370..52e29ddec31 100644 --- a/cpp/demo/Ice/nested/NestedI.cpp +++ b/cpp/demo/Ice/nested/NestedI.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; NestedI::NestedI(const NestedPrx& self) : _self(self) diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h index 4ec81d2f9f0..190a2f8b3dc 100644 --- a/cpp/demo/Ice/nested/NestedI.h +++ b/cpp/demo/Ice/nested/NestedI.h @@ -12,16 +12,16 @@ #include <Nested.h> -class NestedI : public Nested +class NestedI : public Demo::Nested { public: - NestedI(const NestedPrx&); - virtual void nestedCall(Ice::Int, const NestedPrx&, const Ice::Current&); + NestedI(const Demo::NestedPrx&); + virtual void nestedCall(Ice::Int, const Demo::NestedPrx&, const Ice::Current&); private: - NestedPrx _self; + Demo::NestedPrx _self; }; #endif diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp index e3a09b1f03b..0fc9ec2d86a 100644 --- a/cpp/demo/Ice/nested/Server.cpp +++ b/cpp/demo/Ice/nested/Server.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Demo; class NestedServer : public Application { diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp index 5668c95db0c..c117be492fe 100644 --- a/cpp/demo/Ice/throughput/Client.cpp +++ b/cpp/demo/Ice/throughput/Client.cpp @@ -11,6 +11,7 @@ #include <Throughput.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice index 20195e9924e..d0346f0dfd9 100644 --- a/cpp/demo/Ice/throughput/Throughput.ice +++ b/cpp/demo/Ice/throughput/Throughput.ice @@ -10,6 +10,9 @@ #ifndef THROUGHPUT_ICE #define THROUGHPUT_ICE +module Demo +{ + const int seqSize = 500000; sequence<byte> ByteSeq; @@ -21,4 +24,6 @@ interface Throughput ByteSeq echoByteSeq(ByteSeq seq); }; +}; + #endif diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h index de7a31f69b8..ff383861e04 100644 --- a/cpp/demo/Ice/throughput/ThroughputI.h +++ b/cpp/demo/Ice/throughput/ThroughputI.h @@ -13,35 +13,35 @@ #include <Ice/Ice.h> #include <Throughput.h> -class ThroughputI : public Throughput +class ThroughputI : public ::Demo::Throughput { public: ThroughputI() : - _seq(seqSize, 0) + _seq(::Demo::seqSize, 0) { } virtual void - sendByteSeq(const ByteSeq&, const Ice::Current&) + sendByteSeq(const ::Demo::ByteSeq&, const Ice::Current&) { } - virtual ByteSeq + virtual ::Demo::ByteSeq recvByteSeq(const Ice::Current&) { return _seq; } - virtual ByteSeq - echoByteSeq(const ByteSeq& seq, const Ice::Current&) + virtual ::Demo::ByteSeq + echoByteSeq(const ::Demo::ByteSeq& seq, const Ice::Current&) { return seq; } private: - ByteSeq _seq; + ::Demo::ByteSeq _seq; }; #endif diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index a6adfe4b0dd..3ee1c424772 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -12,6 +12,7 @@ #include <ObjectFactory.h> using namespace std; +using namespace Demo; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice index b8f03f2448b..22fbecbcf17 100644 --- a/cpp/demo/Ice/value/Value.ice +++ b/cpp/demo/Ice/value/Value.ice @@ -10,6 +10,9 @@ #ifndef VALUE_ICE #define VALUE_ICE +module Demo +{ + class Simple { string message; @@ -41,4 +44,6 @@ class Initial void throwDerivedPrinter() throws DerivedPrinterException; }; +}; + #endif diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp index 80ff5b609bc..17433b16887 100644 --- a/cpp/demo/Ice/value/ValueI.cpp +++ b/cpp/demo/Ice/value/ValueI.cpp @@ -11,6 +11,7 @@ #include <ValueI.h> using namespace std; +using namespace Demo; InitialI::InitialI(::Ice::ObjectAdapterPtr adapter) { diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h index 3f656eb1297..67393d44185 100644 --- a/cpp/demo/Ice/value/ValueI.h +++ b/cpp/demo/Ice/value/ValueI.h @@ -12,34 +12,34 @@ #include <Value.h> -class InitialI : public Initial +class InitialI : public ::Demo::Initial { public: InitialI(::Ice::ObjectAdapterPtr); - virtual SimplePtr getSimple(const Ice::Current&); + virtual ::Demo::SimplePtr getSimple(const Ice::Current&); virtual ::Ice::ObjectPtr getPrinterAsObject(const Ice::Current&); - virtual void getPrinter(PrinterPtr&, PrinterPrx&, const Ice::Current&); - virtual PrinterPtr getDerivedPrinter(const Ice::Current&); + virtual void getPrinter(::Demo::PrinterPtr&, ::Demo::PrinterPrx&, const Ice::Current&); + virtual ::Demo::PrinterPtr getDerivedPrinter(const Ice::Current&); virtual void throwDerivedPrinter(const Ice::Current&); private: - SimplePtr _simple; - PrinterPtr _printer; - PrinterPrx _printerProxy; - DerivedPrinterPtr _derivedPrinter; + ::Demo::SimplePtr _simple; + ::Demo::PrinterPtr _printer; + ::Demo::PrinterPrx _printerProxy; + ::Demo::DerivedPrinterPtr _derivedPrinter; }; -class PrinterI : virtual public Printer +class PrinterI : virtual public ::Demo::Printer { public: virtual void printBackwards(const Ice::Current&); }; -class DerivedPrinterI : virtual public DerivedPrinter, virtual public PrinterI +class DerivedPrinterI : virtual public ::Demo::DerivedPrinter, virtual public PrinterI { public: diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index 6cb32a985bb..aa2d5870e06 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -11,6 +11,7 @@ #include <Hello.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice index f7344f0d112..52d80d07463 100644 --- a/cpp/demo/IceBox/hello/Hello.ice +++ b/cpp/demo/IceBox/hello/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { void sayHello(); void shutdown(); }; +}; + #endif diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h index ab98269ae92..0ea0331c33f 100644 --- a/cpp/demo/IceBox/hello/HelloI.h +++ b/cpp/demo/IceBox/hello/HelloI.h @@ -16,7 +16,7 @@ # define HELLO_API ICE_DECLSPEC_EXPORT #endif -class HELLO_API HelloI : public Hello +class HELLO_API HelloI : public Demo::Hello { public: diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp index e787c5a9c9b..59e46f40e56 100644 --- a/cpp/demo/IcePack/hello/Client.cpp +++ b/cpp/demo/IcePack/hello/Client.cpp @@ -12,6 +12,7 @@ #include <Hello.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/IcePack/hello/Hello.ice b/cpp/demo/IcePack/hello/Hello.ice index 1fa498dd67c..19f9c3af81e 100644 --- a/cpp/demo/IcePack/hello/Hello.ice +++ b/cpp/demo/IcePack/hello/Hello.ice @@ -10,6 +10,9 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + class Hello { /** @@ -75,4 +78,6 @@ interface HelloFactory throws NameNotExistException; }; +}; + #endif diff --git a/cpp/demo/IcePack/hello/HelloI.cpp b/cpp/demo/IcePack/hello/HelloI.cpp index fd8f88729a8..0b95713079f 100644 --- a/cpp/demo/IcePack/hello/HelloI.cpp +++ b/cpp/demo/IcePack/hello/HelloI.cpp @@ -12,6 +12,7 @@ #include <HelloI.h> using namespace std; +using namespace Demo; HelloFactoryI::HelloFactoryI() { diff --git a/cpp/demo/IcePack/hello/HelloI.h b/cpp/demo/IcePack/hello/HelloI.h index c0ac7c4ed40..bdd47e2ebf4 100644 --- a/cpp/demo/IcePack/hello/HelloI.h +++ b/cpp/demo/IcePack/hello/HelloI.h @@ -16,15 +16,15 @@ # define HELLO_API ICE_DECLSPEC_EXPORT #endif -class HELLO_API HelloFactoryI : public HelloFactory, public IceUtil::Mutex +class HELLO_API HelloFactoryI : public Demo::HelloFactory, public IceUtil::Mutex { public: HelloFactoryI(); - virtual HelloPrx create(const std::string&, const Ice::Current&); + virtual Demo::HelloPrx create(const std::string&, const Ice::Current&); - virtual HelloPrx find(const std::string&, const Ice::Current&) const; + virtual Demo::HelloPrx find(const std::string&, const Ice::Current&) const; private: @@ -32,7 +32,7 @@ private: }; -class HELLO_API HelloI : public Hello +class HELLO_API HelloI : public Demo::Hello { public: diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp index 1d63eb1785f..c516fca9a3a 100644 --- a/cpp/demo/IcePack/simple/Client.cpp +++ b/cpp/demo/IcePack/simple/Client.cpp @@ -12,6 +12,7 @@ #include <Hello.h> using namespace std; +using namespace Demo; void menu() diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice index 9b532a2e9a8..4ce83cbc4c1 100644 --- a/cpp/demo/IcePack/simple/Hello.ice +++ b/cpp/demo/IcePack/simple/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/cpp/demo/IcePack/simple/HelloI.h b/cpp/demo/IcePack/simple/HelloI.h index b3ca691c7e0..9d78cbe4f50 100644 --- a/cpp/demo/IcePack/simple/HelloI.h +++ b/cpp/demo/IcePack/simple/HelloI.h @@ -12,7 +12,7 @@ #include <Hello.h> -class HelloI : public Hello +class HelloI : public Demo::Hello { public: diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice index 23710fdc4fd..4be4d33ab04 100644 --- a/cpp/demo/IceStorm/clock/Clock.ice +++ b/cpp/demo/IceStorm/clock/Clock.ice @@ -10,9 +10,14 @@ #ifndef CLOCK_ICE #define CLOCK_ICE +module Demo +{ + interface Clock { void tick(); }; +}; + #endif diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h index 3918b942a10..6a6a386875b 100644 --- a/cpp/demo/IceStorm/clock/ClockI.h +++ b/cpp/demo/IceStorm/clock/ClockI.h @@ -12,7 +12,7 @@ #include <Clock.h> -class ClockI : public Clock +class ClockI : public Demo::Clock { public: diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp index 9c358d87d99..42c970832a4 100644 --- a/cpp/demo/IceStorm/clock/Publisher.cpp +++ b/cpp/demo/IceStorm/clock/Publisher.cpp @@ -13,6 +13,7 @@ #include <Clock.h> using namespace std; +using namespace Demo; class Publisher : public Ice::Application { diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp index 2394b8d568e..e4387fae9de 100644 --- a/cpp/demo/IceStorm/clock/Subscriber.cpp +++ b/cpp/demo/IceStorm/clock/Subscriber.cpp @@ -16,6 +16,7 @@ #include <map> using namespace std; +using namespace Demo; class Subscriber : public Ice::Application { diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 904a9e980f5..c3da0386092 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -81,6 +81,7 @@ class Const; class Unit; class CICompare; class DerivedToBaseCompare; +class ModulePartialCompare; typedef ::IceUtil::Handle<GrammarBase> GrammarBasePtr; typedef ::IceUtil::Handle<SyntaxTreeBase> SyntaxTreeBasePtr; @@ -157,7 +158,6 @@ public: SLICE_API bool derivedToBaseCompare(const ExceptionPtr&, const ExceptionPtr&); #endif - // ---------------------------------------------------------------------- // ParserVisitor // ---------------------------------------------------------------------- @@ -418,6 +418,8 @@ public: void containerRecDependencies(std::set<ConstructedPtr>&); // Internal operation, don't use directly. bool checkIntroduced(const std::string&, ContainedPtr = 0); + bool nameIsLegal(const std::string&, const char *); + bool checkForGlobalDef(const std::string&, const char *); protected: @@ -923,10 +925,11 @@ public: bool usesProxies() const; bool usesNonLocals() const; bool usesConsts() const; + bool hardErrorForGlobals() const; // TODO: remove this once global definitions are outlawed. StringList includeFiles() const; - int parse(FILE*, bool); + int parse(FILE*, bool, bool = true); // TODO: remove third parameter once global definitions are outlawed. virtual void destroy(); virtual void visit(ParserVisitor*); @@ -941,6 +944,7 @@ private: bool _all; bool _allowIcePrefix; bool _caseSensitive; + bool _hardErrorForGlobals; // TODO: remove this once global definitions are outlawed. int _errors; std::string _currentComment; int _currentLine; @@ -954,7 +958,7 @@ private: std::map<std::string, ContainedList> _contentMap; }; -extern SLICE_API Unit* unit; // The current parser for bison/flex +extern SLICE_API Unit* unit; // The current parser for bison/flex } diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y index 166f5c45a1e..b182aebc0e5 100644 --- a/cpp/src/Slice/Grammar.y +++ b/cpp/src/Slice/Grammar.y @@ -88,6 +88,10 @@ slice_error(const char* s) %token ICE_FLOATING_POINT_LITERAL %token ICE_IDENT_OP %token ICE_KEYWORD_OP +%token ICE_METADATA_OPEN +%token ICE_METADATA_CLOSE +%token ICE_GLOBAL_METADATA_OPEN +%token ICE_GLOBAL_METADATA_CLOSE %% @@ -103,16 +107,16 @@ start // ---------------------------------------------------------------------- global_meta_data // ---------------------------------------------------------------------- -: '[' '[' string_list ']' ']' +: ICE_GLOBAL_METADATA_OPEN string_list ICE_GLOBAL_METADATA_CLOSE { - $$ = $3; + $$ = $2; } ; // ---------------------------------------------------------------------- meta_data // ---------------------------------------------------------------------- -: '[' string_list ']' +: ICE_METADATA_OPEN string_list ICE_METADATA_CLOSE { $$ = $2; } @@ -145,10 +149,11 @@ definitions unit->setSeenDefinition(); } ';' definitions -| error ';' definitions +| error ';' { yyerrok; } +definitions | meta_data definition { unit->error("`;' missing after definition"); @@ -223,18 +228,28 @@ module_def StringTokPtr ident = StringTokPtr::dynamicCast($2); ContainerPtr cont = unit->currentContainer(); ModulePtr module = cont->createModule(ident->v); - if(!module) + if(module) + { + cont->checkIntroduced(ident->v, module); + unit->pushContainer(module); + $$ = module; + } + else { - YYERROR; // Can't continue, jump to next yyerrok + $$ = 0; } - cont->checkIntroduced(ident->v, module); - unit->pushContainer(module); - $$ = module; } '{' definitions '}' { - unit->popContainer(); - $$ = $3; + if($3) + { + unit->popContainer(); + $$ = $3; + } + else + { + $$ = 0; + } } ; @@ -273,17 +288,19 @@ exception_def ExceptionPtr base = ExceptionPtr::dynamicCast($3); ContainerPtr cont = unit->currentContainer(); ExceptionPtr ex = cont->createException(ident->v, base, local->v); - if(!ex) + if(ex) { - YYERROR; // Can't continue, jump to next yyerrok + cont->checkIntroduced(ident->v, ex); + unit->pushContainer(ex); } - cont->checkIntroduced(ident->v, ex); - unit->pushContainer(ex); $$ = ex; } '{' exception_exports '}' { - unit->popContainer(); + if($4); + { + unit->popContainer(); + } $$ = $4; } ; @@ -382,17 +399,19 @@ struct_def StringTokPtr ident = StringTokPtr::dynamicCast($2); ContainerPtr cont = unit->currentContainer(); StructPtr st = cont->createStruct(ident->v, local->v); - if(!st) + if(st) { - YYERROR; // Can't continue, jump to next yyerrok + cont->checkIntroduced(ident->v, st); + unit->pushContainer(st); } - cont->checkIntroduced(ident->v, st); - unit->pushContainer(st); $$ = st; } '{' struct_exports '}' { - unit->popContainer(); + if($3) + { + unit->popContainer(); + } $$ = $3; // @@ -480,18 +499,28 @@ class_def bases->v.push_front(base); } ClassDefPtr cl = cont->createClassDef(ident->v, false, bases->v, local->v); - if(!cl) + if(cl) { - YYERROR; // Can't continue, jump to next yyerrok + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + $$ = cl; + } + else + { + $$ = 0; } - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - $$ = cl; } '{' class_exports '}' { - unit->popContainer(); - $$ = $5; + if($5) + { + unit->popContainer(); + $$ = $5; + } + else + { + $$ = 0; + } } ; @@ -664,66 +693,144 @@ operation_preamble TypePtr returnType = TypePtr::dynamicCast($1); string name = StringTokPtr::dynamicCast($2)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType); - cl->checkIntroduced(name, op); - unit->pushContainer(op); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + $$ = op; + } + else + { + $$ = 0; + } + } + else + { + $$ = 0; + } } | ICE_NONMUTATING return_type ICE_IDENT_OP { TypePtr returnType = TypePtr::dynamicCast($2); string name = StringTokPtr::dynamicCast($3)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType, Operation::Nonmutating); - cl->checkIntroduced(name, op); - unit->pushContainer(op); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType, Operation::Nonmutating); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + $$ = op; + } + else + { + $$ = 0; + } + } + else + { + $$ = 0; + } } | ICE_IDEMPOTENT return_type ICE_IDENT_OP { TypePtr returnType = TypePtr::dynamicCast($2); string name = StringTokPtr::dynamicCast($3)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType, Operation::Idempotent); - cl->checkIntroduced(name, op); - unit->pushContainer(op); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType, Operation::Idempotent); + if(op) + { + cl->checkIntroduced(name, op); + unit->pushContainer(op); + $$ = op; + } + else + { + $$ = 0; + } + } + else + { + $$ = 0; + } } | return_type ICE_KEYWORD_OP { TypePtr returnType = TypePtr::dynamicCast($1); string name = StringTokPtr::dynamicCast($2)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType); - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + $$ = op; + } + else + { + $$ = 0; + } + } + else + { + $$ = 0; + } } | ICE_NONMUTATING return_type ICE_KEYWORD_OP { TypePtr returnType = TypePtr::dynamicCast($2); string name = StringTokPtr::dynamicCast($3)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType, Operation::Nonmutating); - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType, Operation::Nonmutating); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + $$ = op; + } + else + { + $$ = 0; + } + } + else + { + $$ = 0; + } } | ICE_IDEMPOTENT return_type ICE_KEYWORD_OP { TypePtr returnType = TypePtr::dynamicCast($2); string name = StringTokPtr::dynamicCast($3)->v; ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer()); - assert(cl); - OperationPtr op = cl->createOperation(name, returnType, Operation::Idempotent); - unit->pushContainer(op); - unit->error("keyword `" + name + "' cannot be used as operation name"); - $$ = op; + if(cl) + { + OperationPtr op = cl->createOperation(name, returnType, Operation::Idempotent); + if(op) + { + unit->pushContainer(op); + unit->error("keyword `" + name + "' cannot be used as operation name"); + $$ = op; + } + else + { + return 0; + } + } + else + { + $$ = 0; + } } ; @@ -732,8 +839,15 @@ operation // ---------------------------------------------------------------------- : operation_preamble parameters ')' { - unit->popContainer(); - $$ = $1; + if($1) + { + unit->popContainer(); + $$ = $1; + } + else + { + $$ = 0; + } } throws { @@ -747,7 +861,10 @@ throws } | operation_preamble error ')' { - unit->popContainer(); + if($1) + { + unit->popContainer(); + } yyerrok; } throws @@ -808,18 +925,28 @@ interface_def ContainerPtr cont = unit->currentContainer(); ClassListTokPtr bases = ClassListTokPtr::dynamicCast($3); ClassDefPtr cl = cont->createClassDef(ident->v, true, bases->v, local->v); - if(!cl) + if(cl) { - YYERROR; // Can't continue, jump to next yyerrok + cont->checkIntroduced(ident->v, cl); + unit->pushContainer(cl); + $$ = cl; + } + else + { + $$ = 0; } - cont->checkIntroduced(ident->v, cl); - unit->pushContainer(cl); - $$ = cl; } '{' interface_exports '}' { - unit->popContainer(); - $$ = $4; + if($4) + { + unit->popContainer(); + $$ = $4; + } + else + { + $$ = 0; + } } ; diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index 3f1fd5ec1a5..6aeef20ab46 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -424,6 +424,7 @@ Slice::Container::createModule(const string& name) ContainedList matches = _unit->findContents(thisScope() + name); matches.sort(); // Modules can occur many times... matches.unique(); // ... but we only want one instance of each. + for(ContainedList::const_iterator p = matches.begin(); p != matches.end(); ++p) { bool differsOnlyInCase = !_unit->caseSensitive() && matches.front()->name() != name; @@ -438,22 +439,27 @@ Slice::Container::createModule(const string& name) return 0; } } - else if(differsOnlyInCase) + else if(!differsOnlyInCase) { - string msg = "module `" + name + "' differs only in capitalization from "; - msg += matches.front()->kindOf() + " name `" + matches.front()->name() + "'"; + string msg = "redefinition of " + matches.front()->kindOf() + " `" + matches.front()->name(); + msg += "' as module"; _unit->error(msg); return 0; } else { - string msg = "redefinition of " + matches.front()->kindOf() + " `" + matches.front()->name(); - msg += "' as module"; + string msg = "module `" + name + "' differs only in capitalization from "; + msg += matches.front()->kindOf() + " name `" + matches.front()->name() + "'"; _unit->error(msg); return 0; } } + if(!nameIsLegal(name, "module")) + { + return 0; + } + ModulePtr q = new Module(this, name); _contents.push_back(q); return q; @@ -517,6 +523,16 @@ Slice::Container::createClassDef(const string& name, bool intf, const ClassList& return 0; } + if(!nameIsLegal(name, intf ? "interface" : "class")) + { + return 0; + } + + if(!checkForGlobalDef(name, intf ? "interface" : "class")) + { + return 0; + } + ClassDecl::checkBasesAreLegal(name, local, bases, _unit); ClassDefPtr def = new ClassDef(this, name, intf, bases, local); @@ -589,6 +605,16 @@ Slice::Container::createClassDecl(const string& name, bool intf, bool local) } } + if(!nameIsLegal(name, intf ? "interface" : "class")) + { + return 0; + } + + if(!checkForGlobalDef(name, intf ? "interface" : "class")) + { + return 0; + } + // // Multiple declarations are permissible. But if we do already // have a declaration for the class in this container, we don't @@ -608,6 +634,7 @@ Slice::Container::createClassDecl(const string& name, bool intf, bool local) } } + _unit->currentContainer(); ClassDeclPtr decl = new ClassDecl(this, name, intf, local); _contents.push_back(decl); @@ -650,6 +677,10 @@ Slice::Container::createException(const string& name, const ExceptionPtr& base, } } + nameIsLegal(name, "exception"); // Don't return here -- we create the exception anyway + + checkForGlobalDef(name, "exception"); // Don't return here -- we create the exception anyway + // // If this definition is non-local, base cannot be local. // @@ -694,6 +725,10 @@ Slice::Container::createStruct(const string& name, bool local) } } + nameIsLegal(name, "structure"); // Don't return here -- we create the struct anyway. + + checkForGlobalDef(name, "structure"); // Don't return here -- we create the struct anyway. + StructPtr p = new Struct(this, name, local); _contents.push_back(p); return p; @@ -730,6 +765,10 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, bool l } } + nameIsLegal(name, "sequence"); // Don't return here -- we create the sequence anyway. + + checkForGlobalDef(name, "sequence"); // Don't return here -- we create the sequence anyway. + // // If sequence is non-local, element type cannot be local. // @@ -775,6 +814,10 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c } } + nameIsLegal(name, "dictionary"); // Don't return here -- we create the dictionary anyway. + + checkForGlobalDef(name, "dictionary"); // Don't return here -- we create the dictionary anyway. + if(!Dictionary::legalKeyType(keyType)) { _unit->error("dictionary `" + name + "' uses an illegal key type"); @@ -831,6 +874,10 @@ Slice::Container::createEnum(const string& name, bool local) } } + nameIsLegal(name, "enumeration"); // Don't return here -- we create the enumeration anyway. + + checkForGlobalDef(name, "enumeration"); // Don't return here -- we create the enumeration anyway. + EnumPtr p = new Enum(this, name, local); _contents.push_back(p); return p; @@ -867,6 +914,8 @@ Slice::Container::createEnumerator(const string& name) } } + nameIsLegal(name, "enumerator"); // Don't return here -- we create the enumerator anyway. + EnumeratorPtr p = new Enumerator(this, name); _contents.push_back(p); return p; @@ -904,6 +953,10 @@ Slice::Container::createConst(const string name, const TypePtr& constType, } } + nameIsLegal(name, "constant"); // Don't return here -- we create the constant anyway. + + checkForGlobalDef(name, "constant"); // Don't return here -- we create the constant anyway. + // // Check that the constant type is legal. // @@ -1788,6 +1841,68 @@ Slice::Container::checkIntroduced(const string& scoped, ContainedPtr namedThing) return true; } +bool +Slice::Container::nameIsLegal(const string& newName, const char* newConstruct) +{ + // + // Check whether enclosing module has the same name. + // + if(ModulePtr::dynamicCast(this)) + { + ContainedPtr contained = ContainedPtr::dynamicCast(this); + assert(contained); + if(newName == contained->name()) + { + string msg = newConstruct; + msg += " name `" + newName + "' must differ from the name of its immediately enclosing module"; + _unit->error(msg); + return false; + } + if(!_unit->caseSensitive()) + { + string name = newName; + toLower(name); + string thisName = contained->name(); + toLower(thisName); + if(name == thisName) + { + string msg = newConstruct; + msg += " name `" + name + "' cannot differ only in capitalization from its immediately enclosing " + "module name `" + contained->name() + "'"; + _unit->error(msg); + return false; + } + } + } + return true; +} + +bool +Slice::Container::checkForGlobalDef(const string& name, const char* newConstruct) +{ + if(dynamic_cast<Unit*>(this) && strcmp(newConstruct, "module")) + { + if(_unit->hardErrorForGlobals()) + { + static const string vowels = "aeiou"; + string glottalStop; + if(vowels.find_first_of(newConstruct[0]) != string::npos) + { + glottalStop = "n"; + } + _unit->error("`" + name + "': a" + glottalStop + " " + newConstruct + + " can be defined only at module scope"); + return false; + } + else + { + _unit->warning("`" + name + "': " + newConstruct + " definitions at global scope are deprecated"); + } + return true; + } + return true; +} + Slice::Container::Container(const UnitPtr& unit) : SyntaxTreeBase(unit) { @@ -2106,6 +2221,7 @@ Slice::ClassDecl::ClassDecl(const ContainerPtr& container, const string& name, b Constructed(container, name, local), _interface(intf) { + _unit->currentContainer(); } // @@ -2276,7 +2392,6 @@ Slice::ClassDef::createOperation(const string& name, return 0; } - // // Check whether enclosing interface/class has the same name. // @@ -4803,20 +4918,31 @@ Slice::Unit::usesConsts() const return false; } +bool +Slice::Unit::hardErrorForGlobals() const +{ + return _hardErrorForGlobals; +} + StringList Slice::Unit::includeFiles() const { return _includeFiles; } +// +// TODO: remove third parameter once global definitions are outlawed. +// int -Slice::Unit::parse(FILE* file, bool debug) +Slice::Unit::parse(FILE* file, bool debug, bool hardErrorForGlobals) { slice_debug = debug ? 1 : 0; assert(!Slice::unit); Slice::unit = this; + _hardErrorForGlobals = hardErrorForGlobals; // TODO: remove this once global definitions are outlawed. + _currentComment = ""; _currentLine = 1; _currentIncludeLevel = 0; diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 76525a689a5..e80e2e0f753 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -131,6 +131,22 @@ floating_literal (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e return ICE_SCOPE_DELIMITER; } +"[" { + return ICE_METADATA_OPEN; +} + +"]" { + return ICE_METADATA_CLOSE; +} + +"[[" { + return ICE_GLOBAL_METADATA_OPEN; +} + +"]]" { + return ICE_GLOBAL_METADATA_CLOSE; +} + {identifier}[[:space:]]*"(" { StringTokPtr ident = new StringTok; ident->v = *yytext == '\\' ? yytext + 1 : yytext; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 24f07363326..1ad5b03a644 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -401,7 +401,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) C << sp << nl << "const ::std::string " << scoped.substr(2) << "::_name = \"" << p->scoped().substr(2) << "\";"; C << sp << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_name() const"; C << sb; - C << nl << "return " << scoped.substr(2) << "::_name;"; + C << nl << "return " << scoped << "::_name;"; C << eb; if(p->isLocal()) @@ -426,7 +426,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) H << sp << nl << "static const ::IceInternal::UserExceptionFactoryPtr& ice_factory();"; C << sp << nl << "const ::IceInternal::UserExceptionFactoryPtr&"; - C << nl << scoped.substr(2) << "::ice_factory()"; + C << nl << scoped << "::ice_factory()"; C << sb; C << nl << "return _factory;"; C << eb; diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 1b554a842e5..8caeb79562e 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -270,7 +270,7 @@ main(int argc, char* argv[]) } UnitPtr u = Unit::createUnit(false, false, ice, caseSensitive); - int parseStatus = u->parse(cppHandle, debug); + int parseStatus = u->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp index a48fb324789..11bb946ee98 100644 --- a/cpp/src/slice2docbook/Main.cpp +++ b/cpp/src/slice2docbook/Main.cpp @@ -202,7 +202,7 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - status = p->parse(cppHandle, debug); + status = p->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 96907c2e5b7..59baaff2c16 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -825,7 +825,7 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - status = u->parse(cppHandle, debug); + status = u->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 129e52f0162..4079ba2ed0a 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -883,7 +883,7 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - status = u->parse(cppHandle, debug); + status = u->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 8676ec64a96..d352dda0e22 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -236,7 +236,7 @@ main(int argc, char* argv[]) } UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive); - int parseStatus = p->parse(cppHandle, debug); + int parseStatus = p->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile index f36f22aeff3..5c80289b11e 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ b/cpp/test/FreezeScript/dbmap/Makefile @@ -31,7 +31,7 @@ $(CLIENT): $(OBJS) IntSMap.h IntSMap.cpp: $(SLICE2FREEZE) rm -f IntSMap.h IntSMap.cpp - $(SLICE2FREEZE) --dict IntSMap,int,::S IntSMap TestOld.ice + $(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice clean:: rm -f IntSMap.h IntSMap.cpp diff --git a/cpp/test/FreezeScript/dbmap/TestNew.ice b/cpp/test/FreezeScript/dbmap/TestNew.ice index 1a1b1006faf..8b7d072801f 100644 --- a/cpp/test/FreezeScript/dbmap/TestNew.ice +++ b/cpp/test/FreezeScript/dbmap/TestNew.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E3, E1, E2 }; sequence<string> BoolStringSeq; @@ -201,3 +204,5 @@ struct S C dAsCObject; D dObject; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/TestOld.ice b/cpp/test/FreezeScript/dbmap/TestOld.ice index 04c0270d2ee..a40b8a9f4e8 100644 --- a/cpp/test/FreezeScript/dbmap/TestOld.ice +++ b/cpp/test/FreezeScript/dbmap/TestOld.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; sequence<bool> BoolStringSeq; @@ -201,3 +204,5 @@ struct S C dAsCObject; D dObject; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/check.xml b/cpp/test/FreezeScript/dbmap/check.xml index c8cfcd1331e..8194ef023b3 100644 --- a/cpp/test/FreezeScript/dbmap/check.xml +++ b/cpp/test/FreezeScript/dbmap/check.xml @@ -1,14 +1,14 @@ <transformdb> - <database key="int" value="::S"> + <database key="int" value="::Test::S"> <record> </record> </database> <!-- enum ::E --> - <transform type="::E"/> + <transform type="::Test::E"/> <!-- struct ::S --> - <transform type="::S"> + <transform type="::Test::S"> <!-- Primitives --> @@ -54,7 +54,7 @@ <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.stringToEnum != ::New::E1"/> + <fail test="new.stringToEnum != ::New::Test::E1"/> <!-- Sequences --> @@ -217,8 +217,8 @@ <fail test="new.stringSeqToStringSeq[1] != 'world'"/> <fail test="new.stringSeqToEnumSeq.length != 2"/> - <fail test="new.stringSeqToEnumSeq[0] != ::New::E2"/> - <fail test="new.stringSeqToEnumSeq[1] != ::New::E3"/> + <fail test="new.stringSeqToEnumSeq[0] != ::New::Test::E2"/> + <fail test="new.stringSeqToEnumSeq[1] != ::New::Test::E3"/> <!-- Dictionaries --> @@ -269,40 +269,40 @@ <fail test="new.stringToDoubleDict[1] - 9290.9 > 0.001"/> <fail test="new.stringToEnumDict.length != 2"/> - <fail test="new.stringToEnumDict[0] != ::New::E2"/> - <fail test="new.stringToEnumDict[1] != ::New::E3"/> + <fail test="new.stringToEnumDict[0] != ::New::Test::E2"/> + <fail test="new.stringToEnumDict[1] != ::New::Test::E3"/> <!-- Objects --> <fail test="new.nilObject != nil"/> - <fail test="new.baseObject.ice_id != '::F'"/> + <fail test="new.baseObject.ice_id != '::Test::F'"/> <fail test="new.baseObject.stringToEnumSeq.length != 2"/> - <fail test="new.baseObject.stringToEnumSeq[0] != ::New::E1"/> - <fail test="new.baseObject.stringToEnumSeq[1] != ::New::E3"/> + <fail test="new.baseObject.stringToEnumSeq[0] != ::New::Test::E1"/> + <fail test="new.baseObject.stringToEnumSeq[1] != ::New::Test::E3"/> - <fail test="new.cObject.ice_id != '::C'"/> + <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 != '::D'"/> + <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 != '::F'"/> + <fail test="new.dAsCObject.obj.ice_id != '::Test::F'"/> - <fail test="new.dObject.ice_id != '::D'"/> + <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 != '::C'"/> + <fail test="new.dObject.obj.ice_id != '::Test::C'"/> </transform> </transformdb> diff --git a/cpp/test/FreezeScript/dbmap/fail/01.err b/cpp/test/FreezeScript/dbmap/fail/01.err index 664b9c6bf48..1249c9b14d4 100644 --- a/cpp/test/FreezeScript/dbmap/fail/01.err +++ b/cpp/test/FreezeScript/dbmap/fail/01.err @@ -1,44 +1,44 @@ -transformdb: unsupported type change in ::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::D1 value type from bool to byte +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 ::E -transformdb: unsupported type change in c1m10 from bool to struct ::S1 -transformdb: unsupported type change in c1m11 from bool to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from bool to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from bool to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from bool to struct ::S1 -transformdb: unsupported type change in c2m11 from bool to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from bool to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from bool to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from bool to struct ::S1 -transformdb: unsupported type change in m11 from bool to sequence ::Seq1 -transformdb: unsupported type change in m12 from bool to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from bool to class ::C1 +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 index 95007248cb7..1d8f02a9946 100644 --- a/cpp/test/FreezeScript/dbmap/fail/01_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/01_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 1c9b879782b..547335926a7 100644 --- a/cpp/test/FreezeScript/dbmap/fail/01_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/01_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 bool m15; bool m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/02.err b/cpp/test/FreezeScript/dbmap/fail/02.err index 7a3bcf56e99..67d9d397708 100644 --- a/cpp/test/FreezeScript/dbmap/fail/02.err +++ b/cpp/test/FreezeScript/dbmap/fail/02.err @@ -1,35 +1,35 @@ -transformdb: unsupported type change in ::Seq1 sequence type from byte to bool -transformdb: unsupported type change in ::D1 value type from byte to bool +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 ::E -transformdb: unsupported type change in c1m10 from byte to struct ::S1 -transformdb: unsupported type change in c1m11 from byte to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from byte to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from byte to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from byte to struct ::S1 -transformdb: unsupported type change in c2m11 from byte to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from byte to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from byte to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from byte to struct ::S1 -transformdb: unsupported type change in m11 from byte to sequence ::Seq1 -transformdb: unsupported type change in m12 from byte to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from byte to class ::C1 +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 index 628159b01eb..a558a573d28 100644 --- a/cpp/test/FreezeScript/dbmap/fail/02_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/02_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 0270d32834e..516c2c4ed6b 100644 --- a/cpp/test/FreezeScript/dbmap/fail/02_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/02_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 byte m15; byte m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/03.err b/cpp/test/FreezeScript/dbmap/fail/03.err index 352f19df7f9..7d7bfd7c595 100644 --- a/cpp/test/FreezeScript/dbmap/fail/03.err +++ b/cpp/test/FreezeScript/dbmap/fail/03.err @@ -1,35 +1,35 @@ -transformdb: unsupported type change in ::Seq1 sequence type from short to struct ::S1 -transformdb: unsupported type change in ::D1 value type from short to struct ::S1 +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 ::E -transformdb: unsupported type change in c1m10 from short to struct ::S1 -transformdb: unsupported type change in c1m11 from short to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from short to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from short to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from short to struct ::S1 -transformdb: unsupported type change in c2m11 from short to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from short to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from short to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from short to struct ::S1 -transformdb: unsupported type change in m11 from short to sequence ::Seq1 -transformdb: unsupported type change in m12 from short to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from short to class ::C1 +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 index 89c501765ab..9ef0b7f7b5a 100644 --- a/cpp/test/FreezeScript/dbmap/fail/03_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/03_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 53988b6d8f3..4c3a877c0fd 100644 --- a/cpp/test/FreezeScript/dbmap/fail/03_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/03_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 short m15; short m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/04.err b/cpp/test/FreezeScript/dbmap/fail/04.err index b8bf0c0e2fb..b969d55d395 100644 --- a/cpp/test/FreezeScript/dbmap/fail/04.err +++ b/cpp/test/FreezeScript/dbmap/fail/04.err @@ -1,34 +1,34 @@ -transformdb: unsupported type change in ::Seq1 sequence type from int to float +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 ::E -transformdb: unsupported type change in c1m10 from int to struct ::S1 -transformdb: unsupported type change in c1m11 from int to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from int to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from int to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from int to struct ::S1 -transformdb: unsupported type change in c2m11 from int to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from int to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from int to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from int to struct ::S1 -transformdb: unsupported type change in m11 from int to sequence ::Seq1 -transformdb: unsupported type change in m12 from int to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from int to class ::C1 +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 index 21efc77e365..154d617593b 100644 --- a/cpp/test/FreezeScript/dbmap/fail/04_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/04_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index a6dd1f313ee..31eedb0409d 100644 --- a/cpp/test/FreezeScript/dbmap/fail/04_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/04_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 int m15; int m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/05.err b/cpp/test/FreezeScript/dbmap/fail/05.err index af6991d8b18..ebd2b6ee32d 100644 --- a/cpp/test/FreezeScript/dbmap/fail/05.err +++ b/cpp/test/FreezeScript/dbmap/fail/05.err @@ -1,35 +1,35 @@ -transformdb: unsupported type change in ::Seq1 sequence type from long to enumeration ::E -transformdb: unsupported type change in ::D1 value type from long to enumeration ::E +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 ::E -transformdb: unsupported type change in c1m10 from long to struct ::S1 -transformdb: unsupported type change in c1m11 from long to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from long to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from long to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from long to struct ::S1 -transformdb: unsupported type change in c2m11 from long to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from long to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from long to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from long to struct ::S1 -transformdb: unsupported type change in m11 from long to sequence ::Seq1 -transformdb: unsupported type change in m12 from long to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from long to class ::C1 +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 index 05da7095b01..51bfa043e9f 100644 --- a/cpp/test/FreezeScript/dbmap/fail/05_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/05_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index c257d1a4c15..2afcb8233d7 100644 --- a/cpp/test/FreezeScript/dbmap/fail/05_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/05_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 long m15; long m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/06.err b/cpp/test/FreezeScript/dbmap/fail/06.err index c8b724face3..43eb0059c1f 100644 --- a/cpp/test/FreezeScript/dbmap/fail/06.err +++ b/cpp/test/FreezeScript/dbmap/fail/06.err @@ -1,41 +1,41 @@ -transformdb: unsupported type change in ::Seq1 sequence type from float to byte -transformdb: unsupported type change in ::D1 value type from float to byte +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 ::E -transformdb: unsupported type change in c1m10 from float to struct ::S1 -transformdb: unsupported type change in c1m11 from float to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from float to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from float to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from float to struct ::S1 -transformdb: unsupported type change in c2m11 from float to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from float to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from float to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from float to struct ::S1 -transformdb: unsupported type change in m11 from float to sequence ::Seq1 -transformdb: unsupported type change in m12 from float to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from float to class ::C1 +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 index 77d1c86b08d..54f29f94c83 100644 --- a/cpp/test/FreezeScript/dbmap/fail/06_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/06_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 393c379258c..0dd9413081e 100644 --- a/cpp/test/FreezeScript/dbmap/fail/06_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/06_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 float m15; float m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/07.err b/cpp/test/FreezeScript/dbmap/fail/07.err index 3621a281a79..9e14990bb14 100644 --- a/cpp/test/FreezeScript/dbmap/fail/07.err +++ b/cpp/test/FreezeScript/dbmap/fail/07.err @@ -1,41 +1,41 @@ -transformdb: unsupported type change in ::Seq1 sequence type from double to struct ::S1 -transformdb: unsupported type change in ::D1 value type from double to byte +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 ::E -transformdb: unsupported type change in c1m10 from double to struct ::S1 -transformdb: unsupported type change in c1m11 from double to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from double to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c1m16 from double to class ::C1 +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 ::E -transformdb: unsupported type change in c2m10 from double to struct ::S1 -transformdb: unsupported type change in c2m11 from double to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from double to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in c2m16 from double to class ::C1 +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 ::E -transformdb: unsupported type change in m10 from double to struct ::S1 -transformdb: unsupported type change in m11 from double to sequence ::Seq1 -transformdb: unsupported type change in m12 from double to dictionary ::D1 +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 ::C1* -transformdb: unsupported type change in m16 from double to class ::C1 +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 index 960131cdd93..61727809723 100644 --- a/cpp/test/FreezeScript/dbmap/fail/07_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/07_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 109068d29df..83b79f3ed7a 100644 --- a/cpp/test/FreezeScript/dbmap/fail/07_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/07_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 double m15; double m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/08.err b/cpp/test/FreezeScript/dbmap/fail/08.err index 33f27553271..3f0853d4e93 100644 --- a/cpp/test/FreezeScript/dbmap/fail/08.err +++ b/cpp/test/FreezeScript/dbmap/fail/08.err @@ -1,17 +1,17 @@ -transformdb: unsupported type change in ::Seq1 sequence type from string to struct ::S1 -transformdb: unsupported type change in ::D1 value type from string to struct ::S1 -transformdb: unsupported type change in c1m10 from string to struct ::S1 -transformdb: unsupported type change in c1m11 from string to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from string to dictionary ::D1 +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 ::C1 -transformdb: unsupported type change in c2m10 from string to struct ::S1 -transformdb: unsupported type change in c2m11 from string to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from string to dictionary ::D1 +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 ::C1 -transformdb: unsupported type change in m10 from string to struct ::S1 -transformdb: unsupported type change in m11 from string to sequence ::Seq1 -transformdb: unsupported type change in m12 from string to dictionary ::D1 +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 ::C1 +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 index f92a31c3114..5255ff12862 100644 --- a/cpp/test/FreezeScript/dbmap/fail/08_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/08_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index d6b81875ce3..7b0052eef79 100644 --- a/cpp/test/FreezeScript/dbmap/fail/08_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/08_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 string m15; string m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/09.err b/cpp/test/FreezeScript/dbmap/fail/09.err index ed28164334c..65eaeba3209 100644 --- a/cpp/test/FreezeScript/dbmap/fail/09.err +++ b/cpp/test/FreezeScript/dbmap/fail/09.err @@ -1,44 +1,44 @@ -transformdb: unsupported type change in ::Seq1 sequence type from enumeration ::E to byte -transformdb: unsupported type change in ::D1 value type from enumeration ::E to byte -transformdb: unsupported type change in c1m1 from enumeration ::E to bool -transformdb: unsupported type change in c1m2 from enumeration ::E to byte -transformdb: unsupported type change in c1m3 from enumeration ::E to short -transformdb: unsupported type change in c1m4 from enumeration ::E to int -transformdb: unsupported type change in c1m5 from enumeration ::E to long -transformdb: unsupported type change in c1m6 from enumeration ::E to float -transformdb: unsupported type change in c1m7 from enumeration ::E to double -transformdb: unsupported type change in c1m10 from enumeration ::E to struct ::S1 -transformdb: unsupported type change in c1m11 from enumeration ::E to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from enumeration ::E to dictionary ::D1 -transformdb: unsupported type change in c1m13 from enumeration ::E to Object* -transformdb: unsupported type change in c1m14 from enumeration ::E to Object -transformdb: unsupported type change in c1m15 from enumeration ::E to ::C1* -transformdb: unsupported type change in c1m16 from enumeration ::E to class ::C1 -transformdb: unsupported type change in c2m1 from enumeration ::E to bool -transformdb: unsupported type change in c2m2 from enumeration ::E to byte -transformdb: unsupported type change in c2m3 from enumeration ::E to short -transformdb: unsupported type change in c2m4 from enumeration ::E to int -transformdb: unsupported type change in c2m5 from enumeration ::E to long -transformdb: unsupported type change in c2m6 from enumeration ::E to float -transformdb: unsupported type change in c2m7 from enumeration ::E to double -transformdb: unsupported type change in c2m10 from enumeration ::E to struct ::S1 -transformdb: unsupported type change in c2m11 from enumeration ::E to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from enumeration ::E to dictionary ::D1 -transformdb: unsupported type change in c2m13 from enumeration ::E to Object* -transformdb: unsupported type change in c2m14 from enumeration ::E to Object -transformdb: unsupported type change in c2m15 from enumeration ::E to ::C1* -transformdb: unsupported type change in c2m16 from enumeration ::E to class ::C1 -transformdb: unsupported type change in m1 from enumeration ::E to bool -transformdb: unsupported type change in m2 from enumeration ::E to byte -transformdb: unsupported type change in m3 from enumeration ::E to short -transformdb: unsupported type change in m4 from enumeration ::E to int -transformdb: unsupported type change in m5 from enumeration ::E to long -transformdb: unsupported type change in m6 from enumeration ::E to float -transformdb: unsupported type change in m7 from enumeration ::E to double -transformdb: unsupported type change in m10 from enumeration ::E to struct ::S1 -transformdb: unsupported type change in m11 from enumeration ::E to sequence ::Seq1 -transformdb: unsupported type change in m12 from enumeration ::E to dictionary ::D1 -transformdb: unsupported type change in m13 from enumeration ::E to Object* -transformdb: unsupported type change in m14 from enumeration ::E to Object -transformdb: unsupported type change in m15 from enumeration ::E to ::C1* -transformdb: unsupported type change in m16 from enumeration ::E to class ::C1 +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 index 4ab3a4c4ebe..aaabe65fc70 100644 --- a/cpp/test/FreezeScript/dbmap/fail/09_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/09_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 4d1e28beeae..d90ba6f4ad4 100644 --- a/cpp/test/FreezeScript/dbmap/fail/09_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/09_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 E m15; E m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/10.err b/cpp/test/FreezeScript/dbmap/fail/10.err index 2a915fe6aa2..4d6f059cb57 100644 --- a/cpp/test/FreezeScript/dbmap/fail/10.err +++ b/cpp/test/FreezeScript/dbmap/fail/10.err @@ -1,47 +1,47 @@ -transformdb: unsupported type change in ::Seq1 sequence type from struct ::S1 to bool -transformdb: unsupported type change in ::D1 value type from struct ::S1 to bool -transformdb: unsupported type change in c1m1 from struct ::S1 to bool -transformdb: unsupported type change in c1m2 from struct ::S1 to byte -transformdb: unsupported type change in c1m3 from struct ::S1 to short -transformdb: unsupported type change in c1m4 from struct ::S1 to int -transformdb: unsupported type change in c1m5 from struct ::S1 to long -transformdb: unsupported type change in c1m6 from struct ::S1 to float -transformdb: unsupported type change in c1m7 from struct ::S1 to double -transformdb: unsupported type change in c1m8 from struct ::S1 to string -transformdb: unsupported type change in c1m9 from struct ::S1 to enumeration ::E -transformdb: unsupported type change in c1m11 from struct ::S1 to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from struct ::S1 to dictionary ::D1 -transformdb: unsupported type change in c1m13 from struct ::S1 to Object* -transformdb: unsupported type change in c1m14 from struct ::S1 to Object -transformdb: unsupported type change in c1m15 from struct ::S1 to ::C1* -transformdb: unsupported type change in c1m16 from struct ::S1 to class ::C1 -transformdb: unsupported type change in c2m1 from struct ::S1 to bool -transformdb: unsupported type change in c2m2 from struct ::S1 to byte -transformdb: unsupported type change in c2m3 from struct ::S1 to short -transformdb: unsupported type change in c2m4 from struct ::S1 to int -transformdb: unsupported type change in c2m5 from struct ::S1 to long -transformdb: unsupported type change in c2m6 from struct ::S1 to float -transformdb: unsupported type change in c2m7 from struct ::S1 to double -transformdb: unsupported type change in c2m8 from struct ::S1 to string -transformdb: unsupported type change in c2m9 from struct ::S1 to enumeration ::E -transformdb: unsupported type change in c2m11 from struct ::S1 to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from struct ::S1 to dictionary ::D1 -transformdb: unsupported type change in c2m13 from struct ::S1 to Object* -transformdb: unsupported type change in c2m14 from struct ::S1 to Object -transformdb: unsupported type change in c2m15 from struct ::S1 to ::C1* -transformdb: unsupported type change in c2m16 from struct ::S1 to class ::C1 -transformdb: unsupported type change in m1 from struct ::S1 to bool -transformdb: unsupported type change in m2 from struct ::S1 to byte -transformdb: unsupported type change in m3 from struct ::S1 to short -transformdb: unsupported type change in m4 from struct ::S1 to int -transformdb: unsupported type change in m5 from struct ::S1 to long -transformdb: unsupported type change in m6 from struct ::S1 to float -transformdb: unsupported type change in m7 from struct ::S1 to double -transformdb: unsupported type change in m8 from struct ::S1 to string -transformdb: unsupported type change in m9 from struct ::S1 to enumeration ::E -transformdb: unsupported type change in m11 from struct ::S1 to sequence ::Seq1 -transformdb: unsupported type change in m12 from struct ::S1 to dictionary ::D1 -transformdb: unsupported type change in m13 from struct ::S1 to Object* -transformdb: unsupported type change in m14 from struct ::S1 to Object -transformdb: unsupported type change in m15 from struct ::S1 to ::C1* -transformdb: unsupported type change in m16 from struct ::S1 to class ::C1 +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 c1m16 from struct ::Test::S1 to class ::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 c2m16 from struct ::Test::S1 to class ::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* +transformdb: unsupported type change in m16 from struct ::Test::S1 to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/10_new.ice b/cpp/test/FreezeScript/dbmap/fail/10_new.ice index bdfc8678461..7aaed40a5c3 100644 --- a/cpp/test/FreezeScript/dbmap/fail/10_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/10_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 0e1c995e693..a50f3bd94b7 100644 --- a/cpp/test/FreezeScript/dbmap/fail/10_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/10_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 S1 m15; S1 m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/11.err b/cpp/test/FreezeScript/dbmap/fail/11.err index a66098ddafb..2b22dc60fd5 100644 --- a/cpp/test/FreezeScript/dbmap/fail/11.err +++ b/cpp/test/FreezeScript/dbmap/fail/11.err @@ -1,46 +1,46 @@ -transformdb: unsupported type change in ::D1 value type from sequence ::Seq1 to string -transformdb: unsupported type change in c1m1 from sequence ::Seq1 to bool -transformdb: unsupported type change in c1m2 from sequence ::Seq1 to byte -transformdb: unsupported type change in c1m3 from sequence ::Seq1 to short -transformdb: unsupported type change in c1m4 from sequence ::Seq1 to int -transformdb: unsupported type change in c1m5 from sequence ::Seq1 to long -transformdb: unsupported type change in c1m6 from sequence ::Seq1 to float -transformdb: unsupported type change in c1m7 from sequence ::Seq1 to double -transformdb: unsupported type change in c1m8 from sequence ::Seq1 to string -transformdb: unsupported type change in c1m9 from sequence ::Seq1 to enumeration ::E -transformdb: unsupported type change in c1m10 from sequence ::Seq1 to struct ::S1 -transformdb: unsupported type change in c1m12 from sequence ::Seq1 to dictionary ::D1 -transformdb: unsupported type change in c1m13 from sequence ::Seq1 to Object* -transformdb: unsupported type change in c1m14 from sequence ::Seq1 to Object -transformdb: unsupported type change in c1m15 from sequence ::Seq1 to ::C1* -transformdb: unsupported type change in c1m16 from sequence ::Seq1 to class ::C1 -transformdb: unsupported type change in c2m1 from sequence ::Seq1 to bool -transformdb: unsupported type change in c2m2 from sequence ::Seq1 to byte -transformdb: unsupported type change in c2m3 from sequence ::Seq1 to short -transformdb: unsupported type change in c2m4 from sequence ::Seq1 to int -transformdb: unsupported type change in c2m5 from sequence ::Seq1 to long -transformdb: unsupported type change in c2m6 from sequence ::Seq1 to float -transformdb: unsupported type change in c2m7 from sequence ::Seq1 to double -transformdb: unsupported type change in c2m8 from sequence ::Seq1 to string -transformdb: unsupported type change in c2m9 from sequence ::Seq1 to enumeration ::E -transformdb: unsupported type change in c2m10 from sequence ::Seq1 to struct ::S1 -transformdb: unsupported type change in c2m12 from sequence ::Seq1 to dictionary ::D1 -transformdb: unsupported type change in c2m13 from sequence ::Seq1 to Object* -transformdb: unsupported type change in c2m14 from sequence ::Seq1 to Object -transformdb: unsupported type change in c2m15 from sequence ::Seq1 to ::C1* -transformdb: unsupported type change in c2m16 from sequence ::Seq1 to class ::C1 -transformdb: unsupported type change in m1 from sequence ::Seq1 to bool -transformdb: unsupported type change in m2 from sequence ::Seq1 to byte -transformdb: unsupported type change in m3 from sequence ::Seq1 to short -transformdb: unsupported type change in m4 from sequence ::Seq1 to int -transformdb: unsupported type change in m5 from sequence ::Seq1 to long -transformdb: unsupported type change in m6 from sequence ::Seq1 to float -transformdb: unsupported type change in m7 from sequence ::Seq1 to double -transformdb: unsupported type change in m8 from sequence ::Seq1 to string -transformdb: unsupported type change in m9 from sequence ::Seq1 to enumeration ::E -transformdb: unsupported type change in m10 from sequence ::Seq1 to struct ::S1 -transformdb: unsupported type change in m12 from sequence ::Seq1 to dictionary ::D1 -transformdb: unsupported type change in m13 from sequence ::Seq1 to Object* -transformdb: unsupported type change in m14 from sequence ::Seq1 to Object -transformdb: unsupported type change in m15 from sequence ::Seq1 to ::C1* -transformdb: unsupported type change in m16 from sequence ::Seq1 to class ::C1 +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 index f213f3ca89d..3c77ad44d07 100644 --- a/cpp/test/FreezeScript/dbmap/fail/11_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/11_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index f746d94aa21..1a4fa770d08 100644 --- a/cpp/test/FreezeScript/dbmap/fail/11_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/11_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 Seq1 m15; Seq1 m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/12.err b/cpp/test/FreezeScript/dbmap/fail/12.err index a6a0b47137d..6cbc47fb7ed 100644 --- a/cpp/test/FreezeScript/dbmap/fail/12.err +++ b/cpp/test/FreezeScript/dbmap/fail/12.err @@ -1,47 +1,47 @@ -transformdb: unsupported type change in ::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from dictionary ::D1 to bool -transformdb: unsupported type change in c1m2 from dictionary ::D1 to byte -transformdb: unsupported type change in c1m3 from dictionary ::D1 to short -transformdb: unsupported type change in c1m4 from dictionary ::D1 to int -transformdb: unsupported type change in c1m5 from dictionary ::D1 to long -transformdb: unsupported type change in c1m6 from dictionary ::D1 to float -transformdb: unsupported type change in c1m7 from dictionary ::D1 to double -transformdb: unsupported type change in c1m8 from dictionary ::D1 to string -transformdb: unsupported type change in c1m9 from dictionary ::D1 to enumeration ::E -transformdb: unsupported type change in c1m10 from dictionary ::D1 to struct ::S1 -transformdb: unsupported type change in c1m11 from dictionary ::D1 to sequence ::Seq1 -transformdb: unsupported type change in c1m13 from dictionary ::D1 to Object* -transformdb: unsupported type change in c1m14 from dictionary ::D1 to Object -transformdb: unsupported type change in c1m15 from dictionary ::D1 to ::C1* -transformdb: unsupported type change in c1m16 from dictionary ::D1 to class ::C1 -transformdb: unsupported type change in c2m1 from dictionary ::D1 to bool -transformdb: unsupported type change in c2m2 from dictionary ::D1 to byte -transformdb: unsupported type change in c2m3 from dictionary ::D1 to short -transformdb: unsupported type change in c2m4 from dictionary ::D1 to int -transformdb: unsupported type change in c2m5 from dictionary ::D1 to long -transformdb: unsupported type change in c2m6 from dictionary ::D1 to float -transformdb: unsupported type change in c2m7 from dictionary ::D1 to double -transformdb: unsupported type change in c2m8 from dictionary ::D1 to string -transformdb: unsupported type change in c2m9 from dictionary ::D1 to enumeration ::E -transformdb: unsupported type change in c2m10 from dictionary ::D1 to struct ::S1 -transformdb: unsupported type change in c2m11 from dictionary ::D1 to sequence ::Seq1 -transformdb: unsupported type change in c2m13 from dictionary ::D1 to Object* -transformdb: unsupported type change in c2m14 from dictionary ::D1 to Object -transformdb: unsupported type change in c2m15 from dictionary ::D1 to ::C1* -transformdb: unsupported type change in c2m16 from dictionary ::D1 to class ::C1 -transformdb: unsupported type change in m1 from dictionary ::D1 to bool -transformdb: unsupported type change in m2 from dictionary ::D1 to byte -transformdb: unsupported type change in m3 from dictionary ::D1 to short -transformdb: unsupported type change in m4 from dictionary ::D1 to int -transformdb: unsupported type change in m5 from dictionary ::D1 to long -transformdb: unsupported type change in m6 from dictionary ::D1 to float -transformdb: unsupported type change in m7 from dictionary ::D1 to double -transformdb: unsupported type change in m8 from dictionary ::D1 to string -transformdb: unsupported type change in m9 from dictionary ::D1 to enumeration ::E -transformdb: unsupported type change in m10 from dictionary ::D1 to struct ::S1 -transformdb: unsupported type change in m11 from dictionary ::D1 to sequence ::Seq1 -transformdb: unsupported type change in m13 from dictionary ::D1 to Object* -transformdb: unsupported type change in m14 from dictionary ::D1 to Object -transformdb: unsupported type change in m15 from dictionary ::D1 to ::C1* -transformdb: unsupported type change in m16 from dictionary ::D1 to class ::C1 +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 index 08af2244eca..1ef129cb68c 100644 --- a/cpp/test/FreezeScript/dbmap/fail/12_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/12_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 510c42542f1..5800fa3aebf 100644 --- a/cpp/test/FreezeScript/dbmap/fail/12_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/12_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 D1 m15; D1 m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/13.err b/cpp/test/FreezeScript/dbmap/fail/13.err index 18ea5bbc213..ca23c5d18a1 100644 --- a/cpp/test/FreezeScript/dbmap/fail/13.err +++ b/cpp/test/FreezeScript/dbmap/fail/13.err @@ -5,12 +5,12 @@ 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 ::E -transformdb: unsupported type change in c1m10 from Object* to struct ::S1 -transformdb: unsupported type change in c1m11 from Object* to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from Object* to dictionary ::D1 +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 ::C1 +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 @@ -18,12 +18,12 @@ 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 ::E -transformdb: unsupported type change in c2m10 from Object* to struct ::S1 -transformdb: unsupported type change in c2m11 from Object* to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from Object* to dictionary ::D1 +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 ::C1 +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 @@ -31,9 +31,9 @@ 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 ::E -transformdb: unsupported type change in m10 from Object* to struct ::S1 -transformdb: unsupported type change in m11 from Object* to sequence ::Seq1 -transformdb: unsupported type change in m12 from Object* to dictionary ::D1 +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 ::C1 +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 index 0a6dd2ff08b..904702a48cd 100644 --- a/cpp/test/FreezeScript/dbmap/fail/13_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/13_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 7619e0c7caf..6acd628d942 100644 --- a/cpp/test/FreezeScript/dbmap/fail/13_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/13_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 Object* m15; Object* m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/14.err b/cpp/test/FreezeScript/dbmap/fail/14.err index 68ffc34141d..58cddc7461b 100644 --- a/cpp/test/FreezeScript/dbmap/fail/14.err +++ b/cpp/test/FreezeScript/dbmap/fail/14.err @@ -1,5 +1,5 @@ -transformdb: unsupported type change in ::Seq1 sequence type from Object to byte -transformdb: unsupported type change in ::D1 value type from Object to byte +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 @@ -8,12 +8,12 @@ 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 ::E -transformdb: unsupported type change in c1m10 from Object to struct ::S1 -transformdb: unsupported type change in c1m11 from Object to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from Object to dictionary ::D1 +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 ::C1* +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 @@ -22,12 +22,12 @@ 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 ::E -transformdb: unsupported type change in c2m10 from Object to struct ::S1 -transformdb: unsupported type change in c2m11 from Object to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from Object to dictionary ::D1 +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 ::C1* +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 @@ -36,9 +36,9 @@ 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 ::E -transformdb: unsupported type change in m10 from Object to struct ::S1 -transformdb: unsupported type change in m11 from Object to sequence ::Seq1 -transformdb: unsupported type change in m12 from Object to dictionary ::D1 +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 ::C1* +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 index 46d2990d543..c4a2aa6ab2f 100644 --- a/cpp/test/FreezeScript/dbmap/fail/14_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/14_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 268345df5c0..a34384f82eb 100644 --- a/cpp/test/FreezeScript/dbmap/fail/14_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/14_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 Object m15; Object m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/15.err b/cpp/test/FreezeScript/dbmap/fail/15.err index 7505c36b481..1cde3f2f390 100644 --- a/cpp/test/FreezeScript/dbmap/fail/15.err +++ b/cpp/test/FreezeScript/dbmap/fail/15.err @@ -1,41 +1,41 @@ -transformdb: unsupported type change in ::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from ::C1* to bool -transformdb: unsupported type change in c1m2 from ::C1* to byte -transformdb: unsupported type change in c1m3 from ::C1* to short -transformdb: unsupported type change in c1m4 from ::C1* to int -transformdb: unsupported type change in c1m5 from ::C1* to long -transformdb: unsupported type change in c1m6 from ::C1* to float -transformdb: unsupported type change in c1m7 from ::C1* to double -transformdb: unsupported type change in c1m9 from ::C1* to enumeration ::E -transformdb: unsupported type change in c1m10 from ::C1* to struct ::S1 -transformdb: unsupported type change in c1m11 from ::C1* to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from ::C1* to dictionary ::D1 -transformdb: unsupported type change in c1m14 from ::C1* to Object -transformdb: unsupported type change in c1m16 from ::C1* to class ::C1 -transformdb: unsupported type change in c2m1 from ::C1* to bool -transformdb: unsupported type change in c2m2 from ::C1* to byte -transformdb: unsupported type change in c2m3 from ::C1* to short -transformdb: unsupported type change in c2m4 from ::C1* to int -transformdb: unsupported type change in c2m5 from ::C1* to long -transformdb: unsupported type change in c2m6 from ::C1* to float -transformdb: unsupported type change in c2m7 from ::C1* to double -transformdb: unsupported type change in c2m9 from ::C1* to enumeration ::E -transformdb: unsupported type change in c2m10 from ::C1* to struct ::S1 -transformdb: unsupported type change in c2m11 from ::C1* to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from ::C1* to dictionary ::D1 -transformdb: unsupported type change in c2m14 from ::C1* to Object -transformdb: unsupported type change in c2m16 from ::C1* to class ::C1 -transformdb: unsupported type change in m1 from ::C1* to bool -transformdb: unsupported type change in m2 from ::C1* to byte -transformdb: unsupported type change in m3 from ::C1* to short -transformdb: unsupported type change in m4 from ::C1* to int -transformdb: unsupported type change in m5 from ::C1* to long -transformdb: unsupported type change in m6 from ::C1* to float -transformdb: unsupported type change in m7 from ::C1* to double -transformdb: unsupported type change in m9 from ::C1* to enumeration ::E -transformdb: unsupported type change in m10 from ::C1* to struct ::S1 -transformdb: unsupported type change in m11 from ::C1* to sequence ::Seq1 -transformdb: unsupported type change in m12 from ::C1* to dictionary ::D1 -transformdb: unsupported type change in m14 from ::C1* to Object -transformdb: unsupported type change in m16 from ::C1* to class ::C1 +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 index 7767a4253a3..e82c9ca9485 100644 --- a/cpp/test/FreezeScript/dbmap/fail/15_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/15_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 3ae41be53a1..d4ff7d1ab74 100644 --- a/cpp/test/FreezeScript/dbmap/fail/15_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/15_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 C1* m15; C1* m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/16.err b/cpp/test/FreezeScript/dbmap/fail/16.err index c2b1c875971..0c59143cf6b 100644 --- a/cpp/test/FreezeScript/dbmap/fail/16.err +++ b/cpp/test/FreezeScript/dbmap/fail/16.err @@ -1,44 +1,44 @@ -transformdb: unsupported type change in ::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from class ::C1 to bool -transformdb: unsupported type change in c1m2 from class ::C1 to byte -transformdb: unsupported type change in c1m3 from class ::C1 to short -transformdb: unsupported type change in c1m4 from class ::C1 to int -transformdb: unsupported type change in c1m5 from class ::C1 to long -transformdb: unsupported type change in c1m6 from class ::C1 to float -transformdb: unsupported type change in c1m7 from class ::C1 to double -transformdb: unsupported type change in c1m8 from class ::C1 to string -transformdb: unsupported type change in c1m9 from class ::C1 to enumeration ::E -transformdb: unsupported type change in c1m10 from class ::C1 to struct ::S1 -transformdb: unsupported type change in c1m11 from class ::C1 to sequence ::Seq1 -transformdb: unsupported type change in c1m12 from class ::C1 to dictionary ::D1 -transformdb: unsupported type change in c1m13 from class ::C1 to Object* -transformdb: unsupported type change in c1m15 from class ::C1 to ::C1* -transformdb: unsupported type change in c2m1 from class ::C1 to bool -transformdb: unsupported type change in c2m2 from class ::C1 to byte -transformdb: unsupported type change in c2m3 from class ::C1 to short -transformdb: unsupported type change in c2m4 from class ::C1 to int -transformdb: unsupported type change in c2m5 from class ::C1 to long -transformdb: unsupported type change in c2m6 from class ::C1 to float -transformdb: unsupported type change in c2m7 from class ::C1 to double -transformdb: unsupported type change in c2m8 from class ::C1 to string -transformdb: unsupported type change in c2m9 from class ::C1 to enumeration ::E -transformdb: unsupported type change in c2m10 from class ::C1 to struct ::S1 -transformdb: unsupported type change in c2m11 from class ::C1 to sequence ::Seq1 -transformdb: unsupported type change in c2m12 from class ::C1 to dictionary ::D1 -transformdb: unsupported type change in c2m13 from class ::C1 to Object* -transformdb: unsupported type change in c2m15 from class ::C1 to ::C1* -transformdb: unsupported type change in m1 from class ::C1 to bool -transformdb: unsupported type change in m2 from class ::C1 to byte -transformdb: unsupported type change in m3 from class ::C1 to short -transformdb: unsupported type change in m4 from class ::C1 to int -transformdb: unsupported type change in m5 from class ::C1 to long -transformdb: unsupported type change in m6 from class ::C1 to float -transformdb: unsupported type change in m7 from class ::C1 to double -transformdb: unsupported type change in m8 from class ::C1 to string -transformdb: unsupported type change in m9 from class ::C1 to enumeration ::E -transformdb: unsupported type change in m10 from class ::C1 to struct ::S1 -transformdb: unsupported type change in m11 from class ::C1 to sequence ::Seq1 -transformdb: unsupported type change in m12 from class ::C1 to dictionary ::D1 -transformdb: unsupported type change in m13 from class ::C1 to Object* -transformdb: unsupported type change in m15 from class ::C1 to ::C1* +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 c1m10 from class ::Test::C1 to struct ::Test::S1 +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 c2m10 from class ::Test::C1 to struct ::Test::S1 +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 m10 from class ::Test::C1 to struct ::Test::S1 +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 index 46d2990d543..c4a2aa6ab2f 100644 --- a/cpp/test/FreezeScript/dbmap/fail/16_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/16_new.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 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 index 3092a26c0fd..072f9d2a84d 100644 --- a/cpp/test/FreezeScript/dbmap/fail/16_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/16_old.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3 }; struct S1 @@ -72,3 +75,5 @@ struct S2 C1 m15; C1 m16; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/17.err b/cpp/test/FreezeScript/dbmap/fail/17.err index d8adb5f66a8..9a02673a722 100644 --- a/cpp/test/FreezeScript/dbmap/fail/17.err +++ b/cpp/test/FreezeScript/dbmap/fail/17.err @@ -1,4 +1,4 @@ -transformdb: class ::C declared but not defined +transformdb: class ::Test::C declared but not defined The following types had no matching definitions in the new Slice: - ::C + ::Test::C diff --git a/cpp/test/FreezeScript/dbmap/fail/17_new.ice b/cpp/test/FreezeScript/dbmap/fail/17_new.ice index 53c636cc3fe..528d8cc0dde 100644 --- a/cpp/test/FreezeScript/dbmap/fail/17_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/17_new.ice @@ -1,6 +1,11 @@ +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 index 0d8efede30b..05ade822347 100644 --- a/cpp/test/FreezeScript/dbmap/fail/17_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/17_old.ice @@ -1,6 +1,11 @@ +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 index 1e368a2b877..7ff719dba42 100644 --- a/cpp/test/FreezeScript/dbmap/fail/18.err +++ b/cpp/test/FreezeScript/dbmap/fail/18.err @@ -1 +1 @@ -transformdb: unsupported type change in m2 from class ::C1 to class ::C2 +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 index 54a8013af91..dfad7f8981b 100644 --- a/cpp/test/FreezeScript/dbmap/fail/18_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/18_new.ice @@ -1,3 +1,6 @@ +module Test +{ + class C1 {}; class C2 extends C1 {}; class C3 {}; @@ -9,3 +12,5 @@ struct S C1 m3; Object m4; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/18_old.ice b/cpp/test/FreezeScript/dbmap/fail/18_old.ice index 6b7907e66e5..6ed6b829dd5 100644 --- a/cpp/test/FreezeScript/dbmap/fail/18_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/18_old.ice @@ -1,3 +1,6 @@ +module Test +{ + class C1 {}; class C2 extends C1 {}; class C3 {}; @@ -9,3 +12,5 @@ struct S C2 m3; C3 m4; }; + +}; diff --git a/cpp/test/FreezeScript/dbmap/fail/19_new.ice b/cpp/test/FreezeScript/dbmap/fail/19_new.ice index 411b21d8d9b..4c3bebb60c8 100644 --- a/cpp/test/FreezeScript/dbmap/fail/19_new.ice +++ b/cpp/test/FreezeScript/dbmap/fail/19_new.ice @@ -1 +1,6 @@ +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 index 07868b486a5..f52e8c9f09f 100644 --- a/cpp/test/FreezeScript/dbmap/fail/19_old.ice +++ b/cpp/test/FreezeScript/dbmap/fail/19_old.ice @@ -1 +1,6 @@ +module Test +{ + class C {}; + +}; diff --git a/cpp/test/FreezeScript/dbmap/init.xml b/cpp/test/FreezeScript/dbmap/init.xml index 90edf3ab68a..d3220a15b52 100644 --- a/cpp/test/FreezeScript/dbmap/init.xml +++ b/cpp/test/FreezeScript/dbmap/init.xml @@ -1,14 +1,14 @@ <transformdb> - <database key="int" value="::S"> + <database key="int" value="::Test::S"> <record> </record> </database> <!-- enum ::E --> - <transform type="::E"/> + <transform type="::Test::E"/> <!-- struct ::S --> - <transform type="::S"> + <transform type="::Test::S"> <!-- Primitives --> @@ -268,24 +268,24 @@ <!-- Objects --> - <set target="new.baseObject" type="::F"/> + <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="::C"/> + <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="::D"/> + <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="::F"/> + <set target="new.dAsCObject.obj" type="::Test::F"/> - <set target="new.dObject" type="::D"/> + <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"/> diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp index dcda6f5cd3e..c33d2713d4b 100644 --- a/cpp/test/FreezeScript/dbmap/makedb.cpp +++ b/cpp/test/FreezeScript/dbmap/makedb.cpp @@ -14,6 +14,7 @@ using namespace std; using namespace Ice; using namespace Freeze; +using namespace Test; int run(const CommunicatorPtr& communicator, const string& envName, const string& dbName) diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index 6ed553d5279..e8bca81e418 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -58,7 +58,7 @@ for oldfile in files: newfile = oldfile.replace("old", "new") if oldfile.find("19") == 0: - value = "::C" + value = "::Test::C" else: value = "int" @@ -110,7 +110,7 @@ print "ok" print "executing default transformations... ", sys.stdout.flush() -command = transformdb + " --old " + testold + " --new " + testnew + " --key int --value ::S " + init_dbdir + " default.db " + check_dbdir +command = transformdb + " --old " + testold + " --new " + testnew + " --key int --value ::Test::S " + init_dbdir + " default.db " + check_dbdir stdin, stdout, stderr = os.popen3(command) stderr.readlines() diff --git a/cpp/test/FreezeScript/evictor/TestNew.ice b/cpp/test/FreezeScript/evictor/TestNew.ice index 7063e974c49..216127d5f32 100644 --- a/cpp/test/FreezeScript/evictor/TestNew.ice +++ b/cpp/test/FreezeScript/evictor/TestNew.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3}; class MainObject @@ -38,3 +41,5 @@ class DerivedFacetObject extends FacetObject long count; }; */ + +}; diff --git a/cpp/test/FreezeScript/evictor/TestOld.ice b/cpp/test/FreezeScript/evictor/TestOld.ice index 7edf6b5ca3c..25d74db4396 100644 --- a/cpp/test/FreezeScript/evictor/TestOld.ice +++ b/cpp/test/FreezeScript/evictor/TestOld.ice @@ -1,3 +1,6 @@ +module Test +{ + enum E { E1, E2, E3}; class MainObject @@ -27,3 +30,5 @@ class DerivedFacetObject extends FacetObject { long count; }; + +}; diff --git a/cpp/test/FreezeScript/evictor/check.xml b/cpp/test/FreezeScript/evictor/check.xml index c963acdb765..00eee237847 100644 --- a/cpp/test/FreezeScript/evictor/check.xml +++ b/cpp/test/FreezeScript/evictor/check.xml @@ -1,16 +1,16 @@ <transformdb> <database key="::Ice::Identity" value="::Freeze::ObjectRecord"> <record> - <fail test="newvalue.servant.ice_id == '::DerivedMainObject'"/> - <fail test="newvalue.servant.ice_id == '::DerivedFacetObject'"/> + <fail test="newvalue.servant.ice_id == '::Test::DerivedMainObject'"/> + <fail test="newvalue.servant.ice_id == '::Test::DerivedFacetObject'"/> </record> </database> - <!-- enum ::E --> - <transform type="::E"/> + <!-- enum ::Test::E --> + <transform type="::Test::E"/> - <!-- class ::MainObject --> - <transform type="::MainObject"> + <!-- class ::Test::MainObject --> + <transform type="::Test::MainObject"> <fail test="new.boolToString != 'true'"/> <fail test="new.byteToShort != 0"/> <fail test="new.shortToByte != 255"/> @@ -18,12 +18,12 @@ <fail test="new.longToInt != 2147483647"/> <fail test="new.floatToString != '4567.8'"/> <fail test="new.doubleToFloat - 8765.4 > 0.001"/> - <fail test="new.stringToEnum != ::New::E1"/> - <fail test="new.newname != ::New::E2"/> + <fail test="new.stringToEnum != ::New::Test::E1"/> + <fail test="new.newname != ::New::Test::E2"/> </transform> - <!-- class ::RenamedFacetObject --> - <transform type="::RenamedFacetObject"> + <!-- 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/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp index ef8f575fdb5..d169f4713bf 100644 --- a/cpp/test/FreezeScript/evictor/makedb.cpp +++ b/cpp/test/FreezeScript/evictor/makedb.cpp @@ -12,6 +12,7 @@ #include <TestOld.h> using namespace std; +using namespace Test; class MainObjectI : public MainObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> { @@ -36,19 +37,19 @@ public: virtual Ice::ObjectPtr create(const string& type) { - if(type == "::MainObject") + if(type == "::Test::MainObject") { return new MainObjectI; } - else if(type == "::DerivedMainObject") + else if(type == "::Test::DerivedMainObject") { return new DerivedMainObjectI; } - else if(type == "::FacetObject") + else if(type == "::Test::FacetObject") { return new FacetObjectI; } - else if(type == "::DerivedFacetObject") + else if(type == "::Test::DerivedFacetObject") { return new DerivedFacetObjectI; } diff --git a/cpp/test/FreezeScript/evictor/transform.xml b/cpp/test/FreezeScript/evictor/transform.xml index 8e65ba7d749..c18a6c6629c 100644 --- a/cpp/test/FreezeScript/evictor/transform.xml +++ b/cpp/test/FreezeScript/evictor/transform.xml @@ -3,16 +3,16 @@ <record/> </database> - <!-- enum ::E --> - <transform type="::E"/> + <!-- enum ::Test::E --> + <transform type="::Test::E"/> - <!-- class ::MainObject --> - <transform type="::MainObject"> + <!-- 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 ::RenamedFacetObject --> - <transform type="::RenamedFacetObject" rename="::FacetObject"/> + <!-- class ::Test::RenamedFacetObject --> + <transform type="::Test::RenamedFacetObject" rename="::Test::FacetObject"/> </transformdb> diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice index fb56ee553d1..7fe414331e9 100644 --- a/cpp/test/Glacier/starter/Callback.ice +++ b/cpp/test/Glacier/starter/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Test +{ + exception CallbackException { double someValue; @@ -34,4 +37,6 @@ class Callback void shutdown(); }; +}; + #endif diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp index 2a5be3f93cf..be135022c2e 100644 --- a/cpp/test/Glacier/starter/CallbackI.cpp +++ b/cpp/test/Glacier/starter/CallbackI.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Test; CallbackReceiverI::CallbackReceiverI() : _callback(false) diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h index 91d92458313..41e648979c1 100644 --- a/cpp/test/Glacier/starter/CallbackI.h +++ b/cpp/test/Glacier/starter/CallbackI.h @@ -14,7 +14,7 @@ #include <IceUtil/Monitor.h> #include <Callback.h> -class CallbackReceiverI : public CallbackReceiver, IceUtil::Monitor<IceUtil::Mutex> +class CallbackReceiverI : public ::Test::CallbackReceiver, IceUtil::Monitor<IceUtil::Mutex> { public: @@ -29,14 +29,14 @@ private: bool _callback; }; -class CallbackI : public Callback +class CallbackI : public ::Test::Callback { public: CallbackI(const Ice::CommunicatorPtr&); - virtual void initiateCallback(const CallbackReceiverPrx&, const Ice::Current&); - virtual void initiateCallbackEx(const CallbackReceiverPrx&, const Ice::Current&); + virtual void initiateCallback(const ::Test::CallbackReceiverPrx&, const Ice::Current&); + virtual void initiateCallbackEx(const ::Test::CallbackReceiverPrx&, const Ice::Current&); virtual void shutdown(const Ice::Current&); private: diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp index b514c249f1c..0c7db0b14c1 100644 --- a/cpp/test/Glacier/starter/Client.cpp +++ b/cpp/test/Glacier/starter/Client.cpp @@ -16,6 +16,7 @@ using namespace std; using namespace Ice; +using namespace Test; class CallbackClient : public Application { diff --git a/cpp/test/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp index 2fe64be5a45..ac16ef95f99 100644 --- a/cpp/test/Glacier/starter/Server.cpp +++ b/cpp/test/Glacier/starter/Server.cpp @@ -12,6 +12,7 @@ using namespace std; using namespace Ice; +using namespace Test; class CallbackServer : public Application { diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 3215011ac6b..b6c91ecd0d6 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -13,8 +13,9 @@ using namespace std; using namespace Ice; +using namespace Test; -TestPrx +TestIntfPrx allTests(const CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; @@ -23,7 +24,7 @@ allTests(const CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestPrx obj = TestPrx::checkedCast(base); + TestIntfPrx obj = TestIntfPrx::checkedCast(base); test(obj); test(obj == base); cout << "ok" << endl; diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index e11d09a5d62..9b192abb518 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -13,6 +13,7 @@ using namespace std; using namespace Ice; +using namespace Test; class TestClient : public Application { @@ -31,7 +32,7 @@ main(int argc, char* argv[]) int TestClient::run(int argc, char* argv[]) { - TestPrx allTests(const CommunicatorPtr&); - TestPrx obj = allTests(communicator()); + TestIntfPrx allTests(const CommunicatorPtr&); + TestIntfPrx obj = allTests(communicator()); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 7510e04c6a4..7f4b58f9808 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -14,6 +14,7 @@ using namespace std; using namespace Ice; +using namespace Test; class TestServer : public Application { @@ -37,7 +38,7 @@ TestServer::run(int argc, char* argv[]) ServantLocatorPtr locator = new ServantLocatorI; adapter->addServantLocator(locator, ""); - TestPrx allTests(const CommunicatorPtr&); + TestIntfPrx allTests(const CommunicatorPtr&); allTests(communicator()); adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index af6d58f6a4c..da364ca8377 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -13,6 +13,7 @@ using namespace std; using namespace Ice; +using namespace Test; ServantLocatorI::ServantLocatorI() : _deactivated(false) diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice index 61e539de9be..30c397569bc 100644 --- a/cpp/test/Ice/adapterDeactivation/Test.ice +++ b/cpp/test/Ice/adapterDeactivation/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void transient(); @@ -22,4 +25,6 @@ local class Cookie nonmutating string message(); }; +}; + #endif diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h index 73b75a0bb8e..b8ba80a19ea 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.h +++ b/cpp/test/Ice/adapterDeactivation/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class TestI : public Test +class TestI : public Test::TestIntf { public: @@ -20,7 +20,7 @@ public: virtual void deactivate(const Ice::Current&); }; -class CookieI : public Cookie +class CookieI : public Test::Cookie { public: diff --git a/cpp/test/Ice/checksum/client/Types.ice b/cpp/test/Ice/checksum/client/Types.ice index 5162f718775..1fd712e3963 100644 --- a/cpp/test/Ice/checksum/client/Types.ice +++ b/cpp/test/Ice/checksum/client/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -432,4 +435,6 @@ local class LocalClass { }; +}; + #endif diff --git a/cpp/test/Ice/checksum/server/Types.ice b/cpp/test/Ice/checksum/server/Types.ice index 0dd61483918..3f848504eb3 100644 --- a/cpp/test/Ice/checksum/server/Types.ice +++ b/cpp/test/Ice/checksum/server/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -427,4 +430,6 @@ local class LocalClass { }; +}; + #endif diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index d563d5251f3..ee3fe2264ba 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; class EmptyI : virtual public Empty { diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index 990b074a80f..8bb272ac9ff 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 267677062e9..9925fc084a0 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice index 814de090d12..fd37aaba289 100644 --- a/cpp/test/Ice/exceptions/Test.ice +++ b/cpp/test/Ice/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -38,7 +41,7 @@ exception D module Mod { - exception A extends :: A + exception A extends ::Test::A { int a2Mem; }; @@ -74,4 +77,6 @@ module Mod void noSuchOperation(); }; +}; + #endif diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 4195793c995..04611f2034e 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + interface Thrower; exception A @@ -34,7 +37,7 @@ exception D module Mod { - exception A extends :: A + exception A extends ::Test::A { int a2Mem; }; @@ -70,4 +73,6 @@ module Mod void noSuchOperation(); }; +}; + #endif diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index 41b9f08d8d8..38bf4bc72af 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -10,6 +10,8 @@ #include <Ice/Ice.h> #include <TestAMDI.h> +using namespace Test; + ThrowerI::ThrowerI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h index bdfb3132e76..6259a91c241 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.h +++ b/cpp/test/Ice/exceptions/TestAMDI.h @@ -12,48 +12,48 @@ #include <TestAMD.h> -class ThrowerI : public Thrower +class ThrowerI : public Test::Thrower { public: ThrowerI(const Ice::ObjectAdapterPtr&); - virtual void shutdown_async(const AMD_Thrower_shutdownPtr&, + virtual void shutdown_async(const Test::AMD_Thrower_shutdownPtr&, const Ice::Current&); - virtual void supportsUndeclaredExceptions_async(const AMD_Thrower_supportsUndeclaredExceptionsPtr&, + virtual void supportsUndeclaredExceptions_async(const Test::AMD_Thrower_supportsUndeclaredExceptionsPtr&, const Ice::Current&); - virtual void supportsAssertException_async(const AMD_Thrower_supportsAssertExceptionPtr&, + virtual void supportsAssertException_async(const Test::AMD_Thrower_supportsAssertExceptionPtr&, const Ice::Current&); - virtual void throwAasA_async(const AMD_Thrower_throwAasAPtr&, + virtual void throwAasA_async(const Test::AMD_Thrower_throwAasAPtr&, Ice::Int, const Ice::Current&); - virtual void throwAorDasAorD_async(const AMD_Thrower_throwAorDasAorDPtr&, + virtual void throwAorDasAorD_async(const Test::AMD_Thrower_throwAorDasAorDPtr&, Ice::Int, const Ice::Current&); - virtual void throwBasA_async(const AMD_Thrower_throwBasAPtr&, + virtual void throwBasA_async(const Test::AMD_Thrower_throwBasAPtr&, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasA_async(const AMD_Thrower_throwCasAPtr&, + virtual void throwCasA_async(const Test::AMD_Thrower_throwCasAPtr&, Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwBasB_async(const AMD_Thrower_throwBasBPtr&, + virtual void throwBasB_async(const Test::AMD_Thrower_throwBasBPtr&, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasB_async(const AMD_Thrower_throwCasBPtr&, + virtual void throwCasB_async(const Test::AMD_Thrower_throwCasBPtr&, Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasC_async(const AMD_Thrower_throwCasCPtr&, + virtual void throwCasC_async(const Test::AMD_Thrower_throwCasCPtr&, Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwModA_async(const AMD_Thrower_throwModAPtr&, + virtual void throwModA_async(const Test::AMD_Thrower_throwModAPtr&, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwUndeclaredA_async(const AMD_Thrower_throwUndeclaredAPtr&, + virtual void throwUndeclaredA_async(const Test::AMD_Thrower_throwUndeclaredAPtr&, Ice::Int, const Ice::Current&); - virtual void throwUndeclaredB_async(const AMD_Thrower_throwUndeclaredBPtr&, + virtual void throwUndeclaredB_async(const Test::AMD_Thrower_throwUndeclaredBPtr&, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwUndeclaredC_async(const AMD_Thrower_throwUndeclaredCPtr&, + virtual void throwUndeclaredC_async(const Test::AMD_Thrower_throwUndeclaredCPtr&, Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwLocalException_async(const AMD_Thrower_throwLocalExceptionPtr&, + virtual void throwLocalException_async(const Test::AMD_Thrower_throwLocalExceptionPtr&, const Ice::Current&); - virtual void throwNonIceException_async(const AMD_Thrower_throwNonIceExceptionPtr&, + virtual void throwNonIceException_async(const Test::AMD_Thrower_throwNonIceExceptionPtr&, const Ice::Current&); - virtual void throwAssertException_async(const AMD_Thrower_throwAssertExceptionPtr&, + virtual void throwAssertException_async(const Test::AMD_Thrower_throwAssertExceptionPtr&, const Ice::Current&); private: diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp index a5696ec828f..7d6212fba86 100644 --- a/cpp/test/Ice/exceptions/TestI.cpp +++ b/cpp/test/Ice/exceptions/TestI.cpp @@ -10,6 +10,8 @@ #include <Ice/Ice.h> #include <TestI.h> +using namespace Test; + ThrowerI::ThrowerI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/Ice/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h index c0014dae7ed..d9431a47c64 100644 --- a/cpp/test/Ice/exceptions/TestI.h +++ b/cpp/test/Ice/exceptions/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class ThrowerI : public Thrower +class ThrowerI : public Test::Thrower { public: diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 2d158fbf4ce..006a94e5105 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; class EmptyI : virtual public Empty { diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp index ff88f942b96..bf0237540c8 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 2dd0aed44b6..01cc2324184 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/facets/Test.ice b/cpp/test/Ice/facets/Test.ice index adfcb0b9c31..3ee6b51a8f1 100644 --- a/cpp/test/Ice/facets/Test.ice +++ b/cpp/test/Ice/facets/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -55,4 +58,6 @@ interface H extends G string callH(); }; +}; + #endif diff --git a/cpp/test/Ice/facets/TestI.h b/cpp/test/Ice/facets/TestI.h index e3b9a6d132b..e828cfd7e44 100644 --- a/cpp/test/Ice/facets/TestI.h +++ b/cpp/test/Ice/facets/TestI.h @@ -12,49 +12,49 @@ #include <Test.h> -class AI : virtual public A +class AI : virtual public Test::A { public: virtual std::string callA(const Ice::Current&); }; -class BI : virtual public B, virtual public AI +class BI : virtual public Test::B, virtual public AI { public: virtual std::string callB(const Ice::Current&); }; -class CI : virtual public C, virtual public AI +class CI : virtual public Test::C, virtual public AI { public: virtual std::string callC(const Ice::Current&); }; -class DI : virtual public D, virtual public BI, virtual public CI +class DI : virtual public Test::D, virtual public BI, virtual public CI { public: virtual std::string callD(const Ice::Current&); }; -class EI : virtual public E +class EI : virtual public Test::E { public: virtual std::string callE(const Ice::Current&); }; -class FI : virtual public F, virtual public EI +class FI : virtual public Test::F, virtual public EI { public: virtual std::string callF(const Ice::Current&); }; -class GI : virtual public G +class GI : virtual public Test::G { public: @@ -67,7 +67,7 @@ private: Ice::CommunicatorPtr _communicator; }; -class HI : virtual public H, virtual public GI +class HI : virtual public Test::H, virtual public GI { public: diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index efbd59dbc17..903f0a3f47f 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> { @@ -55,7 +56,7 @@ private: bool _called; }; -class AMI_Test_pidI : virtual public AMI_Test_pid, virtual public CallbackBase +class AMI_Test_pidI : virtual public AMI_TestIntf_pid, virtual public CallbackBase { public: @@ -82,7 +83,7 @@ private: typedef IceUtil::Handle<AMI_Test_pidI> AMI_Test_pidIPtr; -class AMI_Test_shutdownI : virtual public AMI_Test_shutdown, virtual public CallbackBase +class AMI_Test_shutdownI : virtual public AMI_TestIntf_shutdown, virtual public CallbackBase { public: @@ -99,7 +100,7 @@ public: typedef IceUtil::Handle<AMI_Test_shutdownI> AMI_Test_shutdownIPtr; -class AMI_Test_abortI : virtual public AMI_Test_abort, virtual public CallbackBase +class AMI_Test_abortI : virtual public AMI_TestIntf_abort, virtual public CallbackBase { public: @@ -131,7 +132,7 @@ public: typedef IceUtil::Handle<AMI_Test_abortI> AMI_Test_abortIPtr; -class AMI_Test_idempotentAbortI : public AMI_Test_idempotentAbort, public AMI_Test_abortI +class AMI_Test_idempotentAbortI : public AMI_TestIntf_idempotentAbort, public AMI_Test_abortI { virtual void ice_response() { @@ -146,7 +147,7 @@ class AMI_Test_idempotentAbortI : public AMI_Test_idempotentAbort, public AMI_Te typedef IceUtil::Handle<AMI_Test_idempotentAbortI> AMI_Test_idempotentAbortIPtr; -class AMI_Test_nonmutatingAbortI : public AMI_Test_nonmutatingAbort, public AMI_Test_abortI +class AMI_Test_nonmutatingAbortI : public AMI_TestIntf_nonmutatingAbort, public AMI_Test_abortI { virtual void ice_response() { @@ -176,7 +177,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestPrx obj = TestPrx::checkedCast(base); + TestIntfPrx obj = TestIntfPrx::checkedCast(base); test(obj); test(obj == base); cout << "ok" << endl; diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice index aa61a3d687f..9f054386a61 100644 --- a/cpp/test/Ice/faultTolerance/Test.ice +++ b/cpp/test/Ice/faultTolerance/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -["ami"] interface Test +module Test +{ + +["ami"] interface TestIntf { void shutdown(); void abort(); @@ -19,4 +22,6 @@ idempotent int pid(); }; +}; + #endif diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h index b9cd2fee481..e3f947b4dff 100644 --- a/cpp/test/Ice/faultTolerance/TestI.h +++ b/cpp/test/Ice/faultTolerance/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class TestI : public Test +class TestI : public Test::TestIntf { public: diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp index 6e03a5920d7..dc7b7ee243a 100644 --- a/cpp/test/Ice/gc/Client.cpp +++ b/cpp/test/Ice/gc/Client.cpp @@ -14,6 +14,7 @@ #include <fstream> using namespace std; +using namespace Test; static int num = 0; diff --git a/cpp/test/Ice/gc/Test.ice b/cpp/test/Ice/gc/Test.ice index ac8315b1ce4..a066c73ef10 100644 --- a/cpp/test/Ice/gc/Test.ice +++ b/cpp/test/Ice/gc/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class C { C left; @@ -92,4 +95,6 @@ class CTest CDictDict theCDictDict; }; +}; + #endif diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 0d1429a56a8..30a2c32b9e8 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; InitialPrx allTests(const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index dc3b3686645..3524ce2cfe1 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 4d44ce4f043..2171cda3afe 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice index db8df3320c5..f131c0c0729 100644 --- a/cpp/test/Ice/inheritance/Test.ice +++ b/cpp/test/Ice/inheritance/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + module MA { @@ -78,4 +81,6 @@ interface Initial MA::IC* icop(); }; +}; + #endif diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp index 6aeb20763dc..6db30e02341 100644 --- a/cpp/test/Ice/inheritance/TestI.cpp +++ b/cpp/test/Ice/inheritance/TestI.cpp @@ -10,6 +10,8 @@ #include <Ice/Ice.h> #include <TestI.h> +using namespace Test; + MA::CAPrx CAI_::caop(const MA::CAPrx& p, const Ice::Current&) { diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h index ed0638a2ee1..264358a672a 100644 --- a/cpp/test/Ice/inheritance/TestI.h +++ b/cpp/test/Ice/inheritance/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class InitialI : public Initial +class InitialI : public Test::Initial { public: @@ -20,82 +20,82 @@ public: virtual void shutdown(const Ice::Current&); - virtual MA::CAPrx caop(const Ice::Current&); - virtual MB::CBPrx cbop(const Ice::Current&); - virtual MA::CCPrx ccop(const Ice::Current&); - virtual MA::CDPrx cdop(const Ice::Current&); - virtual MA::IAPrx iaop(const Ice::Current&); - virtual MB::IB1Prx ib1op(const Ice::Current&); - virtual MB::IB2Prx ib2op(const Ice::Current&); - virtual MA::ICPrx icop(const Ice::Current&); + virtual Test::MA::CAPrx caop(const Ice::Current&); + virtual Test::MB::CBPrx cbop(const Ice::Current&); + virtual Test::MA::CCPrx ccop(const Ice::Current&); + virtual Test::MA::CDPrx cdop(const Ice::Current&); + virtual Test::MA::IAPrx iaop(const Ice::Current&); + virtual Test::MB::IB1Prx ib1op(const Ice::Current&); + virtual Test::MB::IB2Prx ib2op(const Ice::Current&); + virtual Test::MA::ICPrx icop(const Ice::Current&); private: Ice::ObjectAdapterPtr _adapter; - MA::CAPrx _ca; - MB::CBPrx _cb; - MA::CCPrx _cc; - MA::CDPrx _cd; - MA::IAPrx _ia; - MB::IB1Prx _ib1; - MB::IB2Prx _ib2; - MA::ICPrx _ic; + Test::MA::CAPrx _ca; + Test::MB::CBPrx _cb; + Test::MA::CCPrx _cc; + Test::MA::CDPrx _cd; + Test::MA::IAPrx _ia; + Test::MB::IB1Prx _ib1; + Test::MB::IB2Prx _ib2; + Test::MA::ICPrx _ic; }; -class CAI_ : virtual public MA::CA +class CAI_ : virtual public Test::MA::CA { public: - virtual MA::CAPrx caop(const MA::CAPrx&, const Ice::Current&); + virtual Test::MA::CAPrx caop(const Test::MA::CAPrx&, const Ice::Current&); }; -class CBI : virtual public MB::CB, virtual public CAI_ +class CBI : virtual public Test::MB::CB, virtual public CAI_ { public: - virtual MB::CBPrx cbop(const MB::CBPrx&, const Ice::Current&); + virtual Test::MB::CBPrx cbop(const Test::MB::CBPrx&, const Ice::Current&); }; -class CCI : virtual public MA::CC, virtual public CBI +class CCI : virtual public Test::MA::CC, virtual public CBI { public: - virtual MA::CCPrx ccop(const MA::CCPrx&, const Ice::Current&); + virtual Test::MA::CCPrx ccop(const Test::MA::CCPrx&, const Ice::Current&); }; -class IAI : virtual public MA::IA +class IAI : virtual public Test::MA::IA { public: - virtual MA::IAPrx iaop(const MA::IAPrx&, const Ice::Current&); + virtual Test::MA::IAPrx iaop(const Test::MA::IAPrx&, const Ice::Current&); }; -class IB1I : virtual public MB::IB1, virtual public IAI +class IB1I : virtual public Test::MB::IB1, virtual public IAI { public: - virtual MB::IB1Prx ib1op(const MB::IB1Prx&, const Ice::Current&); + virtual Test::MB::IB1Prx ib1op(const Test::MB::IB1Prx&, const Ice::Current&); }; -class IB2I : virtual public MB::IB2, virtual public IAI +class IB2I : virtual public Test::MB::IB2, virtual public IAI { public: - virtual MB::IB2Prx ib2op(const MB::IB2Prx&, const Ice::Current&); + virtual Test::MB::IB2Prx ib2op(const Test::MB::IB2Prx&, const Ice::Current&); }; -class ICI : virtual public MA::IC, virtual public IB1I, virtual public IB2I +class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I { public: - virtual MA::ICPrx icop(const MA::ICPrx&, const Ice::Current&); + virtual Test::MA::ICPrx icop(const Test::MA::ICPrx&, const Ice::Current&); }; -class CDI : virtual public MA::CD, virtual public CCI, virtual public IB1I, virtual public IB2I +class CDI : virtual public Test::MA::CD, virtual public CCI, virtual public IB1I, virtual public IB2I { public: - virtual MA::CDPrx cdop(const MA::CDPrx&, const Ice::Current&); + virtual Test::MA::CDPrx cdop(const Test::MA::CDPrx&, const Ice::Current&); }; #endif diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 1a59bd50aca..4f2249f03b7 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; void allTests(const Ice::CommunicatorPtr& communicator, const string& ref) @@ -31,14 +32,14 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestPrx obj = TestPrx::checkedCast(base); - obj = TestPrx::checkedCast(communicator->stringToProxy("test@TestAdapter")); - obj = TestPrx::checkedCast(communicator->stringToProxy("test @TestAdapter")); - obj = TestPrx::checkedCast(communicator->stringToProxy("test@ TestAdapter")); + TestIntfPrx obj = TestIntfPrx::checkedCast(base); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test@TestAdapter")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test @TestAdapter")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test@ TestAdapter")); test(obj); - TestPrx obj2 = TestPrx::checkedCast(base2); + TestIntfPrx obj2 = TestIntfPrx::checkedCast(base2); test(obj2); - TestPrx obj3 = TestPrx::checkedCast(base3); + TestIntfPrx obj3 = TestIntfPrx::checkedCast(base3); test(obj3); ServerManagerPrx obj4 = ServerManagerPrx::checkedCast(base4); test(obj4); @@ -60,7 +61,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) cout << "testing whether server is still reachable... " << flush; try { - obj2 = TestPrx::checkedCast(base2); + obj2 = TestIntfPrx::checkedCast(base2); obj2->ice_ping(); } catch(const Ice::LocalException&) diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice index 03f7b371bf9..53e0a2fc2a9 100644 --- a/cpp/test/Ice/location/Test.ice +++ b/cpp/test/Ice/location/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface ServerManager { void startServer(); @@ -21,11 +24,13 @@ interface Hello void sayHello(); }; -interface Test +interface TestIntf { void shutdown(); Hello* getHello(); }; +}; + #endif diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 46f84b8ed59..a70e57c1631 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -11,6 +11,8 @@ #include <Ice/Locator.h> #include <TestI.h> +using namespace Test; + ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h index 7a9daf73b9b..be794a7c7e9 100644 --- a/cpp/test/Ice/location/TestI.h +++ b/cpp/test/Ice/location/TestI.h @@ -13,7 +13,7 @@ #include <Test.h> #include <vector> -class ServerManagerI : public ServerManager +class ServerManagerI : public Test::ServerManager { public: ServerManagerI(const Ice::ObjectAdapterPtr&); @@ -27,21 +27,21 @@ private: std::vector<Ice::CommunicatorPtr> _communicators; }; -class HelloI : public Hello +class HelloI : public Test::Hello { public: virtual void sayHello(const Ice::Current&); }; -class TestI : public Test +class TestI : public Test::TestIntf { public: TestI(const Ice::ObjectAdapterPtr&); virtual void shutdown(const Ice::Current&); - virtual HelloPrx getHello(const Ice::Current&); + virtual ::Test::HelloPrx getHello(const Ice::Current&); private: diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 375885d7bb8..a63c8171667 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; InitialPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 0a50ec3ccc4..702b79555b1 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -12,6 +12,7 @@ #include <TestI.h> using namespace std; +using namespace Test; class MyObjectFactory : public Ice::ObjectFactory { @@ -19,15 +20,15 @@ public: virtual Ice::ObjectPtr create(const string& type) { - if(type == "::B") + if(type == "::Test::B") { return new BI; } - else if(type == "::C") + else if(type == "::Test::C") { return new CI; } - else if(type == "::D") + else if(type == "::Test::D") { return new DI; } @@ -45,9 +46,9 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::ObjectFactoryPtr factory = new MyObjectFactory; - communicator->addObjectFactory(factory, "::B"); - communicator->addObjectFactory(factory, "::C"); - communicator->addObjectFactory(factory, "::D"); + communicator->addObjectFactory(factory, "::Test::B"); + communicator->addObjectFactory(factory, "::Test::C"); + communicator->addObjectFactory(factory, "::Test::D"); InitialPrx allTests(const Ice::CommunicatorPtr&, bool); InitialPrx initial = allTests(communicator, false); diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index ae373c4c156..a239de6247a 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 908658ba974..c4f9ddff36a 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice index 3f57616f160..90af1dacd63 100644 --- a/cpp/test/Ice/objects/Test.ice +++ b/cpp/test/Ice/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class B; class C; @@ -55,4 +58,6 @@ class Initial void getAll(out B b1, out B b2, out C theC, out D theD); }; +}; + #endif diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index e4025efdce7..ebffb7e0d0a 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -10,6 +10,8 @@ #include <Ice/Ice.h> #include <TestI.h> +using namespace Test; + BI::BI() : _postUnmarshalInvoked(false) { diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index d28c18dd5f1..6da6ef33716 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class BI : public B +class BI : public Test::B { public: @@ -28,7 +28,7 @@ private: bool _postUnmarshalInvoked; }; -class CI : public C +class CI : public Test::C { public: @@ -44,7 +44,7 @@ private: bool _postUnmarshalInvoked; }; -class DI : public D +class DI : public Test::D { public: @@ -60,26 +60,26 @@ private: bool _postUnmarshalInvoked; }; -class InitialI : public Initial +class InitialI : public Test::Initial { public: InitialI(const Ice::ObjectAdapterPtr&); virtual void shutdown(const Ice::Current&); - virtual BPtr getB1(const Ice::Current&); - virtual BPtr getB2(const Ice::Current&); - virtual CPtr getC(const Ice::Current&); - virtual DPtr getD(const Ice::Current&); - virtual void getAll(BPtr&, BPtr&, CPtr&, DPtr&, const Ice::Current&); + virtual Test::BPtr getB1(const Ice::Current&); + virtual Test::BPtr getB2(const Ice::Current&); + virtual Test::CPtr getC(const Ice::Current&); + virtual Test::DPtr getD(const Ice::Current&); + virtual void getAll(Test::BPtr&, Test::BPtr&, Test::CPtr&, Test::DPtr&, const Ice::Current&); private: Ice::ObjectAdapterPtr _adapter; - BPtr _b1; - BPtr _b2; - CPtr _c; - DPtr _d; + Test::BPtr _b1; + Test::BPtr _b2; + Test::CPtr _c; + Test::DPtr _d; }; #endif diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp index da6bc5ca55e..762958f05eb 100644 --- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp +++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> { @@ -55,7 +56,7 @@ private: bool _called; }; -class AMI_Test_baseAsBaseI : public AMI_Test_baseAsBase, public CallbackBase +class AMI_Test_baseAsBaseI : public AMI_TestIntf_baseAsBase, public CallbackBase { virtual void ice_response() @@ -73,7 +74,7 @@ class AMI_Test_baseAsBaseI : public AMI_Test_baseAsBase, public CallbackBase catch(const Base& b) { test(b.b == "Base.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); } catch(...) { @@ -85,7 +86,7 @@ class AMI_Test_baseAsBaseI : public AMI_Test_baseAsBase, public CallbackBase typedef IceUtil::Handle<AMI_Test_baseAsBaseI> AMI_Test_baseAsBaseIPtr; -class AMI_Test_unknownDerivedAsBaseI : public AMI_Test_unknownDerivedAsBase, public CallbackBase +class AMI_Test_unknownDerivedAsBaseI : public AMI_TestIntf_unknownDerivedAsBase, public CallbackBase { virtual void ice_response() @@ -103,7 +104,7 @@ class AMI_Test_unknownDerivedAsBaseI : public AMI_Test_unknownDerivedAsBase, pub catch(const Base& b) { test(b.b == "UnknownDerived.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); } catch(...) { @@ -115,7 +116,7 @@ class AMI_Test_unknownDerivedAsBaseI : public AMI_Test_unknownDerivedAsBase, pub typedef IceUtil::Handle<AMI_Test_unknownDerivedAsBaseI> AMI_Test_unknownDerivedAsBaseIPtr; -class AMI_Test_knownDerivedAsBaseI : public AMI_Test_knownDerivedAsBase, public CallbackBase +class AMI_Test_knownDerivedAsBaseI : public AMI_TestIntf_knownDerivedAsBase, public CallbackBase { virtual void ice_response() @@ -134,7 +135,7 @@ class AMI_Test_knownDerivedAsBaseI : public AMI_Test_knownDerivedAsBase, public { test(k.b == "KnownDerived.b"); test(k.kd == "KnownDerived.kd"); - test(k.ice_name() == "KnownDerived"); + test(k.ice_name() =="Test::KnownDerived"); } catch(...) { @@ -146,7 +147,7 @@ class AMI_Test_knownDerivedAsBaseI : public AMI_Test_knownDerivedAsBase, public typedef IceUtil::Handle<AMI_Test_knownDerivedAsBaseI> AMI_Test_knownDerivedAsBaseIPtr; -class AMI_Test_knownDerivedAsKnownDerivedI : public AMI_Test_knownDerivedAsKnownDerived, public CallbackBase +class AMI_Test_knownDerivedAsKnownDerivedI : public AMI_TestIntf_knownDerivedAsKnownDerived, public CallbackBase { virtual void ice_response() @@ -165,7 +166,7 @@ class AMI_Test_knownDerivedAsKnownDerivedI : public AMI_Test_knownDerivedAsKnown { test(k.b == "KnownDerived.b"); test(k.kd == "KnownDerived.kd"); - test(k.ice_name() == "KnownDerived"); + test(k.ice_name() =="Test::KnownDerived"); } catch(...) { @@ -177,7 +178,7 @@ class AMI_Test_knownDerivedAsKnownDerivedI : public AMI_Test_knownDerivedAsKnown typedef IceUtil::Handle<AMI_Test_knownDerivedAsKnownDerivedI> AMI_Test_knownDerivedAsKnownDerivedIPtr; -class AMI_Test_unknownIntermediateAsBaseI : public AMI_Test_unknownIntermediateAsBase, public CallbackBase +class AMI_Test_unknownIntermediateAsBaseI : public AMI_TestIntf_unknownIntermediateAsBase, public CallbackBase { virtual void ice_response() @@ -195,7 +196,7 @@ class AMI_Test_unknownIntermediateAsBaseI : public AMI_Test_unknownIntermediateA catch(const Base& b) { test(b.b == "UnknownIntermediate.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); } catch(...) { @@ -207,7 +208,7 @@ class AMI_Test_unknownIntermediateAsBaseI : public AMI_Test_unknownIntermediateA typedef IceUtil::Handle<AMI_Test_unknownIntermediateAsBaseI> AMI_Test_unknownIntermediateAsBaseIPtr; -class AMI_Test_knownIntermediateAsBaseI : public AMI_Test_knownIntermediateAsBase, public CallbackBase +class AMI_Test_knownIntermediateAsBaseI : public AMI_TestIntf_knownIntermediateAsBase, public CallbackBase { virtual void ice_response() @@ -226,7 +227,7 @@ class AMI_Test_knownIntermediateAsBaseI : public AMI_Test_knownIntermediateAsBas { test(ki.b == "KnownIntermediate.b"); test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); } catch(...) { @@ -238,7 +239,7 @@ class AMI_Test_knownIntermediateAsBaseI : public AMI_Test_knownIntermediateAsBas typedef IceUtil::Handle<AMI_Test_knownIntermediateAsBaseI> AMI_Test_knownIntermediateAsBaseIPtr; -class AMI_Test_knownMostDerivedAsBaseI : public AMI_Test_knownMostDerivedAsBase, +class AMI_Test_knownMostDerivedAsBaseI : public AMI_TestIntf_knownMostDerivedAsBase, public CallbackBase { virtual void @@ -259,7 +260,7 @@ class AMI_Test_knownMostDerivedAsBaseI : public AMI_Test_knownMostDerivedAsBase, test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); } catch(...) { @@ -271,7 +272,7 @@ class AMI_Test_knownMostDerivedAsBaseI : public AMI_Test_knownMostDerivedAsBase, typedef IceUtil::Handle<AMI_Test_knownMostDerivedAsBaseI> AMI_Test_knownMostDerivedAsBaseIPtr; -class AMI_Test_knownIntermediateAsKnownIntermediateI : public AMI_Test_knownIntermediateAsKnownIntermediate, +class AMI_Test_knownIntermediateAsKnownIntermediateI : public AMI_TestIntf_knownIntermediateAsKnownIntermediate, public CallbackBase { virtual void @@ -291,7 +292,7 @@ class AMI_Test_knownIntermediateAsKnownIntermediateI : public AMI_Test_knownInte { test(ki.b == "KnownIntermediate.b"); test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); } catch(...) { @@ -303,7 +304,7 @@ class AMI_Test_knownIntermediateAsKnownIntermediateI : public AMI_Test_knownInte typedef IceUtil::Handle<AMI_Test_knownIntermediateAsKnownIntermediateI> AMI_Test_knownIntermediateAsKnownIntermediateIPtr; -class AMI_Test_knownMostDerivedAsKnownMostDerivedI : public AMI_Test_knownMostDerivedAsKnownMostDerived, +class AMI_Test_knownMostDerivedAsKnownMostDerivedI : public AMI_TestIntf_knownMostDerivedAsKnownMostDerived, public CallbackBase { virtual void @@ -324,7 +325,7 @@ class AMI_Test_knownMostDerivedAsKnownMostDerivedI : public AMI_Test_knownMostDe test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); } catch(...) { @@ -336,7 +337,7 @@ class AMI_Test_knownMostDerivedAsKnownMostDerivedI : public AMI_Test_knownMostDe typedef IceUtil::Handle<AMI_Test_knownMostDerivedAsKnownMostDerivedI> AMI_Test_knownMostDerivedAsKnownMostDerivedIPtr; -class AMI_Test_knownMostDerivedAsKnownIntermediateI : public AMI_Test_knownMostDerivedAsKnownIntermediate, +class AMI_Test_knownMostDerivedAsKnownIntermediateI : public AMI_TestIntf_knownMostDerivedAsKnownIntermediate, public CallbackBase { virtual void @@ -357,7 +358,7 @@ class AMI_Test_knownMostDerivedAsKnownIntermediateI : public AMI_Test_knownMostD test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); } catch(...) { @@ -369,8 +370,8 @@ class AMI_Test_knownMostDerivedAsKnownIntermediateI : public AMI_Test_knownMostD typedef IceUtil::Handle<AMI_Test_knownMostDerivedAsKnownIntermediateI> AMI_Test_knownMostDerivedAsKnownIntermediateIPtr; -class AMI_Test_unknownMostDerived1AsBaseI : public AMI_Test_unknownMostDerived1AsBase, - public CallbackBase +class AMI_Test_unknownMostDerived1AsBaseI : public AMI_TestIntf_unknownMostDerived1AsBase, + public CallbackBase { virtual void ice_response() @@ -389,7 +390,7 @@ class AMI_Test_unknownMostDerived1AsBaseI : public AMI_Test_unknownMostDerived1A { test(ki.b == "UnknownMostDerived1.b"); test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); } catch(...) { @@ -401,7 +402,7 @@ class AMI_Test_unknownMostDerived1AsBaseI : public AMI_Test_unknownMostDerived1A typedef IceUtil::Handle<AMI_Test_unknownMostDerived1AsBaseI> AMI_Test_unknownMostDerived1AsBaseIPtr; -class AMI_Test_unknownMostDerived1AsKnownIntermediateI : public AMI_Test_unknownMostDerived1AsKnownIntermediate, +class AMI_Test_unknownMostDerived1AsKnownIntermediateI : public AMI_TestIntf_unknownMostDerived1AsKnownIntermediate, public CallbackBase { virtual void @@ -421,7 +422,7 @@ class AMI_Test_unknownMostDerived1AsKnownIntermediateI : public AMI_Test_unknown { test(ki.b == "UnknownMostDerived1.b"); test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); } catch(...) { @@ -434,7 +435,7 @@ class AMI_Test_unknownMostDerived1AsKnownIntermediateI : public AMI_Test_unknown typedef IceUtil::Handle<AMI_Test_unknownMostDerived1AsKnownIntermediateI> AMI_Test_unknownMostDerived1AsKnownIntermediateIPtr; -class AMI_Test_unknownMostDerived2AsBaseI : public AMI_Test_unknownMostDerived2AsBase, +class AMI_Test_unknownMostDerived2AsBaseI : public AMI_TestIntf_unknownMostDerived2AsBase, public CallbackBase { virtual void @@ -453,7 +454,7 @@ class AMI_Test_unknownMostDerived2AsBaseI : public AMI_Test_unknownMostDerived2A catch(const Base& b) { test(b.b == "UnknownMostDerived2.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); } catch(...) { @@ -465,11 +466,11 @@ class AMI_Test_unknownMostDerived2AsBaseI : public AMI_Test_unknownMostDerived2A typedef IceUtil::Handle<AMI_Test_unknownMostDerived2AsBaseI> AMI_Test_unknownMostDerived2AsBaseIPtr; -TestPrx +TestIntfPrx allTests(const Ice::CommunicatorPtr& communicator) { Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12345"); - TestPrx test = TestPrx::checkedCast(obj); + TestIntfPrx test = TestIntfPrx::checkedCast(obj); cout << "base... " << flush; { @@ -481,7 +482,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Base& b) { test(b.b == "Base.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); gotException = true; } catch(...) @@ -510,7 +511,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Base& b) { test(b.b == "UnknownDerived.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); gotException = true; } catch(...) @@ -540,7 +541,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(k.b == "KnownDerived.b"); test(k.kd == "KnownDerived.kd"); - test(k.ice_name() == "KnownDerived"); + test(k.ice_name() =="Test::KnownDerived"); gotException = true; } catch(...) @@ -570,7 +571,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(k.b == "KnownDerived.b"); test(k.kd == "KnownDerived.kd"); - test(k.ice_name() == "KnownDerived"); + test(k.ice_name() =="Test::KnownDerived"); gotException = true; } catch(...) @@ -599,7 +600,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Base& b) { test(b.b == "UnknownIntermediate.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); gotException = true; } catch(...) @@ -629,7 +630,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(ki.b == "KnownIntermediate.b"); test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); gotException = true; } catch(...) @@ -660,7 +661,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); gotException = true; } catch(...) @@ -690,7 +691,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(ki.b == "KnownIntermediate.b"); test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); gotException = true; } catch(...) @@ -721,7 +722,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); gotException = true; } catch(...) @@ -752,7 +753,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(kmd.b == "KnownMostDerived.b"); test(kmd.ki == "KnownMostDerived.ki"); test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() == "KnownMostDerived"); + test(kmd.ice_name() =="Test::KnownMostDerived"); gotException = true; } catch(...) @@ -782,7 +783,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(ki.b == "UnknownMostDerived1.b"); test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); gotException = true; } catch(...) @@ -812,7 +813,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(ki.b == "UnknownMostDerived1.b"); test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() == "KnownIntermediate"); + test(ki.ice_name() =="Test::KnownIntermediate"); gotException = true; } catch(...) @@ -841,7 +842,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Base& b) { test(b.b == "UnknownMostDerived2.b"); - test(b.ice_name() == "Base"); + test(b.ice_name() =="Test::Base"); gotException = true; } catch(...) diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp index afd4f697e01..1eccc9709a7 100644 --- a/cpp/test/Ice/slicing/exceptions/Client.cpp +++ b/cpp/test/Ice/slicing/exceptions/Client.cpp @@ -12,12 +12,13 @@ #include <Test.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - TestPrx allTests(const Ice::CommunicatorPtr&); - TestPrx Test = allTests(communicator); + TestIntfPrx allTests(const Ice::CommunicatorPtr&); + TestIntfPrx Test = allTests(communicator); Test->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice index 7fb5f592869..49c3f3a81d0 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice index 9426a0c9273..08e0df79485 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice index cc3e8b3f85f..1bf3f61f5b5 100644 --- a/cpp/test/Ice/slicing/exceptions/Test.ice +++ b/cpp/test/Ice/slicing/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami"] interface Test +["ami"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/cpp/test/Ice/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice index 54f3dca65ec..989f71eb4b0 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice +++ b/cpp/test/Ice/slicing/exceptions/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp index 9a54e0dc347..2f342005577 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp @@ -10,13 +10,15 @@ #include <TestAMDI.h> #include <Ice/Ice.h> +using namespace Test; + TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { } void -TestI::baseAsBase_async(const ::AMD_Test_baseAsBasePtr& cb, const ::Ice::Current&) +TestI::baseAsBase_async(const ::AMD_TestIntf_baseAsBasePtr& cb, const ::Ice::Current&) { Base b; b.b = "Base.b"; @@ -24,7 +26,7 @@ TestI::baseAsBase_async(const ::AMD_Test_baseAsBasePtr& cb, const ::Ice::Current } void -TestI::unknownDerivedAsBase_async(const ::AMD_Test_unknownDerivedAsBasePtr& cb, const ::Ice::Current&) +TestI::unknownDerivedAsBase_async(const ::AMD_TestIntf_unknownDerivedAsBasePtr& cb, const ::Ice::Current&) { UnknownDerived d; d.b = "UnknownDerived.b"; @@ -33,7 +35,7 @@ TestI::unknownDerivedAsBase_async(const ::AMD_Test_unknownDerivedAsBasePtr& cb, } void -TestI::knownDerivedAsBase_async(const ::AMD_Test_knownDerivedAsBasePtr& cb, const ::Ice::Current&) +TestI::knownDerivedAsBase_async(const ::AMD_TestIntf_knownDerivedAsBasePtr& cb, const ::Ice::Current&) { KnownDerived d; d.b = "KnownDerived.b"; @@ -42,7 +44,7 @@ TestI::knownDerivedAsBase_async(const ::AMD_Test_knownDerivedAsBasePtr& cb, cons } void -TestI::knownDerivedAsKnownDerived_async(const ::AMD_Test_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&) +TestI::knownDerivedAsKnownDerived_async(const ::AMD_TestIntf_knownDerivedAsKnownDerivedPtr& cb, const ::Ice::Current&) { KnownDerived d; d.b = "KnownDerived.b"; @@ -51,7 +53,7 @@ TestI::knownDerivedAsKnownDerived_async(const ::AMD_Test_knownDerivedAsKnownDeri } void -TestI::unknownIntermediateAsBase_async(const ::AMD_Test_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&) +TestI::unknownIntermediateAsBase_async(const ::AMD_TestIntf_unknownIntermediateAsBasePtr& cb, const ::Ice::Current&) { UnknownIntermediate ui; ui.b = "UnknownIntermediate.b"; @@ -60,7 +62,7 @@ TestI::unknownIntermediateAsBase_async(const ::AMD_Test_unknownIntermediateAsBas } void -TestI::knownIntermediateAsBase_async(const ::AMD_Test_knownIntermediateAsBasePtr& cb, const ::Ice::Current&) +TestI::knownIntermediateAsBase_async(const ::AMD_TestIntf_knownIntermediateAsBasePtr& cb, const ::Ice::Current&) { KnownIntermediate ki; ki.b = "KnownIntermediate.b"; @@ -69,7 +71,7 @@ TestI::knownIntermediateAsBase_async(const ::AMD_Test_knownIntermediateAsBasePtr } void -TestI::knownMostDerivedAsBase_async(const ::AMD_Test_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&) +TestI::knownMostDerivedAsBase_async(const ::AMD_TestIntf_knownMostDerivedAsBasePtr& cb, const ::Ice::Current&) { KnownMostDerived kmd; kmd.b = "KnownMostDerived.b"; @@ -79,7 +81,7 @@ TestI::knownMostDerivedAsBase_async(const ::AMD_Test_knownMostDerivedAsBasePtr& } void -TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_Test_knownIntermediateAsKnownIntermediatePtr& cb, +TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr& cb, const ::Ice::Current&) { KnownIntermediate ki; @@ -89,7 +91,7 @@ TestI::knownIntermediateAsKnownIntermediate_async(const ::AMD_Test_knownIntermed } void -TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_Test_knownMostDerivedAsKnownIntermediatePtr& cb, +TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr& cb, const ::Ice::Current&) { KnownMostDerived kmd; @@ -101,7 +103,7 @@ TestI::knownMostDerivedAsKnownIntermediate_async(const ::AMD_Test_knownMostDeriv void TestI:: -knownMostDerivedAsKnownMostDerived_async(const ::AMD_Test_knownMostDerivedAsKnownMostDerivedPtr& cb, +knownMostDerivedAsKnownMostDerived_async(const ::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr& cb, const ::Ice::Current&) { KnownMostDerived kmd; @@ -112,7 +114,7 @@ knownMostDerivedAsKnownMostDerived_async(const ::AMD_Test_knownMostDerivedAsKnow } void -TestI::unknownMostDerived1AsBase_async(const ::AMD_Test_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&) +TestI::unknownMostDerived1AsBase_async(const ::AMD_TestIntf_unknownMostDerived1AsBasePtr& cb, const ::Ice::Current&) { UnknownMostDerived1 umd1; umd1.b = "UnknownMostDerived1.b"; @@ -122,7 +124,7 @@ TestI::unknownMostDerived1AsBase_async(const ::AMD_Test_unknownMostDerived1AsBas } void -TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_Test_unknownMostDerived1AsKnownIntermediatePtr& cb, +TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr& cb, const ::Ice::Current&) { UnknownMostDerived1 umd1; @@ -133,7 +135,7 @@ TestI::unknownMostDerived1AsKnownIntermediate_async(const ::AMD_Test_unknownMost } void -TestI::unknownMostDerived2AsBase_async(const ::AMD_Test_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&) +TestI::unknownMostDerived2AsBase_async(const ::AMD_TestIntf_unknownMostDerived2AsBasePtr& cb, const ::Ice::Current&) { UnknownMostDerived2 umd2; umd2.b = "UnknownMostDerived2.b"; @@ -143,7 +145,7 @@ TestI::unknownMostDerived2AsBase_async(const ::AMD_Test_unknownMostDerived2AsBas } void -TestI::shutdown_async(const ::AMD_Test_shutdownPtr& cb, const ::Ice::Current&) +TestI::shutdown_async(const ::AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&) { _adapter->getCommunicator()->shutdown(); cb->ice_response(); diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h index 1eb34729a1b..810e0a9a14f 100644 --- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h +++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.h @@ -12,35 +12,45 @@ #include <ServerPrivateAMD.h> -class TestI : virtual public Test +class TestI : virtual public Test::TestIntf { public: TestI(const ::Ice::ObjectAdapterPtr&); - virtual void baseAsBase_async(const ::AMD_Test_baseAsBasePtr&, const ::Ice::Current&); + virtual void baseAsBase_async(const ::Test::AMD_TestIntf_baseAsBasePtr&, const ::Ice::Current&); - virtual void unknownDerivedAsBase_async(const ::AMD_Test_unknownDerivedAsBasePtr&, const ::Ice::Current&); - virtual void knownDerivedAsBase_async(const ::AMD_Test_knownDerivedAsBasePtr&, const ::Ice::Current&); - virtual void knownDerivedAsKnownDerived_async(const ::AMD_Test_knownDerivedAsKnownDerivedPtr&, + virtual void unknownDerivedAsBase_async(const ::Test::AMD_TestIntf_unknownDerivedAsBasePtr&, const ::Ice::Current&); + virtual void knownDerivedAsBase_async(const ::Test::AMD_TestIntf_knownDerivedAsBasePtr&, const ::Ice::Current&); + virtual void knownDerivedAsKnownDerived_async(const ::Test::AMD_TestIntf_knownDerivedAsKnownDerivedPtr&, const ::Ice::Current&); - virtual void unknownIntermediateAsBase_async(const ::AMD_Test_unknownIntermediateAsBasePtr&, const ::Ice::Current&); - virtual void knownIntermediateAsBase_async(const ::AMD_Test_knownIntermediateAsBasePtr&, const ::Ice::Current&); - virtual void knownMostDerivedAsBase_async(const ::AMD_Test_knownMostDerivedAsBasePtr&, const ::Ice::Current&); - virtual void knownIntermediateAsKnownIntermediate_async(const ::AMD_Test_knownIntermediateAsKnownIntermediatePtr&, - const ::Ice::Current&); - virtual void knownMostDerivedAsKnownIntermediate_async(const ::AMD_Test_knownMostDerivedAsKnownIntermediatePtr&, - const ::Ice::Current&); - virtual void knownMostDerivedAsKnownMostDerived_async(const ::AMD_Test_knownMostDerivedAsKnownMostDerivedPtr&, - const ::Ice::Current&); - - virtual void unknownMostDerived1AsBase_async(const ::AMD_Test_unknownMostDerived1AsBasePtr&, const ::Ice::Current&); + virtual void unknownIntermediateAsBase_async(const ::Test::AMD_TestIntf_unknownIntermediateAsBasePtr&, + const ::Ice::Current&); + virtual void knownIntermediateAsBase_async(const ::Test::AMD_TestIntf_knownIntermediateAsBasePtr&, + const ::Ice::Current&); + virtual void knownMostDerivedAsBase_async(const ::Test::AMD_TestIntf_knownMostDerivedAsBasePtr&, + const ::Ice::Current&); + virtual void knownIntermediateAsKnownIntermediate_async( + const ::Test::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr&, + const ::Ice::Current&); + virtual void knownMostDerivedAsKnownIntermediate_async( + const ::Test::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr&, + const ::Ice::Current&); + virtual void knownMostDerivedAsKnownMostDerived_async( + const ::Test::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr&, + const ::Ice::Current&); + + virtual void unknownMostDerived1AsBase_async( + const ::Test::AMD_TestIntf_unknownMostDerived1AsBasePtr&, + const ::Ice::Current&); virtual void unknownMostDerived1AsKnownIntermediate_async( - const ::AMD_Test_unknownMostDerived1AsKnownIntermediatePtr&, + const ::Test::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr&, const ::Ice::Current&); - virtual void unknownMostDerived2AsBase_async(const ::AMD_Test_unknownMostDerived2AsBasePtr&, const ::Ice::Current&); + virtual void unknownMostDerived2AsBase_async( + const ::Test::AMD_TestIntf_unknownMostDerived2AsBasePtr&, + const ::Ice::Current&); - virtual void shutdown_async(const ::AMD_Test_shutdownPtr&, const ::Ice::Current&); + virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&); private: diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp index 4f04f203eb7..6e4a794ff52 100644 --- a/cpp/test/Ice/slicing/exceptions/TestI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp @@ -10,6 +10,8 @@ #include <TestI.h> #include <Ice/Ice.h> +using namespace Test; + TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/Ice/slicing/exceptions/TestI.h b/cpp/test/Ice/slicing/exceptions/TestI.h index f7de3b0da5d..f5282a5c812 100644 --- a/cpp/test/Ice/slicing/exceptions/TestI.h +++ b/cpp/test/Ice/slicing/exceptions/TestI.h @@ -12,7 +12,7 @@ #include <ServerPrivate.h> -class TestI : virtual public Test +class TestI : virtual public Test::TestIntf { public: diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index 53bf7758a01..8dfe865e8f1 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -13,6 +13,7 @@ #include <sstream> using namespace std; +using namespace Test; class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> { @@ -56,13 +57,13 @@ private: bool _called; }; -class AMI_Test_SBaseAsObjectI : public AMI_Test_SBaseAsObject, public CallbackBase +class AMI_Test_SBaseAsObjectI : public AMI_TestIntf_SBaseAsObject, public CallbackBase { virtual void ice_response(const ::Ice::ObjectPtr& o) { test(o); - test(o->ice_id() == "::SBase"); + test(o->ice_id() == "::Test::SBase"); SBasePtr sb = SBasePtr::dynamicCast(o); test(sb); test(sb->sb == "SBase.sb"); @@ -78,7 +79,7 @@ class AMI_Test_SBaseAsObjectI : public AMI_Test_SBaseAsObject, public CallbackBa typedef IceUtil::Handle<AMI_Test_SBaseAsObjectI> AMI_Test_SBaseAsObjectIPtr; -class AMI_Test_SBaseAsSBaseI : public AMI_Test_SBaseAsSBase, public CallbackBase +class AMI_Test_SBaseAsSBaseI : public AMI_TestIntf_SBaseAsSBase, public CallbackBase { virtual void ice_response(const SBasePtr& sb) @@ -96,7 +97,7 @@ class AMI_Test_SBaseAsSBaseI : public AMI_Test_SBaseAsSBase, public CallbackBase typedef IceUtil::Handle<AMI_Test_SBaseAsSBaseI> AMI_Test_SBaseAsSBaseIPtr; -class AMI_Test_SBSKnownDerivedAsSBaseI : public AMI_Test_SBSKnownDerivedAsSBase, public CallbackBase +class AMI_Test_SBSKnownDerivedAsSBaseI : public AMI_TestIntf_SBSKnownDerivedAsSBase, public CallbackBase { virtual void ice_response(const SBasePtr& sb) @@ -116,7 +117,8 @@ class AMI_Test_SBSKnownDerivedAsSBaseI : public AMI_Test_SBSKnownDerivedAsSBase, typedef IceUtil::Handle<AMI_Test_SBSKnownDerivedAsSBaseI> AMI_Test_SBSKnownDerivedAsSBaseIPtr; -class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI : public AMI_Test_SBSKnownDerivedAsSBSKnownDerived, public CallbackBase +class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI + : public AMI_TestIntf_SBSKnownDerivedAsSBSKnownDerived, public CallbackBase { virtual void ice_response(const SBSKnownDerivedPtr& sbskd) @@ -134,7 +136,7 @@ class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI : public AMI_Test_SBSKnownDeriv typedef IceUtil::Handle<AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI> AMI_Test_SBSKnownDerivedAsSBSKnownDerivedIPtr; -class AMI_Test_SBSUnknownDerivedAsSBaseI : public AMI_Test_SBSUnknownDerivedAsSBase, public CallbackBase +class AMI_Test_SBSUnknownDerivedAsSBaseI : public AMI_TestIntf_SBSUnknownDerivedAsSBase, public CallbackBase { virtual void ice_response(const SBasePtr& sb) @@ -152,7 +154,7 @@ class AMI_Test_SBSUnknownDerivedAsSBaseI : public AMI_Test_SBSUnknownDerivedAsSB typedef IceUtil::Handle<AMI_Test_SBSUnknownDerivedAsSBaseI> AMI_Test_SBSUnknownDerivedAsSBaseIPtr; -class AMI_Test_SUnknownAsObjectI : public AMI_Test_SUnknownAsObject, public CallbackBase +class AMI_Test_SUnknownAsObjectI : public AMI_TestIntf_SUnknownAsObject, public CallbackBase { virtual void ice_response(const Ice::ObjectPtr& o) @@ -170,13 +172,13 @@ class AMI_Test_SUnknownAsObjectI : public AMI_Test_SUnknownAsObject, public Call typedef IceUtil::Handle<AMI_Test_SUnknownAsObjectI> AMI_Test_SUnknownAsObjectIPtr; -class AMI_Test_oneElementCycleI : public AMI_Test_oneElementCycle, public CallbackBase +class AMI_Test_oneElementCycleI : public AMI_TestIntf_oneElementCycle, public CallbackBase { virtual void ice_response(const BPtr& b) { test(b); - test(b->ice_id() == "::B"); + test(b->ice_id() == "::Test::B"); test(b->sb == "B1.sb"); test(b->pb == b); called(); @@ -191,18 +193,18 @@ class AMI_Test_oneElementCycleI : public AMI_Test_oneElementCycle, public Callba typedef IceUtil::Handle<AMI_Test_oneElementCycleI> AMI_Test_oneElementCycleIPtr; -class AMI_Test_twoElementCycleI : public AMI_Test_twoElementCycle, public CallbackBase +class AMI_Test_twoElementCycleI : public AMI_TestIntf_twoElementCycle, public CallbackBase { virtual void ice_response(const BPtr& b1) { test(b1); - test(b1->ice_id() == "::B"); + test(b1->ice_id() == "::Test::B"); test(b1->sb == "B1.sb"); BPtr b2 = b1->pb; test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "B2.sb"); test(b2->pb == b1); called(); @@ -217,13 +219,13 @@ class AMI_Test_twoElementCycleI : public AMI_Test_twoElementCycle, public Callba typedef IceUtil::Handle<AMI_Test_twoElementCycleI> AMI_Test_twoElementCycleIPtr; -class AMI_Test_D1AsBI : public AMI_Test_D1AsB, public CallbackBase +class AMI_Test_D1AsBI : public AMI_TestIntf_D1AsB, public CallbackBase { virtual void ice_response(const BPtr& b1) { test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb); test(b1->pb != b1); @@ -238,7 +240,7 @@ class AMI_Test_D1AsBI : public AMI_Test_D1AsB, public CallbackBase test(b2); test(b2->pb == b1); test(b2->sb == "D2.sb"); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); called(); } @@ -251,20 +253,20 @@ class AMI_Test_D1AsBI : public AMI_Test_D1AsB, public CallbackBase typedef IceUtil::Handle<AMI_Test_D1AsBI> AMI_Test_D1AsBIPtr; -class AMI_Test_D1AsD1I : public AMI_Test_D1AsD1, public CallbackBase +class AMI_Test_D1AsD1I : public AMI_TestIntf_D1AsD1, public CallbackBase { virtual void ice_response(const D1Ptr& d1) { test(d1); - test(d1->ice_id() == "::D1"); + test(d1->ice_id() == "::Test::D1"); test(d1->sb == "D1.sb"); test(d1->pb); test(d1->pb != d1); BPtr b2 = d1->pb; test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "D2.sb"); test(b2->pb == d1); called(); @@ -279,20 +281,20 @@ class AMI_Test_D1AsD1I : public AMI_Test_D1AsD1, public CallbackBase typedef IceUtil::Handle<AMI_Test_D1AsD1I> AMI_Test_D1AsD1IPtr; -class AMI_Test_D2AsBI : public AMI_Test_D2AsB, public CallbackBase +class AMI_Test_D2AsBI : public AMI_TestIntf_D2AsB, public CallbackBase { virtual void ice_response(const BPtr& b2) { test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "D2.sb"); test(b2->pb); test(b2->pb != b2); BPtr b1 = b2->pb; test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb == b2); D1Ptr d1 = D1Ptr::dynamicCast(b1); @@ -311,13 +313,13 @@ class AMI_Test_D2AsBI : public AMI_Test_D2AsB, public CallbackBase typedef IceUtil::Handle<AMI_Test_D2AsBI> AMI_Test_D2AsBIPtr; -class AMI_Test_paramTest1I : public AMI_Test_paramTest1, public CallbackBase +class AMI_Test_paramTest1I : public AMI_TestIntf_paramTest1, public CallbackBase { virtual void ice_response(const BPtr& b1, const BPtr& b2) { test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb == b2); D1Ptr d1 = D1Ptr::dynamicCast(b1); @@ -326,7 +328,7 @@ class AMI_Test_paramTest1I : public AMI_Test_paramTest1, public CallbackBase test(d1->pd1 == b2); test(b2); - test(b2->ice_id() == "::B"); // No factory, must be sliced + test(b2->ice_id() == "::Test::B"); // No factory, must be sliced test(b2->sb == "D2.sb"); test(b2->pb == b1); called(); @@ -341,7 +343,7 @@ class AMI_Test_paramTest1I : public AMI_Test_paramTest1, public CallbackBase typedef IceUtil::Handle<AMI_Test_paramTest1I> AMI_Test_paramTest1IPtr; -class AMI_Test_returnTest1I : public AMI_Test_returnTest1, public CallbackBase +class AMI_Test_returnTest1I : public AMI_TestIntf_returnTest1, public CallbackBase { virtual void ice_response(const BPtr& r, const BPtr& p1, const BPtr& p2) @@ -359,7 +361,7 @@ class AMI_Test_returnTest1I : public AMI_Test_returnTest1, public CallbackBase typedef IceUtil::Handle<AMI_Test_returnTest1I> AMI_Test_returnTest1IPtr; -class AMI_Test_returnTest2I : public AMI_Test_returnTest2, public CallbackBase +class AMI_Test_returnTest2I : public AMI_TestIntf_returnTest2, public CallbackBase { virtual void ice_response(const BPtr& r, const BPtr& p1, const BPtr& p2) @@ -377,7 +379,7 @@ class AMI_Test_returnTest2I : public AMI_Test_returnTest2, public CallbackBase typedef IceUtil::Handle<AMI_Test_returnTest2I> AMI_Test_returnTest2IPtr; -class AMI_Test_returnTest3I : public AMI_Test_returnTest3, public CallbackBase +class AMI_Test_returnTest3I : public AMI_TestIntf_returnTest3, public CallbackBase { public: virtual void @@ -398,7 +400,7 @@ public: typedef IceUtil::Handle<AMI_Test_returnTest3I> AMI_Test_returnTest3IPtr; -class AMI_Test_paramTest3I : public AMI_Test_paramTest3, public CallbackBase +class AMI_Test_paramTest3I : public AMI_TestIntf_paramTest3, public CallbackBase { virtual void ice_response(const BPtr& ret, const BPtr& p1, const BPtr& p2) @@ -406,17 +408,17 @@ class AMI_Test_paramTest3I : public AMI_Test_paramTest3, public CallbackBase test(p1); test(p1->sb == "D2.sb (p1 1)"); test(p1->pb == 0); - test(p1->ice_id() == "::B"); + test(p1->ice_id() == "::Test::B"); test(p2); test(p2->sb == "D2.sb (p2 1)"); test(p2->pb == 0); - test(p2->ice_id() == "::B"); + test(p2->ice_id() == "::Test::B"); test(ret); test(ret->sb == "D1.sb (p2 2)"); test(ret->pb == 0); - test(ret->ice_id() == "::D1"); + test(ret->ice_id() == "::Test::D1"); called(); } @@ -429,7 +431,7 @@ class AMI_Test_paramTest3I : public AMI_Test_paramTest3, public CallbackBase typedef IceUtil::Handle<AMI_Test_paramTest3I> AMI_Test_paramTest3IPtr; -class AMI_Test_paramTest4I : public AMI_Test_paramTest4, public CallbackBase +class AMI_Test_paramTest4I : public AMI_TestIntf_paramTest4, public CallbackBase { virtual void ice_response(const BPtr& ret, const BPtr& b) @@ -437,12 +439,12 @@ class AMI_Test_paramTest4I : public AMI_Test_paramTest4, public CallbackBase test(b); test(b->sb == "D4.sb (1)"); test(b->pb == 0); - test(b->ice_id() == "::B"); + test(b->ice_id() == "::Test::B"); test(ret); test(ret->sb == "B.sb (2)"); test(ret->pb == 0); - test(ret->ice_id() == "::B"); + test(ret->ice_id() == "::Test::B"); called(); } @@ -455,7 +457,7 @@ class AMI_Test_paramTest4I : public AMI_Test_paramTest4, public CallbackBase typedef IceUtil::Handle<AMI_Test_paramTest4I> AMI_Test_paramTest4IPtr; -class AMI_Test_sequenceTestI : public AMI_Test_sequenceTest, public CallbackBase +class AMI_Test_sequenceTestI : public AMI_TestIntf_sequenceTest, public CallbackBase { virtual void ice_response(const SS& ss) @@ -477,7 +479,7 @@ public: typedef IceUtil::Handle<AMI_Test_sequenceTestI> AMI_Test_sequenceTestIPtr; -class AMI_Test_dictionaryTestI : public AMI_Test_dictionaryTest, public CallbackBase +class AMI_Test_dictionaryTestI : public AMI_TestIntf_dictionaryTest, public CallbackBase { virtual void ice_response(const BDict& r, const BDict& bout) @@ -501,7 +503,7 @@ public: typedef IceUtil::Handle<AMI_Test_dictionaryTestI> AMI_Test_dictionaryTestIPtr; -class AMI_Test_throwBaseAsBaseI : public AMI_Test_throwBaseAsBase, public CallbackBase +class AMI_Test_throwBaseAsBaseI : public AMI_TestIntf_throwBaseAsBase, public CallbackBase { virtual void ice_response() @@ -512,7 +514,7 @@ class AMI_Test_throwBaseAsBaseI : public AMI_Test_throwBaseAsBase, public Callba virtual void ice_exception(const ::Ice::Exception& ex) { - test(ex.ice_name() == "BaseException"); + test(ex.ice_name() == "Test::BaseException"); const BaseException& e = dynamic_cast<const BaseException&>(ex); test(e.sbe == "sbe"); test(e.pb); @@ -524,7 +526,7 @@ class AMI_Test_throwBaseAsBaseI : public AMI_Test_throwBaseAsBase, public Callba typedef IceUtil::Handle<AMI_Test_throwBaseAsBaseI> AMI_Test_throwBaseAsBaseIPtr; -class AMI_Test_throwDerivedAsBaseI : public AMI_Test_throwDerivedAsBase, public CallbackBase +class AMI_Test_throwDerivedAsBaseI : public AMI_TestIntf_throwDerivedAsBase, public CallbackBase { virtual void ice_response() @@ -535,7 +537,7 @@ class AMI_Test_throwDerivedAsBaseI : public AMI_Test_throwDerivedAsBase, public virtual void ice_exception(const ::Ice::Exception& ex) { - test(ex.ice_name() == "DerivedException"); + test(ex.ice_name() == "Test::DerivedException"); const DerivedException& e = dynamic_cast<const DerivedException&>(ex); test(e.sbe == "sbe"); test(e.pb); @@ -553,7 +555,7 @@ class AMI_Test_throwDerivedAsBaseI : public AMI_Test_throwDerivedAsBase, public typedef IceUtil::Handle<AMI_Test_throwDerivedAsBaseI> AMI_Test_throwDerivedAsBaseIPtr; -class AMI_Test_throwDerivedAsDerivedI : public AMI_Test_throwDerivedAsDerived, public CallbackBase +class AMI_Test_throwDerivedAsDerivedI : public AMI_TestIntf_throwDerivedAsDerived, public CallbackBase { virtual void ice_response() @@ -564,7 +566,7 @@ class AMI_Test_throwDerivedAsDerivedI : public AMI_Test_throwDerivedAsDerived, p virtual void ice_exception(const ::Ice::Exception& ex) { - test(ex.ice_name() == "DerivedException"); + test(ex.ice_name() == "Test::DerivedException"); const DerivedException& e = dynamic_cast<const DerivedException&>(ex); test(e.sbe == "sbe"); test(e.pb); @@ -582,7 +584,7 @@ class AMI_Test_throwDerivedAsDerivedI : public AMI_Test_throwDerivedAsDerived, p typedef IceUtil::Handle<AMI_Test_throwDerivedAsDerivedI> AMI_Test_throwDerivedAsDerivedIPtr; -class AMI_Test_throwUnknownDerivedAsBaseI : public AMI_Test_throwUnknownDerivedAsBase, public CallbackBase +class AMI_Test_throwUnknownDerivedAsBaseI : public AMI_TestIntf_throwUnknownDerivedAsBase, public CallbackBase { virtual void ice_response() @@ -593,7 +595,7 @@ class AMI_Test_throwUnknownDerivedAsBaseI : public AMI_Test_throwUnknownDerivedA virtual void ice_exception(const ::Ice::Exception& ex) { - test(ex.ice_name() == "BaseException"); + test(ex.ice_name() == "Test::BaseException"); const BaseException& e = dynamic_cast<const BaseException&>(ex); test(e.sbe == "sbe"); test(e.pb); @@ -605,7 +607,7 @@ class AMI_Test_throwUnknownDerivedAsBaseI : public AMI_Test_throwUnknownDerivedA typedef IceUtil::Handle<AMI_Test_throwUnknownDerivedAsBaseI> AMI_Test_throwUnknownDerivedAsBaseIPtr; -class AMI_Test_useForwardI : public AMI_Test_useForward, public CallbackBase +class AMI_Test_useForwardI : public AMI_TestIntf_useForward, public CallbackBase { virtual void ice_response(const ForwardPtr& f) @@ -623,11 +625,11 @@ class AMI_Test_useForwardI : public AMI_Test_useForward, public CallbackBase typedef IceUtil::Handle<AMI_Test_useForwardI> AMI_Test_useForwardIPtr; -TestPrx +TestIntfPrx allTests(const Ice::CommunicatorPtr& communicator) { Ice::ObjectPrx obj = communicator->stringToProxy("Test:default -p 12345"); - TestPrx test = TestPrx::checkedCast(obj); + TestIntfPrx test = TestIntfPrx::checkedCast(obj); cout << "base as Object... " << flush; { @@ -636,7 +638,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { o = test->SBaseAsObject(); test(o); - test(o->ice_id() == "::SBase"); + test(o->ice_id() == "::Test::SBase"); } catch(...) { @@ -780,7 +782,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { BPtr b = test->oneElementCycle(); test(b); - test(b->ice_id() == "::B"); + test(b->ice_id() == "::Test::B"); test(b->sb == "B1.sb"); test(b->pb == b); } @@ -805,12 +807,12 @@ allTests(const Ice::CommunicatorPtr& communicator) { BPtr b1 = test->twoElementCycle(); test(b1); - test(b1->ice_id() == "::B"); + test(b1->ice_id() == "::Test::B"); test(b1->sb == "B1.sb"); BPtr b2 = b1->pb; test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "B2.sb"); test(b2->pb == b1); } @@ -836,7 +838,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr b1; b1 = test->D1AsB(); test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb); test(b1->pb != b1); @@ -851,7 +853,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b2); test(b2->pb == b1); test(b2->sb == "D2.sb"); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); } catch(...) { @@ -875,14 +877,14 @@ allTests(const Ice::CommunicatorPtr& communicator) D1Ptr d1; d1 = test->D1AsD1(); test(d1); - test(d1->ice_id() == "::D1"); + test(d1->ice_id() == "::Test::D1"); test(d1->sb == "D1.sb"); test(d1->pb); test(d1->pb != d1); BPtr b2 = d1->pb; test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "D2.sb"); test(b2->pb == d1); } @@ -908,14 +910,14 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr b2; b2 = test->D2AsB(); test(b2); - test(b2->ice_id() == "::B"); + test(b2->ice_id() == "::Test::B"); test(b2->sb == "D2.sb"); test(b2->pb); test(b2->pb != b2); BPtr b1 = b2->pb; test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb == b2); D1Ptr d1 = D1Ptr::dynamicCast(b1); @@ -947,7 +949,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test->paramTest1(b1, b2); test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb == b2); D1Ptr d1 = D1Ptr::dynamicCast(b1); @@ -956,7 +958,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(d1->pd1 == b2); test(b2); - test(b2->ice_id() == "::B"); // No factory, must be sliced + test(b2->ice_id() == "::Test::B"); // No factory, must be sliced test(b2->sb == "D2.sb"); test(b2->pb == b1); } @@ -984,7 +986,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test->paramTest2(b2, b1); test(b1); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); test(b1->sb == "D1.sb"); test(b1->pb == b2); D1Ptr d1 = D1Ptr::dynamicCast(b1); @@ -993,7 +995,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(d1->pd1 == b2); test(b2); - test(b2->ice_id() == "::B"); // No factory, must be sliced + test(b2->ice_id() == "::Test::B"); // No factory, must be sliced test(b2->sb == "D2.sb"); test(b2->pb == b1); } @@ -1071,7 +1073,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b1); test(b1->sb == "D1.sb"); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); D1Ptr p1 = D1Ptr::dynamicCast(b1); test(p1); test(p1->sd1 == "D1.sd1"); @@ -1080,7 +1082,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr b2 = b1->pb; test(b2); test(b2->sb == "D3.sb"); - test(b2->ice_id() == "::B"); // Sliced by server + test(b2->ice_id() == "::Test::B"); // Sliced by server test(b2->pb == b1); D3Ptr p3 = D3Ptr::dynamicCast(b2); test(!p3); @@ -1119,7 +1121,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b1); test(b1->sb == "D1.sb"); - test(b1->ice_id() == "::D1"); + test(b1->ice_id() == "::Test::D1"); D1Ptr p1 = D1Ptr::dynamicCast(b1); test(p1); test(p1->sd1 == "D1.sd1"); @@ -1128,7 +1130,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr b2 = b1->pb; test(b2); test(b2->sb == "D3.sb"); - test(b2->ice_id() == "::B"); // Sliced by server + test(b2->ice_id() == "::Test::B"); // Sliced by server test(b2->pb == b1); D3Ptr p3 = D3Ptr::dynamicCast(b2); test(!p3); @@ -1164,14 +1166,14 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b1); test(b1->sb == "D3.sb"); - test(b1->ice_id() == "::B"); // Sliced by server + test(b1->ice_id() == "::Test::B"); // Sliced by server D3Ptr p1 = D3Ptr::dynamicCast(b1); test(!p1); BPtr b2 = b1->pb; test(b2); test(b2->sb == "D1.sb"); - test(b2->ice_id() == "::D1"); + test(b2->ice_id() == "::Test::D1"); test(b2->pb == b1); D1Ptr p3 = D1Ptr::dynamicCast(b2); test(p3); @@ -1212,14 +1214,14 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b1); test(b1->sb == "D3.sb"); - test(b1->ice_id() == "::B"); // Sliced by server + test(b1->ice_id() == "::Test::B"); // Sliced by server D3Ptr p1 = D3Ptr::dynamicCast(b1); test(!p1); BPtr b2 = b1->pb; test(b2); test(b2->sb == "D1.sb"); - test(b2->ice_id() == "::D1"); + test(b2->ice_id() == "::Test::D1"); test(b2->pb == b1); D1Ptr p3 = D1Ptr::dynamicCast(b2); test(p3); @@ -1249,17 +1251,17 @@ allTests(const Ice::CommunicatorPtr& communicator) test(p1); test(p1->sb == "D2.sb (p1 1)"); test(p1->pb == 0); - test(p1->ice_id() == "::B"); + test(p1->ice_id() == "::Test::B"); test(p2); test(p2->sb == "D2.sb (p2 1)"); test(p2->pb == 0); - test(p2->ice_id() == "::B"); + test(p2->ice_id() == "::Test::B"); test(ret); test(ret->sb == "D1.sb (p2 2)"); test(ret->pb == 0); - test(ret->ice_id() == "::D1"); + test(ret->ice_id() == "::Test::D1"); } catch(...) { @@ -1286,12 +1288,12 @@ allTests(const Ice::CommunicatorPtr& communicator) test(b); test(b->sb == "D4.sb (1)"); test(b->pb == 0); - test(b->ice_id() == "::B"); + test(b->ice_id() == "::Test::B"); test(ret); test(ret->sb == "B.sb (2)"); test(ret->pb == 0); - test(ret->ice_id() == "::B"); + test(ret->ice_id() == "::Test::B"); } catch(...) { @@ -1330,7 +1332,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr r = test->returnTest3(d3, b2); test(r); - test(r->ice_id() == "::B"); + test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); test(r->pb = r); } @@ -1365,7 +1367,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr r = cb->r; test(r); - test(r->ice_id() == "::B"); + test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); test(r->pb = r); } @@ -1400,7 +1402,7 @@ allTests(const Ice::CommunicatorPtr& communicator) BPtr r = test->returnTest3(d3, d12); test(r); - test(r->ice_id() == "::B"); + test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); test(r->pb = r); } @@ -1438,7 +1440,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(cb->check()); BPtr r = cb->r; test(r); - test(r->ice_id() == "::B"); + test(r->ice_id() == "::Test::B"); test(r->sb == "D3.sb"); test(r->pb = r); } @@ -1521,13 +1523,13 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ss2d1->pb == ss2b); test(ss2d3->pb == ss2b); - test(ss1b->ice_id() == "::B"); - test(ss1d1->ice_id() == "::D1"); - test(ss1d3->ice_id() == "::B"); + test(ss1b->ice_id() == "::Test::B"); + test(ss1d1->ice_id() == "::Test::D1"); + test(ss1d3->ice_id() == "::Test::B"); - test(ss2b->ice_id() == "::B"); - test(ss2d1->ice_id() == "::D1"); - test(ss2d3->ice_id() == "::B"); + test(ss2b->ice_id() == "::Test::B"); + test(ss2d1->ice_id() == "::Test::D1"); + test(ss2d3->ice_id() == "::Test::B"); } catch(const ::Ice::Exception&) { @@ -1611,13 +1613,13 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ss2d1->pb == ss2b); test(ss2d3->pb == ss2b); - test(ss1b->ice_id() == "::B"); - test(ss1d1->ice_id() == "::D1"); - test(ss1d3->ice_id() == "::B"); + test(ss1b->ice_id() == "::Test::B"); + test(ss1d1->ice_id() == "::Test::D1"); + test(ss1d3->ice_id() == "::Test::B"); - test(ss2b->ice_id() == "::B"); - test(ss2d1->ice_id() == "::D1"); - test(ss2d3->ice_id() == "::B"); + test(ss2b->ice_id() == "::Test::B"); + test(ss2d1->ice_id() == "::Test::D1"); + test(ss2d3->ice_id() == "::Test::B"); } catch(const ::Ice::Exception&) { @@ -1753,7 +1755,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } catch(const BaseException& e) { - test(e.ice_name() == "BaseException"); + test(e.ice_name() == "Test::BaseException"); test(e.sbe == "sbe"); test(e.pb); test(e.pb->sb == "sb"); @@ -1783,7 +1785,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } catch(const DerivedException& e) { - test(e.ice_name() == "DerivedException"); + test(e.ice_name() == "Test::DerivedException"); test(e.sbe == "sbe"); test(e.pb); test(e.pb->sb == "sb1"); @@ -1819,7 +1821,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } catch(const DerivedException& e) { - test(e.ice_name() == "DerivedException"); + test(e.ice_name() == "Test::DerivedException"); test(e.sbe == "sbe"); test(e.pb); test(e.pb->sb == "sb1"); @@ -1855,7 +1857,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } catch(const BaseException& e) { - test(e.ice_name() == "BaseException"); + test(e.ice_name() == "Test::BaseException"); test(e.sbe == "sbe"); test(e.pb); test(e.pb->sb == "sb d2"); diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp index 5d65ddc55a4..c9009d61983 100644 --- a/cpp/test/Ice/slicing/objects/Client.cpp +++ b/cpp/test/Ice/slicing/objects/Client.cpp @@ -12,12 +12,13 @@ #include <ClientPrivate.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - TestPrx allTests(const Ice::CommunicatorPtr&); - TestPrx Test = allTests(communicator); + TestIntfPrx allTests(const Ice::CommunicatorPtr&); + TestIntfPrx Test = allTests(communicator); Test->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice index c32c2495f52..6ee187eeba5 100644 --- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ClientPrivate.ice @@ -12,10 +12,15 @@ #include <Test.ice> +module Test +{ + class D3 extends B { string sd3; B pd3; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/Forward.ice b/cpp/test/Ice/slicing/objects/Forward.ice index 74ae4b8c7e0..b4a01e4aab8 100644 --- a/cpp/test/Ice/slicing/objects/Forward.ice +++ b/cpp/test/Ice/slicing/objects/Forward.ice @@ -10,6 +10,9 @@ #ifndef FORWARD_ICE #define FORWARD_ICE +module Test +{ + class Forward; class Hidden @@ -22,4 +25,6 @@ class Forward Hidden h; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/ServerPrivate.ice b/cpp/test/Ice/slicing/objects/ServerPrivate.ice index b963d10122d..ecd2228876e 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice index 07e05c6a76b..8c9a5ec3d13 100644 --- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice +++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice index 3817f608833..93bcbf9dcd6 100644 --- a/cpp/test/Ice/slicing/objects/Test.ice +++ b/cpp/test/Ice/slicing/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami"] interface Test +["ami"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice index b68706f831e..f22792c198f 100644 --- a/cpp/test/Ice/slicing/objects/TestAMD.ice +++ b/cpp/test/Ice/slicing/objects/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index 9915f35c06c..eb42882f8fc 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -11,13 +11,15 @@ #include <Ice/Ice.h> #include <sstream> +using namespace Test; + TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { } void -TestI::SBaseAsObject_async(const ::AMD_Test_SBaseAsObjectPtr& cb, const ::Ice::Current&) +TestI::SBaseAsObject_async(const ::AMD_TestIntf_SBaseAsObjectPtr& cb, const ::Ice::Current&) { SBasePtr sb = new SBase; sb->sb = "SBase.sb"; @@ -25,7 +27,7 @@ TestI::SBaseAsObject_async(const ::AMD_Test_SBaseAsObjectPtr& cb, const ::Ice::C } void -TestI::SBaseAsSBase_async(const ::AMD_Test_SBaseAsSBasePtr& cb, const ::Ice::Current&) +TestI::SBaseAsSBase_async(const ::AMD_TestIntf_SBaseAsSBasePtr& cb, const ::Ice::Current&) { SBasePtr sb = new SBase; sb->sb = "SBase.sb"; @@ -33,7 +35,7 @@ TestI::SBaseAsSBase_async(const ::AMD_Test_SBaseAsSBasePtr& cb, const ::Ice::Cur } void -TestI::SBSKnownDerivedAsSBase_async(const ::AMD_Test_SBSKnownDerivedAsSBasePtr& cb, const ::Ice::Current&) +TestI::SBSKnownDerivedAsSBase_async(const ::AMD_TestIntf_SBSKnownDerivedAsSBasePtr& cb, const ::Ice::Current&) { SBSKnownDerivedPtr sbskd = new SBSKnownDerived; sbskd->sb = "SBSKnownDerived.sb"; @@ -42,7 +44,7 @@ TestI::SBSKnownDerivedAsSBase_async(const ::AMD_Test_SBSKnownDerivedAsSBasePtr& } void -TestI::SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_Test_SBSKnownDerivedAsSBSKnownDerivedPtr& cb, +TestI::SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr& cb, const ::Ice::Current&) { SBSKnownDerivedPtr sbskd = new SBSKnownDerived; @@ -52,7 +54,7 @@ TestI::SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_Test_SBSKnownDerivedAs } void -TestI::SBSUnknownDerivedAsSBase_async(const ::AMD_Test_SBSUnknownDerivedAsSBasePtr& cb, const ::Ice::Current&) +TestI::SBSUnknownDerivedAsSBase_async(const ::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr& cb, const ::Ice::Current&) { SBSUnknownDerivedPtr sbsud = new SBSUnknownDerived; sbsud->sb = "SBSUnknownDerived.sb"; @@ -61,7 +63,7 @@ TestI::SBSUnknownDerivedAsSBase_async(const ::AMD_Test_SBSUnknownDerivedAsSBaseP } void -TestI::SUnknownAsObject_async(const ::AMD_Test_SUnknownAsObjectPtr& cb, const ::Ice::Current&) +TestI::SUnknownAsObject_async(const ::AMD_TestIntf_SUnknownAsObjectPtr& cb, const ::Ice::Current&) { SUnknownPtr su = new SUnknown; su->su = "SUnknown.su"; @@ -69,7 +71,7 @@ TestI::SUnknownAsObject_async(const ::AMD_Test_SUnknownAsObjectPtr& cb, const :: } void -TestI::oneElementCycle_async(const ::AMD_Test_oneElementCyclePtr& cb, const ::Ice::Current&) +TestI::oneElementCycle_async(const ::AMD_TestIntf_oneElementCyclePtr& cb, const ::Ice::Current&) { BPtr b = new B; b->sb = "B1.sb"; @@ -78,7 +80,7 @@ TestI::oneElementCycle_async(const ::AMD_Test_oneElementCyclePtr& cb, const ::Ic } void -TestI::twoElementCycle_async(const ::AMD_Test_twoElementCyclePtr& cb, const ::Ice::Current&) +TestI::twoElementCycle_async(const ::AMD_TestIntf_twoElementCyclePtr& cb, const ::Ice::Current&) { BPtr b1 = new B; b1->sb = "B1.sb"; @@ -90,7 +92,7 @@ TestI::twoElementCycle_async(const ::AMD_Test_twoElementCyclePtr& cb, const ::Ic } void -TestI::D1AsB_async(const ::AMD_Test_D1AsBPtr& cb, const ::Ice::Current&) +TestI::D1AsB_async(const ::AMD_TestIntf_D1AsBPtr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -106,7 +108,7 @@ TestI::D1AsB_async(const ::AMD_Test_D1AsBPtr& cb, const ::Ice::Current&) } void -TestI::D1AsD1_async(const ::AMD_Test_D1AsD1Ptr& cb, const ::Ice::Current&) +TestI::D1AsD1_async(const ::AMD_TestIntf_D1AsD1Ptr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -122,7 +124,7 @@ TestI::D1AsD1_async(const ::AMD_Test_D1AsD1Ptr& cb, const ::Ice::Current&) } void -TestI::D2AsB_async(const ::AMD_Test_D2AsBPtr& cb, const ::Ice::Current&) +TestI::D2AsB_async(const ::AMD_TestIntf_D2AsBPtr& cb, const ::Ice::Current&) { D2Ptr d2 = new D2; d2->sb = "D2.sb"; @@ -138,7 +140,7 @@ TestI::D2AsB_async(const ::AMD_Test_D2AsBPtr& cb, const ::Ice::Current&) } void -TestI::paramTest1_async(const ::AMD_Test_paramTest1Ptr& cb, const ::Ice::Current&) +TestI::paramTest1_async(const ::AMD_TestIntf_paramTest1Ptr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -154,7 +156,7 @@ TestI::paramTest1_async(const ::AMD_Test_paramTest1Ptr& cb, const ::Ice::Current } void -TestI::paramTest2_async(const ::AMD_Test_paramTest2Ptr& cb, const ::Ice::Current&) +TestI::paramTest2_async(const ::AMD_TestIntf_paramTest2Ptr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -170,7 +172,7 @@ TestI::paramTest2_async(const ::AMD_Test_paramTest2Ptr& cb, const ::Ice::Current } void -TestI::paramTest3_async(const ::AMD_Test_paramTest3Ptr& cb, const ::Ice::Current&) +TestI::paramTest3_async(const ::AMD_TestIntf_paramTest3Ptr& cb, const ::Ice::Current&) { D2Ptr d2 = new D2; d2->sb = "D2.sb (p1 1)"; @@ -200,7 +202,7 @@ TestI::paramTest3_async(const ::AMD_Test_paramTest3Ptr& cb, const ::Ice::Current } void -TestI::paramTest4_async(const ::AMD_Test_paramTest4Ptr& cb, const ::Ice::Current&) +TestI::paramTest4_async(const ::AMD_TestIntf_paramTest4Ptr& cb, const ::Ice::Current&) { D4Ptr d4 = new D4; d4->sb = "D4.sb (1)"; @@ -213,7 +215,7 @@ TestI::paramTest4_async(const ::AMD_Test_paramTest4Ptr& cb, const ::Ice::Current } void -TestI::returnTest1_async(const ::AMD_Test_returnTest1Ptr& cb, const ::Ice::Current&) +TestI::returnTest1_async(const ::AMD_TestIntf_returnTest1Ptr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -229,7 +231,7 @@ TestI::returnTest1_async(const ::AMD_Test_returnTest1Ptr& cb, const ::Ice::Curre } void -TestI::returnTest2_async(const ::AMD_Test_returnTest2Ptr& cb, const ::Ice::Current&) +TestI::returnTest2_async(const ::AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::Current&) { D1Ptr d1 = new D1; d1->sb = "D1.sb"; @@ -245,13 +247,13 @@ TestI::returnTest2_async(const ::AMD_Test_returnTest2Ptr& cb, const ::Ice::Curre } void -TestI::returnTest3_async(const ::AMD_Test_returnTest3Ptr& cb, const BPtr& p1, const BPtr& p2, const ::Ice::Current&) +TestI::returnTest3_async(const ::AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr& p2, const ::Ice::Current&) { cb->ice_response(p1); } void -TestI::sequenceTest_async(const ::AMD_Test_sequenceTestPtr& cb, +TestI::sequenceTest_async(const ::AMD_TestIntf_sequenceTestPtr& cb, const SS1Ptr& p1, const SS2Ptr& p2, const ::Ice::Current&) { SS ss; @@ -261,7 +263,7 @@ TestI::sequenceTest_async(const ::AMD_Test_sequenceTestPtr& cb, } void -TestI::dictionaryTest_async(const ::AMD_Test_dictionaryTestPtr& cb, const ::BDict& bin, const ::Ice::Current&) +TestI::dictionaryTest_async(const ::AMD_TestIntf_dictionaryTestPtr& cb, const ::BDict& bin, const ::Ice::Current&) { BDict bout; int i; @@ -291,7 +293,7 @@ TestI::dictionaryTest_async(const ::AMD_Test_dictionaryTestPtr& cb, const ::BDic } void -TestI::throwBaseAsBase_async(const ::AMD_Test_throwBaseAsBasePtr& cb, const ::Ice::Current&) +TestI::throwBaseAsBase_async(const ::AMD_TestIntf_throwBaseAsBasePtr& cb, const ::Ice::Current&) { BaseException be; be.sbe = "sbe"; @@ -302,7 +304,7 @@ TestI::throwBaseAsBase_async(const ::AMD_Test_throwBaseAsBasePtr& cb, const ::Ic } void -TestI::throwDerivedAsBase_async(const ::AMD_Test_throwDerivedAsBasePtr& cb, const ::Ice::Current&) +TestI::throwDerivedAsBase_async(const ::AMD_TestIntf_throwDerivedAsBasePtr& cb, const ::Ice::Current&) { DerivedException de; de.sbe = "sbe"; @@ -319,7 +321,7 @@ TestI::throwDerivedAsBase_async(const ::AMD_Test_throwDerivedAsBasePtr& cb, cons } void -TestI::throwDerivedAsDerived_async(const ::AMD_Test_throwDerivedAsDerivedPtr& cb, const ::Ice::Current&) +TestI::throwDerivedAsDerived_async(const ::AMD_TestIntf_throwDerivedAsDerivedPtr& cb, const ::Ice::Current&) { DerivedException de; de.sbe = "sbe"; @@ -336,7 +338,7 @@ TestI::throwDerivedAsDerived_async(const ::AMD_Test_throwDerivedAsDerivedPtr& cb } void -TestI::throwUnknownDerivedAsBase_async(const ::AMD_Test_throwUnknownDerivedAsBasePtr& cb, const ::Ice::Current&) +TestI::throwUnknownDerivedAsBase_async(const ::AMD_TestIntf_throwUnknownDerivedAsBasePtr& cb, const ::Ice::Current&) { D2Ptr d2 = new D2; d2->sb = "sb d2"; @@ -353,7 +355,7 @@ TestI::throwUnknownDerivedAsBase_async(const ::AMD_Test_throwUnknownDerivedAsBas } void -TestI::useForward_async(const ::AMD_Test_useForwardPtr& cb, const ::Ice::Current&) +TestI::useForward_async(const ::AMD_TestIntf_useForwardPtr& cb, const ::Ice::Current&) { ForwardPtr f = new Forward; f->h = new Hidden; @@ -362,7 +364,7 @@ TestI::useForward_async(const ::AMD_Test_useForwardPtr& cb, const ::Ice::Current } void -TestI::shutdown_async(const ::AMD_Test_shutdownPtr& cb, const ::Ice::Current&) +TestI::shutdown_async(const ::AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current&) { _adapter->getCommunicator()->shutdown(); cb->ice_response(); diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h index 0fa7f350990..85bebdc1ecf 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.h +++ b/cpp/test/Ice/slicing/objects/TestAMDI.h @@ -13,53 +13,57 @@ #include <ServerPrivateAMD.h> #include <Forward.h> -class TestI : virtual public Test +class TestI : virtual public ::Test::TestIntf { public: TestI(const ::Ice::ObjectAdapterPtr&); - virtual void SBaseAsObject_async(const ::AMD_Test_SBaseAsObjectPtr&, const ::Ice::Current&); - virtual void SBaseAsSBase_async(const ::AMD_Test_SBaseAsSBasePtr&, const ::Ice::Current&); - virtual void SBSKnownDerivedAsSBase_async(const ::AMD_Test_SBSKnownDerivedAsSBasePtr&, const ::Ice::Current&); - virtual void SBSKnownDerivedAsSBSKnownDerived_async(const ::AMD_Test_SBSKnownDerivedAsSBSKnownDerivedPtr&, + virtual void SBaseAsObject_async(const ::Test::AMD_TestIntf_SBaseAsObjectPtr&, const ::Ice::Current&); + virtual void SBaseAsSBase_async(const ::Test::AMD_TestIntf_SBaseAsSBasePtr&, const ::Ice::Current&); + virtual void SBSKnownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBasePtr&, + const ::Ice::Current&); + virtual void SBSKnownDerivedAsSBSKnownDerived_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr&, const ::Ice::Current&); - virtual void SBSUnknownDerivedAsSBase_async(const ::AMD_Test_SBSUnknownDerivedAsSBasePtr&, + virtual void SBSUnknownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr&, const ::Ice::Current&); - virtual void SUnknownAsObject_async(const ::AMD_Test_SUnknownAsObjectPtr&, const ::Ice::Current&); + virtual void SUnknownAsObject_async(const ::Test::AMD_TestIntf_SUnknownAsObjectPtr&, const ::Ice::Current&); - virtual void oneElementCycle_async(const ::AMD_Test_oneElementCyclePtr&, const ::Ice::Current&); - virtual void twoElementCycle_async(const ::AMD_Test_twoElementCyclePtr&, const ::Ice::Current&); + virtual void oneElementCycle_async(const ::Test::AMD_TestIntf_oneElementCyclePtr&, const ::Ice::Current&); + virtual void twoElementCycle_async(const ::Test::AMD_TestIntf_twoElementCyclePtr&, const ::Ice::Current&); - virtual void D1AsB_async(const ::AMD_Test_D1AsBPtr&, const ::Ice::Current&); - virtual void D1AsD1_async(const ::AMD_Test_D1AsD1Ptr&, const ::Ice::Current&); - virtual void D2AsB_async(const ::AMD_Test_D2AsBPtr&, const ::Ice::Current&); + virtual void D1AsB_async(const ::Test::AMD_TestIntf_D1AsBPtr&, const ::Ice::Current&); + virtual void D1AsD1_async(const ::Test::AMD_TestIntf_D1AsD1Ptr&, const ::Ice::Current&); + virtual void D2AsB_async(const ::Test::AMD_TestIntf_D2AsBPtr&, const ::Ice::Current&); - virtual void paramTest1_async(const ::AMD_Test_paramTest1Ptr&, const ::Ice::Current&); - virtual void paramTest2_async(const ::AMD_Test_paramTest2Ptr&, const ::Ice::Current&); - virtual void paramTest3_async(const ::AMD_Test_paramTest3Ptr&, const ::Ice::Current&); - virtual void paramTest4_async(const ::AMD_Test_paramTest4Ptr&, const ::Ice::Current&); + virtual void paramTest1_async(const ::Test::AMD_TestIntf_paramTest1Ptr&, const ::Ice::Current&); + virtual void paramTest2_async(const ::Test::AMD_TestIntf_paramTest2Ptr&, const ::Ice::Current&); + virtual void paramTest3_async(const ::Test::AMD_TestIntf_paramTest3Ptr&, const ::Ice::Current&); + virtual void paramTest4_async(const ::Test::AMD_TestIntf_paramTest4Ptr&, const ::Ice::Current&); - virtual void returnTest1_async(const ::AMD_Test_returnTest1Ptr&, const ::Ice::Current&); - virtual void returnTest2_async(const ::AMD_Test_returnTest2Ptr&, const ::Ice::Current&); - virtual void returnTest3_async(const ::AMD_Test_returnTest3Ptr&, const BPtr&, const BPtr&, const ::Ice::Current&); + virtual void returnTest1_async(const ::Test::AMD_TestIntf_returnTest1Ptr&, const ::Ice::Current&); + virtual void returnTest2_async(const ::Test::AMD_TestIntf_returnTest2Ptr&, const ::Ice::Current&); + virtual void returnTest3_async(const ::Test::AMD_TestIntf_returnTest3Ptr&, const ::Test::BPtr&, const ::Test::BPtr&, + const ::Ice::Current&); - virtual void sequenceTest_async(const ::AMD_Test_sequenceTestPtr&, - const SS1Ptr&, const SS2Ptr&, const ::Ice::Current&); + virtual void sequenceTest_async(const ::Test::AMD_TestIntf_sequenceTestPtr&, + const ::Test::SS1Ptr&, const ::Test::SS2Ptr&, const ::Ice::Current&); - virtual void dictionaryTest_async(const ::AMD_Test_dictionaryTestPtr&, - const ::BDict&, const ::Ice::Current&); + virtual void dictionaryTest_async(const ::Test::AMD_TestIntf_dictionaryTestPtr&, + const ::Test::BDict&, const ::Ice::Current&); - virtual void throwBaseAsBase_async(const ::AMD_Test_throwBaseAsBasePtr&, const ::Ice::Current&); - virtual void throwDerivedAsBase_async(const ::AMD_Test_throwDerivedAsBasePtr&, const ::Ice::Current&); - virtual void throwDerivedAsDerived_async(const ::AMD_Test_throwDerivedAsDerivedPtr&, const ::Ice::Current&); - virtual void throwUnknownDerivedAsBase_async(const ::AMD_Test_throwUnknownDerivedAsBasePtr&, const ::Ice::Current&); + virtual void throwBaseAsBase_async(const ::Test::AMD_TestIntf_throwBaseAsBasePtr&, const ::Ice::Current&); + virtual void throwDerivedAsBase_async(const ::Test::AMD_TestIntf_throwDerivedAsBasePtr&, const ::Ice::Current&); + virtual void throwDerivedAsDerived_async(const ::Test::AMD_TestIntf_throwDerivedAsDerivedPtr&, + const ::Ice::Current&); + virtual void throwUnknownDerivedAsBase_async(const ::Test::AMD_TestIntf_throwUnknownDerivedAsBasePtr&, + const ::Ice::Current&); - virtual void useForward_async(const ::AMD_Test_useForwardPtr&, const ::Ice::Current&); + virtual void useForward_async(const ::Test::AMD_TestIntf_useForwardPtr&, const ::Ice::Current&); - virtual void shutdown_async(const ::AMD_Test_shutdownPtr&, const ::Ice::Current&); + virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&); private: diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp index 1deb66fe725..db9e6b4d9f4 100644 --- a/cpp/test/Ice/slicing/objects/TestI.cpp +++ b/cpp/test/Ice/slicing/objects/TestI.cpp @@ -11,6 +11,8 @@ #include <Ice/Ice.h> #include <sstream> +using namespace Test; + TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h index 5eda53d47f1..b49fa9fea0a 100644 --- a/cpp/test/Ice/slicing/objects/TestI.h +++ b/cpp/test/Ice/slicing/objects/TestI.h @@ -13,47 +13,47 @@ #include <ServerPrivate.h> #include <Forward.h> -class TestI : virtual public Test +class TestI : virtual public Test::TestIntf { public: TestI(const ::Ice::ObjectAdapterPtr&); virtual ::Ice::ObjectPtr SBaseAsObject(const ::Ice::Current&); - virtual SBasePtr SBaseAsSBase(const ::Ice::Current&); - virtual SBasePtr SBSKnownDerivedAsSBase(const ::Ice::Current&); - virtual SBSKnownDerivedPtr SBSKnownDerivedAsSBSKnownDerived(const ::Ice::Current&); + virtual ::Test::SBasePtr SBaseAsSBase(const ::Ice::Current&); + virtual ::Test::SBasePtr SBSKnownDerivedAsSBase(const ::Ice::Current&); + virtual ::Test::SBSKnownDerivedPtr SBSKnownDerivedAsSBSKnownDerived(const ::Ice::Current&); - virtual SBasePtr SBSUnknownDerivedAsSBase(const ::Ice::Current&); + virtual ::Test::SBasePtr SBSUnknownDerivedAsSBase(const ::Ice::Current&); virtual ::Ice::ObjectPtr SUnknownAsObject(const ::Ice::Current&); - virtual BPtr oneElementCycle(const ::Ice::Current&); - virtual BPtr twoElementCycle(const ::Ice::Current&); + virtual ::Test::BPtr oneElementCycle(const ::Ice::Current&); + virtual ::Test::BPtr twoElementCycle(const ::Ice::Current&); - virtual BPtr D1AsB(const ::Ice::Current&); - virtual D1Ptr D1AsD1(const ::Ice::Current&); - virtual BPtr D2AsB(const ::Ice::Current&); + virtual ::Test::BPtr D1AsB(const ::Ice::Current&); + virtual ::Test::D1Ptr D1AsD1(const ::Ice::Current&); + virtual ::Test::BPtr D2AsB(const ::Ice::Current&); - virtual void paramTest1(BPtr&, BPtr&, const ::Ice::Current&); - virtual void paramTest2(BPtr&, BPtr&, const ::Ice::Current&); - virtual BPtr paramTest3(BPtr&, BPtr&, const ::Ice::Current&); - virtual BPtr paramTest4(BPtr&, const ::Ice::Current&); + virtual void paramTest1(::Test::BPtr&, ::Test::BPtr&, const ::Ice::Current&); + virtual void paramTest2(::Test::BPtr&, ::Test::BPtr&, const ::Ice::Current&); + virtual ::Test::BPtr paramTest3(::Test::BPtr&, ::Test::BPtr&, const ::Ice::Current&); + virtual ::Test::BPtr paramTest4(::Test::BPtr&, const ::Ice::Current&); - virtual BPtr returnTest1(BPtr&, BPtr&, const ::Ice::Current&); - virtual BPtr returnTest2(BPtr&, BPtr&, const ::Ice::Current&); - virtual BPtr returnTest3(const BPtr&, const BPtr&, const ::Ice::Current&); + virtual ::Test::BPtr returnTest1(::Test::BPtr&, ::Test::BPtr&, const ::Ice::Current&); + virtual ::Test::BPtr returnTest2(::Test::BPtr&, ::Test::BPtr&, const ::Ice::Current&); + virtual ::Test::BPtr returnTest3(const ::Test::BPtr&, const ::Test::BPtr&, const ::Ice::Current&); - virtual SS sequenceTest(const SS1Ptr&, const SS2Ptr&, const ::Ice::Current&); + virtual ::Test::SS sequenceTest(const ::Test::SS1Ptr&, const ::Test::SS2Ptr&, const ::Ice::Current&); - virtual ::BDict dictionaryTest(const ::BDict&, ::BDict&, const ::Ice::Current&); + virtual ::Test::BDict dictionaryTest(const ::Test::BDict&, ::Test::BDict&, const ::Ice::Current&); virtual void throwBaseAsBase(const ::Ice::Current&); virtual void throwDerivedAsBase(const ::Ice::Current&); virtual void throwDerivedAsDerived(const ::Ice::Current&); virtual void throwUnknownDerivedAsBase(const ::Ice::Current&); - virtual void useForward(::ForwardPtr&, const ::Ice::Current&); + virtual void useForward(::Test::ForwardPtr&, const ::Ice::Current&); virtual void shutdown(const ::Ice::Current&); diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp index 4deaf9ef799..728885de005 100644 --- a/cpp/test/IcePack/deployer/AllTests.cpp +++ b/cpp/test/IcePack/deployer/AllTests.cpp @@ -16,6 +16,7 @@ #include <Test.h> using namespace std; +using namespace Test; struct ProxyIdentityEqual : public std::binary_function<Ice::ObjectPrx,string,bool> { @@ -99,20 +100,20 @@ allTests(const Ice::CommunicatorPtr& communicator) // cout << "pinging server objects... " << flush; - TestPrx obj; + TestIntfPrx obj; - obj = TestPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); - obj = TestPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox1-Service2@IceBox1Service2Adapter")); - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1")); - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox1-Service2@IceBox1Service2Adapter")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); cout << "ok" << endl; cout << "testing server configuration... " << flush; - obj = TestPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); test(obj->getProperty("Type") == "Server"); test(obj->getProperty("Name") == "Server1"); @@ -120,7 +121,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(obj->getProperty("Variable1") == ""); test(obj->getProperty("Variable2") == ""); - obj = TestPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); test(obj->getProperty("Target1") == "1"); test(obj->getProperty("Target2") == "1"); test(obj->getProperty("Variable") == "val0prop"); @@ -131,13 +132,13 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing service configuration... " << flush; - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); test(obj->getProperty("Service1.Type") == "standard"); test(obj->getProperty("Service1.ServiceName") == "Service1"); test(obj->getProperty("Service1.InheritedVariable") == "inherited"); - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); test(obj->getProperty("Service2.Type") == "freeze"); test(obj->getProperty("Service2.ServiceName") == "Service2"); @@ -151,7 +152,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing server options... " << flush; - obj = TestPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); test(obj->getProperty("Test.Test") == "2"); test(obj->getProperty("Test.Test1") == "0"); @@ -169,11 +170,11 @@ allTestsWithTarget(const Ice::CommunicatorPtr& communicator) cout << "pinging server objects... " << flush; - TestPrx obj; + TestIntfPrx obj; admin->setServerActivation("Server1", IcePack::Manual); try { - obj = TestPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); test(false); } catch(const Ice::LocalException&) @@ -181,15 +182,15 @@ allTestsWithTarget(const Ice::CommunicatorPtr& communicator) } admin->startServer("Server1"); - obj = TestPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server1@Server1.Server")); test(obj->getProperty("Mode") == "manual"); - obj = TestPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("Server2@Server2.Server")); cout << "ok" << endl; cout << "testing service configuration... " << flush; - obj = TestPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrx::checkedCast(communicator->stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); test(obj->getProperty("Service1.DebugProperty") == "debug"); cout << "ok" << endl; diff --git a/cpp/test/IcePack/deployer/Test.ice b/cpp/test/IcePack/deployer/Test.ice index 04841b0d1db..f2cd7f239b8 100644 --- a/cpp/test/IcePack/deployer/Test.ice +++ b/cpp/test/IcePack/deployer/Test.ice @@ -10,11 +10,16 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void shutdown(); string getProperty(string name); }; +}; + #endif diff --git a/cpp/test/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h index d760ad720b7..dd80f510d91 100644 --- a/cpp/test/IcePack/deployer/TestI.h +++ b/cpp/test/IcePack/deployer/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class TestI : public Test +class TestI : public ::Test::TestIntf { public: diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp index eeb8592b0e6..4c5ac451805 100644 --- a/cpp/test/IcePack/simple/AllTests.cpp +++ b/cpp/test/IcePack/simple/AllTests.cpp @@ -13,8 +13,9 @@ #include <Test.h> using namespace std; +using namespace Test; -TestPrx +TestIntfPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; @@ -23,7 +24,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestPrx obj = TestPrx::checkedCast(base); + TestIntfPrx obj = TestIntfPrx::checkedCast(base); test(obj); test(obj == base); cout << "ok" << endl; @@ -35,7 +36,7 @@ allTests(const Ice::CommunicatorPtr& communicator) return obj; } -TestPrx +TestIntfPrx allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; @@ -46,10 +47,10 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestPrx obj = TestPrx::checkedCast(base); + TestIntfPrx obj = TestIntfPrx::checkedCast(base); test(obj); test(obj == base); - TestPrx obj2 = TestPrx::checkedCast(base2); + TestIntfPrx obj2 = TestIntfPrx::checkedCast(base2); test(obj2); test(obj2 == base2); cout << "ok" << endl; @@ -94,7 +95,7 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) cout << "testing whether server is still reachable... " << flush; try { - obj = TestPrx::checkedCast(base); + obj = TestIntfPrx::checkedCast(base); test(false); } catch(const Ice::NoEndpointException&) @@ -102,7 +103,7 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) } try { - obj2 = TestPrx::checkedCast(base2); + obj2 = TestIntfPrx::checkedCast(base2); test(false); } catch(const Ice::NoEndpointException&) @@ -113,7 +114,7 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) try { - obj = TestPrx::checkedCast(base); + obj = TestIntfPrx::checkedCast(base); } catch(const Ice::NoEndpointException&) { @@ -121,7 +122,7 @@ allTestsWithDeploy(const Ice::CommunicatorPtr& communicator) } try { - obj2 = TestPrx::checkedCast(base2); + obj2 = TestIntfPrx::checkedCast(base2); } catch(const Ice::NoEndpointException&) { diff --git a/cpp/test/IcePack/simple/Client.cpp b/cpp/test/IcePack/simple/Client.cpp index 5ff301d7ac0..fbec566f23d 100644 --- a/cpp/test/IcePack/simple/Client.cpp +++ b/cpp/test/IcePack/simple/Client.cpp @@ -12,6 +12,7 @@ #include <Test.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) @@ -27,11 +28,11 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } } - TestPrx obj; + TestIntfPrx obj; if(!withDeploy) { - TestPrx allTests(const Ice::CommunicatorPtr&); + TestIntfPrx allTests(const Ice::CommunicatorPtr&); obj = allTests(communicator); cout << "shutting down server... " << flush; @@ -40,7 +41,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } else { - TestPrx allTestsWithDeploy(const Ice::CommunicatorPtr&); + TestIntfPrx allTestsWithDeploy(const Ice::CommunicatorPtr&); obj = allTestsWithDeploy(communicator); } diff --git a/cpp/test/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice index 54953223857..2553165ab21 100644 --- a/cpp/test/IcePack/simple/Test.ice +++ b/cpp/test/IcePack/simple/Test.ice @@ -10,9 +10,14 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void shutdown(); }; +}; + #endif diff --git a/cpp/test/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp index 10f2ecade27..698588264c5 100644 --- a/cpp/test/IcePack/simple/TestI.cpp +++ b/cpp/test/IcePack/simple/TestI.cpp @@ -10,6 +10,8 @@ #include <Ice/Ice.h> #include <TestI.h> +using namespace Test; + TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter) { diff --git a/cpp/test/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h index 59790712392..c3cd07af279 100644 --- a/cpp/test/IcePack/simple/TestI.h +++ b/cpp/test/IcePack/simple/TestI.h @@ -12,7 +12,7 @@ #include <Test.h> -class TestI : public Test +class TestI : public ::Test::TestIntf { public: diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp index 60505c4ba02..230e0b5734c 100644 --- a/cpp/test/IceSSL/certificateVerification/Client.cpp +++ b/cpp/test/IceSSL/certificateVerification/Client.cpp @@ -14,6 +14,7 @@ #include <Pinger.h> using namespace std; +using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) diff --git a/cpp/test/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice index 8fbe12b4b27..e805fcb87c7 100644 --- a/cpp/test/IceSSL/certificateVerification/Pinger.ice +++ b/cpp/test/IceSSL/certificateVerification/Pinger.ice @@ -12,6 +12,9 @@ #include <Ice/BuiltinSequences.ice> +module Test +{ + class KeyManager { void getServerCerts(out Ice::ByteSeq trusted, out Ice::ByteSeq untrusted); @@ -25,4 +28,6 @@ class Pinger void ping(); }; +}; + #endif diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp index b5bc762bd6a..fe4d689cc99 100644 --- a/cpp/test/IceSSL/certificateVerification/Server.cpp +++ b/cpp/test/IceSSL/certificateVerification/Server.cpp @@ -14,6 +14,7 @@ #include <Pinger.h> using namespace std; +using namespace Test; class KeyManagerI : public KeyManager { diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice index 82f18651871..9167ec4f393 100644 --- a/cpp/test/IceStorm/federation/Event.ice +++ b/cpp/test/IceStorm/federation/Event.ice @@ -10,9 +10,14 @@ #ifndef EVENT_ICE #define EVENT_ICE +module Test +{ + interface Event { void pub(string data); }; +}; + #endif diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp index 2ceac955796..0d7dbde7c6a 100644 --- a/cpp/test/IceStorm/federation/Publisher.cpp +++ b/cpp/test/IceStorm/federation/Publisher.cpp @@ -14,6 +14,7 @@ using namespace std; using namespace Ice; using namespace IceStorm; +using namespace Test; int run(int argc, char* argv[], const CommunicatorPtr& communicator) diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp index 14b8be18faa..d6a2b144d0a 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -24,6 +24,7 @@ using namespace std; using namespace Ice; using namespace IceStorm; +using namespace Test; class EventI : public Event { diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp index fd106e1e5e1..fb6dffc02e9 100644 --- a/cpp/test/IceStorm/single/Publisher.cpp +++ b/cpp/test/IceStorm/single/Publisher.cpp @@ -14,6 +14,7 @@ using namespace std; using namespace Ice; using namespace IceStorm; +using namespace Test; int run(int argc, char* argv[], const CommunicatorPtr& communicator) diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice index a4a1b8cecdf..22287c3698a 100644 --- a/cpp/test/IceStorm/single/Single.ice +++ b/cpp/test/IceStorm/single/Single.ice @@ -10,9 +10,14 @@ #ifndef SINGLE_ICE #define SINGLE_ICE +module Test +{ + interface Single { void event(); }; +}; + #endif diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 70225e34b0a..f026681826a 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -22,6 +22,7 @@ using namespace std; using namespace Ice; using namespace IceStorm; +using namespace Test; class SingleI : public Single, public IceUtil::Mutex { diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.err b/cpp/test/Slice/errorDetection/CaseInsensitive.err index e3accbf1dea..a307a69b466 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.err +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.err @@ -49,23 +49,23 @@ CaseInsensitive.ice:194: redefinition of enumeration `en1' as enumerator CaseInsensitive.ice:195: enumerator `EN1' differs only in capitalization from enumeration `en1' CaseInsensitive.ice:196: redefinition of module `m1' as enumerator CaseInsensitive.ice:197: enumerator `M1' differs only in capitalization from module `m1' -CaseInsensitive.ice:215: interface name `base' is capitalized inconsistently with its previous name: `::xxx::xx::Base' +CaseInsensitive.ice:215: interface name `base' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Base' CaseInsensitive.ice:215: redefinition of interface `Derived' -CaseInsensitive.ice:223: exception name `E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:229: sequence name `S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:230: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:231: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:232: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::xxx::xx::s1' -CaseInsensitive.ice:238: interface name `derived' is capitalized inconsistently with its previous name: `::xxx::xx::Derived' +CaseInsensitive.ice:223: exception name `E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:229: sequence name `S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:230: sequence name `xxx::xx::S1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:231: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:232: sequence name `xxx::XX::s1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::s1' +CaseInsensitive.ice:238: interface name `derived' is capitalized inconsistently with its previous name: `::Test::xxx::xx::Derived' CaseInsensitive.ice:247: parameter `Param' differs only in capitalization from parameter `param' CaseInsensitive.ice:247: `Param' has changed meaning -CaseInsensitive.ice:249: exception name `E1' is capitalized inconsistently with its previous name: `::e1' -CaseInsensitive.ice:251: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:252: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:253: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:255: exception name `xxx::xx::E1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:256: exception name `xxx::XX::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' -CaseInsensitive.ice:257: exception name `XXX::xx::e1' is capitalized inconsistently with its previous name: `::xxx::xx::e1' +CaseInsensitive.ice:249: exception name `E1' is capitalized inconsistently with its previous name: `::Test::e1' +CaseInsensitive.ice:251: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:252: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:253: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:255: exception name `Test::xxx::xx::E1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:256: exception name `Test::xxx::XX::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' +CaseInsensitive.ice:257: exception name `Test::XXX::xx::e1' is capitalized inconsistently with its previous name: `::Test::xxx::xx::e1' CaseInsensitive.ice:258: operation name `op12' cannot be used as parameter name CaseInsensitive.ice:259: parameter `OP13' differs only in capitalization from operation name `op13' CaseInsensitive.ice:275: ambiguous multiple inheritance: `derived' inherits operations `op' and `OP', which differ only in capitalization, from unrelated base interfaces diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice index fa0e5e674c9..30334202b64 100644 --- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseInsensitive.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface i1 { @@ -227,8 +227,8 @@ sequence<long> s1; struct s { S1 x; - ::xxx::xx::S1 y; - ::xxx::XX::s1 z; + xxx::xx::S1 y; + xxx::XX::s1 z; xxx::XX::s1 w; }; @@ -247,14 +247,14 @@ interface Foo void op(long param, string Param); void op2() throws e1; void op3() throws E1; - void op4() throws xxx::xx::e1; - void op5() throws xxx::xx::E1; - void op6() throws xxx::XX::e1; - void op7() throws XXX::xx::e1; - void op8() throws ::xxx::xx::e1; - void op9() throws ::xxx::xx::E1; - void op10() throws ::xxx::XX::e1; - void op11() throws ::XXX::xx::e1; + void op4() throws Test::xxx::xx::e1; + void op5() throws Test::xxx::xx::E1; + void op6() throws Test::xxx::XX::e1; + void op7() throws Test::XXX::xx::e1; + void op8() throws ::Test::xxx::xx::e1; + void op9() throws ::Test::xxx::xx::E1; + void op10() throws ::Test::xxx::XX::e1; + void op11() throws ::Test::XXX::xx::e1; void op12(long op12); void op13(long OP13); }; @@ -275,3 +275,5 @@ module CI { }; }; + +}; diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice index 32149de9f8c..eeaa418b1e3 100644 --- a/cpp/test/Slice/errorDetection/CaseSensitive.ice +++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice @@ -9,8 +9,8 @@ - - +module Test +{ module M1 { @@ -148,3 +148,5 @@ interface i15 { void op(int Op); }; + +}; diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice index 92d9c2cdbec..26ad276009e 100644 --- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice +++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice @@ -9,8 +9,8 @@ - - +module Test +{ sequence<long> ls; @@ -21,7 +21,7 @@ struct s00 struct s0 { - ::ls ls; // OK + Test::ls ls; // OK }; struct s1 @@ -32,7 +32,7 @@ struct s1 struct s2 { - ::ls mem; + Test::ls mem; long ls; // OK }; @@ -67,9 +67,9 @@ module N module O { - interface n1 extends ::i1 {}; + interface n1 extends ::Test::i1 {}; interface i1 {}; // OK - interface i2 extends ::i2 {}; // OK + interface i2 extends ::Test::i2 {}; // OK }; @@ -136,19 +136,19 @@ struct x struct y { - ::IS is; // OK, nothing introduced + ::Test::IS is; // OK, nothing introduced }; interface Blah { - void op1() throws ::E::ee1; // Nothing introduced + void op1() throws ::Test::E::ee1; // Nothing introduced void E(); // OK void op2() throws E; // Changed meaning }; interface Blah2 { - void op3() throws ::E::ee1; // Nothing introduced + void op3() throws ::Test::E::ee1; // Nothing introduced void E(); // OK void op4() throws E::ee1; // Changed meaning }; @@ -178,12 +178,14 @@ module M1 }; }; -const M1::M2::C MyConstant1 = M1::M2::C2; // OK -const ::M1::M2::C MyConstant2 = M1::M2::C2; // OK -const M1::M2::C MyConstant3 = ::M1::M2::C2; // OK -const ::M1::M2::C MyConstant4 = ::M1::M2::C2; // OK +const Test::M1::M2::C MyConstant1 = Test::M1::M2::C2; // OK +const ::Test::M1::M2::C MyConstant2 = Test::M1::M2::C2; // OK +const Test::M1::M2::C MyConstant3 = ::Test::M1::M2::C2; // OK +const ::Test::M1::M2::C MyConstant4 = ::Test::M1::M2::C2; // OK class smnpTest1Class { M1::smnpStruct smnpTest1Op1() throws M1::smnpException; // OK }; + +}; diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.err b/cpp/test/Slice/errorDetection/ClassRedefinition.err index ba6f871e04b..483961ff9e0 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.err +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.err @@ -1,4 +1,2 @@ -ClassRedefinition.ice:17: redefinition of class `Class1' -ClassRedefinition.ice:17: syntax error -ClassRedefinition.ice:21: redefinition of class `Class2' -ClassRedefinition.ice:21: syntax error +ClassRedefinition.ice:18: redefinition of class `Class1' +ClassRedefinition.ice:22: redefinition of class `Class2' diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice index 3de8fb3b7f5..b87f2fbf706 100644 --- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice +++ b/cpp/test/Slice/errorDetection/ClassRedefinition.ice @@ -9,14 +9,16 @@ - - +module Test +{ interface Foo { long op(); }; -class Class1 implements Foo { byte b; }; -class Class1 implements Foo { long l; }; +class Class1 implements Foo { byte b; long l; }; class Class1; +class Class1 implements Foo { long l; }; local class Class2 implements Foo { byte b; }; -local class Class2 implements Foo { byte b; }; local class Class2; +local class Class2 implements Foo { byte b; }; + +}; diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err index 27d7bcafe9e..7f8d198b784 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.err +++ b/cpp/test/Slice/errorDetection/ConstDef.err @@ -9,7 +9,7 @@ ConstDef.ice:85: initializer of type `double' is incompatible with the type `sho ConstDef.ice:86: type of initializer is incompatible with the type `int' of constant `ic7' ConstDef.ice:87: initializer of type `bool' is incompatible with the type `long' of constant `ic8' ConstDef.ice:89: missing constant name -ConstDef.ice:92: enumerator `two' is not defined in enumeration `::color' +ConstDef.ice:92: enumerator `two' is not defined in enumeration `::Test::color' ConstDef.ice:93: type of initializer is incompatible with the type of constant `ic10' ConstDef.ice:109: integer constant `-9223372036854775809' out of range ConstDef.ice:110: integer constant `+9223372036854775808' out of range diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice index c5861cbc604..29bda54871a 100644 --- a/cpp/test/Slice/errorDetection/ConstDef.ice +++ b/cpp/test/Slice/errorDetection/ConstDef.ice @@ -9,8 +9,8 @@ - - +module Test +{ // // Basic checks (all OK) @@ -27,7 +27,7 @@ const string stringconst = "X\aX\x00001X\rX\007\xffX\xffffX\xff7f"; const string stringconst2 = "Hello World!"; enum color { red, green, blue }; const color colorconst = blue; -const ::color colorconst2 = ::green; +const ::Test::color colorconst2 = ::Test::green; // // Checks for number formats (all OK) @@ -73,7 +73,7 @@ const float nf10 = -1E+1f; const float nf11 = -1E1F; const XXX ic1 = 1; // no such type -const long f11 = 1; // redifinition +const long f11 = 1; // redefinition const long F10 = 1; // case-insensitive redefinition sequence<long> LS; @@ -123,3 +123,5 @@ const byte b1 = 0; // OK const byte b2 = 255; // OK const byte b3 = -1; // underflow const byte b4 = 256; // overflow + +}; diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice index 570c125b7dc..7049c527392 100644 --- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice @@ -9,11 +9,13 @@ - - +module Test +{ class C { int member; int member; }; + +}; diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice index 5a96a7b04cb..7074c6e24d8 100644 --- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice +++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice @@ -9,11 +9,13 @@ - - +module Test +{ interface Foo { int bar(string, long l, out bool, out short s); int bar2(string s, long, out bool b, out short); }; + +}; diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice index 24acc948e4b..959c114b71c 100644 --- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface Base1 { @@ -49,3 +49,5 @@ class c1 { long l; }; class c2 extends c1 { double l; }; // error class c3 extends c1 { double d; }; // OK class c4 extends c3 { short l; }; // error, l in c1 + +}; diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index b7dac037a28..7807bc3e696 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -9,10 +9,12 @@ - - +module Test +{ dictionary<int, long> Dictionary; dictionary<int, long> Dictionary; dictionary<int, long> foo; dictionary<int, long> foo; + +}; diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice index 8891863793c..d1d68f5cb05 100644 --- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice +++ b/cpp/test/Slice/errorDetection/DuplicateParameter.ice @@ -9,8 +9,8 @@ - - +module Test +{ class Foo { @@ -29,3 +29,5 @@ interface IFoo string bar3(out string s, out int s); string bar4(string s, int i, out int i); }; + +}; diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice index 0fb106536c3..bbc2f42d067 100644 --- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice +++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice @@ -9,12 +9,14 @@ - - +module Test +{ exception e {}; exception e2 {}; -interface i2 { void op() throws ::e, e; }; -interface i3 { void op() throws e, ::e; }; +interface i2 { void op() throws ::Test::e, e; }; +interface i3 { void op() throws e, ::Test::e; }; interface i4 { void op() throws e2, e, e2; }; -interface i5 { void op() throws e2, e, e2, ::e; }; +interface i5 { void op() throws e2, e, e2, ::Test::e; }; + +}; diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice index 7e796ae8b1e..4c906d71efe 100644 --- a/cpp/test/Slice/errorDetection/EnumEmpty.ice +++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice @@ -9,7 +9,9 @@ - - +module Test +{ enum foo {}; + +}; diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice index 43adb38c70a..c11a8a68370 100644 --- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice @@ -9,8 +9,10 @@ - - +module Test +{ enum E1 { A, B, C }; enum E1 { D, E, F }; + +}; diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice index ea25dffb995..eda84afc845 100644 --- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice +++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice @@ -9,8 +9,10 @@ - - +module Test +{ enum Enum1 { A, B, C }; enum Enum2 { A, B, E }; + +}; diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err index 80a03b40ca4..7fd2910e0bd 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err @@ -18,11 +18,10 @@ IdentAsKeyword.ice:31: illegal identifier: `MOdule' differs from keyword `module IdentAsKeyword.ice:31: keyword `module' cannot be used as class name IdentAsKeyword.ice:32: keyword `module' cannot be used as class name IdentAsKeyword.ice:32: redefinition of class `module' -IdentAsKeyword.ice:32: syntax error IdentAsKeyword.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization IdentAsKeyword.ice:34: keyword `extends' cannot be used as data member name IdentAsKeyword.ice:35: redefinition of class `C' -IdentAsKeyword.ice:35: syntax error +IdentAsKeyword.ice:35: keyword `extends' cannot be used as data member name IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name IdentAsKeyword.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization @@ -31,7 +30,6 @@ IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name IdentAsKeyword.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization IdentAsKeyword.ice:42: keyword `Object' cannot be used as interface name IdentAsKeyword.ice:42: redefinition of interface `Object' -IdentAsKeyword.ice:42: syntax error IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name IdentAsKeyword.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization IdentAsKeyword.ice:45: keyword `implements' cannot be used as sequence name diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice index 13df1383c65..a6e8bd9da81 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice @@ -9,8 +9,8 @@ - - +module Test +{ INTERFACE i { void op(); }; @@ -92,3 +92,5 @@ interface \_true; // Illegal leading underscore interface b_; // Illegal underscore interface tr_ue; // Illegal underscore interface \tr_ue; // Illegal underscore + +}; diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice index ac12f2e1be3..790e9380d6c 100644 --- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice +++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice @@ -9,8 +9,8 @@ - - +module Test +{ dictionary<bool, long> d1; // OK dictionary<byte, long> d2; // OK @@ -55,3 +55,5 @@ sequence<e> s4; dictionary<s4, long> d10; // OK dictionary<d9, long> b9; // Bad + +}; diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice index e6d60267696..851c9370004 100644 --- a/cpp/test/Slice/errorDetection/IllegalLocal.ice +++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface i1 {}; @@ -91,3 +91,5 @@ local class c7 { void op() throws E; // error }; + +}; diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice index 28c78d7020c..4d9b72cc064 100644 --- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice +++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice @@ -9,8 +9,8 @@ - - +module Test +{ exception module; exception void @@ -74,3 +74,5 @@ enum E interface Bletch extends Object { }; + +}; diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.err b/cpp/test/Slice/errorDetection/InterfaceMismatch.err index 96b6c3d2a00..0d97ece8a62 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.err +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.err @@ -1,8 +1,6 @@ InterfaceMismatch.ice:16: class `Foo1' was declared as interface InterfaceMismatch.ice:17: class `Foo1' was declared as interface -InterfaceMismatch.ice:17: syntax error InterfaceMismatch.ice:20: class `Foo2' was defined as interface InterfaceMismatch.ice:23: interface `Foo3' was declared as class InterfaceMismatch.ice:24: interface `Foo3' was declared as class -InterfaceMismatch.ice:24: syntax error InterfaceMismatch.ice:27: interface `Foo4' was defined as class diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice index cedefd8e10c..d6f3d315d6b 100644 --- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice +++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface Foo1; class Foo1; @@ -25,3 +25,5 @@ interface Foo3 { void op(); }; class Foo4 { long l; }; interface Foo4; + +}; diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err index a35abc30814..6137478016e 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.err +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.err @@ -1,4 +1,2 @@ InterfaceRedefinition.ice:16: redefinition of interface `Intf1' -InterfaceRedefinition.ice:16: syntax error InterfaceRedefinition.ice:20: redefinition of interface `Intf2' -InterfaceRedefinition.ice:20: syntax error diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice index ae6d1e04017..51a37fb37ba 100644 --- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface Intf1 { void op(); }; interface Intf1 { void op(); }; @@ -19,3 +19,5 @@ interface Intf1; local interface Intf2 { void op(); }; local interface Intf2 { void op(); }; local interface Intf2; + +}; diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.err b/cpp/test/Slice/errorDetection/LocalMismatch.err index a5b22785fea..9ea56523855 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.err +++ b/cpp/test/Slice/errorDetection/LocalMismatch.err @@ -1,16 +1,12 @@ LocalMismatch.ice:16: local `Intf1' was declared non-local LocalMismatch.ice:17: local `Intf1' was declared non-local -LocalMismatch.ice:17: syntax error LocalMismatch.ice:20: local `Intf2' was defined non-local LocalMismatch.ice:23: non-local `Intf3' was declared local LocalMismatch.ice:24: non-local `Intf3' was declared local -LocalMismatch.ice:24: syntax error LocalMismatch.ice:27: non-local `Intf4' was defined local LocalMismatch.ice:30: local `Class1' was declared non-local LocalMismatch.ice:31: local `Class1' was declared non-local -LocalMismatch.ice:31: syntax error LocalMismatch.ice:34: local `Class2' was defined non-local LocalMismatch.ice:37: non-local `Class3' was declared local LocalMismatch.ice:38: non-local `Class3' was declared local -LocalMismatch.ice:38: syntax error LocalMismatch.ice:41: non-local `Class4' was defined local diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice index e78ac93057f..66b89d97a5d 100644 --- a/cpp/test/Slice/errorDetection/LocalMismatch.ice +++ b/cpp/test/Slice/errorDetection/LocalMismatch.ice @@ -9,8 +9,8 @@ - - +module Test +{ interface Intf1; local interface Intf1; @@ -39,3 +39,5 @@ interface Class3 { void op(); }; local interface Class4 { void op(); }; interface Class4; + +}; diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice index 53591468854..695bf3638b8 100644 --- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice +++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice @@ -9,8 +9,8 @@ - - +module Test +{ class Foo { @@ -38,3 +38,5 @@ struct SBar { string SBar; }; + +}; diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice index f99a5d10d1a..0f95199bf1d 100644 --- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice +++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice @@ -9,8 +9,8 @@ - - +module Test +{ sequence<int> Seq; sequence<int> Sequence1; @@ -20,3 +20,5 @@ interface BarIntf extends Seq { void op(); }; class BarClass1 extends Seq { long l; }; class BarClass2 implements Sequence1, Sequence2, Sequence3 { long l; }; class BarClass3 extends Seq implements Sequence1, Sequence2, Sequence3 { long l; }; + +}; diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice index 2e7f7912737..c849c83c70d 100644 --- a/cpp/test/Slice/errorDetection/NotType.ice +++ b/cpp/test/Slice/errorDetection/NotType.ice @@ -9,8 +9,8 @@ - - +module Test +{ module Module1 { }; module Module2 { }; @@ -39,3 +39,5 @@ interface I E foo(E e1; E e2); void op(); }; + +}; diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice index 10c44d4c00e..3ba61282ded 100644 --- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice +++ b/cpp/test/Slice/errorDetection/OperationRedefinition.ice @@ -9,8 +9,8 @@ - - +module Test +{ class C { @@ -18,3 +18,5 @@ class C void operation(); long l; }; + +}; diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice index 0d6df517a33..5dce166eb25 100644 --- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice +++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice @@ -9,11 +9,13 @@ - - +module Test +{ interface Foo { void bar(long l1, out long l2, long l3); void baz(out long l2, long l3); }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice index 08a43f09ad3..b46342569ef 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice @@ -9,11 +9,13 @@ - - +module Test +{ sequence<int> Sequence1; class Sequence1; sequence<int> Sequence2; class Sequence2 { }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice index 3b0c2b89737..db13d1ae41b 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice @@ -9,8 +9,8 @@ - - +module Test +{ class C { @@ -18,3 +18,5 @@ class C int operation; long l; }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice index 7f5178267c5..86fde40f4d2 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice @@ -9,8 +9,10 @@ - - +module Test +{ class C { long l; }; dictionary<string, int> C; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice index 469959e52c8..7fdd1172a02 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice @@ -9,8 +9,10 @@ - - +module Test +{ class C { long l; }; enum C { A, B, C }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice index ff518a042e1..24d3e7938e8 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice @@ -9,9 +9,11 @@ - - +module Test +{ class C { long l; }; sequence<int> Seq; enum E { C, Seq, blah }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice index 3a102088a90..87328114ca6 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice @@ -9,11 +9,13 @@ - - +module Test +{ sequence<int> Sequence1; interface Sequence1; sequence<int> Sequence2; interface Sequence2 { }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice index cbccdc98141..2a344572a6c 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice @@ -9,10 +9,12 @@ - - +module Test +{ sequence<int> Seq; -module Seq; +module Seq { }; module Mod { }; module Mod { }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice index 580ae63aac5..d89b89440c7 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice @@ -9,11 +9,13 @@ - - +module Test +{ class C { int member; void member(); }; + +}; diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice index 67755555dc2..87158594d01 100644 --- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice +++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice @@ -9,8 +9,10 @@ - - +module Test +{ class C { long l; }; sequence<int> C; + +}; diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice index f12132fffbd..c14e563303b 100644 --- a/cpp/test/Slice/errorDetection/SelfContainment.ice +++ b/cpp/test/Slice/errorDetection/SelfContainment.ice @@ -9,8 +9,8 @@ - - +module Test +{ struct x { @@ -18,11 +18,10 @@ struct x x j; // Error }; -// TODO: The following should cause an error, but doesn't. Need to add a check for that. -#if 0 class y { int i; - y j; // Error + y j; // OK +}; + }; -#endif diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice index 42456734ab5..321ba837e4c 100644 --- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice +++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice @@ -9,8 +9,10 @@ - - +module Test +{ sequence<int> Seq; sequence<int> Seq; + +}; diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice index 7cf23f0ac75..b9dd7fe9353 100644 --- a/cpp/test/Slice/errorDetection/StructMembers.ice +++ b/cpp/test/Slice/errorDetection/StructMembers.ice @@ -9,8 +9,8 @@ - - +module Test +{ struct s1 // Illegal empty struct { @@ -63,3 +63,5 @@ struct s11 { long // Missing data member name }; + +}; diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice index af2982bc5af..395b99e9e1a 100644 --- a/cpp/test/Slice/errorDetection/Undefined.ice +++ b/cpp/test/Slice/errorDetection/Undefined.ice @@ -9,8 +9,8 @@ - - +module Test +{ sequence<Foo> FooSequence; dictionary<Foo, Bar> FooBarDictionary; @@ -18,3 +18,5 @@ interface BarIntf extends Foo { void op(); }; class BarClass1 extends Foo { long l; }; class BarClass2 implements Foo1, Foo2, Foo3 { long l; }; class BarClass3 extends Foo implements Foo1, Foo2, Foo3 { long l; }; + +}; diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice index 042042c5a6d..2139895bcdc 100644 --- a/cpp/test/Slice/errorDetection/WrongProxyType.ice +++ b/cpp/test/Slice/errorDetection/WrongProxyType.ice @@ -9,8 +9,8 @@ - - +module Test +{ sequence<int> Seq; dictionary<Seq, int> Dict; @@ -26,3 +26,5 @@ interface I void f6(out Dict*); void op(); }; + +}; diff --git a/java/CHANGES b/java/CHANGES index d4170e7322a..d2976c66e72 100644 --- a/java/CHANGES +++ b/java/CHANGES @@ -1,6 +1,21 @@ Changes since version 1.5.1 --------------------------- +- The documentation has always stated that same-named constructs + cannot be directly nested inside each other. (For example, a + module `M' cannot contain a constant named `M'. The slice2java + compiler did not enforce this correctly up to now for modules + containing constructs with the same name as the enclosing module. + This has been fixed and now results in a diagnostic. + +- The slice2java compiler now deprecates Slice definitions at global scope: + only modules can be defined at global scope. Everything else + (constants, classes, interfaces, etc.) must be defined inside a module. + + For the time being, the compiler issues a warning for each global definition + but continues to compile the code. Global non-module definitions will + elicit a hard error two releases from now. + - Several demos used Slice classes where interface were more appropriate. This has been fixed. diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 15ddb023220..89f018fd21c 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -234,7 +234,6 @@ def mixedClientServerTestWithOptions(additionalServerOptions, additionalClientOp print "starting client...", clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") - print "\n\n" + client + clientOptions + additionalClientOptions + "\n\n" print "ok" printOutputFromPipe(clientPipe) diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java index f7aee6eb942..4f6406fb9d6 100644 --- a/java/demo/Freeze/bench/Client.java +++ b/java/demo/Freeze/bench/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class TestApp extends Ice.Application { TestApp(String envName) diff --git a/java/demo/Freeze/bench/Test.ice b/java/demo/Freeze/bench/Test.ice index 40dfef6a96e..23d76da8ab1 100644 --- a/java/demo/Freeze/bench/Test.ice +++ b/java/demo/Freeze/bench/Test.ice @@ -7,6 +7,9 @@ // // ********************************************************************** +module Demo +{ + struct Struct1 { long l; @@ -27,3 +30,5 @@ class Class2 extends Class1 Object obj; Object rec; }; + +}; diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml index 5fc12961ceb..4378165c90e 100644 --- a/java/demo/Freeze/bench/build.xml +++ b/java/demo/Freeze/bench/build.xml @@ -64,9 +64,9 @@ <pathelement path="${slice.dir}" /> </includepath> <fileset dir="." includes="Test.ice"/> - <dict name="Struct1Struct2Map" key="Struct1" value="Struct2"/> - <dict name="Struct1Class1Map" key="Struct1" value="Class1"/> - <dict name="Struct1ObjectMap" key="Struct1" value="Object"/> + <dict name="Struct1Struct2Map" key="Demo::Struct1" value="Demo::Struct2"/> + <dict name="Struct1Class1Map" key="Demo::Struct1" value="Demo::Class1"/> + <dict name="Struct1ObjectMap" key="Demo::Struct1" value="Object"/> </slice2freezej> </target> diff --git a/java/demo/Freeze/library/BookI.java b/java/demo/Freeze/library/BookI.java index 5dacd3f4679..b75365d1f4e 100644 --- a/java/demo/Freeze/library/BookI.java +++ b/java/demo/Freeze/library/BookI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class BookI extends Book { // diff --git a/java/demo/Freeze/library/Library.ice b/java/demo/Freeze/library/Library.ice index 915aa6bff4c..b571d3d66fc 100644 --- a/java/demo/Freeze/library/Library.ice +++ b/java/demo/Freeze/library/Library.ice @@ -10,6 +10,9 @@ #ifndef LIBRARY_ICE #define LIBRARY_ICE +module Demo +{ + /** * * This exception is raised in the case of a database failure. @@ -227,4 +230,6 @@ interface Library idempotent void shutdown(); }; +}; + #endif diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java index 7ab176841c5..52cbcae6f9b 100644 --- a/java/demo/Freeze/library/LibraryI.java +++ b/java/demo/Freeze/library/LibraryI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class LibraryI extends _LibraryDisp { public synchronized BookPrx diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java index 1dc7262e109..f8b930731c9 100644 --- a/java/demo/Freeze/library/Parser.java +++ b/java/demo/Freeze/library/Parser.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class Parser { Parser(Ice.Communicator communicator, LibraryPrx library) diff --git a/java/demo/Freeze/library/RunParser.java b/java/demo/Freeze/library/RunParser.java index 5fdcf782e4a..45bac44f680 100644 --- a/java/demo/Freeze/library/RunParser.java +++ b/java/demo/Freeze/library/RunParser.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class RunParser { static void diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java index e1fb1662e04..9f13584d226 100644 --- a/java/demo/Freeze/phonebook/ContactI.java +++ b/java/demo/Freeze/phonebook/ContactI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class ContactI extends Contact { // diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java index e4a745ddae3..2a5feaf1152 100644 --- a/java/demo/Freeze/phonebook/Parser.java +++ b/java/demo/Freeze/phonebook/Parser.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class Parser { Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook) diff --git a/java/demo/Freeze/phonebook/PhoneBook.ice b/java/demo/Freeze/phonebook/PhoneBook.ice index 61c502f3c88..f14c5865794 100644 --- a/java/demo/Freeze/phonebook/PhoneBook.ice +++ b/java/demo/Freeze/phonebook/PhoneBook.ice @@ -12,6 +12,9 @@ #include <Ice/Identity.ice> +module Demo +{ + exception DatabaseException { string message; @@ -45,4 +48,6 @@ interface PhoneBook idempotent void shutdown(); }; +}; + #endif diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java index b0f21c0d76d..3e39c61dba6 100644 --- a/java/demo/Freeze/phonebook/PhoneBookI.java +++ b/java/demo/Freeze/phonebook/PhoneBookI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class PhoneBookI extends _PhoneBookDisp { public ContactPrx diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java index 4c564dbb671..dc03b0dc3de 100644 --- a/java/demo/Freeze/phonebook/RunParser.java +++ b/java/demo/Freeze/phonebook/RunParser.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class RunParser { static void diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml index 9f388a27df8..fb99f406af0 100644 --- a/java/demo/Freeze/phonebook/build.xml +++ b/java/demo/Freeze/phonebook/build.xml @@ -58,7 +58,7 @@ <pathelement path="${slice.dir}" /> </includepath> <fileset dir="." includes="PhoneBook.ice"/> - <index name="NameIndex" type="Contact" member="name" casesensitive="no"/> + <index name="NameIndex" type="Demo::Contact" member="name" casesensitive="no"/> </slice2freezej> </target> diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java index 40ced49e7a3..136cf009a92 100644 --- a/java/demo/Glacier/session/Client.java +++ b/java/demo/Glacier/session/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/Glacier/session/HelloSession.ice b/java/demo/Glacier/session/HelloSession.ice index b4c1723bd94..140ee60222d 100644 --- a/java/demo/Glacier/session/HelloSession.ice +++ b/java/demo/Glacier/session/HelloSession.ice @@ -12,9 +12,14 @@ #include <Glacier/Session.ice> +module Demo +{ + interface HelloSession extends Glacier::Session { void hello(); }; +}; + #endif diff --git a/java/demo/Glacier/session/HelloSessionI.java b/java/demo/Glacier/session/HelloSessionI.java index 430c1f4e619..8671c85d31a 100644 --- a/java/demo/Glacier/session/HelloSessionI.java +++ b/java/demo/Glacier/session/HelloSessionI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -final class HelloSessionI extends HelloSession +import Demo.*; + +final class HelloSessionI extends _HelloSessionDisp { public HelloSessionI(String userId, HelloSessionManagerI manager) diff --git a/java/demo/Ice/callback/Callback.ice b/java/demo/Ice/callback/Callback.ice index 6138731b5c0..f1ae0a03df8 100644 --- a/java/demo/Ice/callback/Callback.ice +++ b/java/demo/Ice/callback/Callback.ice @@ -10,6 +10,8 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Demo { + interface CallbackReceiver { void callback(); @@ -21,4 +23,6 @@ interface Callback void shutdown(); }; +}; + #endif diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java index e1dc5430cd3..d310e88a078 100644 --- a/java/demo/Ice/callback/CallbackClient.java +++ b/java/demo/Ice/callback/CallbackClient.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class CallbackClient extends Ice.Application { private static void diff --git a/java/demo/Ice/callback/CallbackI.java b/java/demo/Ice/callback/CallbackI.java index e879891ca36..2c026b74ab1 100644 --- a/java/demo/Ice/callback/CallbackI.java +++ b/java/demo/Ice/callback/CallbackI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public final class CallbackI extends _CallbackDisp { public void diff --git a/java/demo/Ice/callback/CallbackReceiverI.java b/java/demo/Ice/callback/CallbackReceiverI.java index c408da821c2..656c684fcf9 100644 --- a/java/demo/Ice/callback/CallbackReceiverI.java +++ b/java/demo/Ice/callback/CallbackReceiverI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class CallbackReceiverI extends CallbackReceiver +import Demo.*; + +public final class CallbackReceiverI extends _CallbackReceiverDisp { public void callback(Ice.Current current) diff --git a/java/demo/Ice/callback/CallbackServer.java b/java/demo/Ice/callback/CallbackServer.java index 75aa7ca7e46..9c9025d73f1 100644 --- a/java/demo/Ice/callback/CallbackServer.java +++ b/java/demo/Ice/callback/CallbackServer.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class CallbackServer extends Ice.Application { public int diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java index 6e77b1a3d38..11a2ed73067 100644 --- a/java/demo/Ice/hello/Client.java +++ b/java/demo/Ice/hello/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice index 9b532a2e9a8..b07362aa6df 100644 --- a/java/demo/Ice/hello/Hello.ice +++ b/java/demo/Ice/hello/Hello.ice @@ -10,10 +10,14 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo { + interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java index 02b174e8051..de46e06b2b9 100644 --- a/java/demo/Ice/hello/HelloI.java +++ b/java/demo/Ice/hello/HelloI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class HelloI extends Hello +import Demo.*; + +public class HelloI extends _HelloDisp { public void sayHello(Ice.Current current) diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java index c3a0d9b0e3c..929e5ae18d7 100644 --- a/java/demo/Ice/hello/Server.java +++ b/java/demo/Ice/hello/Server.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Server { private static int diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java index 3b801bc4141..7657b48ec40 100644 --- a/java/demo/Ice/latency/Client.java +++ b/java/demo/Ice/latency/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static int diff --git a/java/demo/Ice/latency/Latency.ice b/java/demo/Ice/latency/Latency.ice index 04c9673ec48..ba5af7216c7 100644 --- a/java/demo/Ice/latency/Latency.ice +++ b/java/demo/Ice/latency/Latency.ice @@ -10,8 +10,13 @@ #ifndef LATENCY_ICE #define LATENCY_ICE +module Demo +{ + class Ping { }; +}; + #endif diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java index 29c86d3703e..64321be7e09 100644 --- a/java/demo/Ice/latency/Server.java +++ b/java/demo/Ice/latency/Server.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Server { private static int diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice index 916d80d0a12..4216d412f11 100644 --- a/java/demo/Ice/nested/Nested.ice +++ b/java/demo/Ice/nested/Nested.ice @@ -10,9 +10,14 @@ #ifndef NESTED_ICE #define NESTED_ICE +module Demo +{ + interface Nested { void nestedCall(int level, Nested* proxy); }; +}; + #endif diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java index 48e277e0bbe..7bfc0266f44 100644 --- a/java/demo/Ice/nested/NestedClient.java +++ b/java/demo/Ice/nested/NestedClient.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class NestedClient extends Ice.Application { public int diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java index 8f45576a92d..ff624b419d4 100644 --- a/java/demo/Ice/nested/NestedI.java +++ b/java/demo/Ice/nested/NestedI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -class NestedI extends Nested +import Demo.*; + +class NestedI extends _NestedDisp { NestedI(NestedPrx self) { diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java index 3606a1a83eb..337a812cbf1 100644 --- a/java/demo/Ice/nested/NestedServer.java +++ b/java/demo/Ice/nested/NestedServer.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class NestedServer extends Ice.Application { public int diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java index b41aa1fb079..f98ac2e461d 100644 --- a/java/demo/Ice/throughput/Client.java +++ b/java/demo/Ice/throughput/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/Ice/throughput/Throughput.ice b/java/demo/Ice/throughput/Throughput.ice index 20195e9924e..d0346f0dfd9 100644 --- a/java/demo/Ice/throughput/Throughput.ice +++ b/java/demo/Ice/throughput/Throughput.ice @@ -10,6 +10,9 @@ #ifndef THROUGHPUT_ICE #define THROUGHPUT_ICE +module Demo +{ + const int seqSize = 500000; sequence<byte> ByteSeq; @@ -21,4 +24,6 @@ interface Throughput ByteSeq echoByteSeq(ByteSeq seq); }; +}; + #endif diff --git a/java/demo/Ice/throughput/ThroughputI.java b/java/demo/Ice/throughput/ThroughputI.java index 733033072fa..2ddfd4c2a66 100644 --- a/java/demo/Ice/throughput/ThroughputI.java +++ b/java/demo/Ice/throughput/ThroughputI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public final class ThroughputI extends _ThroughputDisp { public diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java index 79369dd4e73..02581546580 100644 --- a/java/demo/Ice/value/Client.java +++ b/java/demo/Ice/value/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/Ice/value/DerivedPrinterI.java b/java/demo/Ice/value/DerivedPrinterI.java index 329047ca33e..43bd6682950 100644 --- a/java/demo/Ice/value/DerivedPrinterI.java +++ b/java/demo/Ice/value/DerivedPrinterI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class DerivedPrinterI extends DerivedPrinter { public void diff --git a/java/demo/Ice/value/InitialI.java b/java/demo/Ice/value/InitialI.java index e9bbfb79734..580d9f01c0e 100644 --- a/java/demo/Ice/value/InitialI.java +++ b/java/demo/Ice/value/InitialI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class InitialI extends Initial { InitialI(Ice.ObjectAdapter adapter) diff --git a/java/demo/Ice/value/PrinterI.java b/java/demo/Ice/value/PrinterI.java index 50e5a4f723b..e3f18002a11 100644 --- a/java/demo/Ice/value/PrinterI.java +++ b/java/demo/Ice/value/PrinterI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + class PrinterI extends Printer { public void diff --git a/java/demo/Ice/value/Value.ice b/java/demo/Ice/value/Value.ice index b8f03f2448b..22fbecbcf17 100644 --- a/java/demo/Ice/value/Value.ice +++ b/java/demo/Ice/value/Value.ice @@ -10,6 +10,9 @@ #ifndef VALUE_ICE #define VALUE_ICE +module Demo +{ + class Simple { string message; @@ -41,4 +44,6 @@ class Initial void throwDerivedPrinter() throws DerivedPrinterException; }; +}; + #endif diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java index 3d58e887c16..6cf7d7bade7 100644 --- a/java/demo/IceBox/hello/Client.java +++ b/java/demo/IceBox/hello/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice index f7344f0d112..52d80d07463 100644 --- a/java/demo/IceBox/hello/Hello.ice +++ b/java/demo/IceBox/hello/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { void sayHello(); void shutdown(); }; +}; + #endif diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java index 02b174e8051..de46e06b2b9 100644 --- a/java/demo/IceBox/hello/HelloI.java +++ b/java/demo/IceBox/hello/HelloI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class HelloI extends Hello +import Demo.*; + +public class HelloI extends _HelloDisp { public void sayHello(Ice.Current current) diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java index fb2d0551a87..aeb1b2bc19d 100644 --- a/java/demo/IcePack/hello/Client.java +++ b/java/demo/IcePack/hello/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/IcePack/hello/Hello.ice b/java/demo/IcePack/hello/Hello.ice index 1fa498dd67c..19f9c3af81e 100644 --- a/java/demo/IcePack/hello/Hello.ice +++ b/java/demo/IcePack/hello/Hello.ice @@ -10,6 +10,9 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + class Hello { /** @@ -75,4 +78,6 @@ interface HelloFactory throws NameNotExistException; }; +}; + #endif diff --git a/java/demo/IcePack/hello/HelloFactoryI.java b/java/demo/IcePack/hello/HelloFactoryI.java index 6bbbc188600..ff12e8c0311 100644 --- a/java/demo/IcePack/hello/HelloFactoryI.java +++ b/java/demo/IcePack/hello/HelloFactoryI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class HelloFactoryI extends _HelloFactoryDisp { public HelloPrx diff --git a/java/demo/IcePack/hello/HelloI.java b/java/demo/IcePack/hello/HelloI.java index faf5805610d..c037fa0dd50 100644 --- a/java/demo/IcePack/hello/HelloI.java +++ b/java/demo/IcePack/hello/HelloI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class HelloI extends Hello { HelloI(String n) diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java index 62480255e54..c58ab55c3ec 100644 --- a/java/demo/IcePack/simple/Client.java +++ b/java/demo/IcePack/simple/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Demo.*; + public class Client { private static void diff --git a/java/demo/IcePack/simple/Hello.ice b/java/demo/IcePack/simple/Hello.ice index 9b532a2e9a8..4ce83cbc4c1 100644 --- a/java/demo/IcePack/simple/Hello.ice +++ b/java/demo/IcePack/simple/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + interface Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/java/demo/IcePack/simple/HelloI.java b/java/demo/IcePack/simple/HelloI.java index 02b174e8051..de46e06b2b9 100644 --- a/java/demo/IcePack/simple/HelloI.java +++ b/java/demo/IcePack/simple/HelloI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class HelloI extends Hello +import Demo.*; + +public class HelloI extends _HelloDisp { public void sayHello(Ice.Current current) diff --git a/java/test/Glacier/starter/Callback.ice b/java/test/Glacier/starter/Callback.ice index fb56ee553d1..7fe414331e9 100644 --- a/java/test/Glacier/starter/Callback.ice +++ b/java/test/Glacier/starter/Callback.ice @@ -10,6 +10,9 @@ #ifndef CALLBACK_ICE #define CALLBACK_ICE +module Test +{ + exception CallbackException { double someValue; @@ -34,4 +37,6 @@ class Callback void shutdown(); }; +}; + #endif diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java index e026b19805a..7282dc6f673 100644 --- a/java/test/Glacier/starter/CallbackClient.java +++ b/java/test/Glacier/starter/CallbackClient.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + class CallbackClient extends Ice.Application { public int diff --git a/java/test/Glacier/starter/CallbackI.java b/java/test/Glacier/starter/CallbackI.java index 048f4c47aac..2b3ddbb8e71 100644 --- a/java/test/Glacier/starter/CallbackI.java +++ b/java/test/Glacier/starter/CallbackI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + final class CallbackI extends Callback { CallbackI(Ice.Communicator communicator) diff --git a/java/test/Glacier/starter/CallbackReceiverI.java b/java/test/Glacier/starter/CallbackReceiverI.java index 5e5d8ff8dcc..89f8ff891b5 100644 --- a/java/test/Glacier/starter/CallbackReceiverI.java +++ b/java/test/Glacier/starter/CallbackReceiverI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + final class CallbackReceiverI extends CallbackReceiver { CallbackReceiverI() diff --git a/java/test/Glacier/starter/CallbackServer.java b/java/test/Glacier/starter/CallbackServer.java index afe840fe1c0..c57e82f9d6c 100644 --- a/java/test/Glacier/starter/CallbackServer.java +++ b/java/test/Glacier/starter/CallbackServer.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + class CallbackServer extends Ice.Application { public int diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index d9a0a22bc97..a93c2deccd9 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -18,7 +20,7 @@ public class AllTests } } - public static TestPrx + public static TestIntfPrx allTests(Ice.Communicator communicator) { System.out.print("testing stringToProxy... "); @@ -30,7 +32,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx obj = TestPrxHelper.checkedCast(base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base); test(obj != null); test(obj.equals(base)); System.out.println("ok"); diff --git a/java/test/Ice/adapterDeactivation/CookieI.java b/java/test/Ice/adapterDeactivation/CookieI.java index f2b653a37ab..f83d53c5b8f 100644 --- a/java/test/Ice/adapterDeactivation/CookieI.java +++ b/java/test/Ice/adapterDeactivation/CookieI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class CookieI extends Cookie { public String diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java index aed23396c93..2fb210c1ff8 100644 --- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java +++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.ServantLocator { public diff --git a/java/test/Ice/adapterDeactivation/Test.ice b/java/test/Ice/adapterDeactivation/Test.ice index 61e539de9be..30c397569bc 100644 --- a/java/test/Ice/adapterDeactivation/Test.ice +++ b/java/test/Ice/adapterDeactivation/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void transient(); @@ -22,4 +25,6 @@ local class Cookie nonmutating string message(); }; +}; + #endif diff --git a/java/test/Ice/adapterDeactivation/TestI.java b/java/test/Ice/adapterDeactivation/TestI.java index d35599a1426..9cf9f7c076b 100644 --- a/java/test/Ice/adapterDeactivation/TestI.java +++ b/java/test/Ice/adapterDeactivation/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public void _transient(Ice.Current current) diff --git a/java/test/Ice/checksum/client/Types.ice b/java/test/Ice/checksum/client/Types.ice index 5162f718775..1fd712e3963 100644 --- a/java/test/Ice/checksum/client/Types.ice +++ b/java/test/Ice/checksum/client/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -432,4 +435,6 @@ local class LocalClass { }; +}; + #endif diff --git a/java/test/Ice/checksum/server/Types.ice b/java/test/Ice/checksum/server/Types.ice index 0dd61483918..3f848504eb3 100644 --- a/java/test/Ice/checksum/server/Types.ice +++ b/java/test/Ice/checksum/server/Types.ice @@ -10,6 +10,9 @@ #ifndef CLASS_ICE #define CLASS_ICE +module Test +{ + // // TEST: Same // @@ -427,4 +430,6 @@ local class LocalClass { }; +}; + #endif diff --git a/java/test/Ice/custom/AllTests.java b/java/test/Ice/custom/AllTests.java index 7caa9e220f4..21beb2ad679 100644 --- a/java/test/Ice/custom/AllTests.java +++ b/java/test/Ice/custom/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -18,7 +20,7 @@ public class AllTests } } - public static TestPrx + public static TestIntfPrx allTests(Ice.Communicator communicator) { System.out.print("testing stringToProxy... "); @@ -30,7 +32,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx t = TestPrxHelper.checkedCast(obj); + TestIntfPrx t = TestIntfPrxHelper.checkedCast(obj); test(t != null); test(t.equals(obj)); System.out.println("ok"); diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java index 4bed35f2413..d4eb5361446 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/Ice/custom/Client.java @@ -7,12 +7,14 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int run(String[] args, Ice.Communicator communicator) { - TestPrx test = AllTests.allTests(communicator); + TestIntfPrx test = AllTests.allTests(communicator); test.shutdown(); return 0; } diff --git a/java/test/Ice/custom/Test.ice b/java/test/Ice/custom/Test.ice index ce5b7477a8b..e715fd2448a 100644 --- a/java/test/Ice/custom/Test.ice +++ b/java/test/Ice/custom/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class C {}; sequence<C> CSeq; @@ -39,7 +42,7 @@ dictionary<int, string> D; sequence<StringSeq> StringSeqSeq; -class Test +class TestIntf { CSeq opCSeq(CSeq inSeq, out CSeq outSeq); CArray opCArray(CArray inSeq, out CArray outSeq); @@ -62,4 +65,6 @@ class Test ["java:type:java.util.ArrayList"] CSeq seq; }; +}; + #endif diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java index 841b9c9851b..c2b6efe568a 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/Ice/custom/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends Test +import Test.*; + +public final class TestI extends TestIntf { public TestI(Ice.Communicator communicator) diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index a182c19a8c2..c6392c12003 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java index 9df1ff4576f..5f053e4d0eb 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/Ice/exceptions/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int diff --git a/java/test/Ice/exceptions/EmptyI.java b/java/test/Ice/exceptions/EmptyI.java index 29c04eaf89c..798e8d20f77 100644 --- a/java/test/Ice/exceptions/EmptyI.java +++ b/java/test/Ice/exceptions/EmptyI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class EmptyI extends _EmptyDisp { } diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice index f6d13e9d1df..770654b6ee8 100644 --- a/java/test/Ice/exceptions/Test.ice +++ b/java/test/Ice/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -63,4 +66,6 @@ exception D void noSuchOperation(); }; +}; + #endif diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java index 4006e6a215f..47684ce5c86 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/Ice/exceptions/ThrowerI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class ThrowerI extends _ThrowerDisp { public diff --git a/java/test/Ice/exceptionsAMD/TestAMD.ice b/java/test/Ice/exceptionsAMD/TestAMD.ice index 11719036fda..ce98802bc9c 100644 --- a/java/test/Ice/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/exceptionsAMD/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + interface Thrower; exception A @@ -58,4 +61,6 @@ exception D void noSuchOperation(); }; +}; + #endif diff --git a/java/test/Ice/exceptionsAMD/ThrowerI.java b/java/test/Ice/exceptionsAMD/ThrowerI.java index be7a9f2e116..b00b4feafa8 100644 --- a/java/test/Ice/exceptionsAMD/ThrowerI.java +++ b/java/test/Ice/exceptionsAMD/ThrowerI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class ThrowerI extends _ThrowerDisp { public diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java index 84f93f2046b..ce18a6955ca 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/Ice/facets/AI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class AI extends _ADisp { public diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 1f83dedde45..061926a7640 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java index 5dc13f18884..7796fbc3a6b 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/Ice/facets/BI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class BI extends _BDisp { public diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java index b7bc6a89396..13f8fa4d369 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/Ice/facets/CI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class CI extends _CDisp { public diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java index 3aa5592873d..b934a152322 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/Ice/facets/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java index 2d086fd708f..e05dd828ad6 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/Ice/facets/DI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class DI extends _DDisp { public diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java index f3b2e7af2e6..6df929c2480 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/Ice/facets/EI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class EI extends _EDisp { public diff --git a/java/test/Ice/facets/EmptyI.java b/java/test/Ice/facets/EmptyI.java index 29c04eaf89c..798e8d20f77 100644 --- a/java/test/Ice/facets/EmptyI.java +++ b/java/test/Ice/facets/EmptyI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class EmptyI extends _EmptyDisp { } diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java index 68e766f6da2..d27023bf8b1 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/Ice/facets/FI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class FI extends _FDisp { public diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java index ea39ff00943..08042a185ac 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/Ice/facets/GI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class GI extends _GDisp { public diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java index df2e7636328..3a00c3eb975 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/Ice/facets/HI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class HI extends _HDisp { public diff --git a/java/test/Ice/facets/Test.ice b/java/test/Ice/facets/Test.ice index adfcb0b9c31..3ee6b51a8f1 100644 --- a/java/test/Ice/facets/Test.ice +++ b/java/test/Ice/facets/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -55,4 +58,6 @@ interface H extends G string callH(); }; +}; + #endif diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java index 6bb918f5c6c..577f94b7934 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { public static void @@ -60,7 +62,7 @@ public class AllTests private boolean _called; } - private static class AMI_Test_pidI extends AMI_Test_pid + private static class AMI_Test_pidI extends AMI_TestIntf_pid { public void ice_response(int pid) @@ -98,7 +100,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_shutdownI extends AMI_Test_shutdown + private static class AMI_Test_shutdownI extends AMI_TestIntf_shutdown { public void ice_response() @@ -127,7 +129,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_abortI extends AMI_Test_abort + private static class AMI_Test_abortI extends AMI_TestIntf_abort { public void ice_response() @@ -173,7 +175,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_idempotentAbortI extends AMI_Test_idempotentAbort + private static class AMI_Test_idempotentAbortI extends AMI_TestIntf_idempotentAbort { public void ice_response() @@ -202,7 +204,7 @@ public class AllTests private AMI_Test_abortI delegate = new AMI_Test_abortI(); } - private static class AMI_Test_nonmutatingAbortI extends AMI_Test_nonmutatingAbort + private static class AMI_Test_nonmutatingAbortI extends AMI_TestIntf_nonmutatingAbort { public void ice_response() @@ -247,7 +249,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx obj = TestPrxHelper.checkedCast(base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base); test(obj != null); test(obj.equals(base)); System.out.println("ok"); diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/Ice/faultTolerance/Test.ice index aa61a3d687f..9f054386a61 100644 --- a/java/test/Ice/faultTolerance/Test.ice +++ b/java/test/Ice/faultTolerance/Test.ice @@ -10,7 +10,10 @@ #ifndef TEST_ICE #define TEST_ICE -["ami"] interface Test +module Test +{ + +["ami"] interface TestIntf { void shutdown(); void abort(); @@ -19,4 +22,6 @@ idempotent int pid(); }; +}; + #endif diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java index db6ba133d80..c6d31b813ad 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/Ice/faultTolerance/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter, int port) diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 2210d3ca1dc..c20d0a652f6 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -18,7 +18,7 @@ public class AllTests } } - public static InitialPrx + public static Test.InitialPrx allTests(Ice.Communicator communicator) { System.out.print("testing stringToProxy... "); @@ -30,17 +30,17 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - InitialPrx initial = InitialPrxHelper.checkedCast(base); + Test.InitialPrx initial = Test.InitialPrxHelper.checkedCast(base); test(initial != null); test(initial.equals(base)); System.out.println("ok"); System.out.print("getting proxies for class hierarchy... "); System.out.flush(); - MA.CAPrx ca = initial.caop(); - MB.CBPrx cb = initial.cbop(); - MA.CCPrx cc = initial.ccop(); - MA.CDPrx cd = initial.cdop(); + Test.MA.CAPrx ca = initial.caop(); + Test.MB.CBPrx cb = initial.cbop(); + Test.MA.CCPrx cc = initial.ccop(); + Test.MA.CDPrx cd = initial.cdop(); test(ca != cb); test(ca != cc); test(ca != cd); @@ -51,10 +51,10 @@ public class AllTests System.out.print("getting proxies for interface hierarchy... "); System.out.flush(); - MA.IAPrx ia = initial.iaop(); - MB.IB1Prx ib1 = initial.ib1op(); - MB.IB2Prx ib2 = initial.ib2op(); - MA.ICPrx ic = initial.icop(); + Test.MA.IAPrx ia = initial.iaop(); + Test.MB.IB1Prx ib1 = initial.ib1op(); + Test.MB.IB2Prx ib2 = initial.ib2op(); + Test.MA.ICPrx ic = initial.icop(); test(ia != ib1); test(ia != ib2); test(ia != ic); @@ -64,9 +64,9 @@ public class AllTests System.out.print("invoking proxy operations on class hierarchy... "); System.out.flush(); - MA.CAPrx cao; - MB.CBPrx cbo; - MA.CCPrx cco; + Test.MA.CAPrx cao; + Test.MB.CBPrx cbo; + Test.MA.CCPrx cco; cao = ca.caop(ca); test(cao.equals(ca)); @@ -114,10 +114,10 @@ public class AllTests System.out.print("ditto, but for interface hierarchy... "); System.out.flush(); - MA.IAPrx iao; - MB.IB1Prx ib1o; - MB.IB2Prx ib2o; - MA.ICPrx ico; + Test.MA.IAPrx iao; + Test.MB.IB1Prx ib1o; + Test.MB.IB2Prx ib2o; + Test.MA.ICPrx ico; iao = ia.iaop(ia); test(iao.equals(ia)); @@ -198,7 +198,7 @@ public class AllTests System.out.print("ditto, but for class implementing interfaces... "); System.out.flush(); - MA.CDPrx cdo; + Test.MA.CDPrx cdo; cao = cd.caop(cd); test(cao.equals(cd)); diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 8b5d9ef263c..a4c6d3b7f65 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -7,15 +7,15 @@ // // ********************************************************************** -public final class CAI extends MA.CA +public final class CAI extends Test.MA.CA { public CAI() { } - public MA.CAPrx - caop(MA.CAPrx p, Ice.Current current) + public Test.MA.CAPrx + caop(Test.MA.CAPrx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index 6ede8b568b1..d0a2056aa67 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -7,21 +7,21 @@ // // ********************************************************************** -public final class CBI extends MB.CB +public final class CBI extends Test.MB.CB { public CBI() { } - public MA.CAPrx - caop(MA.CAPrx p, Ice.Current current) + public Test.MA.CAPrx + caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public MB.CBPrx - cbop(MB.CBPrx p, Ice.Current current) + public Test.MB.CBPrx + cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index c04b5c3a8af..1df898246dc 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -7,27 +7,27 @@ // // ********************************************************************** -public final class CCI extends MA.CC +public final class CCI extends Test.MA.CC { public CCI() { } - public MA.CAPrx - caop(MA.CAPrx p, Ice.Current current) + public Test.MA.CAPrx + caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public MA.CCPrx - ccop(MA.CCPrx p, Ice.Current current) + public Test.MA.CCPrx + ccop(Test.MA.CCPrx p, Ice.Current current) { return p; } - public MB.CBPrx - cbop(MB.CBPrx p, Ice.Current current) + public Test.MB.CBPrx + cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index cd40db1856c..b030f9f30df 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -7,51 +7,51 @@ // // ********************************************************************** -public final class CDI extends MA.CD +public final class CDI extends Test.MA.CD { public CDI() { } - public MA.CAPrx - caop(MA.CAPrx p, Ice.Current current) + public Test.MA.CAPrx + caop(Test.MA.CAPrx p, Ice.Current current) { return p; } - public MA.CCPrx - ccop(MA.CCPrx p, Ice.Current current) + public Test.MA.CCPrx + ccop(Test.MA.CCPrx p, Ice.Current current) { return p; } - public MA.CDPrx - cdop(MA.CDPrx p, Ice.Current current) + public Test.MA.CDPrx + cdop(Test.MA.CDPrx p, Ice.Current current) { return p; } - public MA.IAPrx - iaop(MA.IAPrx p, Ice.Current current) + public Test.MA.IAPrx + iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public MB.CBPrx - cbop(MB.CBPrx p, Ice.Current current) + public Test.MB.CBPrx + cbop(Test.MB.CBPrx p, Ice.Current current) { return p; } - public MB.IB1Prx - ib1op(MB.IB1Prx p, Ice.Current current) + public Test.MB.IB1Prx + ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } - public MB.IB2Prx - ib2op(MB.IB2Prx p, Ice.Current current) + public Test.MB.IB2Prx + ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index f44c53c0dc9..01e365c9a85 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index f5a3b85baf6..5dfabdd78fb 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -7,15 +7,15 @@ // // ********************************************************************** -public final class IAI extends MA._IADisp +public final class IAI extends Test.MA._IADisp { public IAI() { } - public MA.IAPrx - iaop(MA.IAPrx p, Ice.Current current) + public Test.MA.IAPrx + iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index 536ac0336da..e8f46fadd80 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -7,21 +7,21 @@ // // ********************************************************************** -public final class IB1I extends MB._IB1Disp +public final class IB1I extends Test.MB._IB1Disp { public IB1I() { } - public MA.IAPrx - iaop(MA.IAPrx p, Ice.Current current) + public Test.MA.IAPrx + iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public MB.IB1Prx - ib1op(MB.IB1Prx p, Ice.Current current) + public Test.MB.IB1Prx + ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index 0c1d60c4a28..1a6598f4bc3 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -7,21 +7,21 @@ // // ********************************************************************** -public final class IB2I extends MB._IB2Disp +public final class IB2I extends Test.MB._IB2Disp { public IB2I() { } - public MA.IAPrx - iaop(MA.IAPrx p, Ice.Current current) + public Test.MA.IAPrx + iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public MB.IB2Prx - ib2op(MB.IB2Prx p, Ice.Current current) + public Test.MB.IB2Prx + ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index d893438aeeb..16e98f73f09 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -7,33 +7,33 @@ // // ********************************************************************** -public final class ICI extends MA._ICDisp +public final class ICI extends Test.MA._ICDisp { public ICI() { } - public MA.IAPrx - iaop(MA.IAPrx p, Ice.Current current) + public Test.MA.IAPrx + iaop(Test.MA.IAPrx p, Ice.Current current) { return p; } - public MA.ICPrx - icop(MA.ICPrx p, Ice.Current current) + public Test.MA.ICPrx + icop(Test.MA.ICPrx p, Ice.Current current) { return p; } - public MB.IB1Prx - ib1op(MB.IB1Prx p, Ice.Current current) + public Test.MB.IB1Prx + ib1op(Test.MB.IB1Prx p, Ice.Current current) { return p; } - public MB.IB2Prx - ib2op(MB.IB2Prx p, Ice.Current current) + public Test.MB.IB2Prx + ib2op(Test.MB.IB2Prx p, Ice.Current current) { return p; } diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index a932de05350..cdbb1986712 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -7,73 +7,73 @@ // // ********************************************************************** -public final class InitialI extends _InitialDisp +public final class InitialI extends Test._InitialDisp { public InitialI(Ice.ObjectAdapter adapter) { _adapter = adapter; - _ca = MA.CAPrxHelper.uncheckedCast( + _ca = Test.MA.CAPrxHelper.uncheckedCast( _adapter.addWithUUID(new CAI())); - _cb = MB.CBPrxHelper.uncheckedCast( + _cb = Test.MB.CBPrxHelper.uncheckedCast( _adapter.addWithUUID(new CBI())); - _cc = MA.CCPrxHelper.uncheckedCast( + _cc = Test.MA.CCPrxHelper.uncheckedCast( _adapter.addWithUUID(new CCI())); - _cd = MA.CDPrxHelper.uncheckedCast( + _cd = Test.MA.CDPrxHelper.uncheckedCast( _adapter.addWithUUID(new CDI())); - _ia = MA.IAPrxHelper.uncheckedCast( + _ia = Test.MA.IAPrxHelper.uncheckedCast( _adapter.addWithUUID(new IAI())); - _ib1 = MB.IB1PrxHelper.uncheckedCast( + _ib1 = Test.MB.IB1PrxHelper.uncheckedCast( _adapter.addWithUUID(new IB1I())); - _ib2 = MB.IB2PrxHelper.uncheckedCast( + _ib2 = Test.MB.IB2PrxHelper.uncheckedCast( _adapter.addWithUUID(new IB2I())); - _ic = MA.ICPrxHelper.uncheckedCast( + _ic = Test.MA.ICPrxHelper.uncheckedCast( _adapter.addWithUUID(new ICI())); } - public MA.CAPrx + public Test.MA.CAPrx caop(Ice.Current current) { return _ca; } - public MB.CBPrx + public Test.MB.CBPrx cbop(Ice.Current current) { return _cb; } - public MA.CCPrx + public Test.MA.CCPrx ccop(Ice.Current current) { return _cc; } - public MA.CDPrx + public Test.MA.CDPrx cdop(Ice.Current current) { return _cd; } - public MA.IAPrx + public Test.MA.IAPrx iaop(Ice.Current current) { return _ia; } - public MB.IB1Prx + public Test.MB.IB1Prx ib1op(Ice.Current current) { return _ib1; } - public MB.IB2Prx + public Test.MB.IB2Prx ib2op(Ice.Current current) { return _ib2; } - public MA.ICPrx + public Test.MA.ICPrx icop(Ice.Current current) { return _ic; @@ -86,12 +86,12 @@ public final class InitialI extends _InitialDisp } private Ice.ObjectAdapter _adapter; - private MA.CAPrx _ca; - private MB.CBPrx _cb; - private MA.CCPrx _cc; - private MA.CDPrx _cd; - private MA.IAPrx _ia; - private MB.IB1Prx _ib1; - private MB.IB2Prx _ib2; - private MA.ICPrx _ic; + private Test.MA.CAPrx _ca; + private Test.MB.CBPrx _cb; + private Test.MA.CCPrx _cc; + private Test.MA.CDPrx _cd; + private Test.MA.IAPrx _ia; + private Test.MB.IB1Prx _ib1; + private Test.MB.IB2Prx _ib2; + private Test.MA.ICPrx _ic; } diff --git a/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice index 3c532e6e855..47e5ec41820 100644 --- a/java/test/Ice/inheritance/Test.ice +++ b/java/test/Ice/inheritance/Test.ice @@ -10,6 +10,9 @@ #ifndef TESTICE #define TESTICE +module Test +{ + module MA { @@ -78,4 +81,6 @@ interface Initial MA::IC* icop(); }; +}; + #endif diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java index b5a63504cec..a01183231c4 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -45,11 +47,11 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx obj = TestPrxHelper.checkedCast(base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base); test(obj != null); - TestPrx obj2 = TestPrxHelper.checkedCast(base2); + TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2); test(obj2 != null); - TestPrx obj3 = TestPrxHelper.checkedCast(base3); + TestIntfPrx obj3 = TestIntfPrxHelper.checkedCast(base3); test(obj3 != null); ServerManagerPrx obj4 = ServerManagerPrxHelper.checkedCast(base4); test(obj4 != null); diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java index 3436535d9d9..5019a59f72d 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/Ice/location/HelloI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class HelloI extends _HelloDisp { public void diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index 871cfe15f9a..dc207892900 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class ServerManagerI extends _ServerManagerDisp { ServerManagerI(Ice.ObjectAdapter adapter) diff --git a/java/test/Ice/location/Test.ice b/java/test/Ice/location/Test.ice index 03f7b371bf9..53e0a2fc2a9 100644 --- a/java/test/Ice/location/Test.ice +++ b/java/test/Ice/location/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface ServerManager { void startServer(); @@ -21,11 +24,13 @@ interface Hello void sayHello(); }; -interface Test +interface TestIntf { void shutdown(); Hello* getHello(); }; +}; + #endif diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java index 373bb50b44b..ea24d6a79c1 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/Ice/location/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class TestI extends _TestDisp +import Test.*; + +public class TestI extends _TestIntfDisp { TestI(Ice.ObjectAdapter adapter) { diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java index 9f31311b775..2ea9cb40dc1 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java index 378cc8ad2c5..cc3eed75841 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/Ice/objects/BI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class BI extends B { public diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java index 5299b2218b8..c04eeaf19c3 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/Ice/objects/CI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class CI extends C { public diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java index bb5b3c0a4ea..f174b4aa1fb 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/Ice/objects/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Client { private static class MyObjectFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory @@ -14,15 +16,15 @@ public class Client public Ice.Object create(String type) { - if(type.equals("::B")) + if(type.equals("::Test::B")) { return new BI(); } - else if(type.equals("::C")) + else if(type.equals("::Test::C")) { return new CI(); } - else if(type.equals("::D")) + else if(type.equals("::Test::D")) { return new DI(); } @@ -41,9 +43,9 @@ public class Client run(String[] args, Ice.Communicator communicator) { Ice.ObjectFactory factory = new MyObjectFactory(); - communicator.addObjectFactory(factory, "::B"); - communicator.addObjectFactory(factory, "::C"); - communicator.addObjectFactory(factory, "::D"); + communicator.addObjectFactory(factory, "::Test::B"); + communicator.addObjectFactory(factory, "::Test::C"); + communicator.addObjectFactory(factory, "::Test::D"); InitialPrx initial = AllTests.allTests(communicator, false); initial.shutdown(); diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index 4e550480892..0eb00e5ea3f 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Collocated { private static int diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java index 0b2a8a5c117..16d9f875b51 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/Ice/objects/DI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class DI extends D { public diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java index 5c11b97f3a0..5426e827dec 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/Ice/objects/InitialI.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public final class InitialI extends Initial { public diff --git a/java/test/Ice/objects/Test.ice b/java/test/Ice/objects/Test.ice index 3f57616f160..90af1dacd63 100644 --- a/java/test/Ice/objects/Test.ice +++ b/java/test/Ice/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class B; class C; @@ -55,4 +58,6 @@ class Initial void getAll(out B b1, out B b2, out C theC, out D theD); }; +}; + #endif diff --git a/java/test/Ice/slicing/exceptions/Test.ice b/java/test/Ice/slicing/exceptions/Test.ice index cc3e8b3f85f..1bf3f61f5b5 100644 --- a/java/test/Ice/slicing/exceptions/Test.ice +++ b/java/test/Ice/slicing/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami"] interface Test +["ami"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/java/test/Ice/slicing/exceptions/csrc/AllTests.java b/java/test/Ice/slicing/exceptions/csrc/AllTests.java index 1460fa7c977..f4ad7bb6ad1 100644 --- a/java/test/Ice/slicing/exceptions/csrc/AllTests.java +++ b/java/test/Ice/slicing/exceptions/csrc/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -60,7 +62,7 @@ public class AllTests private boolean _called; } - private static class AMI_Test_baseAsBaseI extends AMI_Test_baseAsBase + private static class AMI_Test_baseAsBaseI extends AMI_TestIntf_baseAsBase { public void ice_response() @@ -84,7 +86,7 @@ public class AllTests catch(Base b) { test(b.b.equals("Base.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); } catch(Exception ex) { @@ -102,7 +104,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_unknownDerivedAsBaseI extends AMI_Test_unknownDerivedAsBase + private static class AMI_Test_unknownDerivedAsBaseI extends AMI_TestIntf_unknownDerivedAsBase { public void ice_response() @@ -126,7 +128,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownDerived.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); } catch(Exception ex) { @@ -144,7 +146,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_knownDerivedAsBaseI extends AMI_Test_knownDerivedAsBase + private static class AMI_Test_knownDerivedAsBaseI extends AMI_TestIntf_knownDerivedAsBase { public void ice_response() @@ -169,7 +171,7 @@ public class AllTests { test(k.b.equals("KnownDerived.b")); test(k.kd.equals("KnownDerived.kd")); - test(k.ice_name().equals("KnownDerived")); + test(k.ice_name().equals("Test::KnownDerived")); } catch(Exception ex) { @@ -187,7 +189,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_knownDerivedAsKnownDerivedI extends AMI_Test_knownDerivedAsKnownDerived + private static class AMI_Test_knownDerivedAsKnownDerivedI extends AMI_TestIntf_knownDerivedAsKnownDerived { public void ice_response() @@ -212,7 +214,7 @@ public class AllTests { test(k.b.equals("KnownDerived.b")); test(k.kd.equals("KnownDerived.kd")); - test(k.ice_name().equals("KnownDerived")); + test(k.ice_name().equals("Test::KnownDerived")); } catch(Exception ex) { @@ -230,7 +232,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_unknownIntermediateAsBaseI extends AMI_Test_unknownIntermediateAsBase + private static class AMI_Test_unknownIntermediateAsBaseI extends AMI_TestIntf_unknownIntermediateAsBase { public void ice_response() @@ -254,7 +256,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownIntermediate.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); } catch(Exception ex) { @@ -272,7 +274,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_knownIntermediateAsBaseI extends AMI_Test_knownIntermediateAsBase + private static class AMI_Test_knownIntermediateAsBaseI extends AMI_TestIntf_knownIntermediateAsBase { public void ice_response() @@ -297,7 +299,7 @@ public class AllTests { test(ki.b.equals("KnownIntermediate.b")); test(ki.ki.equals("KnownIntermediate.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); } catch(Exception ex) { @@ -315,7 +317,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_knownMostDerivedAsBaseI extends AMI_Test_knownMostDerivedAsBase + private static class AMI_Test_knownMostDerivedAsBaseI extends AMI_TestIntf_knownMostDerivedAsBase { public void ice_response() @@ -341,7 +343,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); } catch(Exception ex) { @@ -360,7 +362,7 @@ public class AllTests } private static class AMI_Test_knownIntermediateAsKnownIntermediateI - extends AMI_Test_knownIntermediateAsKnownIntermediate + extends AMI_TestIntf_knownIntermediateAsKnownIntermediate { public void ice_response() @@ -385,7 +387,7 @@ public class AllTests { test(ki.b.equals("KnownIntermediate.b")); test(ki.ki.equals("KnownIntermediate.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); } catch(Exception ex) { @@ -404,7 +406,7 @@ public class AllTests } private static class AMI_Test_knownMostDerivedAsKnownIntermediateI - extends AMI_Test_knownMostDerivedAsKnownIntermediate + extends AMI_TestIntf_knownMostDerivedAsKnownIntermediate { public void ice_response() @@ -430,7 +432,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); } catch(Exception ex) { @@ -449,7 +451,7 @@ public class AllTests } private static class AMI_Test_knownMostDerivedAsKnownMostDerivedI - extends AMI_Test_knownMostDerivedAsKnownMostDerived + extends AMI_TestIntf_knownMostDerivedAsKnownMostDerived { public void ice_response() @@ -475,7 +477,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); } catch(Exception ex) { @@ -493,7 +495,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_unknownMostDerived1AsBaseI extends AMI_Test_unknownMostDerived1AsBase + private static class AMI_Test_unknownMostDerived1AsBaseI extends AMI_TestIntf_unknownMostDerived1AsBase { public void ice_response() @@ -518,7 +520,7 @@ public class AllTests { test(ki.b.equals("UnknownMostDerived1.b")); test(ki.ki.equals("UnknownMostDerived1.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); } catch(Exception ex) { @@ -537,7 +539,7 @@ public class AllTests } private static class AMI_Test_unknownMostDerived1AsKnownIntermediateI - extends AMI_Test_unknownMostDerived1AsKnownIntermediate + extends AMI_TestIntf_unknownMostDerived1AsKnownIntermediate { public void ice_response() @@ -562,7 +564,7 @@ public class AllTests { test(ki.b.equals("UnknownMostDerived1.b")); test(ki.ki.equals("UnknownMostDerived1.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); } catch(Exception ex) { @@ -580,7 +582,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_unknownMostDerived2AsBaseI extends AMI_Test_unknownMostDerived2AsBase + private static class AMI_Test_unknownMostDerived2AsBaseI extends AMI_TestIntf_unknownMostDerived2AsBase { public void ice_response() @@ -604,7 +606,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownMostDerived2.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); } catch(Exception ex) { @@ -622,7 +624,7 @@ public class AllTests private Callback callback = new Callback(); } - public static TestPrx + public static TestIntfPrx allTests(Ice.Communicator communicator, boolean collocated) { System.out.print("testing stringToProxy... "); @@ -634,7 +636,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx test = TestPrxHelper.checkedCast(base); + TestIntfPrx test = TestIntfPrxHelper.checkedCast(base); test(test != null); test(test.equals(base)); System.out.println("ok"); @@ -650,7 +652,7 @@ public class AllTests catch(Base b) { test(b.b.equals("Base.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); gotException = true; } catch(Exception ex) @@ -681,7 +683,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownDerived.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); gotException = true; } catch(Exception ex) @@ -713,7 +715,7 @@ public class AllTests { test(k.b.equals("KnownDerived.b")); test(k.kd.equals("KnownDerived.kd")); - test(k.ice_name().equals("KnownDerived")); + test(k.ice_name().equals("Test::KnownDerived")); gotException = true; } catch(Exception ex) @@ -745,7 +747,7 @@ public class AllTests { test(k.b.equals("KnownDerived.b")); test(k.kd.equals("KnownDerived.kd")); - test(k.ice_name().equals("KnownDerived")); + test(k.ice_name().equals("Test::KnownDerived")); gotException = true; } catch(Exception ex) @@ -776,7 +778,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownIntermediate.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); gotException = true; } catch(Exception ex) @@ -808,7 +810,7 @@ public class AllTests { test(ki.b.equals("KnownIntermediate.b")); test(ki.ki.equals("KnownIntermediate.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); gotException = true; } catch(Exception ex) @@ -841,7 +843,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); gotException = true; } catch(Exception ex) @@ -873,7 +875,7 @@ public class AllTests { test(ki.b.equals("KnownIntermediate.b")); test(ki.ki.equals("KnownIntermediate.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); gotException = true; } catch(Exception ex) @@ -906,7 +908,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); gotException = true; } catch(Exception ex) @@ -939,7 +941,7 @@ public class AllTests test(kmd.b.equals("KnownMostDerived.b")); test(kmd.ki.equals("KnownMostDerived.ki")); test(kmd.kmd.equals("KnownMostDerived.kmd")); - test(kmd.ice_name().equals("KnownMostDerived")); + test(kmd.ice_name().equals("Test::KnownMostDerived")); gotException = true; } catch(Exception ex) @@ -971,7 +973,7 @@ public class AllTests { test(ki.b.equals("UnknownMostDerived1.b")); test(ki.ki.equals("UnknownMostDerived1.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); gotException = true; } catch(Exception ex) @@ -1003,7 +1005,7 @@ public class AllTests { test(ki.b.equals("UnknownMostDerived1.b")); test(ki.ki.equals("UnknownMostDerived1.ki")); - test(ki.ice_name().equals("KnownIntermediate")); + test(ki.ice_name().equals("Test::KnownIntermediate")); gotException = true; } catch(Exception ex) @@ -1035,7 +1037,7 @@ public class AllTests catch(Base b) { test(b.b.equals("UnknownMostDerived2.b")); - test(b.ice_name().equals("Base")); + test(b.ice_name().equals("Test::Base")); gotException = true; } catch(Exception ex) diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java index 85d80b81283..f86bdca4716 100644 --- a/java/test/Ice/slicing/exceptions/csrc/Client.java +++ b/java/test/Ice/slicing/exceptions/csrc/Client.java @@ -7,12 +7,14 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int run(String[] args, Ice.Communicator communicator) { - TestPrx test = AllTests.allTests(communicator, false); + TestIntfPrx test = AllTests.allTests(communicator, false); test.shutdown(); return 0; } diff --git a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice index 7fb5f592869..49c3f3a81d0 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/exceptions/ssrc/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/java/test/Ice/slicing/exceptions/ssrc/TestI.java b/java/test/Ice/slicing/exceptions/ssrc/TestI.java index 27d6a77a9a6..b5dc9b4e5be 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/TestI.java +++ b/java/test/Ice/slicing/exceptions/ssrc/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) diff --git a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice index 6d9bc64514b..c5245f6c759 100644 --- a/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + exception UnknownDerived extends Base { string ud; @@ -32,4 +35,6 @@ exception UnknownMostDerived2 extends UnknownIntermediate string umd2; }; +}; + #endif diff --git a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice index 54f3dca65ec..989f71eb4b0 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/exceptionsAMD/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/java/test/Ice/slicing/exceptionsAMD/TestI.java b/java/test/Ice/slicing/exceptionsAMD/TestI.java index a1d35f15963..730189d4ef4 100644 --- a/java/test/Ice/slicing/exceptionsAMD/TestI.java +++ b/java/test/Ice/slicing/exceptionsAMD/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) @@ -16,14 +18,14 @@ public final class TestI extends _TestDisp } public void - shutdown_async(AMD_Test_shutdown cb, Ice.Current current) + shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { _adapter.getCommunicator().shutdown(); cb.ice_response(); } public void - baseAsBase_async(AMD_Test_baseAsBase cb, Ice.Current current) + baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current) throws Base { Base b = new Base(); @@ -32,7 +34,7 @@ public final class TestI extends _TestDisp } public void - unknownDerivedAsBase_async(AMD_Test_unknownDerivedAsBase cb, Ice.Current current) + unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current) throws Base { UnknownDerived d = new UnknownDerived(); @@ -42,7 +44,7 @@ public final class TestI extends _TestDisp } public void - knownDerivedAsBase_async(AMD_Test_knownDerivedAsBase cb, Ice.Current current) + knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current) throws Base { KnownDerived d = new KnownDerived(); @@ -52,7 +54,7 @@ public final class TestI extends _TestDisp } public void - knownDerivedAsKnownDerived_async(AMD_Test_knownDerivedAsKnownDerived cb, Ice.Current current) + knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, Ice.Current current) throws KnownDerived { KnownDerived d = new KnownDerived(); @@ -62,7 +64,7 @@ public final class TestI extends _TestDisp } public void - unknownIntermediateAsBase_async(AMD_Test_unknownIntermediateAsBase cb, Ice.Current current) + unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current) throws Base { UnknownIntermediate ui = new UnknownIntermediate(); @@ -72,7 +74,7 @@ public final class TestI extends _TestDisp } public void - knownIntermediateAsBase_async(AMD_Test_knownIntermediateAsBase cb, Ice.Current current) + knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current) throws Base { KnownIntermediate ki = new KnownIntermediate(); @@ -82,7 +84,7 @@ public final class TestI extends _TestDisp } public void - knownMostDerivedAsBase_async(AMD_Test_knownMostDerivedAsBase cb, Ice.Current current) + knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current) throws Base { KnownMostDerived kmd = new KnownMostDerived(); @@ -93,7 +95,8 @@ public final class TestI extends _TestDisp } public void - knownIntermediateAsKnownIntermediate_async(AMD_Test_knownIntermediateAsKnownIntermediate cb, Ice.Current current) + knownIntermediateAsKnownIntermediate_async(AMD_TestIntf_knownIntermediateAsKnownIntermediate cb, + Ice.Current current) throws KnownIntermediate { KnownIntermediate ki = new KnownIntermediate(); @@ -103,7 +106,8 @@ public final class TestI extends _TestDisp } public void - knownMostDerivedAsKnownIntermediate_async(AMD_Test_knownMostDerivedAsKnownIntermediate cb, Ice.Current current) + knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb, + Ice.Current current) throws KnownIntermediate { KnownMostDerived kmd = new KnownMostDerived(); @@ -114,7 +118,8 @@ public final class TestI extends _TestDisp } public void - knownMostDerivedAsKnownMostDerived_async(AMD_Test_knownMostDerivedAsKnownMostDerived cb, Ice.Current current) + knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb, + Ice.Current current) throws KnownMostDerived { KnownMostDerived kmd = new KnownMostDerived(); @@ -125,7 +130,7 @@ public final class TestI extends _TestDisp } public void - unknownMostDerived1AsBase_async(AMD_Test_unknownMostDerived1AsBase cb, Ice.Current current) + unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current) throws Base { UnknownMostDerived1 umd1 = new UnknownMostDerived1(); @@ -136,7 +141,7 @@ public final class TestI extends _TestDisp } public void - unknownMostDerived1AsKnownIntermediate_async(AMD_Test_unknownMostDerived1AsKnownIntermediate cb, + unknownMostDerived1AsKnownIntermediate_async(AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) throws KnownIntermediate { @@ -148,7 +153,7 @@ public final class TestI extends _TestDisp } public void - unknownMostDerived2AsBase_async(AMD_Test_unknownMostDerived2AsBase cb, Ice.Current current) + unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current) throws Base { UnknownMostDerived2 umd2 = new UnknownMostDerived2(); diff --git a/java/test/Ice/slicing/objects/Forward.ice b/java/test/Ice/slicing/objects/Forward.ice index 74ae4b8c7e0..b4a01e4aab8 100644 --- a/java/test/Ice/slicing/objects/Forward.ice +++ b/java/test/Ice/slicing/objects/Forward.ice @@ -10,6 +10,9 @@ #ifndef FORWARD_ICE #define FORWARD_ICE +module Test +{ + class Forward; class Hidden @@ -22,4 +25,6 @@ class Forward Hidden h; }; +}; + #endif diff --git a/java/test/Ice/slicing/objects/Test.ice b/java/test/Ice/slicing/objects/Test.ice index 3817f608833..93bcbf9dcd6 100644 --- a/java/test/Ice/slicing/objects/Test.ice +++ b/java/test/Ice/slicing/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami"] interface Test +["ami"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/java/test/Ice/slicing/objects/csrc/AllTests.java b/java/test/Ice/slicing/objects/csrc/AllTests.java index 4a0e6a56fe7..054c5a0fabe 100644 --- a/java/test/Ice/slicing/objects/csrc/AllTests.java +++ b/java/test/Ice/slicing/objects/csrc/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -60,13 +62,13 @@ public class AllTests private boolean _called; } - private static class AMI_Test_SBaseAsObjectI extends AMI_Test_SBaseAsObject + private static class AMI_Test_SBaseAsObjectI extends AMI_TestIntf_SBaseAsObject { public void ice_response(Ice.Object o) { test(o != null); - test(o.ice_id().equals("::SBase")); + test(o.ice_id().equals("::Test::SBase")); SBase sb = (SBase)o; test(sb != null); test(sb.sb.equals("SBase.sb")); @@ -94,7 +96,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_SBaseAsSBaseI extends AMI_Test_SBaseAsSBase + private static class AMI_Test_SBaseAsSBaseI extends AMI_TestIntf_SBaseAsSBase { public void ice_response(SBase sb) @@ -124,7 +126,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_SBSKnownDerivedAsSBaseI extends AMI_Test_SBSKnownDerivedAsSBase + private static class AMI_Test_SBSKnownDerivedAsSBaseI extends AMI_TestIntf_SBSKnownDerivedAsSBase { public void ice_response(SBase sb) @@ -157,7 +159,8 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI extends AMI_Test_SBSKnownDerivedAsSBSKnownDerived + private static class AMI_Test_SBSKnownDerivedAsSBSKnownDerivedI + extends AMI_TestIntf_SBSKnownDerivedAsSBSKnownDerived { public void ice_response(SBSKnownDerived sbskd) @@ -187,7 +190,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_SBSUnknownDerivedAsSBaseI extends AMI_Test_SBSUnknownDerivedAsSBase + private static class AMI_Test_SBSUnknownDerivedAsSBaseI extends AMI_TestIntf_SBSUnknownDerivedAsSBase { public void ice_response(SBase sb) @@ -217,7 +220,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_SUnknownAsObjectI extends AMI_Test_SUnknownAsObject + private static class AMI_Test_SUnknownAsObjectI extends AMI_TestIntf_SUnknownAsObject { public void ice_response(Ice.Object o) @@ -247,13 +250,13 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_oneElementCycleI extends AMI_Test_oneElementCycle + private static class AMI_Test_oneElementCycleI extends AMI_TestIntf_oneElementCycle { public void ice_response(B b) { test(b != null); - test(b.ice_id().equals("::B")); + test(b.ice_id().equals("::Test::B")); test(b.sb.equals("B1.sb")); test(b.pb == b); callback.called(); @@ -280,18 +283,18 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_twoElementCycleI extends AMI_Test_twoElementCycle + private static class AMI_Test_twoElementCycleI extends AMI_TestIntf_twoElementCycle { public void ice_response(B b1) { test(b1 != null); - test(b1.ice_id().equals("::B")); + test(b1.ice_id().equals("::Test::B")); test(b1.sb.equals("B1.sb")); B b2 = b1.pb; test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("B2.sb")); test(b2.pb == b1); callback.called(); @@ -318,13 +321,13 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_D1AsBI extends AMI_Test_D1AsB + private static class AMI_Test_D1AsBI extends AMI_TestIntf_D1AsB { public void ice_response(B b1) { test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb != null); test(b1.pb != b1); @@ -339,7 +342,7 @@ public class AllTests test(b2 != null); test(b2.pb == b1); test(b2.sb.equals("D2.sb")); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); callback.called(); } @@ -364,20 +367,20 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_D1AsD1I extends AMI_Test_D1AsD1 + private static class AMI_Test_D1AsD1I extends AMI_TestIntf_D1AsD1 { public void ice_response(D1 d1) { test(d1 != null); - test(d1.ice_id().equals("::D1")); + test(d1.ice_id().equals("::Test::D1")); test(d1.sb.equals("D1.sb")); test(d1.pb != null); test(d1.pb != d1); B b2 = d1.pb; test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("D2.sb")); test(b2.pb == d1); callback.called(); @@ -404,20 +407,20 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_D2AsBI extends AMI_Test_D2AsB + private static class AMI_Test_D2AsBI extends AMI_TestIntf_D2AsB { public void ice_response(B b2) { test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("D2.sb")); test(b2.pb != null); test(b2.pb != b2); B b1 = b2.pb; test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1)b1; @@ -448,13 +451,13 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_paramTest1I extends AMI_Test_paramTest1 + private static class AMI_Test_paramTest1I extends AMI_TestIntf_paramTest1 { public void ice_response(B b1, B b2) { test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1)b1; @@ -463,7 +466,7 @@ public class AllTests test(d1.pd1 == b2); test(b2 != null); - test(b2.ice_id().equals("::B")); // No factory, must be sliced + test(b2.ice_id().equals("::Test::B")); // No factory, must be sliced test(b2.sb.equals("D2.sb")); test(b2.pb == b1); callback.called(); @@ -490,13 +493,13 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_paramTest2I extends AMI_Test_paramTest2 + private static class AMI_Test_paramTest2I extends AMI_TestIntf_paramTest2 { public void ice_response(B b2, B b1) { test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1)b1; @@ -505,7 +508,7 @@ public class AllTests test(d1.pd1 == b2); test(b2 != null); - test(b2.ice_id().equals("::B")); // No factory, must be sliced + test(b2.ice_id().equals("::Test::B")); // No factory, must be sliced test(b2.sb.equals("D2.sb")); test(b2.pb == b1); callback.called(); @@ -532,7 +535,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_returnTest1I extends AMI_Test_returnTest1 + private static class AMI_Test_returnTest1I extends AMI_TestIntf_returnTest1 { public void ice_response(B r, B p1, B p2) @@ -562,7 +565,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_returnTest2I extends AMI_Test_returnTest2 + private static class AMI_Test_returnTest2I extends AMI_TestIntf_returnTest2 { public void ice_response(B r, B p1, B p2) @@ -592,7 +595,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_returnTest3I extends AMI_Test_returnTest3 + private static class AMI_Test_returnTest3I extends AMI_TestIntf_returnTest3 { public void ice_response(B b) @@ -624,7 +627,7 @@ public class AllTests public B r; } - private static class AMI_Test_paramTest3I extends AMI_Test_paramTest3 + private static class AMI_Test_paramTest3I extends AMI_TestIntf_paramTest3 { public void ice_response(B ret, B p1, B p2) @@ -632,17 +635,17 @@ public class AllTests test(p1 != null); test(p1.sb.equals("D2.sb (p1 1)")); test(p1.pb == null); - test(p1.ice_id().equals("::B")); + test(p1.ice_id().equals("::Test::B")); test(p2 != null); test(p2.sb.equals("D2.sb (p2 1)")); test(p2.pb == null); - test(p2.ice_id().equals("::B")); + test(p2.ice_id().equals("::Test::B")); test(ret != null); test(ret.sb.equals("D1.sb (p2 2)")); test(ret.pb == null); - test(ret.ice_id().equals("::D1")); + test(ret.ice_id().equals("::Test::D1")); callback.called(); } @@ -667,7 +670,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_paramTest4I extends AMI_Test_paramTest4 + private static class AMI_Test_paramTest4I extends AMI_TestIntf_paramTest4 { public void ice_response(B ret, B b) @@ -675,12 +678,12 @@ public class AllTests test(b != null); test(b.sb.equals("D4.sb (1)")); test(b.pb == null); - test(b.ice_id().equals("::B")); + test(b.ice_id().equals("::Test::B")); test(ret != null); test(ret.sb.equals("B.sb (2)")); test(ret.pb == null); - test(ret.ice_id().equals("::B")); + test(ret.ice_id().equals("::Test::B")); callback.called(); } @@ -705,7 +708,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_sequenceTestI extends AMI_Test_sequenceTest + private static class AMI_Test_sequenceTestI extends AMI_TestIntf_sequenceTest { public void ice_response(SS ss) @@ -737,7 +740,7 @@ public class AllTests public SS r; } - private static class AMI_Test_dictionaryTestI extends AMI_Test_dictionaryTest + private static class AMI_Test_dictionaryTestI extends AMI_TestIntf_dictionaryTest { public void ice_response(java.util.Map r, java.util.Map bout) @@ -771,7 +774,7 @@ public class AllTests public java.util.Map bout; } - private static class AMI_Test_throwBaseAsBaseI extends AMI_Test_throwBaseAsBase + private static class AMI_Test_throwBaseAsBaseI extends AMI_TestIntf_throwBaseAsBase { public void ice_response() @@ -791,7 +794,7 @@ public class AllTests try { BaseException e = (BaseException)exc; - test(e.ice_name().equals("BaseException")); + test(e.ice_name().equals("Test::BaseException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb")); @@ -813,7 +816,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_throwDerivedAsBaseI extends AMI_Test_throwDerivedAsBase + private static class AMI_Test_throwDerivedAsBaseI extends AMI_TestIntf_throwDerivedAsBase { public void ice_response() @@ -833,7 +836,7 @@ public class AllTests try { DerivedException e = (DerivedException)exc; - test(e.ice_name().equals("DerivedException")); + test(e.ice_name().equals("Test::DerivedException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb1")); @@ -861,7 +864,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_throwDerivedAsDerivedI extends AMI_Test_throwDerivedAsDerived + private static class AMI_Test_throwDerivedAsDerivedI extends AMI_TestIntf_throwDerivedAsDerived { public void ice_response() @@ -881,7 +884,7 @@ public class AllTests try { DerivedException e = (DerivedException)exc; - test(e.ice_name().equals("DerivedException")); + test(e.ice_name().equals("Test::DerivedException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb1")); @@ -909,7 +912,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_throwUnknownDerivedAsBaseI extends AMI_Test_throwUnknownDerivedAsBase + private static class AMI_Test_throwUnknownDerivedAsBaseI extends AMI_TestIntf_throwUnknownDerivedAsBase { public void ice_response() @@ -929,7 +932,7 @@ public class AllTests try { BaseException e = (BaseException)exc; - test(e.ice_name().equals("BaseException")); + test(e.ice_name().equals("Test::BaseException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb d2")); @@ -951,7 +954,7 @@ public class AllTests private Callback callback = new Callback(); } - private static class AMI_Test_useForwardI extends AMI_Test_useForward + private static class AMI_Test_useForwardI extends AMI_TestIntf_useForward { public void ice_response(Forward f) @@ -981,7 +984,7 @@ public class AllTests private Callback callback = new Callback(); } - public static TestPrx + public static TestIntfPrx allTests(Ice.Communicator communicator, boolean collocated) { System.out.print("testing stringToProxy... "); @@ -993,7 +996,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx test = TestPrxHelper.checkedCast(base); + TestIntfPrx test = TestIntfPrxHelper.checkedCast(base); test(test != null); test(test.equals(base)); System.out.println("ok"); @@ -1007,7 +1010,7 @@ public class AllTests { o = test.SBaseAsObject(); test(o != null); - test(o.ice_id().equals("::SBase")); + test(o.ice_id().equals("::Test::SBase")); sb = (SBase)o; } catch(Exception ex) @@ -1164,7 +1167,7 @@ public class AllTests { B b = test.oneElementCycle(); test(b != null); - test(b.ice_id().equals("::B")); + test(b.ice_id().equals("::Test::B")); test(b.sb.equals("B1.sb")); test(b.pb == b); } @@ -1191,12 +1194,12 @@ public class AllTests { B b1 = test.twoElementCycle(); test(b1 != null); - test(b1.ice_id().equals("::B")); + test(b1.ice_id().equals("::Test::B")); test(b1.sb.equals("B1.sb")); B b2 = b1.pb; test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("B2.sb")); test(b2.pb == b1); } @@ -1224,7 +1227,7 @@ public class AllTests B b1; b1 = test.D1AsB(); test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb != null); test(b1.pb != b1); @@ -1239,7 +1242,7 @@ public class AllTests test(b2 != null); test(b2.pb == b1); test(b2.sb.equals("D2.sb")); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); } catch(Exception ex) { @@ -1265,14 +1268,14 @@ public class AllTests D1 d1; d1 = test.D1AsD1(); test(d1 != null); - test(d1.ice_id().equals("::D1")); + test(d1.ice_id().equals("::Test::D1")); test(d1.sb.equals("D1.sb")); test(d1.pb != null); test(d1.pb != d1); B b2 = d1.pb; test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("D2.sb")); test(b2.pb == d1); } @@ -1300,14 +1303,14 @@ public class AllTests B b2; b2 = test.D2AsB(); test(b2 != null); - test(b2.ice_id().equals("::B")); + test(b2.ice_id().equals("::Test::B")); test(b2.sb.equals("D2.sb")); test(b2.pb != null); test(b2.pb != b2); B b1 = b2.pb; test(b1 != null); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); test(b1.sb.equals("D1.sb")); test(b1.pb == b2); D1 d1 = (D1)b1; @@ -1341,7 +1344,7 @@ public class AllTests test.paramTest1(b1, b2); test(b1.value != null); - test(b1.value.ice_id().equals("::D1")); + test(b1.value.ice_id().equals("::Test::D1")); test(b1.value.sb.equals("D1.sb")); test(b1.value.pb == b2.value); D1 d1 = (D1)b1.value; @@ -1350,7 +1353,7 @@ public class AllTests test(d1.pd1 == b2.value); test(b2.value != null); - test(b2.value.ice_id().equals("::B")); // No factory, must be sliced + test(b2.value.ice_id().equals("::Test::B")); // No factory, must be sliced test(b2.value.sb.equals("D2.sb")); test(b2.value.pb == b1.value); } @@ -1380,7 +1383,7 @@ public class AllTests test.paramTest2(b2, b1); test(b1.value != null); - test(b1.value.ice_id().equals("::D1")); + test(b1.value.ice_id().equals("::Test::D1")); test(b1.value.sb.equals("D1.sb")); test(b1.value.pb == b2.value); D1 d1 = (D1)b1.value; @@ -1389,7 +1392,7 @@ public class AllTests test(d1.pd1 == b2.value); test(b2.value != null); - test(b2.value.ice_id().equals("::B")); // No factory, must be sliced + test(b2.value.ice_id().equals("::Test::B")); // No factory, must be sliced test(b2.value.sb.equals("D2.sb")); test(b2.value.pb == b1.value); } @@ -1481,7 +1484,7 @@ public class AllTests test(b1 != null); test(b1.sb.equals("D1.sb")); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); D1 p1 = (D1)b1; test(p1 != null); test(p1.sd1.equals("D1.sd1")); @@ -1490,7 +1493,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.equals("D3.sb")); - test(b2.ice_id().equals("::B")); // Sliced by server + test(b2.ice_id().equals("::Test::B")); // Sliced by server test(b2.pb == b1); boolean gotException = false; try @@ -1536,7 +1539,7 @@ public class AllTests test(b1 != null); test(b1.sb.equals("D1.sb")); - test(b1.ice_id().equals("::D1")); + test(b1.ice_id().equals("::Test::D1")); D1 p1 = (D1)b1; test(p1 != null); test(p1.sd1.equals("D1.sd1")); @@ -1545,7 +1548,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.equals("D3.sb")); - test(b2.ice_id().equals("::B")); // Sliced by server + test(b2.ice_id().equals("::Test::B")); // Sliced by server test(b2.pb == b1); boolean gotException = false; try @@ -1585,7 +1588,7 @@ public class AllTests test(b1 != null); test(b1.sb.equals("D3.sb")); - test(b1.ice_id().equals("::B")); // Sliced by server + test(b1.ice_id().equals("::Test::B")); // Sliced by server boolean gotException = false; try @@ -1601,7 +1604,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.equals("D1.sb")); - test(b2.ice_id().equals("::D1")); + test(b2.ice_id().equals("::Test::D1")); test(b2.pb == b1); D1 p3 = (D1)b2; test(p3 != null); @@ -1641,7 +1644,7 @@ public class AllTests test(b1 != null); test(b1.sb.equals("D3.sb")); - test(b1.ice_id().equals("::B")); // Sliced by server + test(b1.ice_id().equals("::Test::B")); // Sliced by server boolean gotException = false; try @@ -1657,7 +1660,7 @@ public class AllTests B b2 = b1.pb; test(b2 != null); test(b2.sb.equals("D1.sb")); - test(b2.ice_id().equals("::D1")); + test(b2.ice_id().equals("::Test::D1")); test(b2.pb == b1); D1 p3 = (D1)b2; test(p3 != null); @@ -1683,17 +1686,17 @@ public class AllTests test(p1.value != null); test(p1.value.sb.equals("D2.sb (p1 1)")); test(p1.value.pb == null); - test(p1.value.ice_id().equals("::B")); + test(p1.value.ice_id().equals("::Test::B")); test(p2.value != null); test(p2.value.sb.equals("D2.sb (p2 1)")); test(p2.value.pb == null); - test(p2.value.ice_id().equals("::B")); + test(p2.value.ice_id().equals("::Test::B")); test(ret != null); test(ret.sb.equals("D1.sb (p2 2)")); test(ret.pb == null); - test(ret.ice_id().equals("::D1")); + test(ret.ice_id().equals("::Test::D1")); } catch(Exception ex) { @@ -1722,12 +1725,12 @@ public class AllTests test(b.value != null); test(b.value.sb.equals("D4.sb (1)")); test(b.value.pb == null); - test(b.value.ice_id().equals("::B")); + test(b.value.ice_id().equals("::Test::B")); test(ret != null); test(ret.sb.equals("B.sb (2)")); test(ret.pb == null); - test(ret.ice_id().equals("::B")); + test(ret.ice_id().equals("::Test::B")); } catch(Exception ex) { @@ -1767,7 +1770,7 @@ public class AllTests B r = test.returnTest3(d3, b2); test(r != null); - test(r.ice_id().equals("::B")); + test(r.ice_id().equals("::Test::B")); test(r.sb.equals("D3.sb")); test(r.pb == r); } @@ -1801,7 +1804,7 @@ public class AllTests B r = cb.r; test(r != null); - test(r.ice_id().equals("::B")); + test(r.ice_id().equals("::Test::B")); test(r.sb.equals("D3.sb")); test(r.pb == r); } @@ -1831,7 +1834,7 @@ public class AllTests B r = test.returnTest3(d3, d12); test(r != null); - test(r.ice_id().equals("::B")); + test(r.ice_id().equals("::Test::B")); test(r.sb.equals("D3.sb")); test(r.pb == r); } @@ -1868,7 +1871,7 @@ public class AllTests B r = cb.r; test(r != null); - test(r.ice_id().equals("::B")); + test(r.ice_id().equals("::Test::B")); test(r.sb.equals("D3.sb")); test(r.pb == r); } @@ -1949,13 +1952,13 @@ public class AllTests test(ss2d1.pb == ss2b); test(ss2d3.pb == ss2b); - test(ss1b.ice_id().equals("::B")); - test(ss1d1.ice_id().equals("::D1")); - test(ss1d3.ice_id().equals("::B")); + test(ss1b.ice_id().equals("::Test::B")); + test(ss1d1.ice_id().equals("::Test::D1")); + test(ss1d3.ice_id().equals("::Test::B")); - test(ss2b.ice_id().equals("::B")); - test(ss2d1.ice_id().equals("::D1")); - test(ss2d3.ice_id().equals("::B")); + test(ss2b.ice_id().equals("::Test::B")); + test(ss2d1.ice_id().equals("::Test::D1")); + test(ss2d3.ice_id().equals("::Test::B")); } catch(Exception ex) { @@ -2039,13 +2042,13 @@ public class AllTests test(ss2d1.pb == ss2b); test(ss2d3.pb == ss2b); - test(ss1b.ice_id().equals("::B")); - test(ss1d1.ice_id().equals("::D1")); - test(ss1d3.ice_id().equals("::B")); + test(ss1b.ice_id().equals("::Test::B")); + test(ss1d1.ice_id().equals("::Test::D1")); + test(ss1d3.ice_id().equals("::Test::B")); - test(ss2b.ice_id().equals("::B")); - test(ss2d1.ice_id().equals("::D1")); - test(ss2d3.ice_id().equals("::B")); + test(ss2b.ice_id().equals("::Test::B")); + test(ss2d1.ice_id().equals("::Test::D1")); + test(ss2d3.ice_id().equals("::Test::B")); } System.out.println("ok"); @@ -2166,7 +2169,7 @@ public class AllTests } catch(BaseException e) { - test(e.ice_name().equals("BaseException")); + test(e.ice_name().equals("Test::BaseException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb")); @@ -2198,7 +2201,7 @@ public class AllTests } catch(DerivedException e) { - test(e.ice_name().equals("DerivedException")); + test(e.ice_name().equals("Test::DerivedException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb1")); @@ -2236,7 +2239,7 @@ public class AllTests } catch(DerivedException e) { - test(e.ice_name().equals("DerivedException")); + test(e.ice_name().equals("Test::DerivedException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb1")); @@ -2274,7 +2277,7 @@ public class AllTests } catch(BaseException e) { - test(e.ice_name().equals("BaseException")); + test(e.ice_name().equals("Test::BaseException")); test(e.sbe.equals("sbe")); test(e.pb != null); test(e.pb.sb.equals("sb d2")); diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java index 85d80b81283..f86bdca4716 100644 --- a/java/test/Ice/slicing/objects/csrc/Client.java +++ b/java/test/Ice/slicing/objects/csrc/Client.java @@ -7,12 +7,14 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int run(String[] args, Ice.Communicator communicator) { - TestPrx test = AllTests.allTests(communicator, false); + TestIntfPrx test = AllTests.allTests(communicator, false); test.shutdown(); return 0; } diff --git a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice index c32c2495f52..6ee187eeba5 100644 --- a/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice +++ b/java/test/Ice/slicing/objects/csrc/ClientPrivate.ice @@ -12,10 +12,15 @@ #include <Test.ice> +module Test +{ + class D3 extends B { string sd3; B pd3; }; +}; + #endif diff --git a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice index b963d10122d..ecd2228876e 100644 --- a/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice +++ b/java/test/Ice/slicing/objects/ssrc/ServerPrivate.ice @@ -12,6 +12,9 @@ #include <Test.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/java/test/Ice/slicing/objects/ssrc/TestI.java b/java/test/Ice/slicing/objects/ssrc/TestI.java index 4e194bc545e..141fd3402b9 100644 --- a/java/test/Ice/slicing/objects/ssrc/TestI.java +++ b/java/test/Ice/slicing/objects/ssrc/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) diff --git a/java/test/Ice/slicing/objectsAMD/Forward.ice b/java/test/Ice/slicing/objectsAMD/Forward.ice index 74ae4b8c7e0..b4a01e4aab8 100644 --- a/java/test/Ice/slicing/objectsAMD/Forward.ice +++ b/java/test/Ice/slicing/objectsAMD/Forward.ice @@ -10,6 +10,9 @@ #ifndef FORWARD_ICE #define FORWARD_ICE +module Test +{ + class Forward; class Hidden @@ -22,4 +25,6 @@ class Forward Hidden h; }; +}; + #endif diff --git a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice index 07e05c6a76b..8c9a5ec3d13 100644 --- a/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/ServerPrivateAMD.ice @@ -12,6 +12,9 @@ #include <TestAMD.ice> +module Test +{ + class SBSUnknownDerived extends SBase { string sbsud; @@ -40,4 +43,6 @@ exception UnknownDerivedException extends BaseException D2 pd2; }; +}; + #endif diff --git a/java/test/Ice/slicing/objectsAMD/TestAMD.ice b/java/test/Ice/slicing/objectsAMD/TestAMD.ice index b68706f831e..f22792c198f 100644 --- a/java/test/Ice/slicing/objectsAMD/TestAMD.ice +++ b/java/test/Ice/slicing/objectsAMD/TestAMD.ice @@ -10,6 +10,9 @@ #ifndef TEST_AMD_ICE #define TEST_AMD_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami", "amd"] interface Test +["ami", "amd"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif diff --git a/java/test/Ice/slicing/objectsAMD/TestI.java b/java/test/Ice/slicing/objectsAMD/TestI.java index 6ee301fab6e..3559e535e9a 100644 --- a/java/test/Ice/slicing/objectsAMD/TestI.java +++ b/java/test/Ice/slicing/objectsAMD/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public final class TestI extends _TestDisp +import Test.*; + +public final class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) @@ -16,14 +18,14 @@ public final class TestI extends _TestDisp } public void - shutdown_async(AMD_Test_shutdown cb, Ice.Current current) + shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { _adapter.getCommunicator().shutdown(); cb.ice_response(); } public void - SBaseAsObject_async(AMD_Test_SBaseAsObject cb, Ice.Current current) + SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current) { SBase sb = new SBase(); sb.sb = "SBase.sb"; @@ -31,7 +33,7 @@ public final class TestI extends _TestDisp } public void - SBaseAsSBase_async(AMD_Test_SBaseAsSBase cb, Ice.Current current) + SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current) { SBase sb = new SBase(); sb.sb = "SBase.sb"; @@ -39,7 +41,7 @@ public final class TestI extends _TestDisp } public void - SBSKnownDerivedAsSBase_async(AMD_Test_SBSKnownDerivedAsSBase cb, Ice.Current current) + SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current) { SBSKnownDerived sbskd = new SBSKnownDerived(); sbskd.sb = "SBSKnownDerived.sb"; @@ -48,7 +50,7 @@ public final class TestI extends _TestDisp } public void - SBSKnownDerivedAsSBSKnownDerived_async(AMD_Test_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) + SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) { SBSKnownDerived sbskd = new SBSKnownDerived(); sbskd.sb = "SBSKnownDerived.sb"; @@ -57,7 +59,7 @@ public final class TestI extends _TestDisp } public void - SBSUnknownDerivedAsSBase_async(AMD_Test_SBSUnknownDerivedAsSBase cb, Ice.Current current) + SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current) { SBSUnknownDerived sbsud = new SBSUnknownDerived(); sbsud.sb = "SBSUnknownDerived.sb"; @@ -66,7 +68,7 @@ public final class TestI extends _TestDisp } public void - SUnknownAsObject_async(AMD_Test_SUnknownAsObject cb, Ice.Current current) + SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current) { SUnknown su = new SUnknown(); su.su = "SUnknown.su"; @@ -74,7 +76,7 @@ public final class TestI extends _TestDisp } public void - oneElementCycle_async(AMD_Test_oneElementCycle cb, Ice.Current current) + oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current) { B b = new B(); b.sb = "B1.sb"; @@ -83,7 +85,7 @@ public final class TestI extends _TestDisp } public void - twoElementCycle_async(AMD_Test_twoElementCycle cb, Ice.Current current) + twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current) { B b1 = new B(); b1.sb = "B1.sb"; @@ -95,7 +97,7 @@ public final class TestI extends _TestDisp } public void - D1AsB_async(AMD_Test_D1AsB cb, Ice.Current current) + D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -111,7 +113,7 @@ public final class TestI extends _TestDisp } public void - D1AsD1_async(AMD_Test_D1AsD1 cb, Ice.Current current) + D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -127,7 +129,7 @@ public final class TestI extends _TestDisp } public void - D2AsB_async(AMD_Test_D2AsB cb, Ice.Current current) + D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb"; @@ -143,7 +145,7 @@ public final class TestI extends _TestDisp } public void - paramTest1_async(AMD_Test_paramTest1 cb, Ice.Current current) + paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -159,7 +161,7 @@ public final class TestI extends _TestDisp } public void - paramTest2_async(AMD_Test_paramTest2 cb, Ice.Current current) + paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -175,7 +177,7 @@ public final class TestI extends _TestDisp } public void - paramTest3_async(AMD_Test_paramTest3 cb, Ice.Current current) + paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb (p1 1)"; @@ -204,7 +206,7 @@ public final class TestI extends _TestDisp } public void - paramTest4_async(AMD_Test_paramTest4 cb, Ice.Current current) + paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current) { D4 d4 = new D4(); d4.sb = "D4.sb (1)"; @@ -217,7 +219,7 @@ public final class TestI extends _TestDisp } public void - returnTest1_async(AMD_Test_returnTest1 cb, Ice.Current current) + returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -233,7 +235,7 @@ public final class TestI extends _TestDisp } public void - returnTest2_async(AMD_Test_returnTest2 cb, Ice.Current current) + returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -249,13 +251,13 @@ public final class TestI extends _TestDisp } public void - returnTest3_async(AMD_Test_returnTest3 cb, B p1, B p2, Ice.Current current) + returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current) { cb.ice_response(p1); } public void - sequenceTest_async(AMD_Test_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) + sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) { SS ss = new SS(); ss.c1 = p1; @@ -264,7 +266,7 @@ public final class TestI extends _TestDisp } public void - dictionaryTest_async(AMD_Test_dictionaryTest cb, java.util.Map bin, Ice.Current current) + dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map bin, Ice.Current current) { java.util.Map bout = new java.util.HashMap(); int i; @@ -293,7 +295,7 @@ public final class TestI extends _TestDisp } public void - throwBaseAsBase_async(AMD_Test_throwBaseAsBase cb, Ice.Current current) + throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current) throws BaseException { BaseException be = new BaseException(); @@ -305,7 +307,7 @@ public final class TestI extends _TestDisp } public void - throwDerivedAsBase_async(AMD_Test_throwDerivedAsBase cb, Ice.Current current) + throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current) throws BaseException { DerivedException de = new DerivedException(); @@ -323,7 +325,7 @@ public final class TestI extends _TestDisp } public void - throwDerivedAsDerived_async(AMD_Test_throwDerivedAsDerived cb, Ice.Current current) + throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current) throws DerivedException { DerivedException de = new DerivedException(); @@ -341,7 +343,7 @@ public final class TestI extends _TestDisp } public void - throwUnknownDerivedAsBase_async(AMD_Test_throwUnknownDerivedAsBase cb, Ice.Current current) + throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current) throws BaseException { D2 d2 = new D2(); @@ -359,7 +361,7 @@ public final class TestI extends _TestDisp } public void - useForward_async(AMD_Test_useForward cb, Ice.Current current) + useForward_async(AMD_TestIntf_useForward cb, Ice.Current current) { Forward f = new Forward(); f = new Forward(); diff --git a/java/test/Ice/translator/NoModuleNoPackage.ice b/java/test/Ice/translator/NoModuleNoPackage.ice deleted file mode 100644 index d39a58016f8..00000000000 --- a/java/test/Ice/translator/NoModuleNoPackage.ice +++ /dev/null @@ -1,58 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// nmnp = no module no package - -enum nmnpEnum { nmnpE1, nmnpE2 }; - -const nmnpEnum nmnpConstant = nmnpE2; - -struct nmnpStruct -{ - nmnpEnum e; -}; - -sequence<nmnpStruct> nmnpStructSeq; - -dictionary<string, nmnpStruct> nmnpStringStructDict; - -interface nmnpBaseInterface -{ - void nmnpBaseInterfaceOp(); -}; - -interface nmnpInterface extends nmnpBaseInterface -{ - void nmnpInterfaceOp(); -}; - -class nmnpBaseClass -{ - nmnpEnum e; - nmnpStruct s; - nmnpStructSeq seq; - nmnpStringStructDict dict; -}; - -class nmnpClass extends nmnpBaseClass implements nmnpInterface -{ -}; - -exception nmnpBaseException -{ - nmnpEnum e; - nmnpStruct s; - nmnpStructSeq seq; - nmnpStringStructDict dict; - nmnpClass c; -}; - -exception nmnpException extends nmnpBaseException -{ -}; diff --git a/java/test/Ice/translator/NoModuleWithPackage.ice b/java/test/Ice/translator/NoModuleWithPackage.ice deleted file mode 100644 index da080b08673..00000000000 --- a/java/test/Ice/translator/NoModuleWithPackage.ice +++ /dev/null @@ -1,60 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// nmwp = no module with package - -[["java:package:nmwp"]] - -enum nmwpEnum { nmwpE1, nmwpE2 }; - -const nmwpEnum nmwpConstant = nmwpE2; - -struct nmwpStruct -{ - nmwpEnum e; -}; - -sequence<nmwpStruct> nmwpStructSeq; - -dictionary<string, nmwpStruct> nmwpStringStructDict; - -interface nmwpBaseInterface -{ - void nmwpBaseInterfaceOp(); -}; - -interface nmwpInterface extends nmwpBaseInterface -{ - void nmwpInterfaceOp(); -}; - -class nmwpBaseClass -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; -}; - -class nmwpClass extends nmwpBaseClass implements nmwpInterface -{ -}; - -exception nmwpBaseException -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; -}; - -exception nmwpException extends nmwpBaseException -{ -}; diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice deleted file mode 100644 index 6b889c904fb..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage1.ice +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleNoPackage types from top-level definitions - -#include <DoubleModuleNoPackage.ice> - -const ::M1::M2::dmnpEnum dmnpTest1Constant = ::M1::M2::dmnpE1; - -struct dmnpTest1Struct -{ - ::M1::M2::dmnpEnum e; - ::M1::M2::dmnpStruct s; - ::M1::M2::dmnpStructSeq seq; - ::M1::M2::dmnpStringStructDict dict; - ::M1::M2::dmnpClass c; - ::M1::M2::dmnpInterface i; -}; - -sequence<::M1::M2::dmnpStruct> dmnpTest1StructSeq; - -dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest1StructClassSeq; - -interface dmnpTest1Interface extends ::M1::M2::dmnpInterface {}; - -exception dmnpTest1Exception extends ::M1::M2::dmnpException -{ - ::M1::M2::dmnpEnum e1; - ::M1::M2::dmnpStruct s1; - ::M1::M2::dmnpStructSeq seq1; - ::M1::M2::dmnpStringStructDict dict1; - ::M1::M2::dmnpClass c1; - ::M1::M2::dmnpInterface i1; -}; - -class dmnpTest1Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface -{ - ::M1::M2::dmnpStruct - dmnpTest1Op1(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["ami"] - ::M1::M2::dmnpStruct - dmnpTest1Op2(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["amd"] - ::M1::M2::dmnpStruct - dmnpTest1Op3(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; -}; diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice deleted file mode 100644 index 66f4c4c00ac..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage2.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleNoPackage types from package definitions - -#include <DoubleModuleNoPackage.ice> - -[["java:package:dmnpTest2"]] - -const ::M1::M2::dmnpEnum dmnpTest2Constant = ::M1::M2::dmnpE1; - -struct dmnpTest2Struct -{ - ::M1::M2::dmnpEnum e; - ::M1::M2::dmnpStruct s; - ::M1::M2::dmnpStructSeq seq; - ::M1::M2::dmnpStringStructDict dict; - ::M1::M2::dmnpClass c; - ::M1::M2::dmnpInterface i; -}; - -sequence<::M1::M2::dmnpStruct> dmnpTest2StructSeq; - -dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest2StructClassSeq; - -interface dmnpTest2Interface extends ::M1::M2::dmnpInterface {}; - -exception dmnpTest2Exception extends ::M1::M2::dmnpException -{ - ::M1::M2::dmnpEnum e1; - ::M1::M2::dmnpStruct s1; - ::M1::M2::dmnpStructSeq seq1; - ::M1::M2::dmnpStringStructDict dict1; - ::M1::M2::dmnpClass c1; - ::M1::M2::dmnpInterface i1; -}; - -class dmnpTest2Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface -{ - ::M1::M2::dmnpStruct - dmnpTest2Op1(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["ami"] - ::M1::M2::dmnpStruct - dmnpTest2Op2(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["amd"] - ::M1::M2::dmnpStruct - dmnpTest2Op3(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; -}; diff --git a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice b/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice deleted file mode 100644 index dfd6295bc4f..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleNoPackage3.ice +++ /dev/null @@ -1,95 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleNoPackage types from (different) single module definitions - -#include <DoubleModuleNoPackage.ice> - -module T1 -{ - -const ::M1::M2::dmnpEnum dmnpTest3Constant = ::M1::M2::dmnpE1; - -struct dmnpTest3Struct -{ - ::M1::M2::dmnpEnum e; - ::M1::M2::dmnpStruct s; - ::M1::M2::dmnpStructSeq seq; - ::M1::M2::dmnpStringStructDict dict; - ::M1::M2::dmnpClass c; - ::M1::M2::dmnpInterface i; -}; - -sequence<::M1::M2::dmnpStruct> dmnpTest3StructSeq; - -dictionary<::M1::M2::dmnpStruct, ::M1::M2::dmnpBaseClass> dmnpTest3StructClassSeq; - -interface dmnpTest3Interface extends ::M1::M2::dmnpInterface {}; - -exception dmnpTest3Exception extends ::M1::M2::dmnpException -{ - ::M1::M2::dmnpEnum e1; - ::M1::M2::dmnpStruct s1; - ::M1::M2::dmnpStructSeq seq1; - ::M1::M2::dmnpStringStructDict dict1; - ::M1::M2::dmnpClass c1; - ::M1::M2::dmnpInterface i1; -}; - -class dmnpTest3Class extends ::M1::M2::dmnpBaseClass implements ::M1::M2::dmnpBaseInterface -{ - ::M1::M2::dmnpStruct - dmnpTest3Op1(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["ami"] - ::M1::M2::dmnpStruct - dmnpTest3Op2(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; - - ["amd"] - ::M1::M2::dmnpStruct - dmnpTest3Op3(::M1::M2::dmnpEnum i1, - ::M1::M2::dmnpStruct i2, - ::M1::M2::dmnpStructSeq i3, - ::M1::M2::dmnpStringStructDict i4, - ::M1::M2::dmnpInterface i5, - ::M1::M2::dmnpClass i6, - out ::M1::M2::dmnpEnum o1, - out ::M1::M2::dmnpStruct o2, - out ::M1::M2::dmnpStructSeq o3, - out ::M1::M2::dmnpStringStructDict o4, - out ::M1::M2::dmnpInterface o5, - out ::M1::M2::dmnpClass o6) - throws ::M1::M2::dmnpException; -}; - -}; diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice deleted file mode 100644 index efec105c6e5..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage1.ice +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleWithPackage types from top-level definitions - -#include <DoubleModuleWithPackage.ice> - -const ::M1::M2::dmwpEnum dmwpTest1Constant = ::M1::M2::dmwpE1; - -struct dmwpTest1Struct -{ - ::M1::M2::dmwpEnum e; - ::M1::M2::dmwpStruct s; - ::M1::M2::dmwpStructSeq seq; - ::M1::M2::dmwpStringStructDict dict; - ::M1::M2::dmwpClass c; - ::M1::M2::dmwpInterface i; -}; - -sequence<::M1::M2::dmwpStruct> dmwpTest1StructSeq; - -dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest1StructClassSeq; - -interface dmwpTest1Interface extends ::M1::M2::dmwpInterface {}; - -exception dmwpTest1Exception extends ::M1::M2::dmwpException -{ - ::M1::M2::dmwpEnum e1; - ::M1::M2::dmwpStruct s1; - ::M1::M2::dmwpStructSeq seq1; - ::M1::M2::dmwpStringStructDict dict1; - ::M1::M2::dmwpClass c1; - ::M1::M2::dmwpInterface i1; -}; - -class dmwpTest1Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface -{ - ::M1::M2::dmwpStruct - dmwpTest1Op1(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["ami"] - ::M1::M2::dmwpStruct - dmwpTest1Op2(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["amd"] - ::M1::M2::dmwpStruct - dmwpTest1Op3(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; -}; diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice deleted file mode 100644 index a5cd85405c2..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage2.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleWithPackage types from (different) package definitions - -#include <DoubleModuleWithPackage.ice> - -[["java:package:dmwpTest2"]] - -const ::M1::M2::dmwpEnum dmwpTest2Constant = ::M1::M2::dmwpE1; - -struct dmwpTest2Struct -{ - ::M1::M2::dmwpEnum e; - ::M1::M2::dmwpStruct s; - ::M1::M2::dmwpStructSeq seq; - ::M1::M2::dmwpStringStructDict dict; - ::M1::M2::dmwpClass c; - ::M1::M2::dmwpInterface i; -}; - -sequence<::M1::M2::dmwpStruct> dmwpTest2StructSeq; - -dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest2StructClassSeq; - -interface dmwpTest2Interface extends ::M1::M2::dmwpInterface {}; - -exception dmwpTest2Exception extends ::M1::M2::dmwpException -{ - ::M1::M2::dmwpEnum e1; - ::M1::M2::dmwpStruct s1; - ::M1::M2::dmwpStructSeq seq1; - ::M1::M2::dmwpStringStructDict dict1; - ::M1::M2::dmwpClass c1; - ::M1::M2::dmwpInterface i1; -}; - -class dmwpTest2Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface -{ - ::M1::M2::dmwpStruct - dmwpTest2Op1(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["ami"] - ::M1::M2::dmwpStruct - dmwpTest2Op2(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["amd"] - ::M1::M2::dmwpStruct - dmwpTest2Op3(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; -}; diff --git a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice b/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice deleted file mode 100644 index 1c638c54a08..00000000000 --- a/java/test/Ice/translator/TestDoubleModuleWithPackage3.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use DoubleModuleWithPackage types from (same) package definitions - -#include <DoubleModuleWithPackage.ice> - -[["java:package:dmwp"]] - -const ::M1::M2::dmwpEnum dmwpTest3Constant = ::M1::M2::dmwpE1; - -struct dmwpTest3Struct -{ - ::M1::M2::dmwpEnum e; - ::M1::M2::dmwpStruct s; - ::M1::M2::dmwpStructSeq seq; - ::M1::M2::dmwpStringStructDict dict; - ::M1::M2::dmwpClass c; - ::M1::M2::dmwpInterface i; -}; - -sequence<::M1::M2::dmwpStruct> dmwpTest3StructSeq; - -dictionary<::M1::M2::dmwpStruct, ::M1::M2::dmwpBaseClass> dmwpTest3StructClassSeq; - -interface dmwpTest3Interface extends ::M1::M2::dmwpInterface {}; - -exception dmwpTest3Exception extends ::M1::M2::dmwpException -{ - ::M1::M2::dmwpEnum e1; - ::M1::M2::dmwpStruct s1; - ::M1::M2::dmwpStructSeq seq1; - ::M1::M2::dmwpStringStructDict dict1; - ::M1::M2::dmwpClass c1; - ::M1::M2::dmwpInterface i1; -}; - -class dmwpTest3Class extends ::M1::M2::dmwpBaseClass implements ::M1::M2::dmwpBaseInterface -{ - ::M1::M2::dmwpStruct - dmwpTest3Op1(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["ami"] - ::M1::M2::dmwpStruct - dmwpTest3Op2(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; - - ["amd"] - ::M1::M2::dmwpStruct - dmwpTest3Op3(::M1::M2::dmwpEnum i1, - ::M1::M2::dmwpStruct i2, - ::M1::M2::dmwpStructSeq i3, - ::M1::M2::dmwpStringStructDict i4, - ::M1::M2::dmwpInterface i5, - ::M1::M2::dmwpClass i6, - out ::M1::M2::dmwpEnum o1, - out ::M1::M2::dmwpStruct o2, - out ::M1::M2::dmwpStructSeq o3, - out ::M1::M2::dmwpStringStructDict o4, - out ::M1::M2::dmwpInterface o5, - out ::M1::M2::dmwpClass o6) - throws ::M1::M2::dmwpException; -}; diff --git a/java/test/Ice/translator/TestNoModuleNoPackage.ice b/java/test/Ice/translator/TestNoModuleNoPackage.ice deleted file mode 100644 index 0f4997bea02..00000000000 --- a/java/test/Ice/translator/TestNoModuleNoPackage.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleNoPackage types from top-level definitions. Note that -// we can *only* test from top-level definitions, because it's not possible -// to refer to top-level Java classes from within packaged types. - -#include <NoModuleNoPackage.ice> - -const nmnpEnum nmnpTestConstant = nmnpE1; - -struct nmnpTestStruct -{ - nmnpEnum e; - nmnpStruct s; - nmnpStructSeq seq; - nmnpStringStructDict dict; - nmnpClass c; - nmnpInterface i; -}; - -sequence<nmnpStruct> nmnpTestStructSeq; - -dictionary<nmnpStruct, nmnpBaseClass> nmnpTestStructClassSeq; - -interface nmnpTestInterface extends nmnpInterface {}; - -exception nmnpTestException extends nmnpException -{ - nmnpEnum e1; - nmnpStruct s1; - nmnpStructSeq seq1; - nmnpStringStructDict dict1; - nmnpClass c1; - nmnpInterface i1; -}; - -class nmnpTestClass extends nmnpBaseClass implements nmnpBaseInterface -{ - nmnpStruct - nmnpTestOp1(nmnpEnum i1, - nmnpStruct i2, - nmnpStructSeq i3, - nmnpStringStructDict i4, - nmnpInterface i5, - nmnpClass i6, - out nmnpEnum o1, - out nmnpStruct o2, - out nmnpStructSeq o3, - out nmnpStringStructDict o4, - out nmnpInterface o5, - out nmnpClass o6) - throws nmnpException; - - ["ami"] - nmnpStruct - nmnpTestOp2(nmnpEnum i1, - nmnpStruct i2, - nmnpStructSeq i3, - nmnpStringStructDict i4, - nmnpInterface i5, - nmnpClass i6, - out nmnpEnum o1, - out nmnpStruct o2, - out nmnpStructSeq o3, - out nmnpStringStructDict o4, - out nmnpInterface o5, - out nmnpClass o6) - throws nmnpException; - - ["amd"] - nmnpStruct - nmnpTestOp3(nmnpEnum i1, - nmnpStruct i2, - nmnpStructSeq i3, - nmnpStringStructDict i4, - nmnpInterface i5, - nmnpClass i6, - out nmnpEnum o1, - out nmnpStruct o2, - out nmnpStructSeq o3, - out nmnpStringStructDict o4, - out nmnpInterface o5, - out nmnpClass o6) - throws nmnpException; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage1.ice b/java/test/Ice/translator/TestNoModuleWithPackage1.ice deleted file mode 100644 index c7c067b62a8..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage1.ice +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from top-level definitions - -#include <NoModuleWithPackage.ice> - -const nmwpEnum nmwpTest1Constant = nmwpE1; - -struct nmwpTest1Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest1StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest1StructClassSeq; - -interface nmwpTest1Interface extends nmwpInterface {}; - -exception nmwpTest1Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest1Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest1Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest1Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest1Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage2.ice b/java/test/Ice/translator/TestNoModuleWithPackage2.ice deleted file mode 100644 index c1135cd23b6..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage2.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from (different) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwpTest2"]] - -const nmwpEnum nmwpTest2Constant = nmwpE1; - -struct nmwpTest2Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest2StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest2StructClassSeq; - -interface nmwpTest2Interface extends nmwpInterface {}; - -exception nmwpTest2Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest2Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest2Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest2Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest2Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage3.ice b/java/test/Ice/translator/TestNoModuleWithPackage3.ice deleted file mode 100644 index abc14df7948..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage3.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from (same) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwp"]] - -const nmwpEnum nmwpTest3Constant = nmwpE1; - -struct nmwpTest3Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest3StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest3StructClassSeq; - -interface nmwpTest3Interface extends nmwpInterface {}; - -exception nmwpTest3Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest3Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest3Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest3Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest3Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage4.ice b/java/test/Ice/translator/TestNoModuleWithPackage4.ice deleted file mode 100644 index 3274e0ea440..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage4.ice +++ /dev/null @@ -1,95 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from single module definitions - -#include <NoModuleWithPackage.ice> - -module P -{ - -const nmwpEnum nmwpTest4Constant = nmwpE1; - -struct nmwpTest4Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest4StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest4StructClassSeq; - -interface nmwpTest4Interface extends nmwpInterface {}; - -exception nmwpTest4Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest4Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest4Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest4Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest4Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage5.ice b/java/test/Ice/translator/TestNoModuleWithPackage5.ice deleted file mode 100644 index 492afc92314..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage5.ice +++ /dev/null @@ -1,98 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from double module definitions - -#include <NoModuleWithPackage.ice> - -module P -{ -module Q -{ - -const nmwpEnum nmwpTest5Constant = nmwpE1; - -struct nmwpTest5Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest5StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest5StructClassSeq; - -interface nmwpTest5Interface extends nmwpInterface {}; - -exception nmwpTest5Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest5Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest5Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest5Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest5Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage6.ice b/java/test/Ice/translator/TestNoModuleWithPackage6.ice deleted file mode 100644 index 7b0cdcbd463..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage6.ice +++ /dev/null @@ -1,97 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from single module with (different) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwpTest6"]] - -module P -{ - -const nmwpEnum nmwpTest6Constant = nmwpE1; - -struct nmwpTest6Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest6StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest6StructClassSeq; - -interface nmwpTest6Interface extends nmwpInterface {}; - -exception nmwpTest6Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest6Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest6Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest6Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest6Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage7.ice b/java/test/Ice/translator/TestNoModuleWithPackage7.ice deleted file mode 100644 index 397660dbf14..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage7.ice +++ /dev/null @@ -1,97 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from single module with (same) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwp"]] - -module P -{ - -const nmwpEnum nmwpTest7Constant = nmwpE1; - -struct nmwpTest7Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest7StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest7StructClassSeq; - -interface nmwpTest7Interface extends nmwpInterface {}; - -exception nmwpTest7Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest7Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest7Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest7Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest7Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage8.ice b/java/test/Ice/translator/TestNoModuleWithPackage8.ice deleted file mode 100644 index 1a76e64a223..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage8.ice +++ /dev/null @@ -1,100 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from double module with (different) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwpTest8"]] - -module P -{ -module Q -{ - -const nmwpEnum nmwpTest8Constant = nmwpE1; - -struct nmwpTest8Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest8StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest8StructClassSeq; - -interface nmwpTest8Interface extends nmwpInterface {}; - -exception nmwpTest8Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest8Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest8Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest8Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest8Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; -}; diff --git a/java/test/Ice/translator/TestNoModuleWithPackage9.ice b/java/test/Ice/translator/TestNoModuleWithPackage9.ice deleted file mode 100644 index feb9ad159d5..00000000000 --- a/java/test/Ice/translator/TestNoModuleWithPackage9.ice +++ /dev/null @@ -1,100 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use NoModuleWithPackage types from double module with (same) package definitions - -#include <NoModuleWithPackage.ice> - -[["java:package:nmwp"]] - -module P -{ -module Q -{ - -const nmwpEnum nmwpTest9Constant = nmwpE1; - -struct nmwpTest9Struct -{ - nmwpEnum e; - nmwpStruct s; - nmwpStructSeq seq; - nmwpStringStructDict dict; - nmwpClass c; - nmwpInterface i; -}; - -sequence<nmwpStruct> nmwpTest9StructSeq; - -dictionary<nmwpStruct, nmwpBaseClass> nmwpTest9StructClassSeq; - -interface nmwpTest9Interface extends nmwpInterface {}; - -exception nmwpTest9Exception extends nmwpException -{ - nmwpEnum e1; - nmwpStruct s1; - nmwpStructSeq seq1; - nmwpStringStructDict dict1; - nmwpClass c1; - nmwpInterface i1; -}; - -class nmwpTest9Class extends nmwpBaseClass implements nmwpBaseInterface -{ - nmwpStruct - nmwpTest9Op1(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["ami"] - nmwpStruct - nmwpTest9Op2(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; - - ["amd"] - nmwpStruct - nmwpTest9Op3(nmwpEnum i1, - nmwpStruct i2, - nmwpStructSeq i3, - nmwpStringStructDict i4, - nmwpInterface i5, - nmwpClass i6, - out nmwpEnum o1, - out nmwpStruct o2, - out nmwpStructSeq o3, - out nmwpStringStructDict o4, - out nmwpInterface o5, - out nmwpClass o6) - throws nmwpException; -}; - -}; -}; diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice b/java/test/Ice/translator/TestSingleModuleNoPackage1.ice deleted file mode 100644 index 92ab08d3dd5..00000000000 --- a/java/test/Ice/translator/TestSingleModuleNoPackage1.ice +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleNoPackage types from top-level definitions - -#include <SingleModuleNoPackage.ice> - -const M::smnpEnum smnpTest1Constant = M::smnpE1; - -struct smnpTest1Struct -{ - M::smnpEnum e; - M::smnpStruct s; - M::smnpStructSeq seq; - M::smnpStringStructDict dict; - M::smnpClass c; - M::smnpInterface i; -}; - -sequence<M::smnpStruct> smnpTest1StructSeq; - -dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest1StructClassSeq; - -interface smnpTest1Interface extends M::smnpInterface {}; - -exception smnpTest1Exception extends M::smnpException -{ - M::smnpEnum e1; - M::smnpStruct s1; - M::smnpStructSeq seq1; - M::smnpStringStructDict dict1; - M::smnpClass c1; - M::smnpInterface i1; -}; - -class smnpTest1Class extends M::smnpBaseClass implements M::smnpBaseInterface -{ - M::smnpStruct - smnpTest1Op1(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["ami"] - M::smnpStruct - smnpTest1Op2(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["amd"] - M::smnpStruct - smnpTest1Op3(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; -}; diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice b/java/test/Ice/translator/TestSingleModuleNoPackage2.ice deleted file mode 100644 index 4f7320ad228..00000000000 --- a/java/test/Ice/translator/TestSingleModuleNoPackage2.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleNoPackage types from package definitions - -#include <SingleModuleNoPackage.ice> - -[["java:package:smnpTest2"]] - -const M::smnpEnum smnpTest2Constant = M::smnpE1; - -struct smnpTest2Struct -{ - M::smnpEnum e; - M::smnpStruct s; - M::smnpStructSeq seq; - M::smnpStringStructDict dict; - M::smnpClass c; - M::smnpInterface i; -}; - -sequence<M::smnpStruct> smnpTest2StructSeq; - -dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest2StructClassSeq; - -interface smnpTest2Interface extends M::smnpInterface {}; - -exception smnpTest2Exception extends M::smnpException -{ - M::smnpEnum e1; - M::smnpStruct s1; - M::smnpStructSeq seq1; - M::smnpStringStructDict dict1; - M::smnpClass c1; - M::smnpInterface i1; -}; - -class smnpTest2Class extends M::smnpBaseClass implements M::smnpBaseInterface -{ - M::smnpStruct - smnpTest2Op1(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["ami"] - M::smnpStruct - smnpTest2Op2(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["amd"] - M::smnpStruct - smnpTest2Op3(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; -}; diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice b/java/test/Ice/translator/TestSingleModuleNoPackage3.ice deleted file mode 100644 index e5cb0f8391c..00000000000 --- a/java/test/Ice/translator/TestSingleModuleNoPackage3.ice +++ /dev/null @@ -1,95 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleNoPackage types from (different) single module definitions - -#include <SingleModuleNoPackage.ice> - -module T1 -{ - -const M::smnpEnum smnpTest3Constant = M::smnpE1; - -struct smnpTest3Struct -{ - M::smnpEnum e; - M::smnpStruct s; - M::smnpStructSeq seq; - M::smnpStringStructDict dict; - M::smnpClass c; - M::smnpInterface i; -}; - -sequence<M::smnpStruct> smnpTest3StructSeq; - -dictionary<M::smnpStruct, M::smnpBaseClass> smnpTest3StructClassSeq; - -interface smnpTest3Interface extends M::smnpInterface {}; - -exception smnpTest3Exception extends M::smnpException -{ - M::smnpEnum e1; - M::smnpStruct s1; - M::smnpStructSeq seq1; - M::smnpStringStructDict dict1; - M::smnpClass c1; - M::smnpInterface i1; -}; - -class smnpTest3Class extends M::smnpBaseClass implements M::smnpBaseInterface -{ - M::smnpStruct - smnpTest3Op1(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["ami"] - M::smnpStruct - smnpTest3Op2(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; - - ["amd"] - M::smnpStruct - smnpTest3Op3(M::smnpEnum i1, - M::smnpStruct i2, - M::smnpStructSeq i3, - M::smnpStringStructDict i4, - M::smnpInterface i5, - M::smnpClass i6, - out M::smnpEnum o1, - out M::smnpStruct o2, - out M::smnpStructSeq o3, - out M::smnpStringStructDict o4, - out M::smnpInterface o5, - out M::smnpClass o6) - throws M::smnpException; -}; - -}; diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice b/java/test/Ice/translator/TestSingleModuleNoPackage5.ice deleted file mode 100644 index ca669372c2c..00000000000 --- a/java/test/Ice/translator/TestSingleModuleNoPackage5.ice +++ /dev/null @@ -1,97 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleNoPackage types from (same) single module with package definitions - -#include <SingleModuleNoPackage.ice> - -[["java:package:snmpTest5"]] - -module M -{ - -const smnpEnum smnpTest5Constant = smnpE1; - -struct smnpTest5Struct -{ - smnpEnum e; - smnpStruct s; - smnpStructSeq seq; - smnpStringStructDict dict; - smnpClass c; - smnpInterface i; -}; - -sequence<smnpStruct> smnpTest5StructSeq; - -dictionary<smnpStruct, smnpBaseClass> smnpTest5StructClassSeq; - -interface smnpTest5Interface extends smnpInterface {}; - -exception smnpTest5Exception extends smnpException -{ - smnpEnum e1; - smnpStruct s1; - smnpStructSeq seq1; - smnpStringStructDict dict1; - smnpClass c1; - smnpInterface i1; -}; - -class smnpTest5Class extends smnpBaseClass implements smnpBaseInterface -{ - smnpStruct - smnpTest5Op1(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; - - ["ami"] - smnpStruct - smnpTest5Op2(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; - - ["amd"] - smnpStruct - smnpTest5Op3(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; -}; - -}; diff --git a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice b/java/test/Ice/translator/TestSingleModuleNoPackage8.ice deleted file mode 100644 index e1bbd7f9fcc..00000000000 --- a/java/test/Ice/translator/TestSingleModuleNoPackage8.ice +++ /dev/null @@ -1,100 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleNoPackage types from (same) double module definitions with package - -#include <SingleModuleNoPackage.ice> - -[["java:package:smnpTest8"]] - -module M -{ -module N -{ - -const smnpEnum smnpTest8Constant = smnpE1; - -struct smnpTest8Struct -{ - smnpEnum e; - smnpStruct s; - smnpStructSeq seq; - smnpStringStructDict dict; - smnpClass c; - smnpInterface i; -}; - -sequence<smnpStruct> smnpTest8StructSeq; - -dictionary<smnpStruct, smnpBaseClass> smnpTest8StructClassSeq; - -interface smnpTest8Interface extends smnpInterface {}; - -exception smnpTest8Exception extends smnpException -{ - smnpEnum e1; - smnpStruct s1; - smnpStructSeq seq1; - smnpStringStructDict dict1; - smnpClass c1; - smnpInterface i1; -}; - -class smnpTest8Class extends smnpBaseClass implements smnpBaseInterface -{ - smnpStruct - smnpTest8Op1(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; - - ["ami"] - smnpStruct - smnpTest8Op2(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; - - ["amd"] - smnpStruct - smnpTest8Op3(smnpEnum i1, - smnpStruct i2, - smnpStructSeq i3, - smnpStringStructDict i4, - smnpInterface i5, - smnpClass i6, - out smnpEnum o1, - out smnpStruct o2, - out smnpStructSeq o3, - out smnpStringStructDict o4, - out smnpInterface o5, - out smnpClass o6) - throws smnpException; -}; - -}; -}; diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice b/java/test/Ice/translator/TestSingleModuleWithPackage1.ice deleted file mode 100644 index 3ac1ada5a31..00000000000 --- a/java/test/Ice/translator/TestSingleModuleWithPackage1.ice +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleWithPackage types from top-level definitions - -#include <SingleModuleWithPackage.ice> - -const M::smwpEnum smwpTest1Constant = M::smwpE1; - -struct smwpTest1Struct -{ - M::smwpEnum e; - M::smwpStruct s; - M::smwpStructSeq seq; - M::smwpStringStructDict dict; - M::smwpClass c; - M::smwpInterface i; -}; - -sequence<M::smwpStruct> smwpTest1StructSeq; - -dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest1StructClassSeq; - -interface smwpTest1Interface extends M::smwpInterface {}; - -exception smwpTest1Exception extends M::smwpException -{ - M::smwpEnum e1; - M::smwpStruct s1; - M::smwpStructSeq seq1; - M::smwpStringStructDict dict1; - M::smwpClass c1; - M::smwpInterface i1; -}; - -class smwpTest1Class extends M::smwpBaseClass implements M::smwpBaseInterface -{ - M::smwpStruct - smwpTest1Op1(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["ami"] - M::smwpStruct - smwpTest1Op2(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["amd"] - M::smwpStruct - smwpTest1Op3(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; -}; diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice b/java/test/Ice/translator/TestSingleModuleWithPackage2.ice deleted file mode 100644 index 306825dc3a9..00000000000 --- a/java/test/Ice/translator/TestSingleModuleWithPackage2.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleWithPackage types from (different) package definitions - -#include <SingleModuleWithPackage.ice> - -[["java:package:smwpTest2"]] - -const M::smwpEnum smwpTest2Constant = M::smwpE1; - -struct smwpTest2Struct -{ - M::smwpEnum e; - M::smwpStruct s; - M::smwpStructSeq seq; - M::smwpStringStructDict dict; - M::smwpClass c; - M::smwpInterface i; -}; - -sequence<M::smwpStruct> smwpTest2StructSeq; - -dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest2StructClassSeq; - -interface smwpTest2Interface extends M::smwpInterface {}; - -exception smwpTest2Exception extends M::smwpException -{ - M::smwpEnum e1; - M::smwpStruct s1; - M::smwpStructSeq seq1; - M::smwpStringStructDict dict1; - M::smwpClass c1; - M::smwpInterface i1; -}; - -class smwpTest2Class extends M::smwpBaseClass implements M::smwpBaseInterface -{ - M::smwpStruct - smwpTest2Op1(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["ami"] - M::smwpStruct - smwpTest2Op2(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["amd"] - M::smwpStruct - smwpTest2Op3(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; -}; diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice b/java/test/Ice/translator/TestSingleModuleWithPackage3.ice deleted file mode 100644 index 87b2896d526..00000000000 --- a/java/test/Ice/translator/TestSingleModuleWithPackage3.ice +++ /dev/null @@ -1,92 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleWithPackage types from (same) package definitions - -#include <SingleModuleWithPackage.ice> - -[["java:package:smwp"]] - -const M::smwpEnum smwpTest3Constant = M::smwpE1; - -struct smwpTest3Struct -{ - M::smwpEnum e; - M::smwpStruct s; - M::smwpStructSeq seq; - M::smwpStringStructDict dict; - M::smwpClass c; - M::smwpInterface i; -}; - -sequence<M::smwpStruct> smwpTest3StructSeq; - -dictionary<M::smwpStruct, M::smwpBaseClass> smwpTest3StructClassSeq; - -interface smwpTest3Interface extends M::smwpInterface {}; - -exception smwpTest3Exception extends M::smwpException -{ - M::smwpEnum e1; - M::smwpStruct s1; - M::smwpStructSeq seq1; - M::smwpStringStructDict dict1; - M::smwpClass c1; - M::smwpInterface i1; -}; - -class smwpTest3Class extends M::smwpBaseClass implements M::smwpBaseInterface -{ - M::smwpStruct - smwpTest3Op1(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["ami"] - M::smwpStruct - smwpTest3Op2(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; - - ["amd"] - M::smwpStruct - smwpTest3Op3(M::smwpEnum i1, - M::smwpStruct i2, - M::smwpStructSeq i3, - M::smwpStringStructDict i4, - M::smwpInterface i5, - M::smwpClass i6, - out M::smwpEnum o1, - out M::smwpStruct o2, - out M::smwpStructSeq o3, - out M::smwpStringStructDict o4, - out M::smwpInterface o5, - out M::smwpClass o6) - throws M::smwpException; -}; diff --git a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice b/java/test/Ice/translator/TestSingleModuleWithPackage8.ice deleted file mode 100644 index 16cc51993eb..00000000000 --- a/java/test/Ice/translator/TestSingleModuleWithPackage8.ice +++ /dev/null @@ -1,97 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2004 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. -// -// ********************************************************************** - -// Test: use SingleModuleWithPackage types from (same) single module with (same) package definitions - -#include <SingleModuleWithPackage.ice> - -[["java:package:smwp"]] - -module M -{ - -const smwpEnum smwpTest8Constant = smwpE1; - -struct smwpTest8Struct -{ - smwpEnum e; - smwpStruct s; - smwpStructSeq seq; - smwpStringStructDict dict; - smwpClass c; - smwpInterface i; -}; - -sequence<smwpStruct> smwpTest8StructSeq; - -dictionary<smwpStruct, smwpBaseClass> smwpTest8StructClassSeq; - -interface smwpTest8Interface extends smwpInterface {}; - -exception smwpTest8Exception extends smwpException -{ - smwpEnum e1; - smwpStruct s1; - smwpStructSeq seq1; - smwpStringStructDict dict1; - smwpClass c1; - smwpInterface i1; -}; - -class smwpTest8Class extends smwpBaseClass implements smwpBaseInterface -{ - smwpStruct - smwpTest8Op1(smwpEnum i1, - smwpStruct i2, - smwpStructSeq i3, - smwpStringStructDict i4, - smwpInterface i5, - smwpClass i6, - out smwpEnum o1, - out smwpStruct o2, - out smwpStructSeq o3, - out smwpStringStructDict o4, - out smwpInterface o5, - out smwpClass o6) - throws smwpException; - - ["ami"] - smwpStruct - smwpTest8Op2(smwpEnum i1, - smwpStruct i2, - smwpStructSeq i3, - smwpStringStructDict i4, - smwpInterface i5, - smwpClass i6, - out smwpEnum o1, - out smwpStruct o2, - out smwpStructSeq o3, - out smwpStringStructDict o4, - out smwpInterface o5, - out smwpClass o6) - throws smwpException; - - ["amd"] - smwpStruct - smwpTest8Op3(smwpEnum i1, - smwpStruct i2, - smwpStructSeq i3, - smwpStringStructDict i4, - smwpInterface i5, - smwpClass i6, - out smwpEnum o1, - out smwpStruct o2, - out smwpStructSeq o3, - out smwpStringStructDict o4, - out smwpInterface o5, - out smwpClass o6) - throws smwpException; -}; - -}; diff --git a/java/test/Ice/translator/build.xml b/java/test/Ice/translator/build.xml index c2dcd3a275e..0b687cc15e9 100644 --- a/java/test/Ice/translator/build.xml +++ b/java/test/Ice/translator/build.xml @@ -42,32 +42,13 @@ <fileset dir="." includes="NoModuleWithPackage.ice"/> <fileset dir="." includes="SingleModuleNoPackage.ice"/> <fileset dir="." includes="SingleModuleWithPackage.ice"/> - <fileset dir="." includes="TestNoModuleNoPackage.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage1.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage2.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage3.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage4.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage5.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage6.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage7.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage8.ice"/> - <fileset dir="." includes="TestNoModuleWithPackage9.ice"/> - <fileset dir="." includes="TestSingleModuleNoPackage1.ice"/> - <fileset dir="." includes="TestSingleModuleNoPackage2.ice"/> - <fileset dir="." includes="TestSingleModuleNoPackage3.ice"/> <fileset dir="." includes="TestSingleModuleNoPackage4.ice"/> - <fileset dir="." includes="TestSingleModuleNoPackage5.ice"/> <fileset dir="." includes="TestSingleModuleNoPackage6.ice"/> <fileset dir="." includes="TestSingleModuleNoPackage7.ice"/> - <fileset dir="." includes="TestSingleModuleNoPackage8.ice"/> - <fileset dir="." includes="TestSingleModuleWithPackage1.ice"/> - <fileset dir="." includes="TestSingleModuleWithPackage2.ice"/> - <fileset dir="." includes="TestSingleModuleWithPackage3.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage4.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage5.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage6.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage7.ice"/> - <fileset dir="." includes="TestSingleModuleWithPackage8.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage9.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage10.ice"/> <fileset dir="." includes="TestSingleModuleWithPackage11.ice"/> @@ -79,16 +60,10 @@ <includepath> <pathelement path="." /> </includepath> - <fileset dir="." includes="TestDoubleModuleNoPackage1.ice"/> - <fileset dir="." includes="TestDoubleModuleNoPackage2.ice"/> - <fileset dir="." includes="TestDoubleModuleNoPackage3.ice"/> <fileset dir="." includes="TestDoubleModuleNoPackage4.ice"/> <fileset dir="." includes="TestDoubleModuleNoPackage5.ice"/> <fileset dir="." includes="TestDoubleModuleNoPackage6.ice"/> <fileset dir="." includes="TestDoubleModuleNoPackage7.ice"/> - <fileset dir="." includes="TestDoubleModuleWithPackage1.ice"/> - <fileset dir="." includes="TestDoubleModuleWithPackage2.ice"/> - <fileset dir="." includes="TestDoubleModuleWithPackage3.ice"/> <fileset dir="." includes="TestDoubleModuleWithPackage4.ice"/> <fileset dir="." includes="TestDoubleModuleWithPackage5.ice"/> <fileset dir="." includes="TestDoubleModuleWithPackage6.ice"/> diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java index 9eb50fa1b0b..f974f10d11d 100644 --- a/java/test/IcePack/deployer/AllTests.java +++ b/java/test/IcePack/deployer/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -131,21 +133,21 @@ public class AllTests System.out.print("pinging server objects... "); System.out.flush(); - TestPrx obj; + TestIntfPrx obj; - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service2@IceBox1Service2Adapter")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service2@IceBox1Service2Adapter")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service1@IceBox2.Service1.Service1")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); System.out.println("ok"); System.out.print("testing server configuration... "); System.out.flush(); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); test(obj.getProperty("Type").equals("Server")); test(obj.getProperty("Name").equals("Server1")); @@ -158,13 +160,13 @@ public class AllTests System.out.print("testing service configuration... "); System.out.flush(); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); test(obj.getProperty("Service1.Type").equals("standard")); test(obj.getProperty("Service1.ServiceName").equals("Service1")); test(obj.getProperty("Service1.InheritedVariable").equals("inherited")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox2-Service2@IceBox2Service2Adapter")); test(obj.getProperty("Service2.Type").equals("freeze")); test(obj.getProperty("Service2.ServiceName").equals("Service2")); @@ -176,7 +178,7 @@ public class AllTests System.out.print("testing server options... "); System.out.flush(); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); test(obj.getProperty("Test.Test").equals("2")); test(obj.getProperty("Test.Test1").equals("0")); @@ -213,10 +215,10 @@ public class AllTests test(false); } - TestPrx obj; + TestIntfPrx obj; try { - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); test(false); } catch(Ice.LocalException ex) @@ -236,15 +238,15 @@ public class AllTests test(false); } - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server1.Server")); test(obj.getProperty("Mode").equals("manual")); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("Server2@Server2.Server")); System.out.println("ok"); System.out.print("testing service configuration... "); - obj = TestPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); + obj = TestIntfPrxHelper.checkedCast(communicator.stringToProxy("IceBox1-Service1@IceBox1.Service1.Service1")); test(obj.getProperty("Service1.DebugProperty").equals("debug")); System.out.println("ok"); diff --git a/java/test/IcePack/deployer/Test.ice b/java/test/IcePack/deployer/Test.ice index 04841b0d1db..f2cd7f239b8 100644 --- a/java/test/IcePack/deployer/Test.ice +++ b/java/test/IcePack/deployer/Test.ice @@ -10,11 +10,16 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void shutdown(); string getProperty(string name); }; +}; + #endif diff --git a/java/test/IcePack/deployer/TestI.java b/java/test/IcePack/deployer/TestI.java index d5607a99684..ebeaaedd26f 100644 --- a/java/test/IcePack/deployer/TestI.java +++ b/java/test/IcePack/deployer/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class TestI extends _TestDisp +import Test.*; + +public class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter, Ice.Properties properties) diff --git a/java/test/IcePack/simple/AllTests.java b/java/test/IcePack/simple/AllTests.java index ddfec7a3243..efa55a44316 100644 --- a/java/test/IcePack/simple/AllTests.java +++ b/java/test/IcePack/simple/AllTests.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class AllTests { private static void @@ -18,7 +20,7 @@ public class AllTests } } - public static TestPrx + public static TestIntfPrx allTests(Ice.Communicator communicator) { System.out.print("testing stringToProxy... "); @@ -30,7 +32,7 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx obj = TestPrxHelper.checkedCast(base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base); test(obj != null); test(obj.equals(base)); System.out.println("ok"); @@ -43,7 +45,7 @@ public class AllTests return obj; } - public static TestPrx + public static TestIntfPrx allTestsWithDeploy(Ice.Communicator communicator) { System.out.print("testing stringToProxy... "); @@ -56,10 +58,10 @@ public class AllTests System.out.print("testing checked cast... "); System.out.flush(); - TestPrx obj = TestPrxHelper.checkedCast(base); + TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base); test(obj != null); test(obj.equals(base)); - TestPrx obj2 = TestPrxHelper.checkedCast(base2); + TestIntfPrx obj2 = TestIntfPrxHelper.checkedCast(base2); test(obj2 != null); test(obj2.equals(base2)); System.out.println("ok"); @@ -119,7 +121,7 @@ public class AllTests System.out.flush(); try { - obj = TestPrxHelper.checkedCast(base); + obj = TestIntfPrxHelper.checkedCast(base); test(false); } catch(Ice.NoEndpointException ex) @@ -127,7 +129,7 @@ public class AllTests } try { - obj2 = TestPrxHelper.checkedCast(base2); + obj2 = TestIntfPrxHelper.checkedCast(base2); test(false); } catch(Ice.NoEndpointException ex) @@ -149,7 +151,7 @@ public class AllTests try { - obj = TestPrxHelper.checkedCast(base); + obj = TestIntfPrxHelper.checkedCast(base); } catch(Ice.NoEndpointException ex) { @@ -157,7 +159,7 @@ public class AllTests } try { - obj2 = TestPrxHelper.checkedCast(base2); + obj2 = TestIntfPrxHelper.checkedCast(base2); } catch(Ice.NoEndpointException ex) { diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java index 9f33b45fb58..b6bdd52a316 100644 --- a/java/test/IcePack/simple/Client.java +++ b/java/test/IcePack/simple/Client.java @@ -7,6 +7,8 @@ // // ********************************************************************** +import Test.*; + public class Client { private static int @@ -22,7 +24,7 @@ public class Client } } - TestPrx obj; + TestIntfPrx obj; if(!withDeploy) { diff --git a/java/test/IcePack/simple/Test.ice b/java/test/IcePack/simple/Test.ice index 54953223857..2553165ab21 100644 --- a/java/test/IcePack/simple/Test.ice +++ b/java/test/IcePack/simple/Test.ice @@ -10,9 +10,14 @@ #ifndef TEST_ICE #define TEST_ICE -interface Test +module Test +{ + +interface TestIntf { void shutdown(); }; +}; + #endif diff --git a/java/test/IcePack/simple/TestI.java b/java/test/IcePack/simple/TestI.java index a9b4b293dd4..fbe51b17a6f 100644 --- a/java/test/IcePack/simple/TestI.java +++ b/java/test/IcePack/simple/TestI.java @@ -7,7 +7,9 @@ // // ********************************************************************** -public class TestI extends _TestDisp +import Test.*; + +public class TestI extends _TestIntfDisp { public TestI(Ice.ObjectAdapter adapter) diff --git a/php/CHANGES b/php/CHANGES index 6a14b33f29e..aa6f206ccc7 100644 --- a/php/CHANGES +++ b/php/CHANGES @@ -1,6 +1,21 @@ Changes since version 1.1.1 --------------------------- +- The documentation has always stated that same-named constructs + cannot be directly nested inside each other. (For example, a + module `M' cannot contain a constant named `M'. The Slice parser + compiler did not enforce this correctly up to now for modules + containing constructs with the same name as the enclosing module. + This has been fixed and now results in a diagnostic. + +- The Slice parser now deprecates Slice definitions at global scope: + only modules can be defined at global scope. Everything else + (constants, classes, interfaces, etc.) must be defined inside a module. + + For the time being, the compiler issues a warning for each global definition + but continues to compile the code. Global non-module definitions will + elicit a hard error two releases from now. + - Fixed a compilation error for Visual C++. Changes since version 1.1.0 diff --git a/php/demo/Ice/hello/Hello.ice b/php/demo/Ice/hello/Hello.ice index 10a98cc1ad3..ab3b999f8e5 100644 --- a/php/demo/Ice/hello/Hello.ice +++ b/php/demo/Ice/hello/Hello.ice @@ -10,10 +10,15 @@ #ifndef HELLO_ICE #define HELLO_ICE +module Demo +{ + class Hello { nonmutating void sayHello(); idempotent void shutdown(); }; +}; + #endif diff --git a/php/demo/Ice/value/Value.ice b/php/demo/Ice/value/Value.ice index b8f03f2448b..22fbecbcf17 100644 --- a/php/demo/Ice/value/Value.ice +++ b/php/demo/Ice/value/Value.ice @@ -10,6 +10,9 @@ #ifndef VALUE_ICE #define VALUE_ICE +module Demo +{ + class Simple { string message; @@ -41,4 +44,6 @@ class Initial void throwDerivedPrinter() throws DerivedPrinterException; }; +}; + #endif diff --git a/php/src/ice/profile.cpp b/php/src/ice/profile.cpp index 9e966b2a565..b02f36e5a4b 100644 --- a/php/src/ice/profile.cpp +++ b/php/src/ice/profile.cpp @@ -313,7 +313,7 @@ parseSlice(const string& argStr, Slice::UnitPtr& unit) break; } - int parseStatus = unit->parse(cppHandle, debug); + int parseStatus = unit->parse(cppHandle, debug, false); if(!icecpp.close()) { diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index 9d963df592e..a44a16e8ed2 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -23,7 +23,7 @@ function allTests() echo "testing checked cast... "; flush(); - $thrower = $base->ice_checkedCast("::Thrower"); + $thrower = $base->ice_checkedCast("::Test::Thrower"); test($thrower != null); test($thrower == $base); echo "ok\n"; @@ -36,7 +36,7 @@ function allTests() $thrower->throwAasA(1); test(false); } - catch(A $ex) + catch(Test_A $ex) { test($ex->aMem == 1); } @@ -46,7 +46,7 @@ function allTests() $thrower->throwAorDasAorD(1); test(false); } - catch(A $ex) + catch(Test_A $ex) { test($ex->aMem == 1); } @@ -56,7 +56,7 @@ function allTests() $thrower->throwAorDasAorD(-1); test(false); } - catch(D $ex) + catch(Test_D $ex) { test($ex->dMem == -1); } @@ -66,7 +66,7 @@ function allTests() $thrower->throwBasB(1, 2); test(false); } - catch(B $ex) + catch(Test_B $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -77,7 +77,7 @@ function allTests() $thrower->throwCasC(1, 2, 3); test(false); } - catch(C $ex) + catch(Test_C $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -94,7 +94,7 @@ function allTests() $thrower->throwBasB(1, 2); test(false); } - catch(A $ex) + catch(Test_A $ex) { test($ex->aMem == 1); } @@ -104,7 +104,7 @@ function allTests() $thrower->throwCasC(1, 2, 3); test(false); } - catch(B $ex) + catch(Test_B $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -120,7 +120,7 @@ function allTests() $thrower->throwBasA(1, 2); test(false); } - catch(B $ex) + catch(Test_B $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -131,7 +131,7 @@ function allTests() $thrower->throwCasA(1, 2, 3); test(false); } - catch(C $ex) + catch(Test_C $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -143,7 +143,7 @@ function allTests() $thrower->throwCasB(1, 2, 3); test(false); } - catch(C $ex) + catch(Test_C $ex) { test($ex->aMem == 1); test($ex->bMem == 2); @@ -193,7 +193,7 @@ function allTests() $id = Ice_stringToIdentity("does not exist"); try { - $thrower2 = $thrower->ice_newIdentity($id)->ice_uncheckedCast("::Thrower"); + $thrower2 = $thrower->ice_newIdentity($id)->ice_uncheckedCast("::Test::Thrower"); $thrower2->throwAasA(1); test(false); } @@ -208,7 +208,7 @@ function allTests() flush(); { - $thrower2 = $thrower->ice_uncheckedCast("::Thrower", "no such facet"); + $thrower2 = $thrower->ice_uncheckedCast("::Test::Thrower", "no such facet"); try { $thrower2->ice_ping(); @@ -227,7 +227,7 @@ function allTests() try { - $thrower2 = $thrower->ice_uncheckedCast("::WrongOperation"); + $thrower2 = $thrower->ice_uncheckedCast("::Test::WrongOperation"); $thrower2->noSuchOperation(); test(false); } diff --git a/php/test/Ice/exceptions/Test.ice b/php/test/Ice/exceptions/Test.ice index e82216ef026..9bd55dd57ac 100644 --- a/php/test/Ice/exceptions/Test.ice +++ b/php/test/Ice/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -60,4 +63,6 @@ exception D void noSuchOperation(); }; +}; + #endif diff --git a/php/test/Ice/facets/Client.php b/php/test/Ice/facets/Client.php index 6abffc7a34e..c7674020fd8 100644 --- a/php/test/Ice/facets/Client.php +++ b/php/test/Ice/facets/Client.php @@ -23,7 +23,7 @@ function allTests() echo "testing checked cast... "; flush(); - $d = $db->ice_checkedCast("::D"); + $d = $db->ice_checkedCast("::Test::D"); test($d != null); test($d == $db); echo "ok\n"; @@ -38,7 +38,7 @@ function allTests() echo "testing facets A, B, C, and D... "; flush(); - $df = $d->ice_checkedCast("::D", "facetABCD"); + $df = $d->ice_checkedCast("::Test::D", "facetABCD"); test($df != null); test($df->callA() == "A"); test($df->callB() == "B"); @@ -48,7 +48,7 @@ function allTests() echo "testing facets E and F... "; flush(); - $ff = $d->ice_checkedCast("::F", "facetEF"); + $ff = $d->ice_checkedCast("::Test::F", "facetEF"); test($ff != null); test($ff->callE() == "E"); test($ff->callF() == "F"); @@ -56,14 +56,14 @@ function allTests() echo "testing facet G... "; flush(); - $gf = $ff->ice_checkedCast("::G", "facetGH"); + $gf = $ff->ice_checkedCast("::Test::G", "facetGH"); test($gf != null); test($gf->callG() == "G"); echo "ok\n"; echo "testing whether casting preserves the facet... "; flush(); - $hf = $gf->ice_checkedCast("::H"); + $hf = $gf->ice_checkedCast("::Test::H"); test($hf != null); test($hf->callG() == "G"); test($hf->callH() == "H"); diff --git a/php/test/Ice/facets/Test.ice b/php/test/Ice/facets/Test.ice index adfcb0b9c31..3ee6b51a8f1 100644 --- a/php/test/Ice/facets/Test.ice +++ b/php/test/Ice/facets/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + interface Empty { }; @@ -55,4 +58,6 @@ interface H extends G string callH(); }; +}; + #endif diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php index ba536d34923..6d9628a9eba 100644 --- a/php/test/Ice/inheritance/Client.php +++ b/php/test/Ice/inheritance/Client.php @@ -23,7 +23,7 @@ function allTests() echo "testing checked cast... "; flush(); - $initial = $base->ice_checkedCast("::Initial"); + $initial = $base->ice_checkedCast("::Test::Initial"); test($initial != null); test($initial == $base); echo "ok\n"; diff --git a/php/test/Ice/inheritance/Test.ice b/php/test/Ice/inheritance/Test.ice index db8df3320c5..f131c0c0729 100644 --- a/php/test/Ice/inheritance/Test.ice +++ b/php/test/Ice/inheritance/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + module MA { @@ -78,4 +81,6 @@ interface Initial MA::IC* icop(); }; +}; + #endif diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index af27d7989a8..19b0f5492d2 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -1,7 +1,7 @@ <? Ice_loadProfileWithArgs($argv); -class BI extends B +class BI extends Test_B { function ice_postUnmarshal() { @@ -16,7 +16,7 @@ class BI extends B var $_postUnmarshalInvoked = false; } -class CI extends C +class CI extends Test_C { function ice_postUnmarshal() { @@ -31,7 +31,7 @@ class CI extends C var $_postUnmarshalInvoked = false; } -class DI extends D +class DI extends Test_D { function ice_postUnmarshal() { @@ -50,15 +50,15 @@ class MyObjectFactory implements Ice_ObjectFactory { function create($id) { - if($id == "::B") + if($id == "::Test::B") { return new BI(); } - else if($id == "::C") + else if($id == "::Test::C") { return new CI(); } - else if($id == "::D") + else if($id == "::Test::D") { return new DI(); } @@ -92,7 +92,7 @@ function allTests() echo "testing checked cast... "; flush(); - $initial = $base->ice_checkedCast("::Initial"); + $initial = $base->ice_checkedCast("::Test::Initial"); test($initial != null); test($initial == $base); echo "ok\n"; @@ -228,9 +228,9 @@ function allTests() } $factory = new MyObjectFactory(); -$ICE->addObjectFactory($factory, "::B"); -$ICE->addObjectFactory($factory, "::C"); -$ICE->addObjectFactory($factory, "::D"); +$ICE->addObjectFactory($factory, "::Test::B"); +$ICE->addObjectFactory($factory, "::Test::C"); +$ICE->addObjectFactory($factory, "::Test::D"); $initial = allTests(); $initial->shutdown(); exit(); diff --git a/php/test/Ice/objects/Test.ice b/php/test/Ice/objects/Test.ice index 3f57616f160..90af1dacd63 100644 --- a/php/test/Ice/objects/Test.ice +++ b/php/test/Ice/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class B; class C; @@ -55,4 +58,6 @@ class Initial void getAll(out B b1, out B b2, out C theC, out D theD); }; +}; + #endif diff --git a/php/test/Ice/slicing/exceptions/Client.php b/php/test/Ice/slicing/exceptions/Client.php index 3e791b3bab0..e4d57692da3 100644 --- a/php/test/Ice/slicing/exceptions/Client.php +++ b/php/test/Ice/slicing/exceptions/Client.php @@ -15,7 +15,7 @@ function allTests() global $ICE; $obj = $ICE->stringToProxy("Test:default -p 12345"); - $test = $obj->ice_checkedCast("::Test"); + $test = $obj->ice_checkedCast("::Test::TestIntf"); echo "testing throwing a base exception... "; flush(); @@ -25,10 +25,10 @@ function allTests() { $test->baseAsBase(); } - catch(Base $b) + catch(Test_Base $b) { test($b->b == "Base.b"); - test(get_class($b) == "Base"); + test(get_class($b) == "Test_Base"); $gotException = true; } test($gotException); @@ -43,10 +43,10 @@ function allTests() { $test->unknownDerivedAsBase(); } - catch(Base $b) + catch(Test_Base $b) { test($b->b == "UnknownDerived.b"); - test(get_class($b) == "Base"); + test(get_class($b) == "Test_Base"); $gotException = true; } test($gotException); @@ -61,11 +61,11 @@ function allTests() { $test->knownDerivedAsBase(); } - catch(KnownDerived $k) + catch(Test_KnownDerived $k) { test($k->b == "KnownDerived.b"); test($k->kd == "KnownDerived.kd"); - test(get_class($k) == "KnownDerived"); + test(get_class($k) == "Test_KnownDerived"); $gotException = true; } test($gotException); @@ -80,11 +80,11 @@ function allTests() { $test->knownDerivedAsKnownDerived(); } - catch(KnownDerived $k) + catch(Test_KnownDerived $k) { test($k->b == "KnownDerived.b"); test($k->kd == "KnownDerived.kd"); - test(get_class($k) == "KnownDerived"); + test(get_class($k) == "Test_KnownDerived"); $gotException = true; } test($gotException); @@ -99,10 +99,10 @@ function allTests() { $test->unknownIntermediateAsBase(); } - catch(Base $b) + catch(Test_Base $b) { test($b->b == "UnknownIntermediate.b"); - test(get_class($b) == "Base"); + test(get_class($b) == "Test_Base"); $gotException = true; } test($gotException); @@ -117,11 +117,11 @@ function allTests() { $test->knownIntermediateAsBase(); } - catch(KnownIntermediate $ki) + catch(Test_KnownIntermediate $ki) { test($ki->b == "KnownIntermediate.b"); test($ki->ki == "KnownIntermediate.ki"); - test(get_class($ki) == "KnownIntermediate"); + test(get_class($ki) == "Test_KnownIntermediate"); $gotException = true; } test($gotException); @@ -136,12 +136,12 @@ function allTests() { $test->knownMostDerivedAsBase(); } - catch(KnownMostDerived $kmd) + catch(Test_KnownMostDerived $kmd) { test($kmd->b == "KnownMostDerived.b"); test($kmd->ki == "KnownMostDerived.ki"); test($kmd->kmd == "KnownMostDerived.kmd"); - test(get_class($kmd) == "KnownMostDerived"); + test(get_class($kmd) == "Test_KnownMostDerived"); $gotException = true; } test($gotException); @@ -156,11 +156,11 @@ function allTests() { $test->knownIntermediateAsKnownIntermediate(); } - catch(KnownIntermediate $ki) + catch(Test_KnownIntermediate $ki) { test($ki->b == "KnownIntermediate.b"); test($ki->ki == "KnownIntermediate.ki"); - test(get_class($ki) == "KnownIntermediate"); + test(get_class($ki) == "Test_KnownIntermediate"); $gotException = true; } test($gotException); @@ -175,12 +175,12 @@ function allTests() { $test->knownMostDerivedAsKnownIntermediate(); } - catch(KnownMostDerived $kmd) + catch(Test_KnownMostDerived $kmd) { test($kmd->b == "KnownMostDerived.b"); test($kmd->ki == "KnownMostDerived.ki"); test($kmd->kmd == "KnownMostDerived.kmd"); - test(get_class($kmd) == "KnownMostDerived"); + test(get_class($kmd) == "Test_KnownMostDerived"); $gotException = true; } test($gotException); @@ -195,12 +195,12 @@ function allTests() { $test->knownMostDerivedAsKnownMostDerived(); } - catch(KnownMostDerived $kmd) + catch(Test_KnownMostDerived $kmd) { test($kmd->b == "KnownMostDerived.b"); test($kmd->ki == "KnownMostDerived.ki"); test($kmd->kmd == "KnownMostDerived.kmd"); - test(get_class($kmd) == "KnownMostDerived"); + test(get_class($kmd) == "Test_KnownMostDerived"); $gotException = true; } test($gotException); @@ -215,11 +215,11 @@ function allTests() { $test->unknownMostDerived1AsBase(); } - catch(KnownIntermediate $ki) + catch(Test_KnownIntermediate $ki) { test($ki->b == "UnknownMostDerived1.b"); test($ki->ki == "UnknownMostDerived1.ki"); - test(get_class($ki) == "KnownIntermediate"); + test(get_class($ki) == "Test_KnownIntermediate"); $gotException = true; } test($gotException); @@ -234,11 +234,11 @@ function allTests() { $test->unknownMostDerived1AsKnownIntermediate(); } - catch(KnownIntermediate $ki) + catch(Test_KnownIntermediate $ki) { test($ki->b == "UnknownMostDerived1.b"); test($ki->ki == "UnknownMostDerived1.ki"); - test(get_class($ki) == "KnownIntermediate"); + test(get_class($ki) == "Test_KnownIntermediate"); $gotException = true; } test($gotException); @@ -253,10 +253,10 @@ function allTests() { $test->unknownMostDerived2AsBase(); } - catch(Base $b) + catch(Test_Base $b) { test($b->b == "UnknownMostDerived2.b"); - test(get_class($b) == "Base"); + test(get_class($b) == "Test_Base"); $gotException = true; } test($gotException); diff --git a/php/test/Ice/slicing/exceptions/Test.ice b/php/test/Ice/slicing/exceptions/Test.ice index cc3e8b3f85f..1bf3f61f5b5 100644 --- a/php/test/Ice/slicing/exceptions/Test.ice +++ b/php/test/Ice/slicing/exceptions/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + exception Base { string b; @@ -30,7 +33,7 @@ exception KnownMostDerived extends KnownIntermediate string kmd; }; -["ami"] interface Test +["ami"] interface TestIntf { void baseAsBase() throws Base; void unknownDerivedAsBase() throws Base; @@ -51,4 +54,6 @@ exception KnownMostDerived extends KnownIntermediate void shutdown(); }; +}; + #endif diff --git a/php/test/Ice/slicing/objects/Client.php b/php/test/Ice/slicing/objects/Client.php index d00df35b2ab..b2c0432c325 100644 --- a/php/test/Ice/slicing/objects/Client.php +++ b/php/test/Ice/slicing/objects/Client.php @@ -15,14 +15,14 @@ function allTests() global $ICE; $obj = $ICE->stringToProxy("Test:default -p 12345"); - $test = $obj->ice_checkedCast("::Test"); + $test = $obj->ice_checkedCast("::Test::TestIntf"); echo "testing base as Object... "; flush(); { $o = $test->SBaseAsObject(); test($o != null); - test(get_class($o) == "SBase"); + test(get_class($o) == "Test_SBase"); test($o->sb == "SBase.sb"); } echo "ok\n"; @@ -40,7 +40,7 @@ function allTests() { $sb = $test->SBSKnownDerivedAsSBase(); test($sb->sb == "SBSKnownDerived.sb"); - test(get_class($sb) == "SBSKnownDerived"); + test(get_class($sb) == "Test_SBSKnownDerived"); test($sb->sbskd == "SBSKnownDerived.sbskd"); } echo "ok\n"; @@ -74,7 +74,7 @@ function allTests() { $b = $test->oneElementCycle(); test($b != null); - test(get_class($b) == "B"); + test(get_class($b) == "Test_B"); test($b->sb == "B1.sb"); test($b->pb === $b); // Object identity comparison @@ -90,12 +90,12 @@ function allTests() { $b1 = $test->twoElementCycle(); test($b1 != null); - test(get_class($b1) == "B"); + test(get_class($b1) == "Test_B"); test($b1->sb == "B1.sb"); $b2 = $b1->pb; test($b2 != null); - test(get_class($b2) == "B"); + test(get_class($b2) == "Test_B"); test($b2->sb == "B2.sb"); test($b2->pb === $b1); // Object identity comparison @@ -111,7 +111,7 @@ function allTests() { $b1 = $test->D1AsB(); test($b1 != null); - test(get_class($b1) == "D1"); + test(get_class($b1) == "Test_D1"); test($b1->sb == "D1.sb"); test($b1->pb != null); test($b1->pb !== $b1); // Object identity comparison @@ -125,7 +125,7 @@ function allTests() test($b2 != null); test($b2->pb === $b1); // Object identity comparison test($b2->sb == "D2.sb"); - test(get_class($b2) == "B"); + test(get_class($b2) == "Test_B"); // // Break cyclic dependencies - helps in detecting leaks. @@ -139,14 +139,14 @@ function allTests() { $d1 = $test->D1AsD1(); test($d1 != null); - test(get_class($d1) == "D1"); + test(get_class($d1) == "Test_D1"); test($d1->sb == "D1.sb"); test($d1->pb != null); test($d1->pb !== $d1); // Object identity comparison $b2 = $d1->pb; test($b2 != null); - test(get_class($b2) == "B"); + test(get_class($b2) == "Test_B"); test($b2->sb == "D2.sb"); test($b2->pb === $d1); // Object identity comparison @@ -162,14 +162,14 @@ function allTests() { $b2 = $test->D2AsB(); test($b2 != null); - test(get_class($b2) == "B"); + test(get_class($b2) == "Test_B"); test($b2->sb == "D2.sb"); test($b2->pb != null); test($b2->pb !== $b2); // Object identity comparison $b1 = $b2->pb; test($b1 != null); - test(get_class($b1) == "D1"); + test(get_class($b1) == "Test_D1"); test($b1->sb == "D1.sb"); test($b1->pb === $b2); // Object identity comparison $d1 = $b1; @@ -191,7 +191,7 @@ function allTests() $test->paramTest1($b1, $b2); test($b1 != null); - test(get_class($b1) == "D1"); + test(get_class($b1) == "Test_D1"); test($b1->sb == "D1.sb"); test($b1->pb === $b2); // Object identity comparison $d1 = $b1; @@ -200,7 +200,7 @@ function allTests() test($d1->pd1 === $b2); // Object identity comparison test($b2 != null); - test(get_class($b2) == "B"); // No factory, must be sliced + test(get_class($b2) == "Test_B"); // No factory, must be sliced test($b2->sb == "D2.sb"); test($b2->pb === $b1); // Object identity comparison @@ -217,7 +217,7 @@ function allTests() $test->paramTest2($b2, $b1); test($b1 != null); - test(get_class($b1) == "D1"); + test(get_class($b1) == "Test_D1"); test($b1->sb == "D1.sb"); test($b1->pb === $b2); // Object identity comparison $d1 = $b1; @@ -226,7 +226,7 @@ function allTests() test($d1->pd1 === $b2); // Object identity comparison test($b2 != null); - test(get_class($b2) == "B"); // No factory, must be sliced + test(get_class($b2) == "Test_B"); // No factory, must be sliced test($b2->sb == "D2.sb"); test($b2->pb === $b1); // Object identity comparison @@ -266,10 +266,10 @@ function allTests() echo "testing return value identity for input params known first... "; flush(); { - $d1 = new D1; + $d1 = new Test_D1; $d1->sb = "D1.sb"; $d1->sd1 = "D1.sd1"; - $d3 = new D3; + $d3 = new Test_D3; $d3->pb = $d1; $d3->sb = "D3.sb"; $d3->sd3 = "D3.sd3"; @@ -281,7 +281,7 @@ function allTests() test($b1 != null); test($b1->sb == "D1.sb"); - test(get_class($b1) == "D1"); + test(get_class($b1) == "Test_D1"); $p1 = $b1; test($p1 != null); test($p1->sd1 == "D1.sd1"); @@ -290,9 +290,9 @@ function allTests() $b2 = $b1->pb; test($b2 != null); test($b2->sb == "D3.sb"); - test(get_class($b2) == "B"); // Sliced by server + test(get_class($b2) == "Test_B"); // Sliced by server test($b2->pb === $b1); // Object identity comparison - test(!($b2 instanceof D3)); + test(!($b2 instanceof Test_D3)); test($b1 !== $d1); test($b1 !== $d3); @@ -312,10 +312,10 @@ function allTests() echo "testing return value identity for input params unknown first... "; flush(); { - $d1 = new D1; + $d1 = new Test_D1; $d1->sb = "D1.sb"; $d1->sd1 = "D1.sd1"; - $d3 = new D3; + $d3 = new Test_D3; $d3->pb = $d1; $d3->sb = "D3.sb"; $d3->sd3 = "D3.sd3"; @@ -327,16 +327,16 @@ function allTests() test($b1 != null); test($b1->sb == "D3.sb"); - test(get_class($b1) == "B"); // Sliced by server - test(!($b1 instanceof D3)); + test(get_class($b1) == "Test_B"); // Sliced by server + test(!($b1 instanceof Test_D3)); $b2 = $b1->pb; test($b2 != null); test($b2->sb == "D1.sb"); - test(get_class($b2) == "D1"); + test(get_class($b2) == "Test_D1"); test($b2->pb === $b1); // Object identity comparison $p3 = $b2; - test($p3 instanceof D1); + test($p3 instanceof Test_D1); test($p3->sd1 == "D1.sd1"); test($p3->pd1 === $b1); // Object identity comparison @@ -358,10 +358,10 @@ function allTests() echo "testing return value identity for input params unknown first... "; flush(); { - $d1 = new D1; + $d1 = new Test_D1; $d1->sb = "D1.sb"; $d1->sd1 = "D1.sd1"; - $d3 = new D3; + $d3 = new Test_D3; $d3->pb = $d1; $d3->sb = "D3.sb"; $d3->sd3 = "D3.sd3"; @@ -373,16 +373,16 @@ function allTests() test($b1 != null); test($b1->sb == "D3.sb"); - test(get_class($b1) == "B"); // Sliced by server - test(!($b1 instanceof D3)); + test(get_class($b1) == "Test_B"); // Sliced by server + test(!($b1 instanceof Test_D3)); $b2 = $b1->pb; test($b2 != null); test($b2->sb == "D1.sb"); - test(get_class($b2) == "D1"); + test(get_class($b2) == "Test_D1"); test($b2->pb === $b1); // Object identity comparison $p3 = $b2; - test($p3 instanceof D1); + test($p3 instanceof Test_D1); test($p3->sd1 == "D1.sd1"); test($p3->pd1 === $b1); // Object identity comparison @@ -411,17 +411,17 @@ function allTests() test($p1 != null); test($p1->sb == "D2.sb (p1 1)"); test($p1->pb == null); - test(get_class($p1) == "B"); + test(get_class($p1) == "Test_B"); test($p2 != null); test($p2->sb == "D2.sb (p2 1)"); test($p2->pb == null); - test(get_class($p2) == "B"); + test(get_class($p2) == "Test_B"); test($ret != null); test($ret->sb == "D1.sb (p2 2)"); test($ret->pb === null); - test(get_class($ret) == "D1"); + test(get_class($ret) == "Test_D1"); } echo "ok\n"; @@ -433,36 +433,36 @@ function allTests() test($b != null); test($b->sb == "D4.sb (1)"); test($b->pb == null); - test(get_class($b) == "B"); + test(get_class($b) == "Test_B"); test($ret != null); test($ret->sb == "B.sb (2)"); test($ret->pb === null); - test(get_class($ret) == "B"); + test(get_class($ret) == "Test_B"); } echo "ok\n"; echo "testing parameter pointer slicing with first instance marshaled in unknown derived as base... "; flush(); { - $b1 = new B; + $b1 = new Test_B; $b1->sb = "B.sb(1)"; $b1->pb = $b1; - $d3 = new D3; + $d3 = new Test_D3; $d3->sb = "D3.sb"; $d3->pb = $d3; $d3->sd3 = "D3.sd3"; $d3->pd3 = $b1; - $b2 = new B; + $b2 = new Test_B; $b2->sb = "B.sb(2)"; $b2->pb = $b1; $r = $test->returnTest3($d3, $b2); test($r != null); - test(get_class($r) == "B"); + test(get_class($r) == "Test_B"); test($r->sb == "D3.sb"); test($r->pb === $r); @@ -479,20 +479,20 @@ function allTests() echo "testing parameter pointer slicing with first instance marshaled in unknown derived as derived... "; flush(); { - $d11 = new D1; + $d11 = new Test_D1; $d11->sb = "D1.sb(1)"; $d11->pb = $d11; $d11->pd1 = null; $d11->sd1 = "D1.sd1(1)"; - $d3 = new D3; + $d3 = new Test_D3; $d3->sb = "D3.sb"; $d3->pb = $d3; $d3->sd3 = "D3.sd3"; $d3->pd1 = null; $d3->pd3 = $d11; - $d12 = new D1; + $d12 = new Test_D1; $d12->sb = "D1.sb(2)"; $d12->pb = $d12; $d12->sd1 = "D1.sd1(2)"; @@ -500,7 +500,7 @@ function allTests() $r = $test->returnTest3($d3, $d12); test($r != null); - test(get_class($r) == "B"); + test(get_class($r) == "Test_B"); test($r->sb == "D3.sb"); test($r->pb === $r); @@ -520,31 +520,31 @@ function allTests() { $ss = null; { - $ss1b = new B; + $ss1b = new Test_B; $ss1b->sb = "B.sb"; $ss1b->pb = $ss1b; - $ss1d1 = new D1; + $ss1d1 = new Test_D1; $ss1d1->sb = "D1.sb"; $ss1d1->sd1 = "D1.sd1"; $ss1d1->pb = $ss1b; - $ss1d3 = new D3; + $ss1d3 = new Test_D3; $ss1d3->sb = "D3.sb"; $ss1d3->sd3 = "D3.sd3"; $ss1d3->pb = $ss1b; $ss1d3->pd3 = null; - $ss2b = new B; + $ss2b = new Test_B; $ss2b->sb = "B.sb"; $ss2b->pb = $ss1b; - $ss2d1 = new D1; + $ss2d1 = new Test_D1; $ss2d1->sb = "D1.sb"; $ss2d1->sd1 = "D1.sd1"; $ss2d1->pb = $ss2b; - $ss2d3 = new D3; + $ss2d3 = new Test_D3; $ss2d3->sb = "D3.sb"; $ss2d3->sd3 = "D3.sd3"; $ss2d3->pb = $ss2b; @@ -556,10 +556,10 @@ function allTests() $ss2d1->pd1 = $ss1d3; $ss2d3->pd3 = $ss1d1; - $ss1 = new SS1; + $ss1 = new Test_SS1; $ss1->s = array($ss1b, $ss1d1, $ss1d3); - $ss2 = new SS2; + $ss2 = new Test_SS2; $ss2->s = array($ss2b, $ss2d1, $ss2d3); $ss = $test->sequenceTest($ss1, $ss2); @@ -592,13 +592,13 @@ function allTests() test($ss2d1->pb === $ss2b); test($ss2d3->pb === $ss2b); - test(get_class($ss1b) == "B"); - test(get_class($ss1d1) == "D1"); - test(get_class($ss1d3) == "B"); + test(get_class($ss1b) == "Test_B"); + test(get_class($ss1d1) == "Test_D1"); + test(get_class($ss1d3) == "Test_B"); - test(get_class($ss2b) == "B"); - test(get_class($ss2d1) == "D1"); - test(get_class($ss2d3) == "B"); + test(get_class($ss2b) == "Test_B"); + test(get_class($ss2d1) == "Test_D1"); + test(get_class($ss2d3) == "Test_B"); // // Break cyclic dependencies - helps in detecting leaks. @@ -613,7 +613,7 @@ function allTests() $bin = array(); for($i = 0; $i < 10; $i++) { - $d1 = new D1; + $d1 = new Test_D1; $d1->sb = sprintf("D1.%d", $i); $d1->pb = $d1; $d1->sd1 = $d1->sb; @@ -651,7 +651,7 @@ function allTests() { test($b->pb === $r[($i - 1) * 20]); } - test($b instanceof D1); + test($b instanceof Test_D1); $d1 = $b; test($d1->sd1 == $s); test($d1->pd1 === $d1); @@ -678,9 +678,9 @@ function allTests() $test->throwBaseAsBase(); test(false); } - catch(BaseException $e) + catch(Test_BaseException $e) { - test(get_class($e) == "BaseException"); + test(get_class($e) == "Test_BaseException"); test($e->sbe == "sbe"); test($e->pb != null); test($e->pb->sb == "sb"); @@ -702,9 +702,9 @@ function allTests() $test->throwDerivedAsBase(); test(false); } - catch(DerivedException $e) + catch(Test_DerivedException $e) { - test(get_class($e) == "DerivedException"); + test(get_class($e) == "Test_DerivedException"); test($e->sbe == "sbe"); test($e->pb != null); test($e->pb->sb == "sb1"); @@ -734,9 +734,9 @@ function allTests() $test->throwDerivedAsDerived(); test(false); } - catch(DerivedException $e) + catch(Test_DerivedException $e) { - test(get_class($e) == "DerivedException"); + test(get_class($e) == "Test_DerivedException"); test($e->sbe == "sbe"); test($e->pb != null); test($e->pb->sb == "sb1"); @@ -766,9 +766,9 @@ function allTests() $test->throwUnknownDerivedAsBase(); test(false); } - catch(BaseException $e) + catch(Test_BaseException $e) { - test(get_class($e) == "BaseException"); + test(get_class($e) == "Test_BaseException"); test($e->sbe == "sbe"); test($e->pb != null); test($e->pb->sb == "sb d2"); diff --git a/php/test/Ice/slicing/objects/ClientPrivate.ice b/php/test/Ice/slicing/objects/ClientPrivate.ice index c32c2495f52..6ee187eeba5 100644 --- a/php/test/Ice/slicing/objects/ClientPrivate.ice +++ b/php/test/Ice/slicing/objects/ClientPrivate.ice @@ -12,10 +12,15 @@ #include <Test.ice> +module Test +{ + class D3 extends B { string sd3; B pd3; }; +}; + #endif diff --git a/php/test/Ice/slicing/objects/Forward.ice b/php/test/Ice/slicing/objects/Forward.ice index 74ae4b8c7e0..b4a01e4aab8 100644 --- a/php/test/Ice/slicing/objects/Forward.ice +++ b/php/test/Ice/slicing/objects/Forward.ice @@ -10,6 +10,9 @@ #ifndef FORWARD_ICE #define FORWARD_ICE +module Test +{ + class Forward; class Hidden @@ -22,4 +25,6 @@ class Forward Hidden h; }; +}; + #endif diff --git a/php/test/Ice/slicing/objects/Test.ice b/php/test/Ice/slicing/objects/Test.ice index 3817f608833..93bcbf9dcd6 100644 --- a/php/test/Ice/slicing/objects/Test.ice +++ b/php/test/Ice/slicing/objects/Test.ice @@ -10,6 +10,9 @@ #ifndef TEST_ICE #define TEST_ICE +module Test +{ + class SBase { string sb; @@ -66,7 +69,7 @@ exception DerivedException extends BaseException class Forward; // Forward-declared class defined in another compilation unit -["ami"] interface Test +["ami"] interface TestIntf { Object SBaseAsObject(); SBase SBaseAsSBase(); @@ -106,4 +109,6 @@ class Forward; // Forward-declared class defined in another compilation unit void shutdown(); }; +}; + #endif |