zeroc-ice 3.7.1 → 3.7.2

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Preprocessor.h>
 #include <Slice/Util.h>
@@ -309,7 +304,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
 
 bool
 Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
-                                               const vector<string>& extraArgs, const string& cppSourceExt,
+                                               const vector<string>& extraArgs, const string& /*cppSourceExt*/,
                                                const string& optValue)
 {
     if(!checkInputFile())
@@ -548,7 +543,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             }
         }
 
-        string::size_type pos = 0;
+        pos = 0;
         while((pos = result.find("\\", pos + 1)) != string::npos)
         {
             result.insert(pos, 1, '\\');
@@ -590,7 +585,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to the h header extension suffix.
             //
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
@@ -621,7 +616,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Find end of next file.
             //
-            string::size_type pos = 0;
+            pos = 0;
             while((pos = result.find_first_of(" :\t\r\n\\", pos + 1)) != string::npos)
             {
                 if(result[pos] == ':')
@@ -654,7 +649,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .cs suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".cs");
@@ -668,7 +663,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .js suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".js");
@@ -684,7 +679,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             {
                 result = pyPrefix + result;
             }
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, "_ice.py");
@@ -696,7 +691,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .rb suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".rb");
@@ -708,7 +703,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .php suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".php");
@@ -717,7 +712,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
         }
         case ObjC:
         {
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef PREPROCESSOR_H
 #define PREPROCESSOR_H

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -92,7 +86,7 @@ createDirectory(const string& dir)
     if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
-        os << "cannot create directory '" << dir << "': " << strerror(errno);
+        os << "cannot create directory '" << dir << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 }
@@ -132,7 +126,7 @@ createPackageDirectory(const string& output, const string& pkgdir)
             if(IceUtilInternal::mkdir(path, 0777) != 0)
             {
                 ostringstream os;
-                os << "cannot create directory '" << path << "': " << strerror(errno);
+                os << "cannot create directory '" << path << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
             FileTracker::instance()->addDirectory(path);
@@ -149,21 +143,21 @@ createPackageDirectory(const string& output, const string& pkgdir)
         // PackageVisitor. We need every intermediate subdirectory to have an __init__.py file, which
         // can be empty.
         //
-        const string init = path + "/__init__.py";
-        if(!IceUtilInternal::fileExists(init))
+        const string initFile = path + "/__init__.py";
+        if(!IceUtilInternal::fileExists(initFile))
         {
             //
             // Create an empty file.
             //
             IceUtilInternal::Output out;
-            out.open(init.c_str());
+            out.open(initFile.c_str());
             if(!out)
             {
                 ostringstream os;
-                os << "cannot open '" << init << "': " << strerror(errno);
+                os << "cannot open '" << initFile << "': " << IceUtilInternal::errorToString(errno);
                 throw FileException(__FILE__, __LINE__, os.str());
             }
-            FileTracker::instance()->addFile(init);
+            FileTracker::instance()->addFile(initFile);
         }
     }
 }
@@ -226,24 +220,24 @@ PackageVisitor::PackageVisitor(StringList& modules) :
 }
 
 void
-PackageVisitor::createModules(const UnitPtr& unit, const string& module, const string& dir)
+PackageVisitor::createModules(const UnitPtr& unt, const string& module, const string& dir)
 {
     StringList modules;
     PackageVisitor v(modules);
-    unit->visit(&v, false);
+    unt->visit(&v, false);
 
     for(StringList::iterator p = modules.begin(); p != modules.end(); ++p)
     {
-        vector<string> v;
-        if(!IceUtilInternal::splitString(*p, ".", v))
+        vector<string> vs;
+        if(!IceUtilInternal::splitString(*p, ".", vs))
         {
             assert(false);
         }
         string currentModule;
         string path = dir.empty() ? "." : dir;
-        for(vector<string>::iterator q = v.begin(); q != v.end(); ++q)
+        for(vector<string>::iterator q = vs.begin(); q != vs.end(); ++q)
         {
-            if(q != v.begin())
+            if(q != vs.begin())
             {
                 addSubmodule(path, currentModule, *q);
                 currentModule += ".";
@@ -322,7 +316,7 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
         if(!in)
         {
             ostringstream os;
-            os << "cannot open file '" << initPath << "': " << strerror(errno);
+            os << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
 
@@ -414,9 +408,9 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
     ofstream os(IceUtilInternal::streamFilename(initPath).c_str());
     if(!os)
     {
-        ostringstream os;
-        os << "cannot open file '" << initPath << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
+        ostringstream oss;
+        oss << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
+        throw FileException(__FILE__, __LINE__, oss.str());
     }
     FileTracker::instance()->addFile(initPath);
 
@@ -750,9 +744,9 @@ Slice::Python::compile(const vector<string>& argv)
                             out.open(path.c_str());
                             if(!out)
                             {
-                                ostringstream os;
-                                os << "cannot open '" << path << "': " << strerror(errno);
-                                throw FileException(__FILE__, __LINE__, os.str());
+                                ostringstream oss;
+                                oss << "cannot open '" << path << "': " << IceUtilInternal::errorToString(errno);
+                                throw FileException(__FILE__, __LINE__, oss.str());
                             }
                             FileTracker::instance()->addFile(path);
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/PythonUtil.h>
 #include <Slice/Checksum.h>
@@ -432,7 +427,8 @@ Slice::Python::CodeVisitor::visitClassDecl(const ClassDeclPtr& p)
             _out << nl << "_M_" << getAbsolute(p, "_t_") << " = IcePy.declareValue('" << scoped << "')";
         }
 
-        if(!p->isLocal() && (p->isInterface() || p->definition()->allOperations().size()))
+        ClassDefPtr def = p->definition();
+        if(!p->isLocal() && (p->isInterface() || (def && def->allOperations().size())))
         {
             _out << nl << "_M_" << getAbsolute(p, "_t_", "Disp") << " = IcePy.declareClass('" << scoped << "')";
             _out << nl << "_M_" << getAbsolute(p, "_t_", "Prx") << " = IcePy.declareProxy('" << scoped << "')";
@@ -459,7 +455,7 @@ Slice::Python::CodeVisitor::writeOperations(const ClassDefPtr& p)
                 if((*oli)->hasMarshaledResult())
                 {
                     string name = (*oli)->name();
-                    name[0] = toupper(static_cast<unsigned char>(name[0]));
+                    name[0] = static_cast<char>(toupper(static_cast<unsigned char>(name[0])));
                     _out << sp;
                     _out << nl << "\"\"\"";
                     _out << nl << "Immediately marshals the result of an invocation of " << (*oli)->name()
@@ -1831,7 +1827,7 @@ Slice::Python::CodeVisitor::writeType(const TypePtr& p)
     if(prx)
     {
         ClassDefPtr def = prx->_class()->definition();
-        if(def->isInterface() || def->allOperations().size() > 0)
+        if(def && (def->isInterface() || def->allOperations().size() > 0))
         {
             _out << "_M_" << getAbsolute(prx->_class(), "_t_", "Prx");
         }
@@ -2307,12 +2303,12 @@ Slice::Python::CodeVisitor::stripMarkup(const string& comment)
         string::size_type start = 0;
         while(start != string::npos)
         {
-            string::size_type nl = text.find_first_of("\r\n", start);
+            string::size_type newline = text.find_first_of("\r\n", start);
             string line;
-            if(nl != string::npos)
+            if(newline != string::npos)
             {
-                line = text.substr(start, nl - start);
-                start = nl;
+                line = text.substr(start, newline - start);
+                start = newline;
             }
             else
             {
@@ -2849,7 +2845,7 @@ Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode
 }
 
 string
-Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
+Slice::Python::getPackageDirectory(const string& file, const UnitPtr& ut)
 {
     //
     // file must be a fully-qualified path name.
@@ -2858,7 +2854,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     const string prefix = "python:pkgdir:";
     string pkgdir = dc->findMetaData(prefix);
@@ -2874,7 +2870,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
 }
 
 string
-Slice::Python::getImportFileName(const string& file, const UnitPtr& unit, const vector<string>& includePaths)
+Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const vector<string>& includePaths)
 {
     //
     // The file and includePaths arguments must be fully-qualified path names.
@@ -2883,7 +2879,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& unit, const
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    string pkgdir = getPackageDirectory(file, unit);
+    string pkgdir = getPackageDirectory(file, ut);
     if(!pkgdir.empty())
     {
         //
@@ -3046,11 +3042,11 @@ Slice::Python::getPackageMetadata(const ContainedPtr& cont)
     string q;
     if(!m->findMetaData(prefix, q))
     {
-        UnitPtr unit = cont->unit();
+        UnitPtr ut = cont->unit();
         string file = cont->file();
         assert(!file.empty());
 
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
         assert(dc);
         q = dc->findMetaData(prefix);
     }
@@ -3088,14 +3084,9 @@ void
 Slice::Python::printHeader(IceUtilInternal::Output& out)
 {
     static const char* header =
-"# **********************************************************************\n"
-"#\n"
-"# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# This copy of Ice is licensed to you under the terms described in the\n"
-"# ICE_LICENSE file included in this distribution.\n"
+"# Copyright (c) ZeroC, Inc. All rights reserved.\n"
 "#\n"
-"# **********************************************************************\n"
         ;
 
     out << header;
@@ -3232,8 +3223,8 @@ Slice::Python::MetaDataVisitor::visitSequence(const SequencePtr& p)
     const string file = p->file();
     const string line = p->line();
     StringList protobufMetaData;
-    const UnitPtr unit = p->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = p->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
@@ -3285,8 +3276,8 @@ StringList
 Slice::Python::MetaDataVisitor::validateSequence(const string& file, const string& line,
                                                  const TypePtr& type, const StringList& metaData)
 {
-    const UnitPtr unit = type->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = type->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     static const string prefix = "python:";
@@ -3296,17 +3287,53 @@ Slice::Python::MetaDataVisitor::validateSequence(const string& file, const strin
         string s = *p++;
         if(s.find(prefix) == 0)
         {
-            string::size_type pos = s.find(':', prefix.size());
-            if(pos != string::npos && s.substr(prefix.size(), pos - prefix.size()) == "seq")
+            SequencePtr seq = SequencePtr::dynamicCast(type);
+            if(seq)
             {
                 static const string seqPrefix = "python:seq:";
-                string arg = s.substr(seqPrefix.size(), pos - seqPrefix.size());
-                if(SequencePtr::dynamicCast(type))
+                if(s.find(seqPrefix) == 0)
+                {
+                    string arg = s.substr(seqPrefix.size());
+                    if(arg == "tuple" || arg == "list" || arg == "default")
+                    {
+                        continue;
+                    }
+                }
+                else if(s.size() > prefix.size())
                 {
+                    string arg = s.substr(prefix.size());
                     if(arg == "tuple" || arg == "list" || arg == "default")
                     {
                         continue;
                     }
+                    else if(arg == "array.array" || arg == "numpy.ndarray" || arg.find("memoryview:") == 0)
+                    {
+                        //
+                        // The memoryview sequence metadata is only valid for integral builtin
+                        // types excluding strings.
+                        //
+                        BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
+                        if(builtin)
+                        {
+                            switch(builtin->kind())
+                            {
+                            case Builtin::KindBool:
+                            case Builtin::KindByte:
+                            case Builtin::KindShort:
+                            case Builtin::KindInt:
+                            case Builtin::KindLong:
+                            case Builtin::KindFloat:
+                            case Builtin::KindDouble:
+                                {
+                                    continue;
+                                }
+                            default:
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                    }
                 }
             }
             dc->warning(InvalidMetaData, file, line, "ignoring invalid metadata `" + s + "'");
@@ -3322,8 +3349,8 @@ Slice::Python::MetaDataVisitor::reject(const ContainedPtr& cont)
     StringList localMetaData = cont->getMetaData();
     static const string prefix = "python:";
 
-    const UnitPtr unit = cont->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(cont->file());
+    const UnitPtr ut = cont->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());
     assert(dc);
 
     for(StringList::const_iterator p = localMetaData.begin(); p != localMetaData.end();)

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef SLICE_PYTHON_UTIL_H
 #define SLICE_PYTHON_UTIL_H