Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

7 files changed, 47 insertions, 12 deletions

diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 4fc6ea5e822..0f121bcda98 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -48,6 +48,7 @@ SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList
                                  const StringList&, bool = false, bool = false);
 SLICE_API void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
                                                const std::string& = "", bool = false, const StringList& = StringList());
+SLICE_API std::string findMetaData(const SequencePtr&, const StringList&, bool, bool&);
 SLICE_API std::string findMetaData(const StringList&, bool);
 SLICE_API bool inWstringModule(const SequencePtr&);
 
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index e9acdfc8138..1f046d19e33 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -51,8 +51,8 @@ private:
     class MetaDataVisitor : public ParserVisitor
     {
     public:
-        MetaDataVisitor();
 
+        virtual bool visitUnitStart(const UnitPtr&);
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
         virtual void visitClassDecl(const ClassDeclPtr&);
@@ -74,8 +74,8 @@ private:
 
         void validate(const ContainedPtr&);
 
+        std::string _fileName;
         StringSet _history;
-        bool _globalMetaDataDone;
     };
 };
 
diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h
index 944774d809b..81261f361d3 100644
--- a/cpp/include/Slice/FileTracker.h
+++ b/cpp/include/Slice/FileTracker.h
@@ -47,14 +47,23 @@ public:
 
     static FileTrackerPtr instance();
 
+    void setSource(const std::string&);
+    void setOutput(const std::string&, bool);
     void addFile(const std::string&);
     void addDirectory(const std::string&);
 
     void cleanup();
+    void dumpxml();
 
 private:
 
+    std::string escape(const std::string&) const;
+
     std::list<std::pair< std::string, bool> > _files;
+    std::string _source;
+    std::map<std::string, std::string> _errors;
+    std::map<std::string, std::list<std::string> > _generated;
+    std::map<std::string, std::list<std::string> >::iterator _curr;
 };
 
 }
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index d85ae3cf2bb..3ede63869e8 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -81,6 +81,12 @@ protected:
                                   const std::string& = std::string(),
                                   const std::string& = std::string()) const;
 
+
+    //
+    // Returns the package prefix for a give Slice file.
+    //
+    std::string getPackagePrefix(const ContainedPtr&) const;
+
     //
     // Returns the Java package of a Contained entity.
     //
@@ -181,8 +187,7 @@ protected:
     //
     bool getDictionaryTypes(const DictionaryPtr&, const std::string&, const StringList&,
                             std::string&, std::string&) const;
-    bool getSequenceTypes(const SequencePtr&, const std::string&, const StringList&,
-                          std::string&, std::string&) const;
+    bool getSequenceTypes(const SequencePtr&, const std::string&, const StringList&, std::string&, std::string&) const;
 
     virtual JavaOutput* createOutput();
 
@@ -198,6 +203,7 @@ private:
     {
     public:
 
+        virtual bool visitUnitStart(const UnitPtr&);
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitClassDecl(const ClassDeclPtr&);
         virtual bool visitClassDefStart(const ClassDefPtr&);
@@ -223,6 +229,7 @@ private:
 
     std::string _dir;
     ::IceUtilInternal::Output* _out;
+    mutable std::map<std::string, std::string> _filePackagePrefix;
 };
 
 }
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 4d0aac70b79..a3db93ab5e4 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -418,6 +418,7 @@ public:
     TypeList lookupTypeNoBuiltin(const std::string&, bool = true);
     ContainedList lookupContained(const std::string&, bool = true);
     ExceptionPtr lookupException(const std::string&, bool = true);
+    UnitPtr unit() const;
     ModuleList modules() const;
     ClassList classes() const;
     ExceptionList exceptions() const;
@@ -938,6 +939,7 @@ public:
     void setComment(const std::string&);
     std::string currentComment(); // Not const, as this function removes the current comment.
     std::string currentFile() const;
+    std::string topLevelFile() const;
     int currentLine() const;
 
     void nextLine();
