Commit 49accd8b authored by BenceJanosSzabo's avatar BenceJanosSzabo
Browse files

OER regtest fixes



Change-Id: I80bf68a44a6026f343f0c516fa3c0a60586505c8
Signed-off-by: default avatarBenceJanosSzabo <bence.janos.szabo@ericsson.com>
parent 6a82db01
......@@ -3152,7 +3152,15 @@ void Type::chk_oer() {
se_comps.clear();
se_comps2.clear();
}
// no break
case T_SEQ_A: {
// These asn1 types are sequences but don't need any checking.
// It could screw up XER coding for example.
if (t->get_typename().find("CHARACTER STRING", 0) != t->get_typename().size() ||
t->get_typename().find("EMBEDDED PDV", 0) != t->get_typename().size() ||
t->get_typename().find("@EXTERNAL", 0) != t->get_typename().size()) {
break;
}
oerattrib->extendable = t->u.secho.ctss->has_ellipsis();
if (oerattrib->extendable) {
oerattrib->nr_of_root_comps = t->u.secho.ctss->get_nof_root_comps();
......
......@@ -4655,7 +4655,7 @@ void defRecordClass1(const struct_def *sdef, output_struct *output)
if (oer_needed) {
// OER encode, RT1
src = mputprintf(src,
"int %s::OER_encode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& p_buf) const\n"
"int %s::OER_encode(const TTCN_Typedescriptor_t&, TTCN_Buffer& p_buf) const\n"
"{\n"
" if (!is_bound()) {\n"
" TTCN_EncDec_ErrorContext::error(TTCN_EncDec::ET_UNBOUND,\n"
......
......@@ -2279,6 +2279,13 @@
setverdict(fail, "tc_sequence: ", match(er, erres));
}
er := { me := 1, me2 := 2 }
os := '8001010102020780020103'O;
erres := dec_ExtensionRecord(os);
if (er != erres) {
setverdict(fail, "tc_sequence: ", match(er, erres));
}
var ExtensionRecord2 er2, erres2;
er2 := {
me := 1,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment