Commit 195d8365 authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Changed previous fix to only affect 'activate', and not all references (bug 565952)


Signed-off-by: Botond Baranyi's avatarBotond Baranyi <botond.baranyi@ericsson.com>
Change-Id: I29ac69ec3a7f024ff96ce56c398fe68533a803f5
parent 6a30efcb
......@@ -735,9 +735,8 @@ namespace Ttcn {
Free(expr_cache);
}
bool Reference::has_parameters()
bool Reference::has_parameters() const
{
get_refd_assignment(); // make sure the reference is checked
return params_checked ? parlist != NULL : params != NULL;
}
......@@ -1005,11 +1004,11 @@ namespace Ttcn {
bool Reference::chk_activate_argument()
{
Common::Assignment *t_ass = get_refd_assignment();
if (!has_parameters()) {
error("Reference with actual parameter list was expected in the argument");
return false;
}
Common::Assignment *t_ass = get_refd_assignment();
if (!t_ass) return false;
if (t_ass->get_asstype() != Common::Assignment::A_ALTSTEP) {
error("Reference to an altstep was expected in the argument instead of "
......
......@@ -364,7 +364,7 @@ namespace Ttcn {
Reference(Identifier *p_modid, Identifier *p_id,
ParsedActualParameters *p_params, reftype_t p_reftype = REF_BASIC);
~Reference();
virtual bool has_parameters();
virtual bool has_parameters() const;
virtual Reference *clone() const;
virtual void set_fullname(const string& p_fullname);
virtual void set_my_scope(Scope* p_scope);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment