zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -9,7 +9,6 @@
 
 #include <IceUtil/Functional.h>
 #include <IceUtil/InputUtil.h>
-#include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
 #include <Slice/Parser.h>
 #include <Slice/GrammarUtil.h>
@@ -19,9 +18,6 @@
 
 #ifdef _WIN32
 #   include <io.h>
-#else
-#   include <climits>  // For PATH_MAX
-#   include <unistd.h> // For readlink()
 #endif
 
 using namespace std;
@@ -547,7 +543,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.
-    
+
     if(thisScope() == "::")
     {
         _unit->addTopLevelModule(_unit->currentFile(), name);
@@ -597,6 +593,7 @@ ClassDefPtr
 Slice::Container::createClassDef(const string& name, int id, bool intf, const ClassList& bases, bool local)
 {
     checkIdentifier(name);
+
     ContainedList matches = _unit->findContents(thisScope() + name);
     for(ContainedList::const_iterator p = matches.begin(); p != matches.end(); ++p)
     {
@@ -662,7 +659,7 @@ Slice::Container::createClassDef(const string& name, int id, bool intf, const Cl
     }
 
     ClassDecl::checkBasesAreLegal(name, intf, local, bases, _unit);
- 
+
     ClassDefPtr def = new ClassDef(this, name, id, intf, bases, local);
     _contents.push_back(def);
 
@@ -677,16 +674,19 @@ Slice::Container::createClassDef(const string& name, int id, bool intf, const Cl
     // definition. This way the code generator can rely on always
     // having a class declaration available for lookup.
     //
-    ClassDeclPtr decl = createClassDecl(name, intf, local);
+    ClassDeclPtr decl = createClassDecl(name, intf, local, false);
     def->_declaration = decl;
 
     return def;
 }
 
 ClassDeclPtr
-Slice::Container::createClassDecl(const string& name, bool intf, bool local)
+Slice::Container::createClassDecl(const string& name, bool intf, bool local, bool checkName)
 {
-    checkIdentifier(name);
+    if (checkName)
+    {
+        checkIdentifier(name);
+    }
 
     ClassDefPtr def;
 
@@ -704,7 +704,7 @@ Slice::Container::createClassDecl(const string& name, bool intf, bool local)
             }
             return 0;
         }
-        
+
         ClassDeclPtr clDecl = ClassDeclPtr::dynamicCast(*p);
         if(clDecl)
         {
@@ -714,7 +714,7 @@ Slice::Container::createClassDecl(const string& name, bool intf, bool local)
             }
             return 0;
         }
-        
+
         bool differsOnlyInCase = matches.front()->name() != name;
         if(differsOnlyInCase)
         {
@@ -929,7 +929,7 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const
         string msg = "non-local sequence `" + name + "' cannot have local element type";
         _unit->error(msg);
     }
-    
+
     SequencePtr p = new Sequence(this, name, type, metaData, local);
     _contents.push_back(p);
     return p;
@@ -952,7 +952,7 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
             return 0;
         }
     }
- 
+
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -979,7 +979,7 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
         }
         return 0;
     }
-    
+
     nameIsLegal(name, "dictionary"); // Don't return here -- we create the dictionary anyway.
 
     if(nt == Real)
@@ -1859,7 +1859,7 @@ Slice::Container::hasContentsWithMetaData(const string& meta) const
         if(container && container->hasContentsWithMetaData(meta))
         {
             return true;
-        }           
+        }
     }
 
     return false;
@@ -1941,7 +1941,7 @@ Slice::Container::mergeModules()
         {
             continue;
         }
-        
+
         DefinitionContextPtr dc1 = mod1->definitionContext();
         assert(dc1);
         StringList metaData1 = dc1->getMetaData();
@@ -1991,7 +1991,7 @@ Slice::Container::mergeModules()
             _unit->removeContent(*q);
             q = _contents.erase(q);
         }
-        
+
         mod1->mergeModules();
     }
 }
@@ -2065,7 +2065,7 @@ Slice::Container::checkIntroduced(const string& scoped, ContainedPtr namedThing)
     {
         return true;
     }
-    
+
     //
     // Split off first component.
     //
@@ -2079,12 +2079,9 @@ Slice::Container::checkIntroduced(const string& scoped, ContainedPtr namedThing)
     if(namedThing == 0)
     {
         ContainedList cl = lookupContained(firstComponent, false);
-        if(namedThing == 0)
+        if(cl.empty())
         {
-            if(cl.empty())
-            {
-                return true; // Ignore types whose creation failed previously.
-            }
+            return true; // Ignore types whose creation failed previously.
         }
         namedThing = cl.front();
     }
@@ -2141,6 +2138,24 @@ Slice::Container::checkIntroduced(const string& scoped, ContainedPtr namedThing)
         //
         if(it->second != namedThing)
         {
+            //
+            // Parameter are in its own scope.
+            //
+            if((ParamDeclPtr::dynamicCast(it->second) && !ParamDeclPtr::dynamicCast(namedThing)) ||
+               (!ParamDeclPtr::dynamicCast(it->second) && ParamDeclPtr::dynamicCast(namedThing)))
+            {
+                return true;
+            }
+
+            //
+            // Data members are in its own scope.
+            //
+            if((DataMemberPtr::dynamicCast(it->second) && !DataMemberPtr::dynamicCast(namedThing)) ||
+               (!DataMemberPtr::dynamicCast(it->second) && DataMemberPtr::dynamicCast(namedThing)))
+            {
+                return true;
+            }
+
             _unit->error("`" + firstComponent + "' has changed meaning");
             return false;
         }
@@ -2316,7 +2331,7 @@ Slice::Container::checkInterfaceAndLocal(const string& name, bool defined,
         _unit->error(msg);
         return false;
     }
-    
+
     if(intf && !intfOther)
     {
         string msg = "interface `";
@@ -2327,7 +2342,7 @@ Slice::Container::checkInterfaceAndLocal(const string& name, bool defined,
         _unit->error(msg);
         return false;
     }
-    
+
     if(!local && localOther)
     {
         string msg = "non-local `";
@@ -2338,7 +2353,7 @@ Slice::Container::checkInterfaceAndLocal(const string& name, bool defined,
         _unit->error(msg);
         return false;
     }
-    
+
     if(local && !localOther)
     {
         string msg = "local `";
@@ -2349,7 +2364,7 @@ Slice::Container::checkInterfaceAndLocal(const string& name, bool defined,
         _unit->error(msg);
         return false;
     }
-    
+
     return true;
 }
 
@@ -2969,7 +2984,7 @@ Slice::ClassDecl::addPartition(GraphPartitionList& gpl,
 // Convert the list of partitions of class definitions into a
 // list of lists, with each member list containing the operation
 // names defined by the interfaces in each partition.
-// 
+//
 Slice::ClassDecl::StringPartitionList
 Slice::ClassDecl::toStringPartitionList(const GraphPartitionList& gpl)
 {
@@ -3144,7 +3159,7 @@ Slice::ClassDef::createOperation(const string& name,
         msg += name + "' with local return type";
         _unit->error(msg);
     }
-    
+
     _hasOperations = true;
     OperationPtr op = new Operation(this, name, returnType, optional, tag, mode);
     _contents.push_back(op);
@@ -3168,7 +3183,7 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
                 string msg = "Class data member `" + name + "' cannot be a value object.";
                 _unit->error(msg);
                 return 0;
-            } 
+            }
 
             ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
             if(classDecl != 0 && !classDecl->isLocal())
@@ -3180,7 +3195,7 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
         }
     }
 
-    assert(!isInterface()); 
+    assert(!isInterface());
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -3193,6 +3208,7 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
                 return p;
             }
         }
+
         if(matches.front()->name() != name)
         {
             string msg = "data member `" + name + "' differs only in capitalization from ";
@@ -3208,26 +3224,7 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
         }
     }
 
-    //
-    // Check whether enclosing class has the same name.
-    //
-    if(name == this->name())
-    {
-        string msg = "class name `";
-        msg += name;
-        msg += "' cannot be used as data member name";
-        _unit->error(msg);
-        return 0;
-    }
-
     string newName = IceUtilInternal::toLower(name);
-    string thisName = IceUtilInternal::toLower(this->name());
-    if(newName == thisName)
-    {
-        string msg = "data member `" + name + "' differs only in capitalization from enclosing class name `";
-        msg += this->name() + "'";
-        _unit->error(msg);
-    }
 
     //
     // Check whether any bases have defined something with the same name already.
