From 58f54f737a074f07855ed359bb6c141262787df8 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Wed, 30 Nov 2016 18:12:09 +0100
Subject: [PATCH] Fixed more faults to timer.stop caused by the 'any from'
commit
Change-Id: I704d68ffaccae56ec10a9d7c05fd969f15c5ec1f
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/ttcn3/Statement.cc | 24 +++++++++++--------
...le.personal.esekilxxen1843.rnd.ericsson.se | 1 -
makefiles/Makefile.personal.esekiux5120 | 2 --
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/compiler2/ttcn3/Statement.cc b/compiler2/ttcn3/Statement.cc
index 90ca67a33..3db410915 100644
--- a/compiler2/ttcn3/Statement.cc
+++ b/compiler2/ttcn3/Statement.cc
@@ -678,10 +678,11 @@ namespace Ttcn {
delete timer_op.timerref;
delete timer_op.value;
break;
- case S_STOP_TIMER:
case S_TIMEOUT:
- delete timer_op.timerref;
delete timer_op.index_redirect;
+ // no break
+ case S_STOP_TIMER:
+ delete timer_op.timerref;
break;
case S_SETVERDICT:
delete setverdict.verdictval;
@@ -1844,12 +1845,13 @@ namespace Ttcn {
timer_op.timerref->set_my_scope(p_scope);
if (timer_op.value) timer_op.value->set_my_scope(p_scope);
break;
- case S_STOP_TIMER:
case S_TIMEOUT:
- if (timer_op.timerref) timer_op.timerref->set_my_scope(p_scope);
if (timer_op.index_redirect != NULL) {
timer_op.index_redirect->set_my_scope(p_scope);
}
+ // no break
+ case S_STOP_TIMER:
+ if (timer_op.timerref) timer_op.timerref->set_my_scope(p_scope);
break;
case S_SETVERDICT:
setverdict.verdictval->set_my_scope(p_scope);
@@ -2116,13 +2118,14 @@ namespace Ttcn {
timer_op.timerref->set_fullname(p_fullname+".timerref");
if(timer_op.value) timer_op.value->set_fullname(p_fullname+".timerval");
break;
- case S_STOP_TIMER:
case S_TIMEOUT:
- if (timer_op.timerref)
- timer_op.timerref->set_fullname(p_fullname+".timerref");
if (timer_op.index_redirect != NULL) {
timer_op.index_redirect->set_fullname(p_fullname + ".redirindex");
}
+ // no break
+ case S_STOP_TIMER:
+ if (timer_op.timerref)
+ timer_op.timerref->set_fullname(p_fullname+".timerref");
break;
case S_SETVERDICT:
setverdict.verdictval->set_fullname(p_fullname+".verdictval");
@@ -5711,13 +5714,14 @@ error:
timer_op.timerref->set_code_section(p_code_section);
if (timer_op.value) timer_op.value->set_code_section(p_code_section);
break;
- case S_STOP_TIMER:
case S_TIMEOUT:
- if (timer_op.timerref)
- timer_op.timerref->set_code_section(p_code_section);
if (timer_op.index_redirect != NULL) {
timer_op.index_redirect->set_code_section(p_code_section);
}
+ // no break
+ case S_STOP_TIMER:
+ if (timer_op.timerref)
+ timer_op.timerref->set_code_section(p_code_section);
break;
case S_SETVERDICT:
setverdict.verdictval->set_code_section(p_code_section);
diff --git a/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se b/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
index 6ce59c3f8..dd82ca457 100644
--- a/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
+++ b/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
@@ -20,4 +20,3 @@ BISON := /usr/bin/bison
JDKDIR := /proj/TTCN/Tools/jdk1.6.0_34
XMLDIR := /usr
OPENSSL_DIR := /usr
-DEBUG := yes
diff --git a/makefiles/Makefile.personal.esekiux5120 b/makefiles/Makefile.personal.esekiux5120
index 1cd1ca7a3..5b2ab9400 100644
--- a/makefiles/Makefile.personal.esekiux5120
+++ b/makefiles/Makefile.personal.esekiux5120
@@ -21,5 +21,3 @@ JDKDIR := /proj/TTCN/Tools/jdk1.6.0_23
XMLDIR := /app/libxml/2.9.1
OPENSSL_DIR := /proj/TTCN/Tools/openssl-0.9.8r
-
-DEBUG := yes
--
GitLab