zeroc-ice 3.6.2 → 3.6.3

data/ext/ice/cpp/src/IceUtil/Cond.cpp

@@ -332,7 +332,7 @@ IceUtil::Cond::Cond()
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
     }
 
-#if !defined(__hpux) && !defined(__APPLE__)
+#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__)
     rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); 
     if(rc != 0)
     {

data/ext/ice/cpp/src/IceUtil/FileUtil.cpp

@@ -344,6 +344,14 @@ IceUtilInternal::FileLock::~FileLock()
     unlink(_path);
 }
 
+#ifndef __MINGW32__
+wstring
+IceUtilInternal::streamFilename(const string& filename)
+{
+    return stringToWstring(filename, IceUtil::getProcessStringConverter());
+}
+#endif
+
 IceUtilInternal::ifstream::ifstream()
 {
 }

data/ext/ice/cpp/src/IceUtil/FileUtil.h

@@ -104,14 +104,14 @@ public:
     // file.
     //
     FileLock(const std::string&);
-    
+
     //
     // The destructor releases the lock and removes the file.
     //
     virtual ~FileLock();
-    
+
 private:
-    
+
 #ifdef _WIN32
     HANDLE _fd;
 #else
@@ -136,7 +136,7 @@ public:
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
     ifstream(const ifstream&) = delete;
-#endif 
+#endif
 
 private:
 
@@ -159,7 +159,7 @@ public:
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
     ofstream(const ofstream&) = delete;
-#endif 
+#endif
 
 private:
 
@@ -168,5 +168,18 @@ private:
     void open(const char*, std::ios_base::openmode mode = std::ios_base::out);
 };
 
+//
+// Use streamFilename to construct the filename given to std stream classes
+// like ifstream and ofstream.
+//
+#if defined(_WIN32) && !defined(__MINGW32__)
+ICE_UTIL_API std::wstring streamFilename(const std::string&);
+#else
+inline std::string streamFilename(const std::string& filename)
+{
+    return filename;
+}
+#endif
+
 }
 #endif

data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp

@@ -93,7 +93,7 @@ IceUtilInternal::OutputBase::open(const string& s)
     // mismatches on case-insensitive OSs.
     //
     IceUtilInternal::unlink(s);
-    _fout.open(s.c_str());
+    _fout.open(IceUtilInternal::streamFilename(s).c_str());
 }
 
 void
@@ -170,13 +170,13 @@ IceUtilInternal::OutputBase::currIndent()
     return _indent;
 }
 
-void 
+void
 IceUtilInternal::OutputBase::setIndent(int indentSize)
 {
-    _indentSize = indentSize; 
+    _indentSize = indentSize;
 }
 
-void 
+void
 IceUtilInternal::OutputBase::setUseTab(bool useTab)
 {
     _useTab = useTab;
@@ -552,7 +552,7 @@ IceUtilInternal::StartElement::StartElement(const string& name) :
     _name(name)
 {
 }
-    
+
 const string&
 IceUtilInternal::StartElement::getName() const
 {

data/ext/ice/cpp/src/IceUtil/Time.cpp

@@ -63,7 +63,7 @@ InitializeFrequency frequencyInitializer;
 }
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
 namespace
 {
 
@@ -137,7 +137,7 @@ IceUtil::Time::now(Clock clock)
 #  endif
             return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000);
         }
-#elif defined(__hpux)
+#elif defined(__hppa)
         //
         // HP does not support CLOCK_MONOTONIC
         //
@@ -247,22 +247,8 @@ IceUtil::Time::toMicroSecondsDouble() const
 std::string
 IceUtil::Time::toDateTime() const
 {
-    time_t time = static_cast<long>(_usec / 1000000);
-
-    struct tm* t;
-#ifdef _WIN32
-    t = localtime(&time);
-#else
-    struct tm tr;
-    localtime_r(&time, &tr);
-    t = &tr;
-#endif
-
-    char buf[32];
-    strftime(buf, sizeof(buf), "%x %H:%M:%S", t);
-
     std::ostringstream os;
-    os << buf << ".";
+    os << toString("%x %H:%M:%S") << ".";
     os.fill('0');
     os.width(3);
     os << static_cast<long>(_usec % 1000000 / 1000);
@@ -294,6 +280,28 @@ IceUtil::Time::toDuration() const
     return os.str();
 }
 
