zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Slice/CPlusPlusUtil.h

@@ -1,72 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef C_PLUS_PLUS_UTIL_H
-#define C_PLUS_PLUS_UTIL_H
-
-#include <Slice/Parser.h>
-#include <IceUtil/OutputUtil.h>
-
-namespace Slice
-{
-
-extern std::string paramPrefix;
-
-struct ToIfdef
-{
-    char operator()(char);
-};
-
-void printHeader(::IceUtilInternal::Output&);
-void printVersionCheck(::IceUtilInternal::Output&);
-void printDllExportStuff(::IceUtilInternal::Output&, const std::string&);
-
-const int TypeContextInParam = 1;
-const int TypeContextAMIEnd = 2;
-const int TypeContextAMIPrivateEnd = 4;
-const int TypeContextAMICallPrivateEnd = 8;
-const int TypeContextUseWstring = 16;
-const int TypeContextLocal = 32;
-const int TypeContextCpp11 = 64;
-
-bool isMovable(const TypePtr&);
-
-std::string getUnqualified(const std::string&, const std::string&);
-std::string typeToString(const TypePtr&, const std::string& = "", const StringList& = StringList(), int = 0);
-std::string typeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
-std::string returnTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
-std::string inputTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
-std::string outputTypeToString(const TypePtr&, bool, const std::string& = "", const StringList& = StringList(), int = 0);
-std::string operationModeToString(Operation::Mode, bool = false);
-std::string opFormatTypeToString(const OperationPtr&, bool);
-
-std::string fixKwd(const std::string&);
-
-void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&,
-                               bool, const StringList& = StringList(), int = 0, const std::string& = "",
-                               bool = true, const std::string& = "");
-
-void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool,
-                      int = 0, const std::string& = "", const std::string& = "");
-void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0,
-                        const std::string& = "", const std::string& = "", const std::string& = "");
-void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, const std::string&,
-                       int = 0, const std::string& = "");
-
-std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
-void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false);
-void writeMarshalUnmarshalDataMemberInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, bool);
-void writeMarshalUnmarshalAllInHolder(IceUtilInternal::Output&, const std::string&, const DataMemberList&, bool, bool);
-void writeStreamHelpers(::IceUtilInternal::Output&, const ContainedPtr&, DataMemberList, bool, bool, bool);
-void writeIceTuple(::IceUtilInternal::Output&, DataMemberList, int);
-
-bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&);
-bool findMetaData(const std::string&, const StringList&, std::string&);
-std::string findMetaData(const StringList&, int = 0);
-bool inWstringModule(const SequencePtr&);
-
-std::string getDataMemberRef(const DataMemberPtr&);
-}
-
-#endif

data/dist/ice/cpp/src/Slice/Checksum.cpp

