zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
-
+   
       Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -76,8 +76,8 @@ extern int slice_debug;
      ICE_IDEMPOTENT = 285,
      ICE_OPTIONAL = 286,
      ICE_VALUE = 287,
-     ICE_SCOPE_DELIMITER = 288,
-     ICE_IDENTIFIER = 289,
+     ICE_IDENTIFIER = 288,
+     ICE_SCOPED_IDENTIFIER = 289,
      ICE_STRING_LITERAL = 290,
      ICE_INTEGER_LITERAL = 291,
      ICE_FLOATING_POINT_LITERAL = 292,

data/ext/ice/cpp/src/Slice/GrammarUtil.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 SLICE_GRAMMAR_UTIL_H
 #define SLICE_GRAMMAR_UTIL_H
@@ -213,7 +208,6 @@ public:
 #define YYSTYPE Slice::GrammarBasePtr
 #define YY_DECL int slice_lex(YYSTYPE* yylvalp)
 YY_DECL;
-int slice_parse();
 
 //
 // I must set the initial stack depth to the maximum stack depth to

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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/StringUtil.h>
 #include <Slice/JavaUtil.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
@@ -144,7 +139,7 @@ public:
         static const string prefix = "java:";
 
         //
-        // Validate global metadata in the top-level file and all included files.
+        // Validate file metadata in the top-level file and all included files.
         //
         StringList files = p->allFiles();
 
@@ -171,7 +166,7 @@ public:
                     }
                     else
                     {
-                        dc->warning(InvalidMetaData, file, "",  "ignoring invalid global metadata `" + s + "'");
+                        dc->warning(InvalidMetaData, file, "",  "ignoring invalid file metadata `" + s + "'");
                         globalMetaData.remove(s);
                         continue;
                     }
@@ -231,9 +226,9 @@ public:
         TypePtr returnType = p->returnType();
         StringList metaData = getMetaData(p);
 
-        UnitPtr unit = p->unit();
+        UnitPtr unt = p->unit();
         string file = p->file();
-        DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        DefinitionContextPtr dc = unt->findDefinitionContext(p->file());
 
         if(!returnType)
         {
@@ -284,8 +279,8 @@ public:
 
         const string file =  p->file();
         const string line = p->line();
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(file);
 
         for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
         {
@@ -363,9 +358,9 @@ private:
         StringList metaData = cont->getMetaData();
         StringList result;
 
-        UnitPtr unit = cont->container()->unit();
+        UnitPtr unt = cont->container()->unit();
         string file = cont->file();
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = unt->findDefinitionContext(file);
         assert(dc);
 
         for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
@@ -431,6 +426,11 @@ private:
                     result.push_back(s);
                     continue;
                 }
+                else if(s.substr(prefix.size(), pos - prefix.size()) == "package")
+                {
+                    result.push_back(s);
+                    continue;
+                }
 
                 dc->warning(InvalidMetaData, cont->file(), cont->line(), "ignoring invalid metadata `" + s + "'");
             }
@@ -444,10 +444,11 @@ private:
         return result;
     }
 
-    StringList validateType(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file, const string& line)
+    StringList validateType(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
+                            const string& line)
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc = unt->findDefinitionContext(file);
         assert(dc);
         StringList newMetaData;
         for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
@@ -520,6 +521,18 @@ private:
                     dc->warning(InvalidMetaData, file, line, "ignoring invalid metadata `" + *i + "'");
                 }
             }
+            else if(i->find("java:package:") == 0)
+            {
+                ModulePtr m = ModulePtr::dynamicCast(p);
+                if(m && UnitPtr::dynamicCast(m->container()))
+                {
+                    newMetaData.push_back(*i);
+                }
+                else
+                {
+                    dc->warning(InvalidMetaData, file, line, "ignoring invalid metadata `" + *i + "'");
+                }
+            }
             else
             {
                 newMetaData.push_back(*i);
@@ -528,10 +541,11 @@ private:
         return newMetaData;
     }
 