@@ -3644,7 +3641,7 @@ Slice::ClassDef::ClassDef(const ContainerPtr& container, const string& name, int
         assert(p == _bases.begin() || (*p)->isInterface());
     }
 #endif
-    
+
     if(_compactId >= 0)
     {
         _unit->addTypeId(_compactId, scoped());
@@ -3764,27 +3761,7 @@ Slice::Exception::createDataMember(const string& name, const TypePtr& type, bool
         }
     }
 
-    //
-    // Check whether enclosing exception has the same name.
-    //
-    if(name == this->name())
-    {
-        string msg = "exception name `";
-        msg += name;
-        msg += "' cannot be used as exception member name";
-        _unit->error(msg);
-        return 0;
-    }
-
     string newName = IceUtilInternal::toLower(name);
-    string thisName = IceUtilInternal::toLower(this->name());
-    if(newName == thisName)
-    {
-        string msg = "exception member `" + name + "' differs only in capitalization ";
-        msg += "from enclosing exception name `" + this->name() + "'";
-        _unit->error(msg);
-    }
-
     //
     // Check whether any bases have defined a member with the same name already.
     //
@@ -4095,7 +4072,7 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op
     if(_unit->profile() == IceE)
     {
         if(!isLocal())
-        {           
+        {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
             if((builtin && builtin->kind() == Builtin::KindObject))
             {
@@ -4112,7 +4089,7 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op
             }
         }
     }
- 
+
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -4139,27 +4116,6 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op
         }
     }
 
-    //
-    // Check whether enclosing struct has the same name.
-    //
-    if(name == this->name())
-    {
-        string msg = "struct name `";
-        msg += name;
-        msg += "' cannot be used as member name";
-        _unit->error(msg);
-        return 0;
-    }
-
-    string newName = IceUtilInternal::toLower(name);
-    string thisName = IceUtilInternal::toLower(this->name());
-    if(newName == thisName)
-    {
-        string msg = "struct member `" + name + "' differs only in capitalization from enclosing struct name `";
-        msg += this->name() + "'";
-        _unit->error(msg);
-    }
-
     //
     // Structures cannot contain themselves.
     //
@@ -4628,7 +4584,7 @@ Slice::Dictionary::legalKeyType(const TypePtr& type, bool& containsSequence)
 }
 
 Slice::Dictionary::Dictionary(const ContainerPtr& container, const string& name, const TypePtr& keyType,
-                              const StringList& keyMetaData, const TypePtr& valueType, 
+                              const StringList& keyMetaData, const TypePtr& valueType,
                               const StringList& valueMetaData, bool local) :
     SyntaxTreeBase(container->unit()),
     Type(container->unit()),
@@ -4908,9 +4864,9 @@ Slice::Const::visit(ParserVisitor* visitor, bool)
 Slice::Const::Const(const ContainerPtr& container, const string& name, const TypePtr& type,
                     const StringList& typeMetaData, const SyntaxTreeBasePtr& valueType, const string& value,
                     const string& literal) :
-    SyntaxTreeBase(container->unit()), 
+    SyntaxTreeBase(container->unit()),
     Contained(container, name),
-    _type(type), 
+    _type(type),
     _typeMetaData(typeMetaData),
     _valueType(valueType),
     _value(value),
@@ -5013,26 +4969,8 @@ Slice::Operation::createParamDecl(const string& name, const TypePtr& type, bool
         }
     }
 
-    //
-    // Check whether enclosing operation has the same name.
-    //
-    if(name == this->name())
-    {
-        string msg = "operation name `";
-        msg += name;
-        msg += "' cannot be used as parameter name";
-        _unit->error(msg);
-        return 0;
-    }
-
     string newName = IceUtilInternal::toLower(name);
     string thisName = IceUtilInternal::toLower(this->name());
-    if(newName == thisName)
-    {
-        string msg = "parameter `" + name + "' differs only in capitalization from operation name `";
-        msg += this->name() + "'";
-        _unit->error(msg);
-    }
 
     //
     // Check that in parameters don't follow out parameters.
