Merge "Fixed type descriptor generation fault caused by OER changes (bug 538482)"

compiler2/Type.cc

@@ -7418,6 +7418,7 @@ namespace Common {
       if (t->is_tagged() || t->rawattrib || t->textattrib || t->jsonattrib ||
           (!t->is_asn1() && t->hasEncodeAttr(get_encoding_name(CT_JSON))) ||
           (t->xerattrib && !t->xerattrib->empty() ) ||
+          (asn1_xer && t->is_asn1() && t->ownertype != OT_RECORD_OF && t->ownertype != OT_REF_SPEC) ||
           (t->oerattrib && !t->oerattrib->empty() && t->is_asn1()))
       {
         return t->get_genname_own(p_scope);

compiler2/ttcn3/OerAST.cc

@@ -13,7 +13,7 @@
 
 OerAST::OerAST() :
   bytes(-1),
-  signed_(false),
+  signed_(true),
   length(-1),
   extendable(false),
   nr_of_root_comps(0),
@@ -33,6 +33,6 @@ OerAST::~OerAST() {
 }
 
 bool OerAST::empty() const {
-  return bytes == -1 && signed_ == false && length == -1 &&
+  return bytes == -1 && signed_ && length == -1 &&
     extendable == false && nr_of_root_comps == 0 && ext_attr_groups.empty() && p.empty();
 }

regression_test/templateOctetstr/.gitignore

@@ -4,4 +4,6 @@ TtemplateOctetstr_se[qt].cc
 TtemplateOctetstr_se[qt]of.cc
 TtemplateOctetstr_union.cc
 TtemplateOctetstr.hh
+TtemplateOctetstringDecmatch*.cc
+TtemplateOctetstringDecmatch*.hh
 templateOctetstr.log