+std::string
+IceUtil::Time::toString(const std::string& format) const
+{
+    time_t time = static_cast<long>(_usec / 1000000);
+
+    struct tm* t;
+#ifdef _WIN32
+    t = localtime(&time);
+#else
+    struct tm tr;
+    localtime_r(&time, &tr);
+    t = &tr;
+#endif
+
+    char buf[32];
+    if(strftime(buf, sizeof(buf), format.c_str(), t) == 0)
+    {
+        return std::string();
+    }
+    return std::string(buf);
+}
+
 Time::Time(Int64 usec) :
     _usec(usec)
 {

data/ext/ice/cpp/src/Slice/JavaUtil.cpp

@@ -13,9 +13,9 @@
 #include <Slice/Util.h>
 #include <Slice/MD5.h>
 #include <IceUtil/Functional.h>
+#include <IceUtil/FileUtil.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
 
 #ifdef _WIN32
@@ -214,10 +214,8 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
                 path += dir.substr(start);
             }
 
-            struct stat st;
-            int result;
-            result = stat(path.c_str(), &st);
-            if(result == 0)
+            IceUtilInternal::structstat st;
+            if(!IceUtilInternal::stat(path, &st))
             {
                 if(!(st.st_mode & S_IFDIR))
                 {
@@ -228,12 +226,8 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
                 }
                 continue;
             }
-#ifdef _WIN32
-            result = _mkdir(path.c_str());
-#else
-            result = ::mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
-            if(result != 0)
+
+            if(IceUtilInternal::mkdir(path, 0777) != 0)
             {
                 ostringstream os;
                 os << "cannot create directory `" << path << "': " << strerror(errno);

data/ext/ice/cpp/src/Slice/Preprocessor.cpp

@@ -236,10 +236,10 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
         // process call _tempnam before any of them call fopen and
         // they will end up using the same tmp file.
         //
-        char* name = _tempnam(0, ("slice-" + IceUtil::generateUUID()).c_str());
+        wchar_t* name = _wtempnam(0, IceUtil::stringToWstring("slice-" + IceUtil::generateUUID()).c_str());
         if(name)
         {
-            _cppFile = name;
+            _cppFile = IceUtil::wstringToString(name);
             free(name);
             _cppHandle = IceUtilInternal::fopen(_cppFile, "w+");
         }
@@ -725,7 +725,7 @@ Slice::Preprocessor::checkInputFile()
         return false;
     }
 