@@ -5279,13 +5217,13 @@ Slice::Operation::attributes() const
         assert(classDef != 0);
         classDef->findMetaData("freeze:", freezeMD);
     }
-    
+
     if(freezeMD != "")
     {
         int result = 0;
 
         freezeMD = freezeMD.substr(strlen("freeze:"));
-                    
+
         int i = 0;
         while(i < 2)
         {
@@ -5307,12 +5245,12 @@ Slice::Operation::attributes() const
             {
                 freezeMD = (result == 0) ? ":supports" : ":required";
             }
-            
+
             //
             // Remove ":"
             //
             freezeMD = freezeMD.substr(1);
-            
+
             int i = 0;
             while(i < 4)
             {
@@ -5331,7 +5269,7 @@ Slice::Operation::attributes() const
                 }
                 i++;
             }
-            
+
             if(i == 4)
             {
                 emitWarning(definitionContext()->filename(), line(), "invalid freeze metadata for operation");
@@ -5689,56 +5627,6 @@ Slice::Unit::nextLine()
     _currentLine++;
 }
 
-#ifndef _WIN32
-namespace
-{
-string
-readLink(const string& orig)
-{
-    string result = orig;
-    string::size_type beg = 0;
-    string::size_type next = string::npos;
-    do
-    {
-        string subpath;
-        next = result.find('/', beg + 1);
-        if(next == string::npos)
-        {
-            subpath = result;
-        }
-        else
-        {
-            subpath = result.substr(0, next);
-        }
-
-        char buf[PATH_MAX + 1];
-        int len = static_cast<int>(readlink(subpath.c_str(), buf, sizeof(buf)));
-        if(len > 0)
-        {
-            buf[len] = '\0';
-            string linkpath = buf;
-            if(!IceUtilInternal::isAbsolutePath(linkpath)) // Path relative to the location of the link
-            {
-                string::size_type pos = subpath.rfind('/');
-                assert(pos != string::npos);
-                linkpath = subpath.substr(0, pos + 1) + linkpath;
-            }
-            result = normalizePath(linkpath) + (next != string::npos ? result.substr(next) : string());
-            beg = 0;
-            next = 0;
-        }
-        else
-        {
-            beg = next;
-        }
-    }
-    while(next != string::npos);
-    return result;
-}
-
-}
-#endif
-
 bool
 Slice::Unit::scanPosition(const char* s)
 {
@@ -5784,18 +5672,8 @@ Slice::Unit::scanPosition(const char* s)
 
     LineType type = File;
 
-    //
-    // We need to compare the file targets as one could be a symbolic link.
-    //
-#ifndef _WIN32
-    if(readLink(currentFile) == readLink(_topLevelFile))
-    {
-        currentFile = _topLevelFile;
-    }
-#endif
-
     if(_currentLine == 0)
-    {        
+    {
         if(_currentIncludeLevel > 0 || currentFile != _topLevelFile)
         {
             type = Push;
@@ -6196,12 +6074,12 @@ Slice::Unit::parse(const string& filename, FILE* file, bool debug, Slice::Featur
     pushDefinitionContext();
 
     //
-    // MCPP Fix: mcpp doesn't always output the first #line when mcpp_lib_main is 
-    // called repeatedly. We scan a fake #line here to ensure the top definition 
+    // MCPP Fix: mcpp doesn't always output the first #line when mcpp_lib_main is
+    // called repeatedly. We scan a fake #line here to ensure the top definition
     // context is correctly initialized.
     //
     scanPosition(string("#line 1 " + _topLevelFile).c_str());
-    
+
     slice_in = file;
     int status = slice_parse();
     if(_errors)
@@ -6358,7 +6236,7 @@ Slice::CICompare::operator()(const string& s1, const string& s2) const
 }
 
 #if defined(__SUNPRO_CC)
-bool 
+bool
 Slice::cICompare(const std::string& s1, const std::string& s2)
 {
     CICompare c;
@@ -6378,7 +6256,7 @@ Slice::DerivedToBaseCompare::operator()(const ExceptionPtr& e1, const ExceptionP
 }
 
 #if defined(__SUNPRO_CC)
-bool 
+bool
 Slice::derivedToBaseCompare(const ExceptionPtr& e1, const ExceptionPtr& e2)
 {
     return e2->isBaseOf(e1);