From 18965c20600c9f64b1a1e7fbc0f26ebf9fcadf20 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Wed, 6 Dec 2017 15:32:12 +0100
Subject: [PATCH] Fixed not_a_number float comparison with str2float return
value
Change-Id: I438b8f13c2937140626cb21626a6377b24130934
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
core/Float.cc | 4 +++-
regression_test/predefFunction/str_to_OK.ttcn | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/core/Float.cc b/core/Float.cc
index ed0de6178..e790b0479 100644
--- a/core/Float.cc
+++ b/core/Float.cc
@@ -1403,7 +1403,9 @@ double operator/(double double_value, const FLOAT& other_value)
boolean operator==(double double_value, const FLOAT& other_value)
{
other_value.must_bound("Unbound right operand of float comparison.");
- return double_value == other_value.float_value;
+ return double_value == other_value.float_value || // check if they're both NaN
+ (double_value != double_value &&
+ other_value.float_value != other_value.float_value);
}
boolean operator<(double double_value, const FLOAT& other_value)
diff --git a/regression_test/predefFunction/str_to_OK.ttcn b/regression_test/predefFunction/str_to_OK.ttcn
index 82435c8d3..6b445a886 100644
--- a/regression_test/predefFunction/str_to_OK.ttcn
+++ b/regression_test/predefFunction/str_to_OK.ttcn
@@ -363,11 +363,22 @@ testcase str_to_float() runs on PDTestComponent{ //In testcase definition//
{setverdict(pass);}
else {setverdict(fail, __LINE__);}
if ((s2fmp16 == str2float(s2fmp16_str))
+ and (str2float(s2fmp16_str) == s2fmp16)
and (s2fmp16 == not_a_number))
{setverdict(pass);}
else {setverdict(fail, __LINE__);}
}
+testcase str_to_float_var_nan() runs on PDTestComponent {
+ var charstring vl_cs := "not_a_number";
+ if(str2float(vl_cs) == not_a_number){
+ setverdict(pass)
+ } else {
+ setverdict(fail,"expected not_a_number got:", str2float(vl_cs));
+ }
+}
+
+
/*--- STR2HEX --------------------------------------------------*/
@@ -627,6 +638,7 @@ testcase str_to_oct() runs on PDTestComponent{
control {
execute (str_to_bit());
execute (str_to_float());
+ execute (str_to_float_var_nan());
execute (str_to_hex());
execute (str_to_int());
execute (str_to_oct());
--
GitLab