summaryrefslogtreecommitdiff
path: root/CIAO/CIDLC/ServantSourceGenerator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/CIDLC/ServantSourceGenerator.cpp')
-rw-r--r--CIAO/CIDLC/ServantSourceGenerator.cpp458
1 files changed, 180 insertions, 278 deletions
diff --git a/CIAO/CIDLC/ServantSourceGenerator.cpp b/CIAO/CIDLC/ServantSourceGenerator.cpp
index 25562a84b7b..f4d715b523d 100644
--- a/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -99,14 +99,13 @@ namespace
virtual void
receives_none (Type&)
{
- os << " (" << endl
- << STRS[ENV_SNGL_ARG] << ");";
+ os << " ();";
}
virtual void
receives_post (Type&)
{
- os << endl << STRS[ENV_ARG] << ");";
+ os << endl << ");";
}
/// If we don't do this, the comma() method just below
@@ -174,10 +173,8 @@ namespace
OperationEmitter (Context& c,
T& scope)
: EmitterBase (c),
- scope_ (scope),
- ace_check_return_emitter_ (c)
+ scope_ (scope)
{
- ace_check_returns_.node_traverser (ace_check_return_emitter_);
}
// Overridden by facet and home operation emitters to do nothing.
@@ -189,11 +186,7 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-
- Traversal::Operation::returns (o, ace_check_returns_);
-
- os << endl;
+ os << "this->activate_component ();" << endl;
}
}
@@ -213,14 +206,13 @@ namespace
virtual void
receives_none (Type&)
{
- os << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl;
+ os << " ()" << endl;
}
virtual void
receives_post (Type&)
{
- os << endl << STRS[ENV_SRC] << ")" << endl;
+ os << endl << ")" << endl;
}
virtual void
@@ -275,8 +267,6 @@ namespace
protected:
T& scope_;
- AceCheckReturnEmitter ace_check_return_emitter_;
- Traversal::Returns ace_check_returns_;
};
struct FacetEmitter : Traversal::UnconstrainedInterface,
@@ -345,7 +335,7 @@ namespace
Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
os << " " << a.name () << endl
- << STRS[ENV_SRC] << ")" << endl;
+ << ")" << endl;
}
};
@@ -387,7 +377,7 @@ namespace
{
os << scope_.name () << "_Servant_T<T>::"
<< a.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl;
+ << ")" << endl;
}
// ReadAttribute
@@ -412,7 +402,7 @@ namespace
{
os << scope_.name () << "_Servant_T<T>::"
<< a.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl;
+ << ")" << endl;
}
};
@@ -507,28 +497,28 @@ namespace
os << "template <typename T>" << endl
<< "::CORBA::Object_ptr" << endl
<< i.name () << "_Servant_T<T>::_get_component (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< STRS[COMP_SC] << "_var sc =" << endl
<< " " << STRS[COMP_SC] << "::_narrow (" << endl
<< " this->ctx_.in ()" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+ << " " << ");"
+ << endl
<< "if (! ::CORBA::is_nil (sc.in ()))" << endl
<< "{"
<< "return sc->get_CCM_object (" << endl
- << STRS[ENV_SNGL_ARG] << ");"
+ << ");"
<< "}"
<< "::Components::EntityContext_var ec =" << endl
<< "::Components::EntityContext::_narrow (" << endl
<< "this->ctx_.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+ << ");"
+ << endl
<< "if (! ::CORBA::is_nil (ec.in ()))" << endl
<< "{"
<< "return ec->get_CCM_object (" << endl
- << STRS[ENV_SNGL_ARG] << ");"
+ << ");"
<< "}"
<< STRS[ACE_TR] << " ( ::CORBA::INTERNAL (), 0);" << endl
<< "}" << endl;
@@ -574,7 +564,7 @@ namespace
os << "_ptr" << endl
<< scope_.name () << "_Context::get_connection_"
<< u.name () << " (" << endl
- << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "return ";
@@ -592,8 +582,7 @@ namespace
Traversal::SingleUserData::belongs (u, belongs_);
- os << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_AC] << "," << endl
@@ -602,11 +591,11 @@ namespace
<< "if (! ::CORBA::is_nil (this->ciao_uses_"
<< u.name () << "_.in ()))" << endl
<< "{"
- << "ACE_THROW ( " << STRS[EXCP_AC] << " ());"
+ << "throw " << STRS[EXCP_AC] << " ();"
<< "}"
<< "if ( ::CORBA::is_nil (c))" << endl
<< "{"
- << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
+ << "throw " << STRS[EXCP_IC] << " ();"
<< "}"
<< "this->ciao_uses_" << u.name () << "_ =" << endl
<< " ";
@@ -620,8 +609,7 @@ namespace
os << "_ptr" << endl
<< scope_.name () << "_Context::disconnect_"
- << u.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << u.name () << " ()" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_NC] << "))" << endl
@@ -647,7 +635,7 @@ namespace
os << u.scoped_name () << "Connections *" << endl
<< scope_.name () << "_Context::get_connections_"
<< u.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< u.scoped_name () << "Connections *tmp_retv = 0;"
@@ -686,8 +674,8 @@ namespace
os << "::_narrow (" << endl
<< "entry.int_id_.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ << ");"
+ << endl;
os << "ACE_NEW_THROW_EX ("
<< "retv[i].ck.inout ()," << endl
@@ -705,8 +693,7 @@ namespace
Traversal::MultiUserData::belongs (u, belongs_);
- os << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "," << endl
@@ -751,8 +738,7 @@ namespace
os << "_ptr" << endl
<< scope_.name () << "_Context::disconnect_"
<< u.name () << " (" << endl
- << STRS[COMP_CK] << " * ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_CK] << " * ck)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IC] << "))" << endl
@@ -799,7 +785,7 @@ namespace
Traversal::PublisherData::belongs (p, belongs_);
os << " *ev" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "for (ACE_Active_Map_Manager< " << endl
@@ -820,8 +806,7 @@ namespace
os << " (" << endl
<< "ev" << endl
- << STRS[ENV_ARG] << ");"
- << "ACE_CHECK;" << endl
+ << ");" << endl
<< "}";
// @@ GD Modified Code Below
@@ -850,8 +835,7 @@ namespace
Traversal::PublisherData::belongs (p, simple_belongs_);
os << endl
- << STRS[ENV_ARG] << ");"
- << "ACE_CHECK;" << endl
+ << ");" << endl
<< "}"
<< "}";
@@ -861,8 +845,7 @@ namespace
Traversal::PublisherData::belongs (p, belongs_);
- os << "Consumer_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "Consumer_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "))" << endl
@@ -895,8 +878,7 @@ namespace
os << STRS[COMP_CK] << " *" << endl
<< scope_.name () << "_Context::subscribe_"
<< p.name () << "_generic (" << endl
- << STRS[COMP_ECB] << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_ECB] << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "))" << endl
@@ -925,8 +907,7 @@ namespace
os << "Consumer_ptr" << endl
<< scope_.name () << "_Context::unsubscribe_"
<< p.name () << " (" << endl
- << STRS[COMP_CK] << " *ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_CK] << " *ck)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IC] << "))" << endl
@@ -982,7 +963,7 @@ namespace
Traversal::EmitterData::belongs (e, belongs_);
os << " *ev" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "this->ciao_emits_" << e.name ()
@@ -992,7 +973,7 @@ namespace
os << " (" << endl
<< "ev" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
os << "void" << endl
@@ -1001,20 +982,19 @@ namespace
Traversal::EmitterData::belongs (e, belongs_);
- os << "Consumer_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "Consumer_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_AC] << "))" << endl
<< "{"
<< "if ( ::CORBA::is_nil (c))" << endl
<< "{"
- << "ACE_THROW ( ::CORBA::BAD_PARAM ());" << endl
+ << "throw ::CORBA::BAD_PARAM ();" << endl
<< "}"
<< "if (! ::CORBA::is_nil (this->ciao_emits_" << e.name ()
<< "_consumer_.in ()))" << endl
<< "{"
- << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" << endl
+ << "throw " << STRS[EXCP_AC] << " ();" << endl
<< "}"
<< "this->ciao_emits_" << e.name ()
<< "_consumer_ = " << endl;
@@ -1028,8 +1008,7 @@ namespace
os << "Consumer_ptr" << endl
<< scope_.name () << "_Context::disconnect_"
- << e.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << e.name () << " ()" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_NC] << "))" << endl
@@ -1116,8 +1095,8 @@ namespace
os << "Consumer::_narrow (" << endl
<< "e.int_id_.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl
+ << ");"
+ << endl
<< "if ( ::CORBA::is_nil (c.in ()))"
<< "{"
<< STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1226,8 +1205,7 @@ namespace
os << STRS[COMP_CD] << " *" << endl
<< t.name () << "_Context::get_registered_consumers (" << endl
- << "const char *publisher_name" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << "const char *publisher_name)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -1272,7 +1250,7 @@ namespace
os << t.name () << "_Context *" << endl
<< t.name () << "_Context::_narrow (" << endl
<< STRS[COMP_SC] << "_ptr p" << endl
- << STRS[ENV_SRC_NOTUSED] << ")" << endl
+ << ")" << endl
<< "{"
<< "return dynamic_cast<" << t.name () << "_Context *> (p);"
<< endl
@@ -1315,17 +1293,16 @@ namespace
os << "Consumer::_narrow (" << endl
<< " consumer" << endl
- << " " << STRS[ENV_ARG] << ");"
- << "ACE_CHECK;" << endl
+ << " " << ");" << endl
<< "if ( ::CORBA::is_nil (_ciao_consumer.in ()))" << endl
<< "{"
- << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
+ << "throw " << STRS[EXCP_IC] << " ();"
<< endl
<< "}"
<< "this->connect_" << t.name ()
<< " (" << endl
<< "_ciao_consumer.in ()" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "return;"
<< "}";
}
@@ -1350,7 +1327,7 @@ namespace
<< t.name ().unescaped_str () << "\") == 0)" << endl
<< "{"
<< "return this->disconnect_" << t.name ()
- << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+ << " ();" << endl
<< "}";
}
};
@@ -1369,7 +1346,7 @@ namespace
<< t.name ().unescaped_str () << "\") == 0)" << endl
<< "{"
<< "return this->executor_->get_" << t.name ()
- << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+ << " ();" << endl
<< "}";
}
};
@@ -1395,8 +1372,7 @@ namespace
Traversal::PublisherData::belongs (p, belongs_);
- os << "Consumer_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "Consumer_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "))" << endl
@@ -1407,21 +1383,20 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "return this->context_->subscribe_" << p.name ()
<< " (" << endl
<< "c" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
os << STRS[COMP_CK] << " *" << endl
<< scope_.name ()
<< "_Servant::subscribe_" << p.name () << "_generic (" << endl
- << STRS[COMP_ECB] << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_ECB] << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "))" << endl
@@ -1429,14 +1404,14 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "return this->context_->subscribe_" << p.name ()
<< "_generic (" << endl
<< "c" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
Traversal::PublisherData::belongs (p, belongs_);
@@ -1444,8 +1419,7 @@ namespace
os << "Consumer_ptr" << endl
<< scope_.name ()
<< "_Servant::unsubscribe_" << p.name () << " (" << endl
- << STRS[COMP_CK] << " *ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_CK] << " *ck)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IC] << "))" << endl
@@ -1453,18 +1427,14 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::PublisherData::belongs (p, belongs_);
-
- os << "Consumer::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "return this->context_->unsubscribe_"
<< p.name () << " (" << endl
<< "ck" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
@@ -1500,8 +1470,8 @@ namespace
os << "::_narrow (" << endl
<< "connection" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl
+ << ");"
+ << endl
<< "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
<< "{"
<< STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1510,8 +1480,8 @@ namespace
<< "// Simplex connect." << endl
<< "this->connect_" << u.name () << " (" << endl
<< "_ciao_conn.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl
+ << ");"
+ << endl
<< "return 0;" << endl
<< "}";
}
@@ -1531,8 +1501,8 @@ namespace
os << "::_narrow (" << endl
<< "connection" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl
+ << ");"
+ << endl
<< "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
<< "{"
<< STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1541,7 +1511,7 @@ namespace
<< "// Multiplex connect." << endl
<< "return this->connect_" << u.name () << " (" << endl
<< "_ciao_conn.in ()" << endl
- << STRS[ENV_ARG] << ");"
+ << ");"
<< "}";
}
@@ -1567,7 +1537,7 @@ namespace
<< "{"
<< "// Simplex disconnect." << endl
<< "return this->disconnect_" << u.name ()
- << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+ << " ();" << endl
<< "}";
}
@@ -1586,7 +1556,7 @@ namespace
<< "}"
<< "return this->disconnect_" << u.name () << " (" << endl
<< "ck" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
};
@@ -1612,8 +1582,7 @@ namespace
Traversal::SingleUserData::belongs (u, belongs_);
- os << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_AC] << "," << endl
@@ -1622,7 +1591,7 @@ namespace
<< "this->context_->connect_" << u.name () << " ("
<< endl
<< "c" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "this->add_receptacle (\"" << u.name ().unescaped_str ()
<< "\", c, 0);" << endl
<< "}";
@@ -1631,15 +1600,14 @@ namespace
os << "_ptr" << endl
<< scope_.name () << "_Servant::disconnect_"
- << u.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << u.name () << " ()" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_NC] << "))" << endl
<< "{"
<< "return this->context_->disconnect_" << u.name ()
<< " (" << endl
- << STRS[ENV_SNGL_ARG] << ");" << endl
+ << ");" << endl
<< "}";
Traversal::SingleUserData::belongs (u, belongs_);
@@ -1648,12 +1616,12 @@ namespace
<< scope_.name ()
<< "_Servant::get_connection_" << u.name ()
<< " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "return this->context_->get_connection_"
<< u.name () << " (" << endl
- << STRS[ENV_SNGL_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
@@ -1666,8 +1634,7 @@ namespace
Traversal::MultiUserData::belongs (u, belongs_);
- os << "_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_ECL] << "," << endl
@@ -1677,7 +1644,7 @@ namespace
"this->context_->connect_" << u.name () << " ("
<< endl
<< "c" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "this->add_receptacle (\"" << u.name ().unescaped_str ()
<< "\", c, cookie);" << endl
<< "return cookie;" << endl
@@ -1688,8 +1655,7 @@ namespace
os << "_ptr" << endl
<< scope_.name () << "_Servant::disconnect_"
<< u.name () << " (" << endl
- << STRS[COMP_CK] << " * ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << STRS[COMP_CK] << " * ck)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IC] << "))" << endl
@@ -1697,19 +1663,19 @@ namespace
<< "return this->context_->disconnect_" << u.name ()
<< " (" << endl
<< "ck" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
os << u.scoped_name () << "Connections *" << endl
<< scope_.name ()
<< "_Servant::get_connections_" << u.name ()
<< " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "return this->context_->get_connections_"
<< u.name () << " (" << endl
- << STRS[ENV_SNGL_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
@@ -1745,8 +1711,8 @@ namespace
os << "Consumer::_narrow (" << endl
<< "subscribe" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ << ");"
+ << endl;
os << "if ( ::CORBA::is_nil (sub.in ()))" << endl
<< "{"
@@ -1757,14 +1723,14 @@ namespace
Traversal::PublisherData::belongs (p, belongs_);
os << "::_tao_obv_static_repository_id ()" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ << " " << ");"
+ << endl;
os << "if (substitutable)" << endl
<< "{"
<< "return this->subscribe_" << p.name () << "_generic (" << endl
<< "subscribe" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}"
<< "else" << endl
<< "{"
@@ -1775,7 +1741,7 @@ namespace
<< "{"
<< "return this->subscribe_" << p.name () << " (" << endl
<< "sub.in ()" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}"
<< "}";
}
@@ -1801,7 +1767,7 @@ namespace
<< "return this->unsubscribe_" << p.name ()
<< " (" << endl
<< "ck" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
};
@@ -1826,8 +1792,7 @@ namespace
Traversal::EmitterData::belongs (e, belongs_);
- os << "Consumer_ptr c" << endl
- << STRS[ENV_SRC] << ")" << endl
+ os << "Consumer_ptr c)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_AC] << "))" << endl
@@ -1835,22 +1800,21 @@ namespace
<< "this->context_->connect_" << e.name ()
<< " (" << endl
<< "c" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
Traversal::EmitterData::belongs (e, belongs_);
os << "Consumer_ptr" << endl
<< scope_.name () << "_Servant::disconnect_"
- << e.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << e.name () << " ()" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_NC] << "))" << endl
<< "{"
<< "return this->context_->disconnect_"
<< e.name () << " (" << endl
- << STRS[ENV_SNGL_ARG] << ");" << endl
+ << ");" << endl
<< "}";
}
@@ -1907,7 +1871,7 @@ namespace
os << "_ptr" << endl
<< scope_.name ()
<< "_Servant::provide_" << p.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{";
@@ -1917,12 +1881,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ProviderData::belongs (p, belongs_);
-
- os << "::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "if (! ::CORBA::is_nil (this->provide_"
@@ -1937,12 +1897,8 @@ namespace
os << "::CORBA::Object_var obj =" << endl
<< " this->provide_" << p.name () << "_i ("
- << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ProviderData::belongs (p, belongs_);
-
- os << "::_nil ());" << endl;
+ << ");"
+ << endl;
ScopedName scoped (scope_.scoped_name ());
Name stripped (scoped.begin () + 1, scoped.end ());
@@ -1956,12 +1912,8 @@ namespace
os << "::_narrow ("
<< "obj.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ProviderData::belongs (p, belongs_);
-
- os << "::_nil ());" << endl
+ << ");"
+ << endl
<< "this->provide_" << p.name () << "_ = fo;"
<< "return ";
@@ -1976,7 +1928,7 @@ namespace
os << "::CORBA::Object_ptr" << endl
<< scope_.name ()
<< "_Servant::provide_" << p.name () << "_i (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "::CORBA::Object_ptr ret =" << endl
@@ -2068,21 +2020,13 @@ namespace
os << "," << endl
<< " ::CIAO::Container::Facet_Consumer" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ProviderData::belongs (p, belongs_);
-
- os << "::_nil ());" << endl
+ << " " << ");"
+ << endl
<< "this->add_facet (\""
<< p.name ().unescaped_str () << "\"," << endl
<< "obj.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ProviderData::belongs (p, belongs_);
-
- os << "::_nil ());" << endl;
+ << ");"
+ << endl;
os << "return obj._retn ();" << endl
<< "}";
@@ -2170,11 +2114,11 @@ namespace
os << "Consumer_" << c.name ()
<< "_Servant::_get_component (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "return this->ctx_->get_CCM_object "
- << "(" << STRS[ENV_SNGL_ARG] << ");" << endl
+ << "();" << endl
<< "}";
os << "void" << endl
@@ -2192,13 +2136,13 @@ namespace
Traversal::ConsumerData::belongs (c, belongs_);
os << " *evt" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "this->executor_->push_" << c.name ()
<< " (" << endl
<< "evt" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "}";
os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
@@ -2209,8 +2153,7 @@ namespace
os << "Consumer_" << c.name ()
<< "_Servant::push_event (" << endl
- << "::Components::EventBase *ev" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << "::Components::EventBase *ev)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_BET] << "))" << endl
@@ -2232,10 +2175,10 @@ namespace
os << " (" << endl
<< "ev_type" << endl
- << STRS[ENV_ARG] << ");" << endl
+ << ");" << endl
<< "return;" << endl
<< "}"
- << "ACE_THROW ( " << STRS[EXCP_BET] << " ());" << endl
+ << "throw " << STRS[EXCP_BET] << " ();" << endl
<< "}";
// GD Added below code
@@ -2251,8 +2194,7 @@ namespace
<< "_Servant::ciao_push_event (" << endl
<< "::Components::EventBase *ev," << endl
<< "const char * /* source_id */," << endl
- << "::CORBA::TypeCode_ptr /* tc */" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << "::CORBA::TypeCode_ptr /* tc */)" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_BET] << "))" << endl
@@ -2270,7 +2212,7 @@ namespace
os << "Consumer_" << c.name ()
<< "_Servant::ciao_is_substitutable (" << endl
<< "const char * event_repo_id" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "if (event_repo_id == 0)" << endl
@@ -2280,8 +2222,8 @@ namespace
<< scope_.name () << "_Context *ctx =" << endl
<< " " << scope_.name () << "_Context::_narrow (" << endl
<< " this->ctx_.in ()" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (false);" << endl;
+ << " " << ");"
+ << endl;
os << "CORBA::ORB_ptr orb = ctx->_ciao_the_Container ()->the_ORB ();"
<< endl;
@@ -2289,16 +2231,16 @@ namespace
os << "CORBA::ValueFactory f =" << endl
<< " orb->lookup_value_factory (" << endl
<< " event_repo_id" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (false);" << endl;
+ << " " << ");"
+ << endl;
os << "if (f == 0)" << endl
<< "{"
<< "return false;" << endl
<< "}"
<< "CORBA::ValueBase_var v =" << endl
- << " f->create_for_unmarshal (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " (false);" << endl;
+ << " f->create_for_unmarshal ();"
+ << endl;
os << "f->_remove_ref ();" << endl;
@@ -2319,7 +2261,7 @@ namespace
os << "Consumer_ptr" << endl
<< scope_.name () << "_Servant::"
<< "get_consumer_" << c.name () << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "if (! ::CORBA::is_nil (this->consumes_" << c.name ()
@@ -2335,12 +2277,8 @@ namespace
os << "::Components::EventConsumerBase_var obj =" << endl
<< " this->get_consumer_" << c.name () << "_i (" << endl
- << " " << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ConsumerData::belongs (c, belongs_);
-
- os << "Consumer::_nil ());" << endl;
+ << " " << ");"
+ << endl;
Traversal::ConsumerData::belongs (c, belongs_);
@@ -2351,12 +2289,8 @@ namespace
os << "Consumer::_narrow (" << endl
<< " obj.in ()" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ConsumerData::belongs (c, belongs_);
-
- os << "Consumer::_nil ());" << endl
+ << " " << ");"
+ << endl
<< "this->consumes_" << c.name () << "_ = eco;"
<< "return ";
@@ -2371,7 +2305,7 @@ namespace
os << "::Components::EventConsumerBase_ptr" << endl
<< scope_.name () << "_Servant::"
<< "get_consumer_" << c.name () << "_i (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< "::Components::EventConsumerBase_ptr ret =" << endl
@@ -2453,32 +2387,20 @@ namespace
os << "," << endl
<< " ::CIAO::Container::Facet_Consumer" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ConsumerData::belongs (c, belongs_);
-
- os << "Consumer::_nil ());" << endl;
+ << " " << ");"
+ << endl;
os << "::Components::EventConsumerBase_var ecb =" << endl
<< " ::Components::EventConsumerBase::_narrow (" << endl
<< " obj.in ()" << endl
- << " " << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ConsumerData::belongs (c, belongs_);
-
- os << "Consumer::_nil ());" << endl;
+ << " " << ");"
+ << endl;
os << "this->add_consumer (\""
<< c.name ().unescaped_str () << "\"," << endl
<< "ecb.in ()" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " ( ";
-
- Traversal::ConsumerData::belongs (c, belongs_);
-
- os << "Consumer::_nil ());" << endl;
+ << ");"
+ << endl;
os << "return ecb._retn ();" << endl
<< "}";
@@ -2693,8 +2615,7 @@ namespace
{
os << "obj_var =" << endl
<< " this->provide_" << p.name () << "_i (" << endl
- << " " << STRS[ENV_SNGL_ARG] << ");"
- << "ACE_CHECK;" << endl;
+ << " " << ");" << endl;
}
virtual void
@@ -2717,8 +2638,7 @@ namespace
{
os << "ecb_var =" << endl
<< " this->get_consumer_" << p.name () << "_i (" << endl
- << " " << STRS[ENV_SNGL_ARG] << ");"
- << "ACE_CHECK;" << endl;
+ << " " << ");" << endl;
}
};
@@ -3015,28 +2935,25 @@ namespace
component_emitter.traverse (t);
}
- os << "ACE_TRY_NEW_ENV" << endl
+ os << "try" << endl
<< "{"
<< "::Components::SessionComponent_var scom =" << endl
<< " ::Components::SessionComponent::_narrow (" << endl
<< " exe" << endl
- << " " << STRS[ENV_ARG] << ");"
- << "ACE_TRY_CHECK;" << endl
+ << " " << ");" << endl
<< "if (! ::CORBA::is_nil (scom.in ()))" << endl
<< "{"
<< "scom->set_session_context (" << endl
<< "this->context_" << endl
- << STRS[ENV_ARG] << ");"
- << "ACE_TRY_CHECK;"
+ << ");"
<< "}"
<< "this->populate_port_tables (" << endl
- << STRS[ENV_SNGL_ARG] << ");"
- << "ACE_TRY_CHECK;"
+ << ");"
<< "}"
- << "ACE_CATCHANY" << endl
+ << "catch (const CORBA::Exception&)" << endl
<< "{"
<< "}"
- << "ACE_ENDTRY;" << endl
+ << endl
<< "}";
// Servant Destructor
@@ -3049,17 +2966,16 @@ namespace
os << "void" << endl
<< t.name () << "_Servant::set_attributes (" << endl
<< "const ::Components::ConfigValues &descr" << endl
- << STRS[ENV_SRC] << ")" << endl
- << "{"
- << "ACE_ENV_EMIT_CODE (ACE_UNUSED_ARG (ACE_TRY_ENV));" << endl;
+ << ")" << endl
+ << "{" << endl;
string swap_option = ctx.cl ().get_value ("custom-container", "");
bool swapping = (swap_option == "upgradeable");
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << "ACE_CHECK;" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
@@ -3146,7 +3062,7 @@ namespace
<< t.name () << "_Servant::connect (" << endl
<< "const char *name," << endl
<< "::CORBA::Object_ptr connection" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3157,8 +3073,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "// If the component has no receptacles, this will be unused."
@@ -3193,7 +3109,7 @@ namespace
<< t.name () << "_Servant::disconnect (" << endl
<< "const char *name," << endl
<< STRS[COMP_CK] << " * ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3205,8 +3121,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "if (name == 0)" << endl
@@ -3240,7 +3156,7 @@ namespace
os << STRS[COMP_RD] << " *" << endl
<< t.name () << "_Servant::get_all_receptacles (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< STRS[COMP_RD] << " *retval = 0;"
@@ -3312,7 +3228,7 @@ namespace
<< endl
<< "const char * emitter_name," << endl
<< STRS[COMP_ECB] << "_ptr consumer" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3322,13 +3238,13 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CK] << ";" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "if (emitter_name == 0)" << endl
<< "{"
- << STRS[ACE_TH] << " ( " << STRS[EXCP_BP] << ");" << endl
+ << "throw " << STRS[EXCP_BP] << ";" << endl
<< "}";
// Generate an IF block for each 'emits' declaration.
@@ -3349,14 +3265,14 @@ namespace
}
os << STRS[ACE_UA] << " (consumer);"
- << STRS[ACE_TH] << " ( "
- << STRS[EXCP_IN] << " ());" << endl
+ << "throw "
+ << STRS[EXCP_IN] << " ();" << endl
<< "}";
os << STRS[COMP_ECB] << "_ptr" << endl
<< t.name () << "_Servant::disconnect_consumer (" << endl
<< "const char *source_name" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3365,9 +3281,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( "
- << STRS[COMP_ECB] << "::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "if (source_name == 0)" << endl
@@ -3400,7 +3315,7 @@ namespace
os << STRS[COMP_PD] << " *" << endl
<< t.name () << "_Servant::get_all_publishers (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< STRS[COMP_PD] << " *retval = 0;"
@@ -3450,7 +3365,7 @@ namespace
os << STRS[COMP_ED] << " *" << endl
<< t.name () << "_Servant::get_all_emitters (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
<< STRS[COMP_ED] << " *retval = 0;"
@@ -3502,7 +3417,7 @@ namespace
<< t.name () << "_Servant::subscribe (" << endl
<< "const char *publisher_name," << endl
<< STRS[COMP_ECB] << "_ptr subscribe" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3512,8 +3427,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "// Just in case there are no if blocks" << endl
@@ -3549,7 +3464,7 @@ namespace
<< endl
<< "const char *publisher_name," << endl
<< STRS[COMP_CK] << " *ck" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "," << endl
<< STRS[EXCP_IN] << "," << endl
@@ -3558,9 +3473,8 @@ namespace
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( " << STRS[COMP_ECB]
- << "::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "// Just in case there are no if blocks" << endl
@@ -3615,15 +3529,15 @@ namespace
<< t.name ()
<< "_Servant::get_facet_executor (" << endl
<< "const char *name" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_START] << " "
<< STRS[EXCP_SYS] << "))" << endl
<< "{";
if (swapping)
{
- os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
- << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
+ os << "this->activate_component ();"
+ << endl;
}
os << "if (name == 0)" << endl
@@ -3739,10 +3653,10 @@ namespace
os << "void" << endl
<< t.name () << "_Servant::populate_port_tables (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl
+ << ")" << endl
<< STRS[EXCP_SNGL] << endl
<< "{"
- << "ACE_ENV_ARG_NOT_USED;"
+ << ";"
<< "::CORBA::Object_var obj_var;"
<< "::Components::EventConsumerBase_var ecb_var;" << endl;
@@ -3868,7 +3782,7 @@ namespace
receives_none (SemanticGraph::HomeFactory&)
{
os << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl;
+ << ")" << endl;
}
virtual void
@@ -3880,7 +3794,7 @@ namespace
virtual void
receives_post (SemanticGraph::HomeFactory&)
{
- os << endl << STRS[ENV_SRC] << ")" << endl;
+ os << endl << ")" << endl;
}
virtual void
@@ -3928,12 +3842,6 @@ namespace
operation_emitter.traverse (hf);
}
- os << STRS[ACE_CR] << " ( ";
-
- Traversal::Home::manages (scope_, manages_);
-
- os << "::_nil ());" << endl;
-
Traversal::Home::manages (scope_, enclosing_manages_);
os << "::CCM_";
@@ -3950,17 +3858,11 @@ namespace
os << "::_narrow (" << endl
<< "_ciao_ec.in ()" << endl
- << STRS[ENV_ARG] << ");" << endl;
-
- os << STRS[ACE_CR] << " ( ";
-
- Traversal::Home::manages (scope_, manages_);
-
- os << "::_nil ());" << endl;
+ << ");" << endl;
os << "return this->_ciao_activate_component (" << endl
<< "_ciao_comp.in ()" << endl
- << STRS[ENV_ARG] << ");" << endl;
+ << ");" << endl;
os << "}";
}
@@ -4019,7 +3921,7 @@ namespace
receives_none (SemanticGraph::HomeFinder&)
{
os << " (" << endl
- << STRS[ENV_SNGL_SRC] << ")" << endl;
+ << ")" << endl;
}
virtual void
@@ -4031,7 +3933,7 @@ namespace
virtual void
receives_post (SemanticGraph::HomeFinder&)
{
- os << endl << STRS[ENV_SRC] << ")" << endl;
+ os << endl << ")" << endl;
}
virtual void
@@ -4337,7 +4239,7 @@ namespace
<< "::Components::HomeExecutorBase_ptr p," << endl
<< "::CIAO::Session_Container *c," << endl
<< "const char *ins_name" << endl
- << STRS[ENV_SRC] << ")" << endl
+ << ")" << endl
<< "{"
<< "if (p == 0)" << endl
<< "{"
@@ -4348,8 +4250,8 @@ namespace
<< t.scoped_name ().scope_name () << "::CCM_" << t.name ()
<< "::_narrow (" << endl
<< "p" << endl
- << STRS[ENV_ARG] << ");"
- << STRS[ACE_CR] << " (0);" << endl
+ << ");"
+ << endl
<< "if (::CORBA::is_nil (x.in ()))" << endl
<< "{"
<< "return 0;" << endl
View Lorry Controller Status