-    StringList validateGetSet(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file, const string& line)
+    StringList validateGetSet(const SyntaxTreeBasePtr& p, const StringList& metaData, const string& file,
+                              const string& line)
     {
-        const UnitPtr unit = p->unit();
-        const DefinitionContextPtr dc= unit->findDefinitionContext(file);
+        const UnitPtr unt = p->unit();
+        const DefinitionContextPtr dc= unt->findDefinitionContext(file);
         assert(dc);
         StringList newMetaData;
         for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); ++i)
@@ -721,7 +735,7 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
             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);
@@ -760,7 +774,7 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix, const stri
     else
     {
         ostringstream os;
-        os << "cannot open file `" << path << "': " << strerror(errno);
+        os << "cannot open file `" << path << "': " << IceUtilInternal::errorToString(errno);
         throw FileException(__FILE__, __LINE__, os.str());
     }
 }
@@ -769,14 +783,9 @@ void
 Slice::JavaOutput::printHeader()
 {
     static const char* header =
-"// **********************************************************************\n"
-"//\n"
-"// Copyright (c) 2003-2017 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"
         ;
 
     print(header);
@@ -921,25 +930,51 @@ Slice::JavaCompatGenerator::convertScopedName(const string& scoped, const string
 string
 Slice::JavaCompatGenerator::getPackagePrefix(const ContainedPtr& cont) const
 {
-    UnitPtr unit = cont->container()->unit();
-    string file = cont->file();
-    assert(!file.empty());
-
-    map<string, string>::const_iterator p = _filePackagePrefix.find(file);
-    if(p != _filePackagePrefix.end())
+    //
+    // Traverse to the top-level module.
+    //
+    ModulePtr m;
+    ContainedPtr p = cont;
+    while(true)
     {
-        return p->second;
+        if(ModulePtr::dynamicCast(p))
+        {
+            m = ModulePtr::dynamicCast(p);
+        }
+
+        ContainerPtr c = p->container();
+        p = ContainedPtr::dynamicCast(c); // This cast fails for Unit.
+        if(!p)
+        {
+            break;
+        }
     }
 
+    assert(m);
+
+    //
+    // The java:package metadata can be defined as file metadata or applied to a top-level module.
+    // We check for the metadata at the top-level module first and then fall back to the global scope.
+    //
     static const string prefix = "java:package:";
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
-    assert(dc);
-    string q = dc->findMetaData(prefix);
+
+    string q;
+    if(!m->findMetaData(prefix, q))
+    {
+        UnitPtr ut = cont->unit();
+        string file = cont->file();
+        assert(!file.empty());
+
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
+        assert(dc);
+        q = dc->findMetaData(prefix);
+    }
+
     if(!q.empty())
     {
         q = q.substr(prefix.size());
     }
-    _filePackagePrefix[file] = q;
+
     return q;
 }
 
@@ -964,7 +999,17 @@ Slice::JavaCompatGenerator::getPackage(const ContainedPtr& cont) const
 }
 
 string
-Slice::JavaCompatGenerator::getAbsolute(const ContainedPtr& cont,
+Slice::JavaCompatGenerator::getUnqualified(const std::string& type, const std::string& package) const
+{
+    if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
+    {
+        return type.substr(package.size() + 1);
+    }
+    return type;
+}
+
+string
+Slice::JavaCompatGenerator::getUnqualified(const ContainedPtr& cont,
                                         const string& package,
                                         const string& prefix,
                                         const string& suffix) const
@@ -1003,11 +1048,11 @@ Slice::JavaCompatGenerator::getStaticId(const TypePtr& type, const string& packa
     }
     else if(cl->isInterface())
     {
-        return getAbsolute(cl, package, "_", "Disp") + ".ice_staticId()";
+        return getUnqualified(cl, package, "_", "Disp") + ".ice_staticId()";
     }
     else
     {
-        return getAbsolute(cl, package) + ".ice_staticId()";
+        return getUnqualified(cl, package) + ".ice_staticId()";
     }
 }
 
@@ -1236,13 +1281,13 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return getAbsolute(cl, package, "", mode == TypeModeOut ? "Holder" : "");
+        return getUnqualified(cl, package, "", mode == TypeModeOut ? "Holder" : "");
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return getAbsolute(proxy->_class(), package, "", mode == TypeModeOut ? "PrxHolder" : "Prx");
+        return getUnqualified(proxy->_class(), package, "", mode == TypeModeOut ? "PrxHolder" : "Prx");
     }
 
     DictionaryPtr dict = DictionaryPtr::dynamicCast(type);