@@ -1,447 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Slice/Checksum.h>
-#include <Slice/MD5.h>
-#include <IceUtil/OutputUtil.h>
-
-using namespace std;
-using namespace Slice;
-
-namespace Slice
-{
-
-class ChecksumVisitor : public ParserVisitor
-{
-public:
-
-    ChecksumVisitor(ChecksumMap&);
-
-    virtual bool visitClassDefStart(const ClassDefPtr&);
-    virtual bool visitExceptionStart(const ExceptionPtr&);
-    virtual bool visitStructStart(const StructPtr&);
-    virtual void visitSequence(const SequencePtr&);
-    virtual void visitDictionary(const DictionaryPtr&);
-    virtual void visitEnum(const EnumPtr&);
-    virtual void visitConst(const ConstPtr&);
-
-private:
-
-    string typeToString(const TypePtr&);
-    void updateMap(const string&, const string&);
-
-    ChecksumMap& _map;
-};
-
-}
-
-Slice::ChecksumVisitor::ChecksumVisitor(ChecksumMap& m) :
-    _map(m)
-{
-}
-
-bool
-Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p)
-{
-    if(p->isLocal())
-    {
-        return false;
-    }
-
-    ClassList bases = p->bases();
-
-    ostringstream ostr;
-
-    if(p->isInterface())
-    {
-        ostr << "interface ";
-    }
-    else
-    {
-        ostr << "class ";
-    }
-
-    ostr << p->name();
-
-    if(p->compactId() >= 0)
-    {
-        ostr << '(' << p->compactId() << ')';
-    }
-
-    if(!bases.empty())
-    {
-        if(!bases.front()->isInterface())
-        {
-            ostr << " extends " << bases.front()->scoped();
-            bases.erase(bases.begin());
-        }
-        if(!bases.empty())
-        {
-            if(p->isInterface())
-            {
-                ostr << " extends ";
-            }
-            else
-            {
-                ostr << " implements ";
-            }
-            for(ClassList::iterator q = bases.begin(); q != bases.end(); ++q)
-            {
-                if(q != bases.begin())
-                {
-                    ostr << ", ";
-                }
-                ostr << (*q)->scoped();
-            }
-        }
-    }
-    ostr << endl;
-
-    if(p->hasDataMembers())
-    {
-        DataMemberList members = p->dataMembers();
-        DataMemberList optionals;
-        for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
-        {
-            if((*q)->optional())
-            {
-                optionals.push_back(*q);
-            }
-            else
-            {
-                ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl;
-            }
-        }
-
-        if(!optionals.empty())
-        {
-            //
-            // Sort optional parameters by tag.
-            //
-            class SortFn
-            {
-            public:
-                static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs)
-                {
-                    return lhs->tag() < rhs->tag();
-                }
-            };
-            optionals.sort(SortFn::compare);
-
-            for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q)
-            {
-                ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name();
-            }
-        }
-    }
-
-    if(p->hasOperations())
-    {
-        OperationList ops = p->operations();
-        for(OperationList::iterator q = ops.begin(); q != ops.end(); ++q)
-        {
-            ostr << typeToString((*q)->returnType()) << ' ';
-            if((*q)->returnIsOptional())
-            {
-                ostr << (*q)->returnTag() << ' ';
-            }
-            ostr << (*q)->name() << '(';
-            ParamDeclList params = (*q)->parameters();
-            ParamDeclList optionals;
-            for(ParamDeclList::iterator r = params.begin(); r != params.end(); ++r)
-            {
-                if((*r)->optional())
-                {
-                    optionals.push_back(*r);
-                }
-                else
-                {
-                    if(r != params.begin())
-                    {
-                        ostr << ", ";
-                    }
-                    if((*r)->isOutParam())
-                    {
-                        ostr << "out ";
-                    }
-                    ostr << typeToString((*r)->type()) << ' ' << (*r)->name();
-                }
-            }
-
-            if(!optionals.empty())
-            {
-                //
-                // Sort optional parameters by tag.
-                //
-                class SortFn
-                {
-                public:
-                    static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs)
-                    {
-                        return lhs->tag() < rhs->tag();
-                    }
-                };
-                optionals.sort(SortFn::compare);
-
-                for(ParamDeclList::iterator r = optionals.begin(); r != optionals.end(); ++r)
-                {
-                    if(r != optionals.begin() || params.size() > optionals.size())
-                    {
-                        ostr << ", ";
-                    }
-                    if((*r)->isOutParam())
-                    {
-                        ostr << "out ";
-                    }
-                    ostr << typeToString((*r)->type()) << ' ' << (*r)->tag() << ' ' << (*r)->name();
-                }
-            }
-
-            ostr << ')';
-            ExceptionList ex = (*q)->throws();
-            if(!ex.empty())
-            {
-                ostr << " throws ";
-                for(ExceptionList::iterator s = ex.begin(); s != ex.end(); ++s)
-                {
-                    if(s != ex.begin())
-                    {
-                        ostr << ", ";
-                    }
-                    ostr << (*s)->scoped();
-                }
-            }
-            ostr << endl;
-        }
-    }
-
-    updateMap(p->scoped(), ostr.str());
-
-    return false;
-}
-
-bool
-Slice::ChecksumVisitor::visitExceptionStart(const ExceptionPtr& p)
-{
-    if(p->isLocal())
-    {
-        return false;
-    }
-
-    ExceptionPtr base = p->base();
-
-    ostringstream ostr;
-
-    ostr << "exception " << p->name();
-    if(base)
-    {
-        ostr << " extends " << base->scoped();
-    }
-    ostr << endl;
-
-    DataMemberList members = p->dataMembers();
-    DataMemberList optionals;
-    for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
-    {
-        if((*q)->optional())
-        {
-            optionals.push_back(*q);
-        }
-        else
-        {
-            ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl;
-        }
-    }
-
-    if(!optionals.empty())
-    {
-        //
-        // Sort optional parameters by tag.
-        //
-        class SortFn
-        {
-        public:
-            static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs)
-            {
-                return lhs->tag() < rhs->tag();
-            }
-        };
-        optionals.sort(SortFn::compare);
-
-        for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q)
-        {
-            ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name();
-        }
-    }
-
-    updateMap(p->scoped(), ostr.str());
-
-    return false;
-}
-
-bool
-Slice::ChecksumVisitor::visitStructStart(const StructPtr& p)
-{
-    if(p->isLocal())
-    {
-        return false;
-    }
-
-    ostringstream ostr;
-
-    ostr << "struct " << p->name() << endl;
-
-    DataMemberList members = p->dataMembers();
-    for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q)
-    {
-        ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl;
-    }
-
-    updateMap(p->scoped(), ostr.str());
-
-    return false;
-}
-
-void
-Slice::ChecksumVisitor::visitSequence(const SequencePtr& p)
-{
-    if(p->isLocal())
-    {
-        return;
-    }
-
-    ostringstream ostr;
-    ostr << "sequence<" << typeToString(p->type()) << "> " << p->name() << endl;
-    updateMap(p->scoped(), ostr.str());
-}
-
-void
-Slice::ChecksumVisitor::visitDictionary(const DictionaryPtr& p)
-{
-    if(p->isLocal())
-    {
-        return;
-    }
-
-    ostringstream ostr;
-    ostr << "dictionary<" << typeToString(p->keyType()) << ", " << typeToString(p->valueType()) << "> " << p->name()
-         << endl;
-    updateMap(p->scoped(), ostr.str());
-}
-
-void
-Slice::ChecksumVisitor::visitEnum(const EnumPtr& p)
-{
-    if(p->isLocal())
-    {
-        return;
-    }
-
-    ostringstream ostr;
-
-    ostr << "enum " << p->name() << endl;
-
-    //
-    // Check if any of the enumerators were assigned an explicit value.
-    //
-    const bool explicitValue = p->explicitValue();
-
-    EnumeratorList enums = p->enumerators();
-    if(explicitValue)
-    {
-        //
-        // Sort enumerators by value.
-        //
-        class SortFn
-        {
-        public:
-            static bool compare(const EnumeratorPtr& lhs, const EnumeratorPtr& rhs)
-            {
-                return lhs->value() < rhs->value();
-            }
-        };
-        enums.sort(SortFn::compare);
-        for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q)
-        {
-            ostr << (*q)->name() << ' ' << IceUtilInternal::int64ToString((*q)->value()) << endl;
-        }
-    }
-    else
-    {
-        for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q)
-        {
-            ostr << (*q)->name() << endl;
-        }
-    }
-    updateMap(p->scoped(), ostr.str());
-}
-
-void
-Slice::ChecksumVisitor::visitConst(const ConstPtr& p)
-{
-    ostringstream ostr;
-    ostr << "const " << typeToString(p->type()) << ' ' << p->name() << " = " << p->value() << endl;
-    updateMap(p->scoped(), ostr.str());
-}
-
-string
-Slice::ChecksumVisitor::typeToString(const TypePtr& type)
-{
-    static const char* builtinTable[] =
-    {
-        "byte",
-        "boolean",
-        "short",
-        "int",
-        "long",
-        "float",
-        "double",
-        "string",
-        "Object",
-        "Object*",
-        "LocalObject"
-    };
-
-    if(!type)
-    {
-        return "void";
-    }
-
-    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-    if(builtin)
-    {
-        return builtinTable[builtin->kind()];
-    }
-
-    ProxyPtr proxy = ProxyPtr::dynamicCast(type);
-    if(proxy)
-    {
-        return proxy->_class()->scoped() + "*";
-    }
-
-    ContainedPtr cont = ContainedPtr::dynamicCast(type);
-    assert(cont);
-    return cont->scoped();
-}
-
-void
-Slice::ChecksumVisitor::updateMap(const string& scoped, const string& data)
-{
-    MD5 md5(reinterpret_cast<const unsigned char*>(data.c_str()), static_cast<int>(data.size()));
-    vector<unsigned char> bytes;
-    bytes.resize(16);
-    md5.getDigest(reinterpret_cast<unsigned char*>(&bytes[0]));
-    _map.insert(ChecksumMap::value_type(scoped, bytes));
-}
-
-Slice::ChecksumMap
-Slice::createChecksums(const UnitPtr& u)
-{
-    ChecksumMap result;
-
-    ChecksumVisitor visitor(result);
-    u->visit(&visitor, false);
-
-    return result;
-}

data/dist/ice/cpp/src/Slice/Checksum.h

@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef SLICE_CHECKSUM_H
-#define SLICE_CHECKSUM_H
-
-#include <Slice/Parser.h>
-#include <map>
-#include <vector>
-
-namespace Slice
-{
-
-typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap;
-
-ChecksumMap createChecksums(const UnitPtr&);
-
-}
-
-#endif