CBSP: Hack to make receive templates work
For some reason, the 'ifpresent' annotation doesn't work in lists
of templates. This means we have to re-think the CBSP template
structure at some point. However, this would be a significant detour
and I'd rather have working tests right now, so we can verify the
actual functionality merged into the BSC right now.
Change-Id: I3fa174b4352c17feaea4d33f773877104d4913c4
diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index 3c60f14..86eaf69 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -454,7 +454,7 @@
tr_CbspFailList(fail_list)
};
if (istemplatekind(compl_list, "*")) {
- ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
+ //ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
} else if (istemplatekind(compl_list, "?")) {
ies[lengthof(ies)] := tr_CbspNumComplList(?);
} else if (not istemplatekind(compl_list, "omit")) {
@@ -507,14 +507,14 @@
tr_CbspFailList(fail_list)
};
if (istemplatekind(compl_list, "*")) {
- ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+ //ies[lengthof(ies)] := tr_CbspCellList ifpresent;
} else if (istemplatekind(compl_list, "?")) {
ies[lengthof(ies)] := tr_CbspNumComplList(?);
} else if (not istemplatekind(compl_list, "omit")) {
ies[lengthof(ies)] := tr_CbspNumComplList(compl_list);
}
if (istemplatekind(cell_list, "*")) {
- ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+ //ies[lengthof(ies)] := tr_CbspCellList ifpresent;
} else if (istemplatekind(cell_list, "?")) {
ies[lengthof(ies)] := tr_CbspCellList(?);
} else if (not istemplatekind(cell_list, "omit")) {
@@ -626,12 +626,12 @@
tr_CbspFailList(fail_list)
};
if (istemplatekind(compl_list, "*")) {
- ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
+ //ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
} else if (not istemplatekind(compl_list, "omit")) {
ies[lengthof(ies)] := tr_CbspNumComplList(compl_list);
}
if (istemplatekind(compl_list, "*")) {
- ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+ //ies[lengthof(ies)] := tr_CbspCellList ifpresent;
} else if (not istemplatekind(cell_list, "omit")) {
ies[lengthof(ies)] := tr_CbspCellList(cell_list);
}