@@ -1260,7 +1305,7 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
             getDictionaryTypes(dict, "", StringList(), origInstanceType, origFormalType);
             if(formalType == origFormalType && instanceType == origInstanceType)
             {
-                return getAbsolute(dict, package, "", "Holder");
+                return getUnqualified(dict, package, "", "Holder");
             }
 
             //
@@ -1295,7 +1340,7 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
                 getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType);
                 if(formalType == origFormalType && instanceType == origInstanceType)
                 {
-                    return getAbsolute(seq, package, "", "Holder");
+                    return getUnqualified(seq, package, "", "Holder");
                 }
             }
 
@@ -1319,11 +1364,11 @@ Slice::JavaCompatGenerator::typeToString(const TypePtr& type,
     {
         if(mode == TypeModeOut)
         {
-            return getAbsolute(contained, package, "", "Holder");
+            return getUnqualified(contained, package, "", "Holder");
         }
         else
         {
-            return getAbsolute(contained, package);
+            return getUnqualified(contained, package);
         }
     }
 
@@ -2137,7 +2182,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
                 }
             }
 
-            string ignore;
+            string ignored;
             const size_t wireSize = elemType->minWireSize();
 
             if(marshal)
@@ -2165,8 +2210,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
                     writeSequenceMarshalUnmarshalCode(out, package, seq, s, marshal, iter, true, customStream, metaData);
                     out << nl << stream << ".endSize(pos);";
                 }
-                else if(findMetaData("java:type:", metaData, ignore) ||
-                        findMetaData("java:type:", seq->getMetaData(), ignore))
+                else if(findMetaData("java:type:", metaData, ignored) ||
+                        findMetaData("java:type:", seq->getMetaData(), ignored))
                 {
                     //
                     // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
@@ -2192,8 +2237,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
                     }
                     writeSequenceMarshalUnmarshalCode(out, package, seq, tmpName, marshal, iter, true, customStream, metaData);
                 }
-                else if(findMetaData("java:protobuf:", seq->getMetaData(), ignore) ||
-                        findMetaData("java:serializable:", seq->getMetaData(), ignore))
+                else if(findMetaData("java:protobuf:", seq->getMetaData(), ignored) ||
+                        findMetaData("java:serializable:", seq->getMetaData(), ignored))
                 {
                     //
                     // This just writes a byte sequence.
@@ -2254,8 +2299,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
                 }
                 else if(wireSize > 1)
                 {
-                    if(findMetaData("java:type:", metaData, ignore) ||
-                       findMetaData("java:type:", seq->getMetaData(), ignore))
+                    if(findMetaData("java:type:", metaData, ignored) ||
+                       findMetaData("java:type:", seq->getMetaData(), ignored))
                     {
                         //
                         // The sequence is an instance of java.util.List<E>, where E is a fixed-size type.
@@ -2263,8 +2308,8 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
 
                         out << nl << stream << ".skipSize();";
                     }
-                    else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignore) &&
-                            !findMetaData("java:serializable:", seq->getMetaData(), ignore))
+                    else if(!findMetaData("java:protobuf:", seq->getMetaData(), ignored) &&
+                            !findMetaData("java:serializable:", seq->getMetaData(), ignored))
                     {
                         out << nl << stream << ".skipSize();";
                     }
@@ -2295,7 +2340,7 @@ Slice::JavaCompatGenerator::writeMarshalUnmarshalCode(Output& out,
 
     ConstructedPtr constructed = ConstructedPtr::dynamicCast(type);
     assert(constructed);
-    string typeS = getAbsolute(constructed, package, "", "Helper");
+    string typeS = getUnqualified(constructed, package, "", "Helper");
     if(marshal)
     {
         out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2355,7 +2400,7 @@ Slice::JavaCompatGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
     //
     if(useHelper)
     {
-        string typeS = getAbsolute(dict, package, "", "Helper");
+        string typeS = getUnqualified(dict, package, "", "Helper");
         if(marshal)
         {
             out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2663,7 +2708,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     //
     if(useHelper)
     {
-        string typeS = getAbsolute(seq, package, "", "Helper");
+        string typeS = getUnqualified(seq, package, "", "Helper");
         if(marshal)
         {
             out << nl << typeS << ".write(" << stream << ", " << v << ");";
@@ -2704,7 +2749,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        string typeS = getAbsolute(seq, package);
+        string typeS = getUnqualified(seq, package);
         ostringstream o;
         o << origContentS;
         int d = depth;
@@ -2722,7 +2767,7 @@ Slice::JavaCompatGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             out << nl << "else";
             out << sb;
             out << nl << stream << ".writeSize(" << v << ".size());";
-            string typeS = typeToString(type, TypeModeIn, package);
+            typeS = typeToString(type, TypeModeIn, package);
             out << nl << "for(" << typeS << " elem : " << v << ')';
             out << sb;
             writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, false, customStream);
@@ -3153,8 +3198,8 @@ Slice::JavaCompatGenerator::getSequenceTypes(const SequencePtr& seq,
         {
             string prefix = "java:buffer";
             string meta;
-            string ignore;
-            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignore))
+            string ignored;
+            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
             {
                 instanceType = formalType = typeToBufferString(seq->type());
                 return true;
@@ -3365,25 +3410,51 @@ Slice::JavaGenerator::convertScopedName(const string& scoped, const string& pref
 string
 Slice::JavaGenerator::getPackagePrefix(const ContainedPtr& cont) const
 {
-    UnitPtr unit = cont->container()->unit();
-    string file = cont->file();
-    assert(!file.empty());
-
-    map<string, string>::const_iterator p = _filePackagePrefix.find(file);
-    if(p != _filePackagePrefix.end())
+    //
+    // Traverse to the top-level module.
+    //
+    ModulePtr m;
+    ContainedPtr p = cont;
+    while(true)
     {
-        return p->second;
+        if(ModulePtr::dynamicCast(p))
+        {
+            m = ModulePtr::dynamicCast(p);
+        }
+
+        ContainerPtr c = p->container();
+        p = ContainedPtr::dynamicCast(c); // This cast fails for Unit.
+        if(!p)
+        {
+            break;
+        }
     }
 
+    assert(m);
+
+    //
+    // The java:package metadata can be defined as file metadata or applied to a top-level module.
+    // We check for the metadata at the top-level module first and then fall back to the global scope.
+    //
     static const string prefix = "java:package:";
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
-    assert(dc);
-    string q = dc->findMetaData(prefix);
+
+    string q;
+    if(!m->findMetaData(prefix, q))
+    {
+        UnitPtr ut = cont->unit();
+        string file = cont->file();
+        assert(!file.empty());
+
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
+        assert(dc);
+        q = dc->findMetaData(prefix);
+    }
+
     if(!q.empty())
     {
         q = q.substr(prefix.size());
     }
-    _filePackagePrefix[file] = q;
+
     return q;
 }
 
@@ -3408,7 +3479,17 @@ Slice::JavaGenerator::getPackage(const ContainedPtr& cont) const
 }
 
 string
-Slice::JavaGenerator::getAbsolute(const ContainedPtr& cont,
+Slice::JavaGenerator::getUnqualified(const std::string& type, const std::string& package) const
+{
+    if(type.find(".") != string::npos && type.find(package) == 0 && type.find(".", package.size() + 1) == string::npos)
+    {
+        return type.substr(package.size() + 1);
+    }
+    return type;
+}
+
+string
+Slice::JavaGenerator::getUnqualified(const ContainedPtr& cont,
                                   const string& package,
                                   const string& prefix,
                                   const string& suffix) const
@@ -3443,15 +3524,15 @@ Slice::JavaGenerator::getStaticId(const TypePtr& type, const string& package) co
 
     if(b && b->kind() == Builtin::KindObject)
     {
-        return "com.zeroc.Ice.Object.ice_staticId()";
+        return getUnqualified("com.zeroc.Ice.Object", package) + ".ice_staticId()";
     }
     else if(b && b->kind() == Builtin::KindValue)
     {
-        return "com.zeroc.Ice.Value.ice_staticId()";
+        return getUnqualified("com.zeroc.Ice.Value", package) + ".ice_staticId()";
     }
     else
     {
-        return getAbsolute(cl, package) + ".ice_staticId()";
+        return getUnqualified(cl, package) + ".ice_staticId()";
     }
 }
 
@@ -3569,21 +3650,6 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
                                    bool local) const
 {
     static const char* builtinTable[] =
-    {
-        "byte",
-        "boolean",
-        "short",
-        "int",
-        "long",
-        "float",
-        "double",
-        "String",
-        "com.zeroc.Ice.Value",
-        "com.zeroc.Ice.ObjectPrx",
-        "java.lang.Object",
-        "com.zeroc.Ice.Value"
-    };
-    static const char* builtinLocalTable[] =
     {
         "byte",
         "boolean",
@@ -3598,6 +3664,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
         "java.lang.Object",
         "com.zeroc.Ice.Value"
     };
+
     static const char* builtinOptionalTable[] =
     {
         "java.util.Optional<java.lang.Byte>",
@@ -3649,7 +3716,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
                 case Builtin::KindFloat:
                 case Builtin::KindDouble:
                 {
-                    return builtinOptionalTable[builtin->kind()];
+                    return getUnqualified(builtinOptionalTable[builtin->kind()], package);
                 }
                 case Builtin::KindString:
                 case Builtin::KindObject:
@@ -3663,7 +3730,14 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
         }
         else
         {
-            return local ? builtinLocalTable[builtin->kind()] : builtinTable[builtin->kind()];
+            if(!local && builtin->kind() == Builtin::KindObject)
+            {
+                return getUnqualified(builtinTable[Builtin::KindValue], package);
+            }
+            else
+            {
+                return getUnqualified(builtinTable[builtin->kind()], package);
+            }
         }
     }
 
@@ -3678,11 +3752,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
     {
         if(cl->isInterface() && !local)
         {
-            return "com.zeroc.Ice.Value";
+            return getUnqualified("com.zeroc.Ice.Value", package);
         }
         else
         {
-            return getAbsolute(cl, package);
+            return getUnqualified(cl, package);
         }
     }
 
@@ -3690,14 +3764,13 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
     if(proxy)
     {
         ClassDefPtr def = proxy->_class()->definition();
-        assert(def);
-        if(def->isAbstract())
+        if(!def || def->isAbstract())
         {
-            return getAbsolute(proxy->_class(), package, "", "Prx");
+            return getUnqualified(proxy->_class(), package, "", "Prx");
         }
         else
         {
-            return "com.zeroc.Ice.ObjectPrx";
+            return getUnqualified("com.zeroc.Ice.ObjectPrx", package);
         }
     }
 
@@ -3722,11 +3795,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
     {
         if(mode == TypeModeOut)
         {
-            return getAbsolute(contained, package, "", "Holder");
+            return getUnqualified(contained, package, "", "Holder");
         }
         else
         {
-            return getAbsolute(contained, package);
+            return getUnqualified(contained, package);
         }
     }
 
@@ -4003,7 +4076,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 //
                 // If we can use the helper, it's easy.
                 //
-                string helper = getAbsolute(dict, package, "", "Helper");
+                string helper = getUnqualified(dict, package, "", "Helper");
                 if(marshal)
                 {
                     out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
@@ -4098,7 +4171,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
     {
         if(optionalParam || mode == OptionalMember)
         {
-            string ignore;
+            string ignored;
             TypePtr elemType = seq->type();
             BuiltinPtr eltBltin = BuiltinPtr::dynamicCast(elemType);
             if(!hasTypeMetaData(seq, metaData) && eltBltin && eltBltin->kind() < Builtin::KindObject)
@@ -4115,7 +4188,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                     return;
                 }
             }
-            else if(findMetaData("java:serializable", seq->getMetaData(), ignore))
+            else if(findMetaData("java:serializable", seq->getMetaData(), ignored))
             {
                 if(marshal)
                 {
@@ -4129,15 +4202,15 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 }
             }
             else if(!hasTypeMetaData(seq, metaData) ||
-                    findMetaData("java:type", seq->getMetaData(), ignore) ||
-                    findMetaData("java:type", metaData, ignore))
+                    findMetaData("java:type", seq->getMetaData(), ignored) ||
+                    findMetaData("java:type", metaData, ignored))
             {
                 string instanceType, formalType, origInstanceType, origFormalType;
                 getSequenceTypes(seq, "", metaData, instanceType, formalType, false);
                 getSequenceTypes(seq, "", StringList(), origInstanceType, origFormalType, false);
                 if(formalType == origFormalType && (marshal || instanceType == origInstanceType))
                 {
-                    string helper = getAbsolute(seq, package, "", "Helper");
+                    string helper = getUnqualified(seq, package, "", "Helper");
                     if(marshal)
                     {
                         out << nl << helper << ".write" << spar << stream << tag << param << epar << ";";
@@ -4181,10 +4254,10 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                     string s = optionalParam && optionalMapping ? param + ".get()" : param;
                     if(sz > 1)
                     {
-                        string ignore;
+                        string ignored2;
                         out << nl << "final int optSize = " << s << " == null ? 0 : ";
-                        if(findMetaData("java:buffer", seq->getMetaData(), ignore) ||
-                           findMetaData("java:buffer", metaData, ignore))
+                        if(findMetaData("java:buffer", seq->getMetaData(), ignored2) ||
+                           findMetaData("java:buffer", metaData, ignored2))
                         {
                             out << s << ".remaining() / " << sz << ";";
                         }
@@ -4317,7 +4390,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
         //
         // If we can use the helper, it's easy.
         //
-        string helper = getAbsolute(dict, package, "", "Helper");
+        string helper = getUnqualified(dict, package, "", "Helper");
         if(marshal)
         {
             out << nl << helper << ".write" << spar << stream << v << epar << ";";
@@ -4386,7 +4459,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
             out << nl << "final " << keyS << " key;";
             writeMarshalUnmarshalCode(out, package, key, OptionalNone, false, 0, "key", false, iter, customStream);
 
-            string valueS = typeToObjectString(value, TypeModeIn, package);
+            valueS = typeToObjectString(value, TypeModeIn, package);
             ostringstream patchParams;
             patchParams << "value -> " << v << ".put(key, value), " << valueS << ".class";
             writeMarshalUnmarshalCode(out, package, value, OptionalNone, false, 0, "value", false, iter, customStream,
@@ -4546,7 +4619,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
         //
         // If we can use the helper, it's easy.
         //
-        string helper = getAbsolute(seq, package, "", "Helper");
+        string helper = getUnqualified(seq, package, "", "Helper");
         if(marshal)
         {
             out << nl << helper << ".write" << spar << stream << v << epar << ";";
@@ -4587,7 +4660,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        string typeS = getAbsolute(seq, package);
+        typeS = getUnqualified(seq, package);
         ostringstream o;
         o << origContentS;
         int d = depth;
@@ -4605,8 +4678,8 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             out << nl << "else";
             out << sb;
             out << nl << stream << ".writeSize(" << v << ".size());";
-            string typeS = typeToString(type, TypeModeIn, package);
-            out << nl << "for(" << typeS << " elem : " << v << ')';
+            string ctypeS = typeToString(type, TypeModeIn, package);
+            out << nl << "for(" << ctypeS << " elem : " << v << ')';
             out << sb;
             writeMarshalUnmarshalCode(out, package, type, OptionalNone, false, 0, "elem", true, iter, customStream);
             out << eb;
@@ -5028,8 +5101,8 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
         {
             string prefix = "java:buffer";
             string meta;
-            string ignore;
-            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignore))
+            string ignored;
+            if(seq->findMetaData(prefix, meta) || findMetaData(prefix, metaData, ignored))
             {
                 instanceType = formalType = typeToBufferString(seq->type());
                 return true;