diff --git a/compiler2/enum.c b/compiler2/enum.c index 1eabf5a5b9cca516719ed04221e7dc798d311814..8116f6ada3b04396995739b6ac93012720372ee8 100644 --- a/compiler2/enum.c +++ b/compiler2/enum.c @@ -1321,7 +1321,7 @@ void defEnumTemplate(const enum_def *edef, output_struct *output) "TTCN_Logger::log_event_enum(%s::enum_to_str(single_value), single_value);\n" "break;\n" "case COMPLEMENTED_LIST:\n" - "TTCN_Logger::log_event_str(\"complement \");\n" + "TTCN_Logger::log_event_str(\"complement\");\n" "case VALUE_LIST:\n" "TTCN_Logger::log_char('(');\n" "for (unsigned int elem_count = 0; elem_count < value_list.n_values; " diff --git a/compiler2/functionref.c b/compiler2/functionref.c index df807aa5e7d2bddc553e54d5031a45878aa88ba6..5f9d78666184105874871cdcf9f18e2685142a9e 100644 --- a/compiler2/functionref.c +++ b/compiler2/functionref.c @@ -646,7 +646,7 @@ void defFunctionrefTemplate(const funcref_def *fdef, output_struct *output) "Module_List::log_%s((genericfunc_t)single_value);\n" "break;\n" "case COMPLEMENTED_LIST:\n" - "TTCN_Logger::log_event_str(\"complement \");\n" + "TTCN_Logger::log_event_str(\"complement\");\n" "case VALUE_LIST:\n" "TTCN_Logger::log_char('(');\n" "for(unsigned int i = 0; i < value_list.n_values; i++) {\n" diff --git a/compiler2/record.c b/compiler2/record.c index 11f21314c1553cf6a696af0c431e51ee238fef2f..b016a22d68834cb9f7959038022cf7413d9cef30 100644 --- a/compiler2/record.c +++ b/compiler2/record.c @@ -5671,7 +5671,7 @@ void defRecordTemplate1(const struct_def *sdef, output_struct *output) "TTCN_Logger::log_event_str(\" }\");\n" "break;\n" "case COMPLEMENTED_LIST:\n" - "TTCN_Logger::log_event_str(\"complement \");\n" + "TTCN_Logger::log_event_str(\"complement\");\n" "case VALUE_LIST:\n" "TTCN_Logger::log_char('(');\n" "for (unsigned int list_count = 0; list_count < value_list.n_values; " @@ -6652,7 +6652,7 @@ static void defEmptyRecordTemplate(const char *name, const char *dispname, "TTCN_Logger::log_event_str(\"{ }\");\n" "break;\n" "case COMPLEMENTED_LIST:\n" - "TTCN_Logger::log_event_str(\"complement \");\n" + "TTCN_Logger::log_event_str(\"complement\");\n" "case VALUE_LIST:\n" "TTCN_Logger::log_char('(');\n" "for (unsigned int list_count = 0; list_count < value_list.n_values; " diff --git a/compiler2/union.c b/compiler2/union.c index 4ed9b55a1c8993dcab56efbeef8e7f3393e37ed0..5b1a117c49e1e526339382cde4f0b8addfdc0f7c 100644 --- a/compiler2/union.c +++ b/compiler2/union.c @@ -3132,7 +3132,7 @@ void defUnionTemplate(const struct_def *sdef, output_struct *output) "}\n" "break;\n" "case COMPLEMENTED_LIST:\n" - "TTCN_Logger::log_event_str(\"complement \");\n" + "TTCN_Logger::log_event_str(\"complement\");\n" "case VALUE_LIST:\n" "TTCN_Logger::log_char('(');\n" "for (unsigned int list_count = 0; list_count < value_list.n_values; " diff --git a/core/ASN_CharacterString.cc b/core/ASN_CharacterString.cc index fbddbae13d4366ee858d0b592223d2c628ce0e03..287f032c0b5964ed96c35b7e98a91a3a9fceaa57 100644 --- a/core/ASN_CharacterString.cc +++ b/core/ASN_CharacterString.cc @@ -1359,7 +1359,7 @@ void CHARACTER_STRING_identification_template::log() const } break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2211,7 +2211,7 @@ void CHARACTER_STRING_identification_syntaxes_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2945,7 +2945,7 @@ void CHARACTER_STRING_identification_context__negotiation_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -3849,7 +3849,7 @@ void CHARACTER_STRING_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/ASN_EmbeddedPDV.cc b/core/ASN_EmbeddedPDV.cc index 7e262a7dbc2b865db32800446d255374a214b788..2102abde9dee68e9ecdc2414ae0d27cd0ad37808 100644 --- a/core/ASN_EmbeddedPDV.cc +++ b/core/ASN_EmbeddedPDV.cc @@ -1418,7 +1418,7 @@ void EMBEDDED_PDV_identification_template::log() const } break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2290,7 +2290,7 @@ void EMBEDDED_PDV_identification_syntaxes_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -3044,7 +3044,7 @@ void EMBEDDED_PDV_identification_context__negotiation_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -3983,7 +3983,7 @@ void EMBEDDED_PDV_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/ASN_External.cc b/core/ASN_External.cc index abe554dba9b2234dc1464d3122fdcd10774c73bb..bd68594fc9fdf425e3ed314828af45a11d3b39eb 100644 --- a/core/ASN_External.cc +++ b/core/ASN_External.cc @@ -1845,7 +1845,7 @@ void EXTERNAL_identification_template::log() const } break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2612,7 +2612,7 @@ void EXTERNAL_identification_syntaxes_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -3259,7 +3259,7 @@ void EXTERNAL_identification_context__negotiation_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -4063,7 +4063,7 @@ void EXTERNAL_template::log() const TTCN_Logger::log_event_str(" }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/ASN_Null.cc b/core/ASN_Null.cc index 62b334d63538d356247a31c9d4c04bab20aa63fb..0c3bdccd58fd89494f87a0e86b241c2d34a76421 100644 --- a/core/ASN_Null.cc +++ b/core/ASN_Null.cc @@ -553,7 +553,7 @@ void ASN_NULL_template::log() const TTCN_Logger::log_event_str("NULL"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); case VALUE_LIST: TTCN_Logger::log_char('('); for (unsigned int i = 0; i < value_list.n_values; i++) { diff --git a/core/Bitstring.cc b/core/Bitstring.cc index 219289b91bf063837c20f5addaa670565a9476b8..adf323630ed97eba65ced544d24fcd63b421cb35 100644 --- a/core/Bitstring.cc +++ b/core/Bitstring.cc @@ -2224,7 +2224,7 @@ void BITSTRING_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Boolean.cc b/core/Boolean.cc index b870d3821830cd171996ce688274d9cb497399f1..3572ae5f7465f361b1d512e62609e23c5be5f912 100644 --- a/core/Boolean.cc +++ b/core/Boolean.cc @@ -1054,7 +1054,7 @@ void BOOLEAN_template::log() const TTCN_Logger::log_event_str(single_value ? "true" : "false"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Charstring.cc b/core/Charstring.cc index dc09bdd58a37204f5a16e87157922e29376971c7..2a87aadb032a3c074161b3b45b74484d5d594cba 100644 --- a/core/Charstring.cc +++ b/core/Charstring.cc @@ -2977,7 +2977,7 @@ void CHARSTRING_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Component.cc b/core/Component.cc index c634058de5bffad67e2a5347d67560225fdc1db0..08cf62634b9347c9aaab8ce8fc8a1655de2e4784 100644 --- a/core/Component.cc +++ b/core/Component.cc @@ -622,7 +622,7 @@ void COMPONENT_template::log() const } break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Default.cc b/core/Default.cc index c86680724090c004d70cba0cc7b91ee1744a5f45..b5a4ea7c899f5c4350f81b7817bdbd79f6431479 100644 --- a/core/Default.cc +++ b/core/Default.cc @@ -434,7 +434,7 @@ void DEFAULT_template::log() const TTCN_Default::log(single_value); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Float.cc b/core/Float.cc index dacecc43719583ba2d84d2b9e0230fed26442db4..ed0de6178bbf52fdbcdfaf1c0f4e9142949a4fae 100644 --- a/core/Float.cc +++ b/core/Float.cc @@ -1703,7 +1703,7 @@ void FLOAT_template::log() const log_float(single_value); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Hexstring.cc b/core/Hexstring.cc index f7a406c21e0f43d7b13d0c2b726a79dfed1cb550..d09f5ddbcfbdebf363c77c32796cf95969b407be 100644 --- a/core/Hexstring.cc +++ b/core/Hexstring.cc @@ -2036,7 +2036,7 @@ void HEXSTRING_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Integer.cc b/core/Integer.cc index 875bb09671103d065a5148a8137b1017c4157355..4cc53d6fba34c7f1e9ea360fb2df43d82b3ec8cf 100644 --- a/core/Integer.cc +++ b/core/Integer.cc @@ -2489,7 +2489,7 @@ void INTEGER_template::log() const Free(tmp_str); break; } case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Objid.cc b/core/Objid.cc index 68dbf0271465d89a576f646877b9fc68a281ea89..6e125186f5aa279213ac7e34b1878f68813f514b 100644 --- a/core/Objid.cc +++ b/core/Objid.cc @@ -967,7 +967,7 @@ void OBJID_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Octetstring.cc b/core/Octetstring.cc index fdf43f4c3356c8870344c0003f10730003872a54..204203d7e7fdabc58a49f8f8019779fea0e4454f 100644 --- a/core/Octetstring.cc +++ b/core/Octetstring.cc @@ -2332,7 +2332,7 @@ void OCTETSTRING_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Template.cc b/core/Template.cc index b515887cdc97a0c103236b9ab792e63f7de16741..ff56c5bd0f37374e59ae40fa04b9fc4ba854a448 100644 --- a/core/Template.cc +++ b/core/Template.cc @@ -1236,7 +1236,7 @@ void Record_Of_Template::log() const } else TTCN_Logger::log_event_str("{ }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2252,7 +2252,7 @@ void Set_Of_Template::log() const } else TTCN_Logger::log_event_str("{ }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -2870,7 +2870,7 @@ void Record_Template::log() const } else TTCN_Logger::log_event_str("{ }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); @@ -3430,7 +3430,7 @@ void Empty_Record_Template::log() const TTCN_Logger::log_event_str("{ }"); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Universal_charstring.cc b/core/Universal_charstring.cc index 86465842b12ebfdd7f4b102a93954c2dbdd52858..ea0cc03072bd1c7dab98e198d36331c495e74ad8 100644 --- a/core/Universal_charstring.cc +++ b/core/Universal_charstring.cc @@ -4767,7 +4767,7 @@ void UNIVERSAL_CHARSTRING_template::log() const single_value.log(); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/core/Verdicttype.cc b/core/Verdicttype.cc index c3b9305890930ff5216f98cd1c424fd17f1c7b11..d87c2561838d9562db621ce85becd02ed577c055 100644 --- a/core/Verdicttype.cc +++ b/core/Verdicttype.cc @@ -658,7 +658,7 @@ void VERDICTTYPE_template::log() const else TTCN_Logger::log_event("<unknown verdict value: %d>", single_value); break; case COMPLEMENTED_LIST: - TTCN_Logger::log_event_str("complement "); + TTCN_Logger::log_event_str("complement"); // no break case VALUE_LIST: TTCN_Logger::log_char('('); diff --git a/regression_test/all_from/all_from_with_functions.ttcn b/regression_test/all_from/all_from_with_functions.ttcn index 7c46674978805a29517e505b8cfd213c2756d86f..d896b1d53d9f792947ab59a3e6917f41a3de0196 100644 --- a/regression_test/all_from/all_from_with_functions.ttcn +++ b/regression_test/all_from/all_from_with_functions.ttcn @@ -93,7 +93,7 @@ testcase tc_all_from_with_functions() runs on CT_Empty { if (log2str(t1) == "{ permutation(3, 4) }" and log2str(t2) == "{ 3, 4 }" and log2str(t3) == "{ permutation(3, 4) }" and log2str(t4) == "{ permutation(1, 2) }" and log2str(t5) == "(1, 2, 1, 2, (6 .. 9), 10)" and - log2str(t6) == "complement (1, 2, 1, 2, (6 .. 9), 10)" and + log2str(t6) == "complement(1, 2, 1, 2, (6 .. 9), 10)" and log2str(t7) == "subset(1, 2, 3, 4, 5) length (2 .. 3)" and log2str(t8) == "superset(1, 2, 3, 4, 5) length (6 .. 8)" and log2str(t9) == "(1, 2, 3, 4, 6)" and log2str(t10) == "{ (1, 2, 3, 4, 6), ((20 .. 30)) }" and diff --git a/regression_test/text2ttcn/boolean_test.ttcn b/regression_test/text2ttcn/boolean_test.ttcn index 849b8cb7a0a40975538fcfa4cefb7b1619f227e8..3460201f97904839d4b9c27a583fa8b31eadb422 100644 --- a/regression_test/text2ttcn/boolean_test.ttcn +++ b/regression_test/text2ttcn/boolean_test.ttcn @@ -230,7 +230,7 @@ modulepar { testcase tc_boolean_c() runs on MC { log(tspt_b_c); - if( log2str( tspt_b_c) != "complement (true)" ) { setverdict(fail) } else {setverdict(pass) } + if( log2str( tspt_b_c) != "complement(true)" ) { setverdict(fail) } else {setverdict(pass) } var RoB vl_good_values := {false}; var RoB vl_wrong_values := {true}; f_checkMatchingValues_bool(tspt_b_c,vl_good_values,vl_wrong_values); @@ -328,7 +328,7 @@ modulepar { //modified for complement(true) testcase tc_boolean_modified4ct() runs on MC { log(tspt_b_a11); - if( log2str( tspt_b_a11) != "complement (true)" ) { setverdict(fail) } else {setverdict(pass) } + if( log2str( tspt_b_a11) != "complement(true)" ) { setverdict(fail) } else {setverdict(pass) } var RoB vl_good_values := {false}; var RoB vl_wrong_values := {true}; f_checkMatchingValues_bool(tspt_b_a11,vl_good_values,vl_wrong_values); diff --git a/regression_test/text2ttcn/enum_test.ttcn b/regression_test/text2ttcn/enum_test.ttcn index 6fa9aee056d150067857c921a5c1d688eeaa8b63..3735ea990f14525590ce4687be9eeda03d9f2444 100644 --- a/regression_test/text2ttcn/enum_test.ttcn +++ b/regression_test/text2ttcn/enum_test.ttcn @@ -113,11 +113,11 @@ testcase tc_enum_ModulePar() runs on MC { log(log2str(tspt_enum_mod4o)); if(log2str(tspt_enum_mod4o) == "omit" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c0)); - if(log2str(tspt_enum_mod4c0) == "complement (omit)" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c0) == "complement(omit)" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c1)); - if(log2str(tspt_enum_mod4c1) == "complement (first (0))" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c1) == "complement(first (0))" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c2)); - if(log2str(tspt_enum_mod4c2) == "complement (first (0), second (1))" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c2) == "complement(first (0), second (1))" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4vl1)); if(log2str(tspt_enum_mod4vl1) == "first (0)" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4vl2)); @@ -132,11 +132,11 @@ testcase tc_enum_ModulePar() runs on MC { log(log2str(tspt_enum_mod4oifp)); if(log2str(tspt_enum_mod4oifp) == "omit ifpresent") {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c0ifp)); - if(log2str(tspt_enum_mod4c0ifp) == "complement (omit) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c0ifp) == "complement(omit) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c1ifp)); - if(log2str(tspt_enum_mod4c1ifp) == "complement (first (0)) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c1ifp) == "complement(first (0)) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4c2ifp)); - if(log2str(tspt_enum_mod4c2ifp) == "complement (first (0), second (1)) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(tspt_enum_mod4c2ifp) == "complement(first (0), second (1)) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4vl1ifp)); if(log2str(tspt_enum_mod4vl1ifp) == "first (0) ifpresent" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(tspt_enum_mod4vl2ifp)); diff --git a/regression_test/text2ttcn/float_test.ttcn b/regression_test/text2ttcn/float_test.ttcn index fe9790e0c0a8d0f77911f6184a3c623cdf928535..b1003252f93b471aad8df1ee770ff77d33f2bfd0 100644 --- a/regression_test/text2ttcn/float_test.ttcn +++ b/regression_test/text2ttcn/float_test.ttcn @@ -103,7 +103,7 @@ modulepar { if( log2str(t_f_a) != "*") { setverdict(fail)}; if( log2str(t_f_q) != "?") { setverdict(fail)}; if( log2str(t_f_vl) != "(0.000000, 1.200000, -1.900000)") { setverdict(fail) }; - if( log2str(t_f_c) != "complement (0.000000, 1.200000, -1.900000)") { setverdict(fail) }; + if( log2str(t_f_c) != "complement(0.000000, 1.200000, -1.900000)") { setverdict(fail) }; } testcase tc_float_ModulePar() runs on MC { @@ -115,8 +115,8 @@ modulepar { if( log2str(tspt_f_vl1) != "0.000000") { setverdict(fail) }; if( log2str(tspt_f_vl2) != "(0.000000, 1.200000)") { setverdict(fail) }; if( log2str(tspt_f_vl3) != "(0.000000, 1.200000, -1.900000)") { setverdict(fail) }; - if( log2str(tspt_f_c1) != "complement (0.000000)") { setverdict(fail) }; - if( log2str(tspt_f_c3) != "complement (0.000000, 1.200000, -1.900000)") { setverdict(fail) }; + if( log2str(tspt_f_c1) != "complement(0.000000)") { setverdict(fail) }; + if( log2str(tspt_f_c3) != "complement(0.000000, 1.200000, -1.900000)") { setverdict(fail) }; //log(tspt_f_r); if( log2str(tspt_f_r) != "(-1.900000 .. 3.100000)") { setverdict(fail) }; } @@ -249,7 +249,7 @@ modulepar { testcase tc_float_modified4c() runs on MC { var template float vlt := tspt_f11; log( vlt ); - if( log2str(vlt) != "complement (9.000000)" ) { setverdict(fail) } else { setverdict(pass) } + if( log2str(vlt) != "complement(9.000000)" ) { setverdict(fail) } else { setverdict(pass) } var RoF vl_good_values := { -1000000.0, 0.01, -1.91, 8.99999, 9.0001, 2.0, 20001.0e9, 4294967296.0, 4294967296.0+1.0} var RoF vl_wrong_values := { 9.0 } f_checkMatchingValues_float( vlt, vl_good_values, vl_wrong_values ); @@ -317,7 +317,7 @@ modulepar { testcase tc_float_modified4cifp() runs on MC { var template float vlt := tspt_f12; log( vlt ); - if( log2str(vlt) != "complement (9.000000) ifpresent" ) { setverdict(fail) } else { setverdict(pass) } + if( log2str(vlt) != "complement(9.000000) ifpresent" ) { setverdict(fail) } else { setverdict(pass) } var RoF vl_good_values := { -1000000.0, 0.01, -1.91, 8.99999, 9.0001, 2.0, 20001.0e9, 4294967296.0, 4294967296.0+1.0} var RoF vl_wrong_values := { 9.0 } f_checkMatchingValues_float( vlt, vl_good_values, vl_wrong_values ); diff --git a/regression_test/text2ttcn/integer_test.ttcn b/regression_test/text2ttcn/integer_test.ttcn index 9d70bfc5682053ec8e1fb11b2dc11caf31f4ed66..04cc7a21c984592a4b391de684ac6d429b04dfc8 100644 --- a/regression_test/text2ttcn/integer_test.ttcn +++ b/regression_test/text2ttcn/integer_test.ttcn @@ -125,7 +125,7 @@ modulepar { if( log2str(t_i_q) != "?") { setverdict(fail)}; //log(t_i_vl); if( log2str(t_i_vl) != "(0, 1, -1)") { setverdict(fail) }; - if( log2str(t_i_c) != "complement (0, 1, -1)") { setverdict(fail) }; + if( log2str(t_i_c) != "complement(0, 1, -1)") { setverdict(fail) }; } testcase tc_integer_NoModulePar_Embedded() runs on MC { @@ -329,7 +329,7 @@ modulepar { //complement testcase tc_integer_modified4c() runs on MC { log( tspt_i11); - if( log2str(tspt_i11) != "complement (9)" ) { setverdict(fail) } else { setverdict(pass) } + if( log2str(tspt_i11) != "complement(9)" ) { setverdict(fail) } else { setverdict(pass) } var RoI vl_good_values := {-100000, -1, 0,1, 4294967296, 4294967296+1} var RoI vl_wrong_values := {9} f_checkMatchingValues_int( tspt_i11, vl_good_values, vl_wrong_values ); diff --git a/regression_test/text2ttcn/record_test.ttcn b/regression_test/text2ttcn/record_test.ttcn index 8d6ba9ed0789d666c1e0a874df51a8d68d2a0692..4aefe594a36cddaf03cf80d0144b50ab648a7fbe 100644 --- a/regression_test/text2ttcn/record_test.ttcn +++ b/regression_test/text2ttcn/record_test.ttcn @@ -827,7 +827,7 @@ testcase tc_REC_log2str() runs on MC { log(tspt_rec_mod4vr); if(log2str(tspt_rec_mod4vr) == "{ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4c); - if(log2str(tspt_rec_mod4c) == "complement ({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B })") { setverdict(pass) } else {setverdict(fail)} + if(log2str(tspt_rec_mod4c) == "complement({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B })") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vl); if(log2str(tspt_rec_mod4vl) == "{ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vq); @@ -854,7 +854,7 @@ testcase tc_REC_ifp_log2str() runs on MC { log(tspt_rec_mod4vrifp); if(log2str(tspt_rec_mod4vrifp) == "{ i := (1 .. 2) ifpresent, f := ? ifpresent, cs := \"ABBA\" ifpresent, bs := '0100'B ifpresent }" ) { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4cifp); - if(log2str(tspt_rec_mod4cifp) == "complement ({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent })") { setverdict(pass) } else {setverdict(fail)} + if(log2str(tspt_rec_mod4cifp) == "complement({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent })") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vlifp); if(log2str(tspt_rec_mod4vlifp) == "{ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }" ) { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vqifp); @@ -948,7 +948,7 @@ testcase tc_REC_ttcn2string() runs on MC { log(tspt_rec_mod4vr); if(ttcn2string(tspt_rec_mod4vr) == "{ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4c); - if(ttcn2string(tspt_rec_mod4c) == "complement ({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B })") { setverdict(pass) } else {setverdict(fail)} + if(ttcn2string(tspt_rec_mod4c) == "complement({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B })") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vl); if(ttcn2string(tspt_rec_mod4vl) == "{ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vq); @@ -975,7 +975,7 @@ testcase tc_REC_ifp_ttcn2string() runs on MC { log(tspt_rec_mod4vrifp); if(ttcn2string(tspt_rec_mod4vrifp) == "{ i := (1 .. 2) ifpresent, f := ? ifpresent, cs := \"ABBA\" ifpresent, bs := '0100'B ifpresent }" ) { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4cifp); - if(ttcn2string(tspt_rec_mod4cifp) == "complement ({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent })") { setverdict(pass) } else {setverdict(fail)} + if(ttcn2string(tspt_rec_mod4cifp) == "complement({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent })") { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vlifp); if(ttcn2string(tspt_rec_mod4vlifp) == "{ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }" ) { setverdict(pass) } else {setverdict(fail)} log(tspt_rec_mod4vqifp);