-    ifstream test(_fileName.c_str());
+    IceUtilInternal::ifstream test(_fileName);
     if(!test)
     {
         getErrorStream() << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;

data/ext/ice/cpp/src/Slice/Python.cpp

@@ -187,10 +187,8 @@ PackageVisitor::visitModuleEnd(const ModulePtr& p)
 void
 PackageVisitor::createDirectory(const string& dir)
 {
-    struct stat st;
-    int result;
-    result = stat(dir.c_str(), &st);
-    if(result == 0)
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(dir, &st))
     {
         if(!(st.st_mode & S_IFDIR))
         {
@@ -201,13 +199,8 @@ PackageVisitor::createDirectory(const string& dir)
         }
         return;
     }
-#ifdef _WIN32
-    result = _mkdir(dir.c_str());
-#else
-    result = mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
 
-    if(result != 0)
+    if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
         os << "cannot create directory `" << dir << "': " << strerror(errno);
@@ -254,10 +247,10 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
 {
     string initPath = dir + "/__init__.py";
 
-    struct stat st;
-    if(stat(initPath.c_str(), &st) == 0)
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(initPath, &st))
     {
-        ifstream in(initPath.c_str());
+        IceUtilInternal::ifstream in(initPath);
         if(!in)
         {
             ostringstream os;
@@ -358,7 +351,7 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 {
     string initPath = dir + "/__init__.py";
 
-    ofstream os(initPath.c_str());
+    IceUtilInternal::ofstream os(initPath);
     if(!os)
     {
         ostringstream os;
@@ -388,7 +381,7 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 }
 
 void
-usage(const char* n)
+usage(const string& n)
 {
     getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
     getErrorStream() <<
@@ -416,7 +409,7 @@ usage(const char* n)
 }
 
 int
-Slice::Python::compile(int argc, char* argv[])
+Slice::Python::compile(const vector<string>& argv)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -441,7 +434,7 @@ Slice::Python::compile(int argc, char* argv[])
     vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        args = opts.parse(argv);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
@@ -665,6 +658,10 @@ Slice::Python::compile(int argc, char* argv[])
                             }
                             FileTracker::instance()->addFile(file);
 
+                            //
+                            // Python magic comment to set the file encoding, it must be first or second line
+                            //
+                            out << "# -*- coding: utf-8 -*-\n";
                             printHeader(out);
                             printGeneratedHeader(out, base + ".ice", "#");
                             //

data/ext/ice/cpp/src/Slice/PythonUtil.cpp

@@ -196,6 +196,44 @@ private:
 }
 }
 
+string
+u32CodePoint(unsigned int value)
+{
+    ostringstream s;
+    s << "\\U";
+    s << hex;
+    s.width(8);
+    s.fill('0');
+    s << value;
+    return s.str();
+}
+
+void
+writeU8Buffer(const vector<unsigned char>& u8buffer, ostringstream& out)
+{
+    vector<unsigned int> u32buffer;
+    IceUtilInternal::ConversionResult result = convertUTF8ToUTF32(u8buffer, u32buffer, IceUtil::lenientConversion);
+    switch(result)
+    {
+        case conversionOK:
+            break;
+        case sourceExhausted:
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source exhausted");
+        case sourceIllegal:
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__, "string source illegal");
+        default:
+        {
+            assert(0);
+            throw IceUtil::IllegalConversionException(__FILE__, __LINE__);
+        }
+    }
+
+    for(vector<unsigned int>::const_iterator c = u32buffer.begin(); c != u32buffer.end(); ++c)
+    {
+        out << u32CodePoint(*c);
+    }
+}
+
 static string
 lookupKwd(const string& name)
 {
@@ -518,17 +556,7 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         //
         ClassList allBases = p->allBases();
         StringList ids;
-#if defined(__IBMCPP__) && defined(NDEBUG)
-//
-// VisualAge C++ 6.0 does not see that ClassDef is a Contained,
-// when inlining is on. The code below issues a warning: better
-// than an error!
-//
-        transform(allBases.begin(), allBases.end(), back_inserter(ids),
-                  IceUtil::constMemFun<string,ClassDef>(&Contained::scoped));
-#else
         transform(allBases.begin(), allBases.end(), back_inserter(ids), IceUtil::constMemFun(&Contained::scoped));
-#endif
         StringList other;
         other.push_back(scoped);
         other.push_back("::Ice::Object");
@@ -1847,6 +1875,9 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
             }
             case Slice::Builtin::KindString:
             {
+                ostringstream sv2;
+                ostringstream sv3;
+                
                 //
                 // Expand strings into the basic source character set. We can't use isalpha() and the like
                 // here because they are sensitive to the current locale.
@@ -1857,8 +1888,6 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                                                        "_{}[]#()<>%:;.?*+-/^&|~!=, '";
                 static const set<char> charSet(basicSourceChars.begin(), basicSourceChars.end());
 
-                _out << "\"";                                       // Opening "
-
                 for(size_t i = 0; i < value.size();)
                 {
                     char c = value[i];
@@ -1866,7 +1895,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                     {
                         case '"':
                         {
-                            _out << "\\\"";
+                            sv2 << "\\\"";
                             break;
                         }
                         case '\\':
@@ -1894,7 +1923,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                                 //
                                 // Convert codepoint to UTF8 bytes and write the escaped bytes
                                 //
-                                _out << s.substr(0, s.size() - 1);
+                                sv2 << s.substr(0, s.size() - 1);
 
                                 size_t sz = value[j] == 'U' ? 8 : 4;
                                 string codepoint = value.substr(j + 1, sz);
@@ -1931,40 +1960,40 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                                     s << oct;
                                     s << static_cast<unsigned int>(*q);
                                 }
-                                _out << s.str();
+                                sv2 << s.str();
 
                                 i = j + 1 + sz;
                             }
                             else
                             {
-                                _out << s;
+                                sv2 << s;
                                 i = j;
                             }
                             continue;
                         }
                         case '\r':
                         {
-                            _out << "\\r";
+                            sv2 << "\\r";
                             break;
                         }
                         case '\n':
                         {
-                            _out << "\\n";
+                            sv2 << "\\n";
                             break;
                         }
                         case '\t':
                         {
-                            _out << "\\t";
+                            sv2 << "\\t";
                             break;
                         }
                         case '\b':
                         {
-                            _out << "\\b";
+                            sv2 << "\\b";
                             break;
                         }
                         case '\f':
                         {
-                            _out << "\\f";
+                            sv2 << "\\f";
                             break;
                         }
                         default:
@@ -1978,19 +2007,140 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                                 s.width(3);
                                 s.fill('0');
                                 s << static_cast<unsigned>(uc);
-                                _out << s.str();
+                                sv2 << s.str();
                             }
                             else
                             {
-                                _out << c;                          // Print normally if in basic source character set.
+                                sv2 << c;                          // Print normally if in basic source character set.
                             }
                             break;
                         }
                     }
                     ++i;
                 }
+                
+                vector<unsigned char> u8buffer;                     // Buffer to convert multibyte characters
+
+                for(size_t i = 0; i < value.size();)
+                {
+                    if(charSet.find(value[i]) == charSet.end())
+                    {
+                        char c = value[i];
+                        if(static_cast<unsigned char>(c) < 128) // Single byte character
+                        {
+                            //
+                            // Print as unicode if not in basic source character set
+                            //
+                            switch(c)
+                            {
+                                //
+                                // Don't encode this special characters as universal characters
+                                //
+                                case '\r':
+                                {
+                                    sv3 << "\\r";
+                                    break;
+                                }
+                                case '\n':
+                                {
+                                    sv3 << "\\n";
+                                    break;
+                                }
+                                case  '\\':
+                                {
+                                    sv3 << "\\";
+                                    break;
+                                }
+                                default:
+                                {
+                                    sv3 << u32CodePoint(c);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            u8buffer.push_back(value[i]);
+                        }
+                    }
+                    else
+                    {
+                        //
+                        // Write any pedding characters in the utf8 buffer
+                        //
+                        if(!u8buffer.empty())
+                        {
+                            writeU8Buffer(u8buffer, sv3);
+                            u8buffer.clear();
+                        }
+                        switch(value[i])
+                        {
+                            case '\\':
+                            {
+                                string s = "\\";
+                                size_t j = i + 1;
+                                for(; j < value.size(); ++j)
+                                {
+                                    if(value[j] != '\\')
+                                    {
+                                        break;
+                                    }
+                                    s += "\\";
+                                }
+
+                                //
+                                // An even number of slash \ will escape the backslash and
+                                // the codepoint will be interpreted as its charaters
+                                //
+                                // \\U00000041  - ['\\', 'U', '0', '0', '0', '0', '0', '0', '4', '1']
+                                // \\\U00000041 - ['\\', 'A'] (41 is the codepoint for 'A')
+                                //
+                                if(s.size() % 2 != 0 && (value[j] == 'U' || value[j] == 'u'))
+                                {
+                                    size_t sz = value[j] == 'U' ? 8 : 4;
+                                    sv3 << s.substr(0, s.size() - 1);
+                                    i = j + 1;
+
+                                    string codepoint = value.substr(j + 1, sz);
+                                    assert(codepoint.size() ==  sz);
+
+                                    IceUtil::Int64 v = IceUtilInternal::strToInt64(codepoint.c_str(), 0, 16);
+                                    sv3 << u32CodePoint(static_cast<unsigned int>(v));
+                                    i = j + 1 + sz;
+                                }
+                                else
+                                {
+                                    sv3 << s;
+                                    i = j;
+                                }
+                                continue;
+                            }
+                            case '"':
+                            {
+                                sv3 << "\\";
+                                break;
+                            }
+                        }
+                        sv3 << value[i];                        // Print normally if in basic source character set
+                    }
+                    i++;
+                }
+
+                //
+                // Write any pedding characters in the utf8 buffer
+                //
+                if(!u8buffer.empty())
+                {
+                    writeU8Buffer(u8buffer, sv3);
+                    u8buffer.clear();
+                }
+                
 
-                _out << "\"";                                       // Closing "
+                _out << "\"" << sv2.str() << "\"";
+                if(sv2.str() != sv3.str())
+                {
+                    _out << " if _version_info_[0] < 3 else \"" << sv3.str() << "\"";
+                }
                 break;
             }
             case Slice::Builtin::KindObject:
@@ -2291,14 +2441,10 @@ Slice::Python::CodeVisitor::writeDocstring(const string& comment, const string&
 
     for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q)
     {
-        if(q != lines.begin())
-        {
-            _out << nl;
-        }
-        _out << *q;
+        _out << nl << *q;
     }
 
-    _out << "\"\"\"";
+    _out << nl << "\"\"\"";
 }
 
 void
