zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,17 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_PARSER_H
 #define SLICE_PARSER_H
 
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
+#include <IceUtil/Exception.h>
 #include <string>
 #include <vector>
 #include <list>
@@ -23,6 +19,29 @@
 namespace Slice
 {
 
+class CompilerException : public ::IceUtil::Exception
+{
+public:
+
+    CompilerException(const char*, int, const std::string&);
+#ifndef ICE_CPP11_COMPILER
+    ~CompilerException() throw();
+#endif
+    virtual std::string ice_id() const;
+    virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
+    virtual CompilerException* ice_clone() const;
+#endif
+    virtual void ice_throw() const;
+
+    std::string reason() const;
+
+private:
+
+    static const char* _name;
+    const std::string _reason;
+};
+
 #if defined(_WIN32) && !defined(__MINGW32__)
 
 const IceUtil::Int64 Int32Max =  0x7fffffffi64;
@@ -246,6 +265,9 @@ public:
     void warning(WarningCategory, const std::string&, int, const std::string&) const;
     void warning(WarningCategory, const std::string&, const std::string&, const std::string&) const;
 
+    void error(const std::string&, int, const std::string&) const;
+    void error(const std::string&, const std::string&, const std::string&) const;
+
 private:
 
     bool suppressWarning(WarningCategory) const;
@@ -259,6 +281,43 @@ private:
 };
 typedef ::IceUtil::Handle<DefinitionContext> DefinitionContextPtr;
 
+// ----------------------------------------------------------------------
+// Comment
+// ----------------------------------------------------------------------
+
+class Comment : public ::IceUtil::SimpleShared
+{
+public:
+
+    bool isDeprecated() const;
+    StringList deprecated() const;
+
+    StringList overview() const;  // Contains all introductory lines up to the first tag.
+    StringList misc() const;      // Contains unrecognized tags.
+    StringList seeAlso() const;   // Targets of @see tags.
+
+    StringList returns() const;                           // Description of an operation's return value.
+    std::map<std::string, StringList> parameters() const; // Parameter descriptions for an op. Key is parameter name.
+    std::map<std::string, StringList> exceptions() const; // Exception descriptions for an op. Key is exception name.
+
+private:
+
+    Comment();
+
+    bool _isDeprecated;
+    StringList _deprecated;
+    StringList _overview;
+    StringList _misc;
+    StringList _seeAlso;
+
+    StringList _returns;
+    std::map<std::string, StringList> _parameters;
+    std::map<std::string, StringList> _exceptions;
+
+    friend class Contained;
+};
+typedef ::IceUtil::Handle<Comment> CommentPtr;
+
 // ----------------------------------------------------------------------
 // GrammarBase
 // ----------------------------------------------------------------------
@@ -282,7 +341,7 @@ public:
 
 protected:
 
-    SyntaxTreeBase(const UnitPtr&);
+    SyntaxTreeBase(const UnitPtr&, const DefinitionContextPtr& = 0);
 
     UnitPtr _unit;
     DefinitionContextPtr _definitionContext;
@@ -366,6 +425,7 @@ public:
     std::string file() const;
     std::string line() const;
     std::string comment() const;
+    CommentPtr parseComment(bool) const;
 
     int includeLevel() const;
     void updateIncludeLevel();
@@ -427,7 +487,7 @@ public:
     virtual void destroy();
     ModulePtr createModule(const std::string&);
     ClassDefPtr createClassDef(const std::string&, int, bool, const ClassList&, bool);
-    ClassDeclPtr createClassDecl(const std::string&, bool, bool, bool = true);
+    ClassDeclPtr createClassDecl(const std::string&, bool, bool);
     ExceptionPtr createException(const std::string&, const ExceptionPtr&, bool, NodeType = Real);
     StructPtr createStruct(const std::string&, bool, NodeType = Real);
     SequencePtr createSequence(const std::string&, const TypePtr&, const StringList&, bool, NodeType = Real);
@@ -469,7 +529,8 @@ public:
     bool hasNonLocalInterfaceDefs() const;
     bool hasValueDefs() const;
     bool hasOnlyClassDecls() const;
-    bool hasAbstractClassDefs() const;
+    bool hasOperations() const; // interfaces or classes with operations
+    bool hasNonLocalAbstractClassDefs() const; // interfaces or abstract classes
     bool hasNonLocalDataOnlyClasses() const;
     bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
     bool hasContentsWithMetaData(const std::string&) const;