@@ -945,6 +947,7 @@ public:
     int currentIncludeLevel() const;
 
     void addGlobalMetaData(const StringList&);
+
     void setSeenDefinition();
 
     void error(const char*); // Not const, because error count is increased.
@@ -960,6 +963,7 @@ public:
     DefinitionContextPtr currentDefinitionContext() const;
     void pushDefinitionContext();
     void popDefinitionContext();
+    DefinitionContextPtr findDefinitionContext(const std::string&) const;
 
     void addContent(const ContainedPtr&);
     void removeContent(const ContainedPtr&);
@@ -974,8 +978,16 @@ public:
 
     FeatureProfile profile() const;
 
+    //
+    // Returns the path names of the files included directly by the top-level file.
+    //
     StringList includeFiles() const;
-    
+
+    //
+    // Returns the path names of all files parsed by this unit.
+    //
+    StringList allFiles() const;
+
     int parse(const std::string&, FILE*, bool, FeatureProfile profile = Ice);
 
     virtual void destroy();
@@ -992,20 +1004,20 @@ private:
     bool _all;
     bool _allowIcePrefix;
     bool _caseSensitive;
-    StringList _defaultGlobalMetadata;
+    StringList _defaultGlobalMetaData;
     int _errors;
     std::string _currentComment;
     int _currentLine;
     int _currentIncludeLevel;
     std::string _currentFile;
     std::string _topLevelFile;
-    std::map<std::string, std::string> _fullPaths;
     std::stack<DefinitionContextPtr> _definitionContextStack;
     StringList _includeFiles;
     std::stack<ContainerPtr> _containerStack;
     std::map<Builtin::Kind, BuiltinPtr> _builtins;
     std::map<std::string, ContainedList> _contentMap;
     FeatureProfile _featureProfile;
+    std::map<std::string, DefinitionContextPtr> _definitionContextMap;
 };
 
 extern SLICE_API Unit* unit; // The current parser for bison/flex
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 54535e28812..23458bccfbb 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -32,15 +32,15 @@ class SLICE_API Preprocessor
 {
 public:
 
-    Preprocessor(const std::string&, const std::string&, const std::vector<std::string>&, const std::string& = "cpp");
+    Preprocessor(const std::string&, const std::string&, const std::vector<std::string>&);
     ~Preprocessor();
     
     FILE* preprocess(bool);
     bool close();
 
-    enum Language { CPlusPlus, Java, CSharp, VisualBasic };
+    enum Language { CPlusPlus, Java, JavaXML, CSharp, VisualBasic };
 
-    bool printMakefileDependencies(Language, const std::vector<std::string>&);
+    bool printMakefileDependencies(Language, const std::vector<std::string>&, const std::string& = "cpp");
     
     std::string getBaseName();
 
@@ -54,7 +54,6 @@ private:
     const std::string _path;
     const std::string _fileName;
     const std::vector<std::string> _args;
-    const std::string _cppSourceExt;
 #ifdef _WIN32
     std::wstring _cppFile;
 #else
diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h
index 1e645595ea4..76c5a27d6f3 100644
--- a/cpp/include/Slice/Util.h
+++ b/cpp/include/Slice/Util.h
@@ -17,7 +17,14 @@ namespace Slice
 
 SLICE_API std::string fullPath(const std::string&);
 SLICE_API std::string changeInclude(const std::string&, const std::vector<std::string>&);
-
+SLICE_API void setErrorStream(std::ostream&);
+SLICE_API std::ostream& getErrorStream();
+SLICE_API void emitError(const std::string&, int, const std::string&);
+SLICE_API void emitWarning(const std::string&, int, const std::string&);
+SLICE_API void emitError(const std::string&, const std::string&, const std::string&);
+SLICE_API void emitWarning(const std::string&, const std::string&, const std::string&);
+SLICE_API void emitRaw(const char*);
+SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&);
 }
 
 #endif