@@ -2314,11 +2460,7 @@ Slice::Python::CodeVisitor::writeDocstring(const string& comment, const DataMemb
 
     for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q)
     {
-        if(q != lines.begin())
-        {
-            _out << nl;
-        }
-        _out << *q;
+        _out << nl << *q;
     }
 
     if(!members.empty())
@@ -2360,7 +2502,7 @@ Slice::Python::CodeVisitor::writeDocstring(const string& comment, const DataMemb
         }
     }
 
-    _out << "\"\"\"";
+    _out << nl << "\"\"\"";
 }
 
 void
@@ -2376,11 +2518,7 @@ Slice::Python::CodeVisitor::writeDocstring(const string& comment, const Enumerat
 
     for(StringVec::const_iterator q = lines.begin(); q != lines.end(); ++q)
     {
-        if(q != lines.begin())
-        {
-            _out << nl;
-        }
-        _out << *q;
+        _out << nl << *q;
     }
 
     if(!enums.empty())
@@ -2422,7 +2560,7 @@ Slice::Python::CodeVisitor::writeDocstring(const string& comment, const Enumerat
         }
     }
 
-    _out << "\"\"\"";
+    _out << nl << "\"\"\"";
 }
 
 bool
@@ -2665,11 +2803,7 @@ Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode
     {
         for(StringVec::const_iterator q = comment.description.begin(); q != comment.description.end(); ++q)
         {
-            if(q != comment.description.begin())
-            {
-                _out << nl;
-            }
-            _out << *q;
+            _out << nl << *q;
         }
     }
 
@@ -2798,7 +2932,7 @@ Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode
             _out << nl << r->first << " -- " << r->second;
         }
     }
-    _out << "\"\"\"";
+    _out << nl << "\"\"\"";
 }
 
 void
@@ -2807,6 +2941,7 @@ Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector
     Slice::Python::MetaDataVisitor visitor;
     un->visit(&visitor, false);
 
+    out << nl << "from sys import version_info as _version_info_";
     out << nl << "import Ice, IcePy";
 
     if(!all)