diff --git a/regression_test/text2ttcn/array_test.ttcn b/regression_test/text2ttcn/array_test.ttcn index 537884f3911d16c0d108c04afebd8ffec59ffa33..6210c706ec234f68a15a63e934c5c07e03984afc 100644 --- a/regression_test/text2ttcn/array_test.ttcn +++ b/regression_test/text2ttcn/array_test.ttcn @@ -241,7 +241,7 @@ testcase tc_array_i_NoModulePar() runs on MC { log(t_array_i3_v3mix); if( log2str(t_array_i3_v3mix) != "{ (0, 1), 1, (1 .. 3) }" ) {setverdict(fail) } else { setverdict(pass) }; log(t_array_i3_v3c); - if( log2str(t_array_i3_v3c) != "{ (0, 1), 1, complement (2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; + if( log2str(t_array_i3_v3c) != "{ (0, 1), 1, complement(2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; log(t_array_i3_v3p); if( log2str(t_array_i3_v3p) != "{ permutation(1, 2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; } @@ -265,7 +265,7 @@ testcase tc_array_i_ModulePar() runs on MC { log(tspt_array_i3_v3mix); if( log2str(tspt_array_i3_v3mix) != "{ (0, 1), 1, (1 .. 3) }" ) {setverdict(fail) } else { setverdict(pass) }; log(tspt_array_i3_v3c); - if( log2str(tspt_array_i3_v3c) != "{ (0, 1), 1, complement (2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; + if( log2str(tspt_array_i3_v3c) != "{ (0, 1), 1, complement(2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; log(tspt_array_i3_v3p); if( log2str(tspt_array_i3_v3p) != "{ permutation(1, 2, 3) }" ) {setverdict(fail) } else { setverdict(pass) }; //TR: HS10539, fixed log(tspt_array_i3_v3pa); @@ -577,7 +577,7 @@ testcase tc_array_i_emb() runs on MC { log(t_array_bai3(true,tspt_array_i3_v3mix)); if( log2str(t_array_bai3(true,tspt_array_i3_v3mix)) != "{ b := true, ai3 := { (0, 1), 1, (1 .. 3) } }") {setverdict(fail)} else {setverdict(pass)} log(t_array_bai3(true,tspt_array_i3_v3c)); - if( log2str(t_array_bai3(true,tspt_array_i3_v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } }") {setverdict(fail)} else {setverdict(pass)} + if( log2str(t_array_bai3(true,tspt_array_i3_v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } }") {setverdict(fail)} else {setverdict(pass)} } //array embedded in record, modified from cfg file @@ -609,7 +609,7 @@ testcase tc_array_i_ModulePar_emb() runs on MC { log(t_array_bai3(true,tspt_array_i3_mod4v3mix)); if( log2str(t_array_bai3(true,tspt_array_i3_mod4v3mix)) != "{ b := true, ai3 := { (0, 1), 1, (1 .. 3) } }") {setverdict(fail)} else {setverdict(pass)} log(t_array_bai3(true,tspt_array_i3_mod4v3c)); - if( log2str(t_array_bai3(true,tspt_array_i3_mod4v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } }") {setverdict(fail)} else {setverdict(pass)} + if( log2str(t_array_bai3(true,tspt_array_i3_mod4v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } }") {setverdict(fail)} else {setverdict(pass)} log(t_array_bai3(true,tspt_array_i3_mod4field1ifp)); if( log2str(t_array_bai3(true,tspt_array_i3_mod4field1ifp)) != "{ b := true, ai3 := { 0, 1, (1 .. 3) } ifpresent }") {setverdict(fail)} else {setverdict(pass)} } @@ -670,7 +670,7 @@ testcase tc_array_i_ModulePar_emb_ttcn2string() runs on MC { log(t_array_bai3(true,tspt_array_i3_mod4v3mix)); if( ttcn2string(t_array_bai3(true,tspt_array_i3_mod4v3mix)) != "{ b := true, ai3 := { (0, 1), 1, (1 .. 3) } }") {setverdict(fail)} else {setverdict(pass)} log(t_array_bai3(true,tspt_array_i3_mod4v3c)); - if( ttcn2string(t_array_bai3(true,tspt_array_i3_mod4v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } }") {setverdict(fail)} else {setverdict(pass)} + if( ttcn2string(t_array_bai3(true,tspt_array_i3_mod4v3c)) != "{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } }") {setverdict(fail)} else {setverdict(pass)} log(t_array_bai3(true,tspt_array_i3_mod4field1)); if( ttcn2string(t_array_bai3(true,tspt_array_i3_mod4field1)) != "{ b := true, ai3 := { 0, 1, (1 .. 3) } }") {setverdict(fail)} else {setverdict(pass)} } @@ -796,8 +796,8 @@ testcase tc_array_string2ttcn_i3_mod4v3mix() runs on MC { } testcase tc_array_string2ttcn_i3_mod4v3c() runs on MC { - f_string2ttcn_REC_BAI3_t("{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } }", t_array_bai3(true,tspt_array_i3_mod4v3c)) - f_string2ttcn_REC_BAI3_v("{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } }", t_array_bai3(true,tspt_array_i3_mod4v3c),false) + f_string2ttcn_REC_BAI3_t("{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } }", t_array_bai3(true,tspt_array_i3_mod4v3c)) + f_string2ttcn_REC_BAI3_v("{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } }", t_array_bai3(true,tspt_array_i3_mod4v3c),false) } testcase tc_array_string2ttcn_i3_mod4field1() runs on MC { @@ -870,8 +870,8 @@ testcase tc_array_string2ttcn_i3_mod4v3mixifp() runs on MC { } testcase tc_array_string2ttcn_i3_mod4v3cifp() runs on MC { - f_string2ttcn_REC_BAI3_t("{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } ifpresent }", t_array_bai3(true,tspt_array_i3_mod4v3cifp)) - f_string2ttcn_REC_BAI3_v("{ b := true, ai3 := { (0, 1), 1, complement (2, 3) } ifpresent }", t_array_bai3(true,tspt_array_i3_mod4v3cifp),false) + f_string2ttcn_REC_BAI3_t("{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } ifpresent }", t_array_bai3(true,tspt_array_i3_mod4v3cifp)) + f_string2ttcn_REC_BAI3_v("{ b := true, ai3 := { (0, 1), 1, complement(2, 3) } ifpresent }", t_array_bai3(true,tspt_array_i3_mod4v3cifp),false) } testcase tc_array_string2ttcn_i3_mod4field1ifp() runs on MC { diff --git a/regression_test/text2ttcn/bitstring_test.ttcn b/regression_test/text2ttcn/bitstring_test.ttcn index 370eb47046b9ef1d5f12769fbd5d585f0622261b..90af0b988f35d5957a1b603ba8a49e4ebc960428 100644 --- a/regression_test/text2ttcn/bitstring_test.ttcn +++ b/regression_test/text2ttcn/bitstring_test.ttcn @@ -232,11 +232,11 @@ testcase tc_bs_ModulePar_emb() runs on MC { log(t_rbs(tspt_bs_mod4vl3)); if(log2str(t_rbs(tspt_bs_mod4vl3)) != "{ bs := (\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c1)); - if(log2str(t_rbs(tspt_bs_mod4c1)) != "{ bs := complement (\'01101\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c1)) != "{ bs := complement(\'01101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c2)); - if(log2str(t_rbs(tspt_bs_mod4c2)) != "{ bs := complement (\'01101\'B, \'1010\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c2)) != "{ bs := complement(\'01101\'B, \'1010\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c3)); - if(log2str(t_rbs(tspt_bs_mod4c3)) != "{ bs := complement (\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c3)) != "{ bs := complement(\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pa)); if(log2str(t_rbs(tspt_bs_mod4pa)) != "{ bs := \'000*111\'B }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pq)); @@ -265,11 +265,11 @@ testcase tc_bs_ModulePar_emb() runs on MC { log(t_rbs(tspt_bs_mod4vl3ifp)); if(log2str(t_rbs(tspt_bs_mod4vl3ifp)) != "{ bs := (\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c1ifp)); - if(log2str(t_rbs(tspt_bs_mod4c1ifp)) != "{ bs := complement (\'01101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c1ifp)) != "{ bs := complement(\'01101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c2ifp)); - if(log2str(t_rbs(tspt_bs_mod4c2ifp)) != "{ bs := complement (\'01101\'B, \'1010\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c2ifp)) != "{ bs := complement(\'01101\'B, \'1010\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c3ifp)); - if(log2str(t_rbs(tspt_bs_mod4c3ifp)) != "{ bs := complement (\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rbs(tspt_bs_mod4c3ifp)) != "{ bs := complement(\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4paifp)); if(log2str(t_rbs(tspt_bs_mod4paifp)) != "{ bs := \'000*111'B ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pqifp)); @@ -301,11 +301,11 @@ testcase tc_bs_ttcn2string_emb() runs on MC { log(t_rbs(tspt_bs_mod4vl3)); if(ttcn2string(t_rbs(tspt_bs_mod4vl3)) != "{ bs := (\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c1)); - if(ttcn2string(t_rbs(tspt_bs_mod4c1)) != "{ bs := complement (\'01101\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c1)) != "{ bs := complement(\'01101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c2)); - if(ttcn2string(t_rbs(tspt_bs_mod4c2)) != "{ bs := complement (\'01101\'B, \'1010\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c2)) != "{ bs := complement(\'01101\'B, \'1010\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c3)); - if(ttcn2string(t_rbs(tspt_bs_mod4c3)) != "{ bs := complement (\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c3)) != "{ bs := complement(\'01101\'B, \'1010\'B, \'101\'B) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pa)); if(ttcn2string(t_rbs(tspt_bs_mod4pa)) != "{ bs := \'000*111\'B }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pq)); @@ -334,11 +334,11 @@ testcase tc_bs_ttcn2string_emb() runs on MC { log(t_rbs(tspt_bs_mod4vl3ifp)); if(ttcn2string(t_rbs(tspt_bs_mod4vl3ifp)) != "{ bs := (\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c1ifp)); - if(ttcn2string(t_rbs(tspt_bs_mod4c1ifp)) != "{ bs := complement (\'01101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c1ifp)) != "{ bs := complement(\'01101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c2ifp)); - if(ttcn2string(t_rbs(tspt_bs_mod4c2ifp)) != "{ bs := complement (\'01101\'B, \'1010\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c2ifp)) != "{ bs := complement(\'01101\'B, \'1010\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4c3ifp)); - if(ttcn2string(t_rbs(tspt_bs_mod4c3ifp)) != "{ bs := complement (\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rbs(tspt_bs_mod4c3ifp)) != "{ bs := complement(\'01101\'B, \'1010\'B, \'101\'B) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4paifp)); if(ttcn2string(t_rbs(tspt_bs_mod4paifp)) != "{ bs := \'000*111'B ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rbs(tspt_bs_mod4pqifp)); diff --git a/regression_test/text2ttcn/boolean_test.ttcn b/regression_test/text2ttcn/boolean_test.ttcn index 3460201f97904839d4b9c27a583fa8b31eadb422..666d8bbaa539884ccde0185dd7996078be5ab8ff 100644 --- a/regression_test/text2ttcn/boolean_test.ttcn +++ b/regression_test/text2ttcn/boolean_test.ttcn @@ -38,7 +38,7 @@ modulepar { template boolean tspt_b_oifp := omit ifpresent; // omit ifpresent is meaningless!!!! => Should be comp error!!! TODO: put into neg test!!! template boolean tspt_b_aifp := * ifpresent; // ?????? only "? ispresent" acceptable template boolean tspt_b_qifp := ? ifpresent; - template boolean tspt_b_c := complement (true); //complemented list + template boolean tspt_b_c := complement(true); //complemented list template boolean tspt_b_tl := (true,false); //template list //template boolean tspt_b_n := not(true); @@ -119,7 +119,7 @@ modulepar { if( log2str( t_rec_b(t_b_aifp) ) != "{ b := * ifpresent, o := omit, h := omit }" ) { setverdict(fail) }; if( log2str( t_rec_b(t_b_qifp) ) != "{ b := ? ifpresent, o := omit, h := omit }" ) { setverdict(fail) }; //log(t_rec_b(t_b_c)); - if( log2str( t_rec_b(t_b_c) ) != "{ b := complement (true), o := omit, h := omit }" ) { setverdict(fail) }; + if( log2str( t_rec_b(t_b_c) ) != "{ b := complement(true), o := omit, h := omit }" ) { setverdict(fail) }; } //modulepar template - template string check @@ -145,7 +145,7 @@ modulepar { log( "template value:", t_rec_b(tspt_b_qifp) ); if( log2str( t_rec_b(tspt_b_qifp) ) != "{ b := ? ifpresent, o := omit, h := omit }" ) { setverdict(fail) }; log( "template value:", t_rec_b(tspt_b_c) ); - if( log2str( t_rec_b(tspt_b_c) ) != "{ b := complement (true), o := omit, h := omit }" ) { setverdict(fail) }; + if( log2str( t_rec_b(tspt_b_c) ) != "{ b := complement(true), o := omit, h := omit }" ) { setverdict(fail) }; } //true diff --git a/regression_test/text2ttcn/charstring_test.ttcn b/regression_test/text2ttcn/charstring_test.ttcn index b8c4447dc755e68c8eac1aa2f5ed1c83ce69cefe..383fb47b9d3fce27442d9970490076b6ca94a1ee 100644 --- a/regression_test/text2ttcn/charstring_test.ttcn +++ b/regression_test/text2ttcn/charstring_test.ttcn @@ -711,11 +711,11 @@ testcase tc_cs_ModulePar_emb() runs on MC { log(t_rcs(tspt_cs_mod4vl3)); if(log2str(t_rcs(tspt_cs_mod4vl3)) != "{ cs := (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c1)); - if(log2str(t_rcs(tspt_cs_mod4c1)) != "{ cs := complement (\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c1)) != "{ cs := complement(\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c2)); - if(log2str(t_rcs(tspt_cs_mod4c2)) != "{ cs := complement (\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c2)) != "{ cs := complement(\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c3)); - if(log2str(t_rcs(tspt_cs_mod4c3)) != "{ cs := complement (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c3)) != "{ cs := complement(\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r1)); if(log2str(t_rcs(tspt_cs_mod4r1)) != "{ cs := (\"A\" .. \"B\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r2)); @@ -748,11 +748,11 @@ testcase tc_cs_ModulePar_emb() runs on MC { log(t_rcs(tspt_cs_mod4vl3ifp)); if(log2str(t_rcs(tspt_cs_mod4vl3ifp)) != "{ cs := (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c1ifp)); - if(log2str(t_rcs(tspt_cs_mod4c1ifp)) != "{ cs := complement (\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c1ifp)) != "{ cs := complement(\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c2ifp)); - if(log2str(t_rcs(tspt_cs_mod4c2ifp)) != "{ cs := complement (\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c2ifp)) != "{ cs := complement(\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c3ifp)); - if(log2str(t_rcs(tspt_cs_mod4c3ifp)) != "{ cs := complement (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rcs(tspt_cs_mod4c3ifp)) != "{ cs := complement(\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r1ifp)); if(log2str(t_rcs(tspt_cs_mod4r1ifp)) != "{ cs := (\"A\" .. \"B\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r2ifp)); @@ -1023,11 +1023,11 @@ testcase tc_cs_ttcn2string_emb() runs on MC { log(t_rcs(tspt_cs_mod4vl3)); if(ttcn2string(t_rcs(tspt_cs_mod4vl3)) != "{ cs := (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c1)); - if(ttcn2string(t_rcs(tspt_cs_mod4c1)) != "{ cs := complement (\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c1)) != "{ cs := complement(\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c2)); - if(ttcn2string(t_rcs(tspt_cs_mod4c2)) != "{ cs := complement (\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c2)) != "{ cs := complement(\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c3)); - if(ttcn2string(t_rcs(tspt_cs_mod4c3)) != "{ cs := complement (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c3)) != "{ cs := complement(\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r1)); if(ttcn2string(t_rcs(tspt_cs_mod4r1)) != "{ cs := (\"A\" .. \"B\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r2)); @@ -1060,11 +1060,11 @@ testcase tc_cs_ttcn2string_emb() runs on MC { log(t_rcs(tspt_cs_mod4vl3ifp)); if(ttcn2string(t_rcs(tspt_cs_mod4vl3ifp)) != "{ cs := (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c1ifp)); - if(ttcn2string(t_rcs(tspt_cs_mod4c1ifp)) != "{ cs := complement (\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c1ifp)) != "{ cs := complement(\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c2ifp)); - if(ttcn2string(t_rcs(tspt_cs_mod4c2ifp)) != "{ cs := complement (\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c2ifp)) != "{ cs := complement(\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4c3ifp)); - if(ttcn2string(t_rcs(tspt_cs_mod4c3ifp)) != "{ cs := complement (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rcs(tspt_cs_mod4c3ifp)) != "{ cs := complement(\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r1ifp)); if(ttcn2string(t_rcs(tspt_cs_mod4r1ifp)) != "{ cs := (\"A\" .. \"B\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rcs(tspt_cs_mod4r2ifp)); diff --git a/regression_test/text2ttcn/enum_test.ttcn b/regression_test/text2ttcn/enum_test.ttcn index 3735ea990f14525590ce4687be9eeda03d9f2444..eeeb398d4d40521e8e576ed7f75bef4a85949b09 100644 --- a/regression_test/text2ttcn/enum_test.ttcn +++ b/regression_test/text2ttcn/enum_test.ttcn @@ -153,11 +153,11 @@ testcase tc_enum_ModulePar_emb() runs on MC { log(log2str(t_renum(tspt_enum_mod4o))); if(log2str(t_renum(tspt_enum_mod4o)) == "{ e := omit }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c0))); - if(log2str(t_renum(tspt_enum_mod4c0)) == "{ e := complement (omit) }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c0)) == "{ e := complement(omit) }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c1))); - if(log2str(t_renum(tspt_enum_mod4c1)) == "{ e := complement (first (0)) }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c1)) == "{ e := complement(first (0)) }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c2))); - if(log2str(t_renum(tspt_enum_mod4c2)) == "{ e := complement (first (0), second (1)) }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c2)) == "{ e := complement(first (0), second (1)) }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4vl1))); if(log2str(t_renum(tspt_enum_mod4vl1)) == "{ e := first (0) }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4vl2))); @@ -172,11 +172,11 @@ testcase tc_enum_ModulePar_emb() runs on MC { log(log2str(t_renum(tspt_enum_mod4oifp))); if(log2str(t_renum(tspt_enum_mod4oifp)) == "{ e := omit ifpresent }") {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c0ifp))); - if(log2str(t_renum(tspt_enum_mod4c0ifp)) == "{ e := complement (omit) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c0ifp)) == "{ e := complement(omit) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c1ifp))); - if(log2str(t_renum(tspt_enum_mod4c1ifp)) == "{ e := complement (first (0)) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c1ifp)) == "{ e := complement(first (0)) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4c2ifp))); - if(log2str(t_renum(tspt_enum_mod4c2ifp)) == "{ e := complement (first (0), second (1)) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(log2str(t_renum(tspt_enum_mod4c2ifp)) == "{ e := complement(first (0), second (1)) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4vl1ifp))); if(log2str(t_renum(tspt_enum_mod4vl1ifp)) == "{ e := first (0) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(log2str(t_renum(tspt_enum_mod4vl2ifp))); @@ -194,11 +194,11 @@ testcase tc_enum_ttcn2str_emb() runs on MC { log(ttcn2string(t_renum(tspt_enum_mod4o))); if(ttcn2string(t_renum(tspt_enum_mod4o)) == "{ e := omit }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c0))); - if(ttcn2string(t_renum(tspt_enum_mod4c0)) == "{ e := complement (omit) }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c0)) == "{ e := complement(omit) }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c1))); - if(ttcn2string(t_renum(tspt_enum_mod4c1)) == "{ e := complement (first) }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c1)) == "{ e := complement(first) }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c2))); - if(ttcn2string(t_renum(tspt_enum_mod4c2)) == "{ e := complement (first, second) }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c2)) == "{ e := complement(first, second) }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4vl1))); if(ttcn2string(t_renum(tspt_enum_mod4vl1)) == "{ e := first }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4vl2))); @@ -213,11 +213,11 @@ testcase tc_enum_ttcn2str_emb() runs on MC { log(ttcn2string(t_renum(tspt_enum_mod4oifp))); if(ttcn2string(t_renum(tspt_enum_mod4oifp)) == "{ e := omit ifpresent }") {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c0ifp))); - if(ttcn2string(t_renum(tspt_enum_mod4c0ifp)) == "{ e := complement (omit) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c0ifp)) == "{ e := complement(omit) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c1ifp))); - if(ttcn2string(t_renum(tspt_enum_mod4c1ifp)) == "{ e := complement (first) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c1ifp)) == "{ e := complement(first) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4c2ifp))); - if(ttcn2string(t_renum(tspt_enum_mod4c2ifp)) == "{ e := complement (first, second) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} + if(ttcn2string(t_renum(tspt_enum_mod4c2ifp)) == "{ e := complement(first, second) ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4vl1ifp))); if(ttcn2string(t_renum(tspt_enum_mod4vl1ifp)) == "{ e := first ifpresent }" ) {setverdict(pass)} else {setverdict(fail)} log(ttcn2string(t_renum(tspt_enum_mod4vl2ifp))); diff --git a/regression_test/text2ttcn/float_test.ttcn b/regression_test/text2ttcn/float_test.ttcn index b1003252f93b471aad8df1ee770ff77d33f2bfd0..a3790e517afe2890fe42490ee6162c28cd211133 100644 --- a/regression_test/text2ttcn/float_test.ttcn +++ b/regression_test/text2ttcn/float_test.ttcn @@ -131,8 +131,8 @@ modulepar { if( log2str(t_rec(1,tspt_f_vl1,omit,omit)) != "{ i := 1, f := 0.000000, cs := omit, bs := omit }") { setverdict(fail) }; if( log2str(t_rec(1,tspt_f_vl2,omit,omit)) != "{ i := 1, f := (0.000000, 1.200000), cs := omit, bs := omit }") { setverdict(fail) }; if( log2str(t_rec(1,tspt_f_vl3,omit,omit)) != "{ i := 1, f := (0.000000, 1.200000, -1.900000), cs := omit, bs := omit }") { setverdict(fail) }; - if( log2str(t_rec(1,tspt_f_c1,omit,omit)) != "{ i := 1, f := complement (0.000000), cs := omit, bs := omit }") { setverdict(fail) }; - if( log2str(t_rec(1,tspt_f_c3,omit,omit)) != "{ i := 1, f := complement (0.000000, 1.200000, -1.900000), cs := omit, bs := omit }") { setverdict(fail) }; + if( log2str(t_rec(1,tspt_f_c1,omit,omit)) != "{ i := 1, f := complement(0.000000), cs := omit, bs := omit }") { setverdict(fail) }; + if( log2str(t_rec(1,tspt_f_c3,omit,omit)) != "{ i := 1, f := complement(0.000000, 1.200000, -1.900000), cs := omit, bs := omit }") { setverdict(fail) }; //log(tspt_f_r); if( log2str(t_rec(1,tspt_f_r,omit,omit)) != "{ i := 1, f := (-1.900000 .. 3.100000), cs := omit, bs := omit }" ) { setverdict(fail) }; } diff --git a/regression_test/text2ttcn/hexstring_test.ttcn b/regression_test/text2ttcn/hexstring_test.ttcn index 9f24bb21298d24a7fbce55f7e5b188e00760a03e..e5ac30270a7fdc6c29fb5ec5adfd5bd4da2b7895 100644 --- a/regression_test/text2ttcn/hexstring_test.ttcn +++ b/regression_test/text2ttcn/hexstring_test.ttcn @@ -199,11 +199,11 @@ modulepar { log(t_rhs(tspt_hs_mod4vl3)); if(log2str(t_rhs(tspt_hs_mod4vl3)) != "{ hs := (\'ABBA\'H, \'BABA\'H, \'B12\'H) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c1)); - if(log2str(t_rhs(tspt_hs_mod4c1)) != "{ hs := complement (\'ABBA\'H) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c1)) != "{ hs := complement(\'ABBA\'H) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c2)); - if(log2str(t_rhs(tspt_hs_mod4c2)) != "{ hs := complement (\'ABBA\'H, \'BABA\'H) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c2)) != "{ hs := complement(\'ABBA\'H, \'BABA\'H) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c3)); - if(log2str(t_rhs(tspt_hs_mod4c3)) != "{ hs := complement (\'ABBA\'H, \'BABA\'H, \'B12\'H) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c3)) != "{ hs := complement(\'ABBA\'H, \'BABA\'H, \'B12\'H) }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4pa)); if(log2str(t_rhs(tspt_hs_mod4pa)) != "{ hs := \'ABC*123\'H }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4pq)); @@ -232,11 +232,11 @@ modulepar { log(t_rhs(tspt_hs_mod4vl3ifp)); if(log2str(t_rhs(tspt_hs_mod4vl3ifp)) != "{ hs := (\'ABBA\'H, \'BABA\'H, \'B12\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c1ifp)); - if(log2str(t_rhs(tspt_hs_mod4c1ifp)) != "{ hs := complement (\'ABBA\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c1ifp)) != "{ hs := complement(\'ABBA\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c2ifp)); - if(log2str(t_rhs(tspt_hs_mod4c2ifp)) != "{ hs := complement (\'ABBA\'H, \'BABA\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c2ifp)) != "{ hs := complement(\'ABBA\'H, \'BABA\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4c3ifp)); - if(log2str(t_rhs(tspt_hs_mod4c3ifp)) != "{ hs := complement (\'ABBA\'H, \'BABA\'H, \'B12\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_rhs(tspt_hs_mod4c3ifp)) != "{ hs := complement(\'ABBA\'H, \'BABA\'H, \'B12\'H) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4paifp)); if(log2str(t_rhs(tspt_hs_mod4paifp)) != "{ hs := \'ABC*123'H ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rhs(tspt_hs_mod4pqifp)); diff --git a/regression_test/text2ttcn/integer_test.ttcn b/regression_test/text2ttcn/integer_test.ttcn index 04cc7a21c984592a4b391de684ac6d429b04dfc8..eec0f745af02b1d3db93b42f6eaa26fd3d271fdd 100644 --- a/regression_test/text2ttcn/integer_test.ttcn +++ b/regression_test/text2ttcn/integer_test.ttcn @@ -140,7 +140,7 @@ modulepar { log( t_rec(t_i_vl,omit,omit,omit)); if( log2str(t_rec(t_i_vl,omit,omit,omit)) != "{ i := (0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; log( t_rec(t_i_c,omit,omit,omit)); - if( log2str(t_rec(t_i_c,omit,omit,omit)) != "{ i := complement (0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; + if( log2str(t_rec(t_i_c,omit,omit,omit)) != "{ i := complement(0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; } testcase tc_integer_Embedded() runs on MC { @@ -159,7 +159,7 @@ modulepar { log( t_rec(tspt_i_vl3,omit,omit,omit)); if( log2str(t_rec(tspt_i_vl3,omit,omit,omit)) != "{ i := (0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; log( t_rec(tspt_i_c,omit,omit,omit)); - if( log2str(t_rec(tspt_i_c,omit,omit,omit)) != "{ i := complement (0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; + if( log2str(t_rec(tspt_i_c,omit,omit,omit)) != "{ i := complement(0, 1, -1), f := omit, cs := omit, bs := omit }") { setverdict(fail) }; } testcase tc_integer_Embedded_value() runs on MC { diff --git a/regression_test/text2ttcn/octetstring_test.ttcn b/regression_test/text2ttcn/octetstring_test.ttcn index 53dd0012975d98ae0499f36c270606f4e29b6980..ee169457e7ee38aad44124b1f57d0040c10df704 100644 --- a/regression_test/text2ttcn/octetstring_test.ttcn +++ b/regression_test/text2ttcn/octetstring_test.ttcn @@ -192,11 +192,11 @@ modulepar { log(t_ros(tspt_os_mod4vl3)); if(log2str(t_ros(tspt_os_mod4vl3)) != "{ os := (\'ABBA\'O, \'BABA\'O, \'B120\'O) }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c1)); - if(log2str(t_ros(tspt_os_mod4c1)) != "{ os := complement (\'ABBA\'O) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c1)) != "{ os := complement(\'ABBA\'O) }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c2)); - if(log2str(t_ros(tspt_os_mod4c2)) != "{ os := complement (\'ABBA\'O, \'BABA\'O) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c2)) != "{ os := complement(\'ABBA\'O, \'BABA\'O) }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c3)); - if(log2str(t_ros(tspt_os_mod4c3)) != "{ os := complement (\'ABBA\'O, \'BABA\'O, \'B120\'O) }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c3)) != "{ os := complement(\'ABBA\'O, \'BABA\'O, \'B120\'O) }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4pa)); if(log2str(t_ros(tspt_os_mod4pa)) != "{ os := \'ABCD*1234\'O }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4pq)); @@ -225,11 +225,11 @@ modulepar { log(t_ros(tspt_os_mod4vl3ifp)); if(log2str(t_ros(tspt_os_mod4vl3ifp)) != "{ os := (\'ABBA\'O, \'BABA\'O, \'B120\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c1ifp)); - if(log2str(t_ros(tspt_os_mod4c1ifp)) != "{ os := complement (\'ABBA\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c1ifp)) != "{ os := complement(\'ABBA\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c2ifp)); - if(log2str(t_ros(tspt_os_mod4c2ifp)) != "{ os := complement (\'ABBA\'O, \'BABA\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c2ifp)) != "{ os := complement(\'ABBA\'O, \'BABA\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4c3ifp)); - if(log2str(t_ros(tspt_os_mod4c3ifp)) != "{ os := complement (\'ABBA\'O, \'BABA\'O, \'B120\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(log2str(t_ros(tspt_os_mod4c3ifp)) != "{ os := complement(\'ABBA\'O, \'BABA\'O, \'B120\'O) ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4paifp)); if(log2str(t_ros(tspt_os_mod4paifp)) != "{ os := \'ABCD*1234'O ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_ros(tspt_os_mod4pqifp)); diff --git a/regression_test/text2ttcn/record_test.ttcn b/regression_test/text2ttcn/record_test.ttcn index 4aefe594a36cddaf03cf80d0144b50ab648a7fbe..4cda1968fdea82c2e6c44b732941fbdfd67bec5b 100644 --- a/regression_test/text2ttcn/record_test.ttcn +++ b/regression_test/text2ttcn/record_test.ttcn @@ -887,7 +887,7 @@ testcase tc_REC_log2str_emb() runs on MC { log(t_rrec(tspt_rec_mod4vr)); if(log2str(t_rrec(tspt_rec_mod4vr)) == "{ rec := { i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B } }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4c)); - if(log2str(t_rrec(tspt_rec_mod4c)) == "{ rec := complement ({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }) }") { setverdict(pass) } else {setverdict(fail)} + if(log2str(t_rrec(tspt_rec_mod4c)) == "{ rec := complement({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }) }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vl)); if(log2str(t_rrec(tspt_rec_mod4vl)) == "{ rec := { i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B } }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vq)); @@ -914,7 +914,7 @@ testcase tc_REC_ifp_log2str_emb() runs on MC { log(t_rrec(tspt_rec_mod4vrifp)); if(log2str(t_rrec(tspt_rec_mod4vrifp)) == "{ rec := { i := (1 .. 2) ifpresent, f := ? ifpresent, cs := \"ABBA\" ifpresent, bs := '0100'B ifpresent } }" ) { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4cifp)); - if(log2str(t_rrec(tspt_rec_mod4cifp)) == "{ rec := complement ({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }) }") { setverdict(pass) } else {setverdict(fail)} + if(log2str(t_rrec(tspt_rec_mod4cifp)) == "{ rec := complement({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }) }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vlifp)); if(log2str(t_rrec(tspt_rec_mod4vlifp)) == "{ rec := { i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent } }" ) { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vqifp)); @@ -1007,7 +1007,7 @@ testcase tc_REC_ttcn2string_emb() runs on MC { log(t_rrec(tspt_rec_mod4vr)); if(ttcn2string(t_rrec(tspt_rec_mod4vr)) == "{ rec := { i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B } }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4c)); - if(ttcn2string(t_rrec(tspt_rec_mod4c)) == "{ rec := complement ({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }) }") { setverdict(pass) } else {setverdict(fail)} + if(ttcn2string(t_rrec(tspt_rec_mod4c)) == "{ rec := complement({ i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B }) }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vl)); if(ttcn2string(t_rrec(tspt_rec_mod4vl)) == "{ rec := { i := 1, f := 1.000000, cs := (\"ABBA\", \"baba\"), bs := '0100'B } }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vq)); @@ -1045,7 +1045,7 @@ testcase tc_REC_ifp_ttcn2string_emb() runs on MC { log(t_rrec(tspt_rec_mod4vrifp)); if(ttcn2string(t_rrec(tspt_rec_mod4vrifp)) == "{ rec := { i := (1 .. 2) ifpresent, f := ? ifpresent, cs := \"ABBA\" ifpresent, bs := '0100'B ifpresent } }" ) { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4cifp)); - if(ttcn2string(t_rrec(tspt_rec_mod4cifp)) == "{ rec := complement ({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }) }") { setverdict(pass) } else {setverdict(fail)} + if(ttcn2string(t_rrec(tspt_rec_mod4cifp)) == "{ rec := complement({ i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent }) }") { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vlifp)); if(ttcn2string(t_rrec(tspt_rec_mod4vlifp)) == "{ rec := { i := 1 ifpresent, f := 1.000000 ifpresent, cs := (\"ABBA\", \"baba\") ifpresent, bs := '0100'B ifpresent } }" ) { setverdict(pass) } else {setverdict(fail)} log(t_rrec(tspt_rec_mod4vqifp)); diff --git a/regression_test/text2ttcn/recordof_test.ttcn b/regression_test/text2ttcn/recordof_test.ttcn index 55e99be8a530e1e276d0a535183a645cce678031..292121c3231d40075bfa47c46ea4b8713921324a 100644 --- a/regression_test/text2ttcn/recordof_test.ttcn +++ b/regression_test/text2ttcn/recordof_test.ttcn @@ -221,7 +221,7 @@ modulepar { log(t_recof_i_r); if( log2str(t_recof_i_r) != "{ 1, (1 .. 3) }") { setverdict(fail) } else { setverdict(pass) }; log(t_recof_i_c); - if( log2str(t_recof_i_c) != "{ 1, complement (1, 2, 3) }") { setverdict(fail) } else { setverdict(pass) }; + if( log2str(t_recof_i_c) != "{ 1, complement(1, 2, 3) }") { setverdict(fail) } else { setverdict(pass) }; log(t_recof_i_lv); if( log2str(t_recof_i_lv) != "? length (3)") { setverdict(fail) } else { setverdict(pass) }; log(t_recof_i_lr); @@ -258,7 +258,7 @@ modulepar { log(tspt_recof_i_r); if( log2str(tspt_recof_i_r) != "{ 1, (1 .. 3) }") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_i_c); - if( log2str(tspt_recof_i_c) != "{ 1, complement (1, 2, 3) }") { setverdict(fail) } else { setverdict(pass) }; + if( log2str(tspt_recof_i_c) != "{ 1, complement(1, 2, 3) }") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_i_lv); if( log2str(tspt_recof_i_lv) != "? length (3)") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_i_lr); @@ -529,7 +529,7 @@ modulepar { var template RoI vlt := { permutation (1,2,3),10 } log("Before mod: ",vlt); //Before mod: { permutation(1, 2, 3), 10 } vlt := { 1, complement(1,2,3),3,4 } ; - log("after mod: ",vlt); //after mod: { permutation(1, complement (1, 2, 3), 3), 4 } but it should be { 1, complement(1,2,3),3,4 } + log("after mod: ",vlt); //after mod: { permutation(1, complement(1, 2, 3), 3), 4 } but it should be { 1, complement(1,2,3),3,4 } var RoRoI vl_good_values := {{1,0,3,4},{1,4,3,4},{1,5,3,4},{1,-1,3,4}} var RoRoI vl_wrong_values := { {}, {2},{1,1,3,4},{1,2,3,4},{1,3,3,4},{1,2,3,4},{1,3},{3,1,1,4} } f_checkMatchingValues_roi(vlt,vl_good_values,vl_wrong_values); @@ -538,7 +538,7 @@ modulepar { //fails testcase tc_recordof_i_mod4c_undefined() runs on MC { //original: - log(tspt_recof_i_mod4cu); //expected: { 1, complement(1,2,3),3,4 } , got: { permutation(1, complement (1, 2, 3), 3), 4 } + log(tspt_recof_i_mod4cu); //expected: { 1, complement(1,2,3),3,4 } , got: { permutation(1, complement(1, 2, 3), 3), 4 } var RoRoI vl_good_values := {{1,0,3,4},{1,4,3,4},{1,5,3,4},{1,-1,3,4}} var RoRoI vl_wrong_values := { {}, {2},{1,1,3,4},{1,2,3,4},{1,3,3,4},{1,2,3,4},{1,3},{3,1,1,4} } f_checkMatchingValues_roi(tspt_recof_i_mod4cu,vl_good_values,vl_wrong_values); @@ -629,7 +629,7 @@ modulepar { log(tspt_recof_f_r); if( log2str(tspt_recof_f_r) != "{ 1.000000, (1.000000 .. 3.000000) }") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_f_c); - if( log2str(tspt_recof_f_c) != "{ 1.000000, complement (1.000000, 2.000000, 3.000000) }") { setverdict(fail) } else { setverdict(pass) }; + if( log2str(tspt_recof_f_c) != "{ 1.000000, complement(1.000000, 2.000000, 3.000000) }") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_f_lv); if( log2str(tspt_recof_f_lv) != "? length (3)") { setverdict(fail) } else { setverdict(pass) }; log(tspt_recof_f_lr); diff --git a/regression_test/text2ttcn/set_test.ttcn b/regression_test/text2ttcn/set_test.ttcn index 69ec72df563ce50df7f521b3bc0a00353053912b..2850b925c16c8dd8d3413dad93a7d8cb165fc0a2 100644 --- a/regression_test/text2ttcn/set_test.ttcn +++ b/regression_test/text2ttcn/set_test.ttcn @@ -152,11 +152,11 @@ testcase tc_set_ModulePar_emb() runs on MC { log(t_rset(tspt_set_mod4o)); if(log2str(t_rset(tspt_set_mod4o)) == "{ s := omit }") {setverdict(pass)} else {setverdict(fail)}; log(t_rset(tspt_set_mod4c1)); - if(log2str(t_rset(tspt_set_mod4c1)) == "{ s := complement ({ b := true, i := 99, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }) }") {setverdict(pass)} else {setverdict(fail)}; + if(log2str(t_rset(tspt_set_mod4c1)) == "{ s := complement({ b := true, i := 99, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }) }") {setverdict(pass)} else {setverdict(fail)}; log(t_rset(tspt_set_mod4c2)); - if(log2str(t_rset(tspt_set_mod4c2)) == "{ s := complement ({ b := true, i := 99, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, omit) }") {setverdict(pass)} else {setverdict(fail)}; + if(log2str(t_rset(tspt_set_mod4c2)) == "{ s := complement({ b := true, i := 99, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, omit) }") {setverdict(pass)} else {setverdict(fail)}; log(t_rset(tspt_set_mod4c3)); - if(log2str(t_rset(tspt_set_mod4c3)) == "{ s := complement ({ b := true, i := 0, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, { b := true, i := 1, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, { b := true, i := 2, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }) }") {setverdict(pass)} else {setverdict(fail)}; + if(log2str(t_rset(tspt_set_mod4c3)) == "{ s := complement({ b := true, i := 0, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, { b := true, i := 1, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }, { b := true, i := 2, f := 0.000000, bs := omit, os := ?, hs := ?, cs := \"sth\" }) }") {setverdict(pass)} else {setverdict(fail)}; } //rset diff --git a/regression_test/text2ttcn/setof_test.ttcn b/regression_test/text2ttcn/setof_test.ttcn index 8686587820d42351f41d399b3df50e572a252cb4..a229caacfb270e1f8fd6f5720181dff78912b255 100644 --- a/regression_test/text2ttcn/setof_test.ttcn +++ b/regression_test/text2ttcn/setof_test.ttcn @@ -133,11 +133,11 @@ testcase tc_setof_ModulePar() runs on MC { log(log2str(tspt_setof_mod4o)); if( log2str(tspt_setof_mod4o) == "omit") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c0)); - if( log2str(tspt_setof_mod4c0) == "{ complement (omit) }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c0) == "{ complement(omit) }") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c1)); - if( log2str(tspt_setof_mod4c1) == "{ complement (\"a\"), \"b\" }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c1) == "{ complement(\"a\"), \"b\" }") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c2)); - if( log2str(tspt_setof_mod4c2) == "{ complement (\"a\", \"b\"), \"c\" }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c2) == "{ complement(\"a\", \"b\"), \"c\" }") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c3)); if( log2str(tspt_setof_mod4c3) == "complement({ \"a\" }, { \"a\", \"b\" }, { \"c\" })") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4vl)); @@ -164,11 +164,11 @@ testcase tc_setof_ModulePar() runs on MC { log(log2str(tspt_setof_mod4oifp)); if( log2str(tspt_setof_mod4oifp) == "omit ifpresent") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c0ifp)); - if( log2str(tspt_setof_mod4c0ifp) == "{ complement (omit) } ifpresent") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c0ifp) == "{ complement(omit) } ifpresent") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c1ifp)); - if( log2str(tspt_setof_mod4c1ifp) == "{ complement (\"a\"), \"b\" } ifpresent") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c1ifp) == "{ complement(\"a\"), \"b\" } ifpresent") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c2ifp)); - if( log2str(tspt_setof_mod4c2ifp) == "{ complement (\"a\", \"b\"), \"c\" } ifpresent") { setverdict(pass)} else { setverdict(fail) } + if( log2str(tspt_setof_mod4c2ifp) == "{ complement(\"a\", \"b\"), \"c\" } ifpresent") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4c3ifp)); if( log2str(tspt_setof_mod4c3ifp) == "complement({ \"a\" }, { \"a\", \"b\" }, { \"c\" }) ifpresent") { setverdict(pass)} else { setverdict(fail) } log(log2str(tspt_setof_mod4vlifp)); @@ -195,11 +195,11 @@ testcase tc_setof_ModulePar_emb() runs on MC { log(log2str(t_rsocs(tspt_setof_mod4o))); if( log2str(t_rsocs(tspt_setof_mod4o)) == "{ s := omit }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c0))); - if( log2str(t_rsocs(tspt_setof_mod4c0)) == "{ s := { complement (omit) } }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c0)) == "{ s := { complement(omit) } }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c1))); - if( log2str(t_rsocs(tspt_setof_mod4c1)) == "{ s := { complement (\"a\"), \"b\" } }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c1)) == "{ s := { complement(\"a\"), \"b\" } }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c2))); - if( log2str(t_rsocs(tspt_setof_mod4c2)) == "{ s := { complement (\"a\", \"b\"), \"c\" } }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c2)) == "{ s := { complement(\"a\", \"b\"), \"c\" } }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c3))); if( log2str(t_rsocs(tspt_setof_mod4c3)) == "{ s := complement({ \"a\" }, { \"a\", \"b\" }, { \"c\" }) }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4vl))); @@ -225,11 +225,11 @@ testcase tc_setof_ModulePar_emb() runs on MC { log(log2str(t_rsocs(tspt_setof_mod4oifp))); if( log2str(t_rsocs(tspt_setof_mod4oifp)) == "{ s := omit ifpresent }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c0ifp))); - if( log2str(t_rsocs(tspt_setof_mod4c0ifp)) == "{ s := { complement (omit) } ifpresent }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c0ifp)) == "{ s := { complement(omit) } ifpresent }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c1ifp))); - if( log2str(t_rsocs(tspt_setof_mod4c1ifp)) == "{ s := { complement (\"a\"), \"b\" } ifpresent }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c1ifp)) == "{ s := { complement(\"a\"), \"b\" } ifpresent }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c2ifp))); - if( log2str(t_rsocs(tspt_setof_mod4c2ifp)) == "{ s := { complement (\"a\", \"b\"), \"c\" } ifpresent }") { setverdict(pass)} else { setverdict(fail) } + if( log2str(t_rsocs(tspt_setof_mod4c2ifp)) == "{ s := { complement(\"a\", \"b\"), \"c\" } ifpresent }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4c3ifp))); if( log2str(t_rsocs(tspt_setof_mod4c3ifp)) == "{ s := complement({ \"a\" }, { \"a\", \"b\" }, { \"c\" }) ifpresent }") { setverdict(pass)} else { setverdict(fail) } log(log2str(t_rsocs(tspt_setof_mod4vlifp))); diff --git a/regression_test/text2ttcn/text2ttcn_1.cfg b/regression_test/text2ttcn/text2ttcn_1.cfg index 45d3fa3925643600ba6fc487d994dc641288cd1d..72a4d0dcb2683ef4daf24e4852bb4f748e623ef6 100644 --- a/regression_test/text2ttcn/text2ttcn_1.cfg +++ b/regression_test/text2ttcn/text2ttcn_1.cfg @@ -332,8 +332,8 @@ tspt_recof_i_mod4o := omit; tspt_recof_i_mod4a := *; tspt_recof_i_mod4q := ?; tspt_recof_i_mod4r := {1,(1..3)}; //range -//tspt_recof_i_mod4cu := { 1, complement(1,2,3) } //3->2 elements --undefined behavior, result: { permutation(1, complement (1, 2, 3) } -tspt_recof_i_mod4cu := { 1, complement(1,2,3),3,4 } //3->2 elements --undefined behavior, result: { permutation(1, complement (1, 2, 3) } +//tspt_recof_i_mod4cu := { 1, complement(1,2,3) } //3->2 elements --undefined behavior, result: { permutation(1, complement(1, 2, 3) } +tspt_recof_i_mod4cu := { 1, complement(1,2,3),3,4 } //3->2 elements --undefined behavior, result: { permutation(1, complement(1, 2, 3) } tspt_recof_i_mod4c := { 1, complement(1,2,3),1,1 } //3->4 elements tspt_recof_i_mod4cm1 := { 1, complement(1,2,3),1} //3->3 elements tspt_recof_i_mod4cm2 := { 1, complement(1,2,3),1,1,1} //3->5 elements diff --git a/regression_test/text2ttcn/ucharstring_test.ttcn b/regression_test/text2ttcn/ucharstring_test.ttcn index c7dda3e63a14445b1160f9b3cd96dbaf67c53feb..512a94b10f076b926a6ee315363e849a6627076a 100644 --- a/regression_test/text2ttcn/ucharstring_test.ttcn +++ b/regression_test/text2ttcn/ucharstring_test.ttcn @@ -269,11 +269,11 @@ testcase tc_ucs_ttcn2string_emb() runs on MC { log(t_rucs(tspt_ucs_mod4vl3)); if(ttcn2string(t_rucs(tspt_ucs_mod4vl3)) != "{ ucs := (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c1)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c1)) != "{ ucs := complement (\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c1)) != "{ ucs := complement(\"ABBA\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c2)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c2)) != "{ ucs := complement (\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c2)) != "{ ucs := complement(\"ABBA\", \"baba\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c3)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c3)) != "{ ucs := complement (\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c3)) != "{ ucs := complement(\"ABBA\", \"baba\", \"Bye\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4r1)); if(ttcn2string(t_rucs(tspt_ucs_mod4r1)) != "{ ucs := (\"A\" .. \"B\") }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4r2)); @@ -306,11 +306,11 @@ testcase tc_ucs_ttcn2string_emb() runs on MC { log(t_rucs(tspt_ucs_mod4vl3ifp)); if(ttcn2string(t_rucs(tspt_ucs_mod4vl3ifp)) != "{ ucs := (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c1ifp)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c1ifp)) != "{ ucs := complement (\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c1ifp)) != "{ ucs := complement(\"ABBA\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c2ifp)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c2ifp)) != "{ ucs := complement (\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c2ifp)) != "{ ucs := complement(\"ABBA\", \"baba\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4c3ifp)); - if(ttcn2string(t_rucs(tspt_ucs_mod4c3ifp)) != "{ ucs := complement (\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; + if(ttcn2string(t_rucs(tspt_ucs_mod4c3ifp)) != "{ ucs := complement(\"ABBA\", \"baba\", \"Bye\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4r1ifp)); if(ttcn2string(t_rucs(tspt_ucs_mod4r1ifp)) != "{ ucs := (\"A\" .. \"B\") ifpresent }") {setverdict(fail)} else {setverdict(pass)}; log(t_rucs(tspt_ucs_mod4r2ifp));