@@ -490,7 +551,6 @@ protected:
 
     Container(const UnitPtr&);
 
-    void checkIdentifier(const std::string&) const;
     bool checkInterfaceAndLocal(const std::string&, bool, bool, bool, bool, bool);
     bool checkGlobalMetaData(const StringList&, const StringList&);
     bool validateConstant(const std::string&, const TypePtr&, SyntaxTreeBasePtr&, const std::string&, bool);
@@ -1055,7 +1115,8 @@ public:
     ContainedList findUsedBy(const ContainedPtr&) const;
 
     void addTypeId(int, const std::string&);
-    std::string getTypeId(int);
+    std::string getTypeId(int) const;
+    bool hasCompactTypeId() const;
 
     bool usesNonLocals() const;
     bool usesConsts() const;
@@ -1084,7 +1145,6 @@ private:
 
     Unit(bool, bool, bool, bool, const StringList&);
     static void eraseWhiteSpace(::std::string&);
-    bool checkUndefinedTypes();
 
     bool _ignRedefs;
     bool _all;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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())
@@ -474,7 +469,8 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
                     {
                         if(file.compare(0, p->length(), *p) == 0)
                         {
-                            string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length());
+                            string s = includePaths[static_cast<size_t>(p - fullIncludePaths.begin())] +
+                                file.substr(p->length());
                             if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size())
                             {
                                 newFile = s;
@@ -548,7 +544,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 +586,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);
@@ -602,6 +598,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
         case SliceXML:
             break;
         case Java:
+        case MATLAB:
         {
             //
             // We want to shift the files left one position, so that
@@ -620,7 +617,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] == ':')
@@ -653,7 +650,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");
@@ -667,7 +664,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");
@@ -683,7 +680,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");
@@ -695,7 +692,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");
@@ -707,7 +704,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");
@@ -716,7 +713,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);
@@ -724,6 +721,18 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             }
             break;
         }
+        case Swift:
+        {
+            //
+            // Change .o[bj] suffix to .swift suffix.
+            //
+            pos = 0;
+            if ((pos = result.find(suffix)) != string::npos)
+            {
+                result.replace(pos, suffix.size() - 1, ".swift");
+            }
+            break;
+        }
         default:
         {
             assert(false);

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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
@@ -32,7 +27,7 @@ public:
     FILE* preprocess(bool, const std::vector<std::string>&);
     bool close();
 
-    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML };
+    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB, Swift };
 
     bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "",
                                    const std::string& = "cpp", const std::string& = "");

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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());
         }
 
@@ -356,9 +350,7 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
 
                 if(s.size() < 8)
                 {
-                    ostringstream os;
-                    os << "invalid line '" << s << "' in '" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 string name = s.substr(7);
@@ -388,16 +380,12 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
             {
                 if(state != InSubmodules)
                 {
-                    ostringstream os;
-                    os << "invalid line '" << s << "' in '" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 if(s.size() < 15)
                 {
-                    ostringstream os;
-                    os << "invalid line '" << s << "' in '" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 submodules.push_back(s.substr(14));
@@ -406,9 +394,7 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
 
         if(state == InModules)
         {
-            ostringstream os;
-            os << "invalid format in '" << initPath << "'" << endl;
-            throw os.str();
+            throw runtime_error("invalid format in '" + initPath + "'\n");
         }
     }
 }
@@ -422,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);
 
@@ -699,7 +685,7 @@ Slice::Python::compile(const vector<string>& argv)
                         }
 
                         //
-                        // Check if the file contains the python:pkgdir global metadata.
+                        // Check if the file contains the python:pkgdir file metadata.
                         //
                         const string pkgdir = getPackageDirectory(icecpp->getFileName(), u);
 
@@ -758,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);
 
@@ -807,10 +793,10 @@ Slice::Python::compile(const vector<string>& argv)
                         consoleErr << argv[0] << ": error: " << ex.reason() << endl;
                         return EXIT_FAILURE;
                     }
-                    catch(const string& err)
+                    catch(const exception& ex)
                     {
                         FileTracker::instance()->cleanup();
-                        consoleErr << argv[0] << ": error: " << err << endl;
+                        consoleErr << argv[0] << ": error: " << ex.what() << endl;
                         status = EXIT_FAILURE;
                     }
                 }