summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IcePack/ComponentBuilder.cpp8
-rw-r--r--cpp/src/Slice/JavaUtil.cpp20
-rw-r--r--cpp/src/slice2java/Gen.cpp68
3 files changed, 69 insertions, 27 deletions
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp
index 85757014f17..91a4da7d5ff 100644
--- a/cpp/src/IcePack/ComponentBuilder.cpp
+++ b/cpp/src/IcePack/ComponentBuilder.cpp
@@ -228,7 +228,7 @@ public:
catch(const ObjectExistsException& lex)
{
ostringstream os;
- os << "couldn't add the object:\n" << lex << ends;
+ os << "couldn't add the object:\n" << lex;
ObjectDeploymentException ex;
ex.reason = os.str();
@@ -238,7 +238,7 @@ public:
catch(const Ice::LocalException& lex)
{
ostringstream os;
- os << "couldn't contact the object registry:\n" << lex << ends;
+ os << "couldn't contact the object registry:\n" << lex;
ObjectDeploymentException ex;
ex.reason = os.str();
@@ -257,7 +257,7 @@ public:
catch(const ObjectNotExistException& ex)
{
ostringstream os;
- os << "couldn't remove the object:\n" << ex << ends;
+ os << "couldn't remove the object:\n" << ex;
ObjectDeploymentException ode;
ode.reason = os.str();
@@ -267,7 +267,7 @@ public:
catch(const Ice::LocalException& lex)
{
ostringstream os;
- os << "couldn't contact the object registry:\n" << lex << ends;
+ os << "couldn't contact the object registry:\n" << lex;
ObjectDeploymentException ex;
ex.reason = os.str();
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3b4c45f0d7c..8986ff98b3c 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -787,7 +787,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
out << sb;
out << nl << stream << ".writeSize(" << v << ".size());";
ostringstream o;
- o << "__i" << iter << ends;
+ o << "__i" << iter;
string it = o.str();
iter++;
out << nl << "java.util.Iterator " << it << " = " << v << ".iterator();";
@@ -865,7 +865,6 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
{
o << "[]";
}
- o << ends;
switch(b->kind())
{
case Builtin::KindByte:
@@ -974,7 +973,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
{
out << nl << stream << ".writeSize(" << v << ".size());";
ostringstream o;
- o << "__i" << iter << ends;
+ o << "__i" << iter;
iter++;
string it = o.str();
out << nl << "java.util.Iterator " << it << " = " << v << ".iterator();";
@@ -1126,7 +1125,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
<< "++)";
out << sb;
ostringstream o;
- o << v << "[__i" << iter << "]" << ends;
+ o << v << "[__i" << iter << "]";
iter++;
writeMarshalUnmarshalCode(out, scope, seq->type(), o.str(), true, iter, false);
out << eb;
@@ -1146,9 +1145,9 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
<< "++)";
out << sb;
ostringstream o;
- o << v << "[__i" << iter << "]" << ends;
+ o << v << "[__i" << iter << "]";
ostringstream patchParams;
- patchParams << v << ", __i" << iter << ends;
+ patchParams << v << ", __i" << iter;
writeMarshalUnmarshalCode(out, scope, seq->type(), o.str(), false, iter, false,
list<string>(), patchParams.str());
iter++;
@@ -1505,7 +1504,7 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
out << sb;
out << nl << stream << ".startWriteSequence(" << name << ", " << v << ".size());";
ostringstream o;
- o << "__i" << iter << ends;
+ o << "__i" << iter;
string it = o.str();
iter++;
out << nl << "java.util.Iterator " << it << " = " << v << ".iterator();";
@@ -1584,7 +1583,6 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
{
o << "[]";
}
- o << ends;
switch(b->kind())
{
case Builtin::KindByte:
@@ -1695,7 +1693,7 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
{
out << nl << stream << ".startWriteSequence(" << name << ", " << v << ".size());";
ostringstream o;
- o << "__i" << iter << ends;
+ o << "__i" << iter;
iter++;
string it = o.str();
out << nl << "java.util.Iterator " << it << " = " << v << ".iterator();";
@@ -1851,7 +1849,7 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
<< "++)";
out << sb;
ostringstream o;
- o << v << "[__i" << iter << "]" << ends;
+ o << v << "[__i" << iter << "]";
iter++;
writeGenericMarshalUnmarshalCode(out, scope, seq->type(), "\"e\"", o.str(), true, iter, false);
out << eb;
@@ -1872,7 +1870,7 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
<< "++)";
out << sb;
ostringstream o;
- o << v << "[__i" << iter << "]" << ends;
+ o << v << "[__i" << iter << "]";
iter++;
writeGenericMarshalUnmarshalCode(out, scope, seq->type(), "\"e\"", o.str(), false, iter, false);
out << eb;
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index b79d90f2f83..a68905eb785 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -354,7 +354,7 @@ Slice::JavaVisitor::writeHashCode(Output& out, const TypePtr& type, const string
<< "++)";
out << sb;
ostringstream elem;
- elem << name << "[__i" << iter << ']' << ends;
+ elem << name << "[__i" << iter << ']';
iter++;
writeHashCode(out, seq->type(), elem.str(), iter);
out << eb;
@@ -1323,7 +1323,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
DataMemberList allClassMembers = p->allClassDataMembers();
if(allClassMembers.size() != 0)
{
- out << sp << nl << "private class Patcher implements Ice.Patcher";
+ out << sp << nl << "private class Patcher implements IceInternal.Patcher";
out << sb;
if(allClassMembers.size() > 1)
{
@@ -1393,7 +1393,6 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
patchParams << classMemberCount++;
}
}
- patchParams << ends;
writeMarshalUnmarshalCode(out, scope, (*d)->type(), fixKwd((*d)->name()), false, iter, false, metaData,
patchParams.str());
}
@@ -1526,7 +1525,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
DataMemberList allClassMembers = p->allClassDataMembers();
if(allClassMembers.size() != 0)
{
- out << sp << nl << "private class Patcher implements Ice.Patcher";
+ out << sp << nl << "private class Patcher implements IceInternal.Patcher";
out << sb;
if(allClassMembers.size() > 1)
{
@@ -1594,7 +1593,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
patchParams << classMemberCount++;
}
}
- patchParams << ends;
list<string> metaData = (*d)->getMetaData();
writeMarshalUnmarshalCode(out, scope, (*d)->type(), fixKwd((*d)->name()), false, iter, false, metaData,
patchParams.str());
@@ -1828,7 +1826,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
if(classMembers.size() != 0)
{
- out << sp << nl << "private class Patcher implements Ice.Patcher";
+ out << sp << nl << "private class Patcher implements IceInternal.Patcher";
out << sb;
if(classMembers.size() > 1)
{
@@ -1891,7 +1889,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
patchParams << classMemberCount++;
}
}
- patchParams << ends;
list<string> metaData = (*d)->getMetaData();
writeMarshalUnmarshalCode(out, scope, (*d)->type(), fixKwd((*d)->name()), false, iter, false, metaData,
patchParams.str());
@@ -2261,7 +2258,7 @@ Slice::Gen::HolderVisitor::writeHolder(const TypePtr& p)
BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(p))
{
- out << sp << nl << "public class Patcher implements Ice.Patcher";
+ out << sp << nl << "public class Patcher implements IceInternal.Patcher";
out << sb;
out << nl << "public void";
out << nl << "patch(Ice.Object v)";
@@ -2604,7 +2601,7 @@ Slice::Gen::HelperVisitor::visitSequence(const SequencePtr& p)
//
// The sequence has class elements.
//
- out << sp << nl << "private static class Patcher implements Ice.Patcher";
+ out << sp << nl << "private static class Patcher implements IceInternal.Patcher";
out << sb;
out << sp << nl << "Patcher(" << typeS << " values, int index)";
out << sb;
@@ -2780,9 +2777,56 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
//
// The dictionary uses class values.
//
- out << sp << nl << "private static class Patcher implements Ice.Patcher";
+ out << sp << nl << "private static class Patcher implements IceInternal.Patcher";
out << sb;
- out << sp << nl << "Patcher(java.util.Map m, " << keyS << " key)";
+ string keyTypeS = keyS;
+ BuiltinPtr b = BuiltinPtr::dynamicCast(key);
+ if(b)
+ {
+ switch(b->kind())
+ {
+ case Builtin::KindByte:
+ {
+ keyTypeS = "java.lang.Byte";
+ break;
+ }
+ case Builtin::KindBool:
+ {
+ keyTypeS = "java.lang.Boolean";
+ break;
+ }
+ case Builtin::KindShort:
+ {
+ keyTypeS = "java.lang.Short";
+ break;
+ }
+ case Builtin::KindInt:
+ {
+ keyTypeS = "java.lang.Integer";
+ break;
+ }
+ case Builtin::KindLong:
+ {
+ keyTypeS = "java.lang.Long";
+ break;
+ }
+ case Builtin::KindFloat:
+ {
+ keyTypeS = "java.lang.Float";
+ break;
+ }
+ case Builtin::KindDouble:
+ {
+ keyTypeS = "java.lang.Double";
+ break;
+ }
+ default:
+ {
+ break; // Do nothing
+ }
+ }
+ }
+ out << sp << nl << "Patcher(java.util.Map m, " << keyTypeS << " key)";
out << sb;
out << nl << "__m = m;";
out << nl << "__key = key;";
@@ -2794,7 +2838,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
out << eb;
out << sp << nl << "private java.util.Map __m;";
- out << nl << "private " << keyS << " __key;";
+ out << nl << "private " << keyTypeS << " __key;";
out << eb;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 20:52:45 +0000