Merge branch 'maint'

* maint: (128 commits)
  beam_lib: Correct wrong type specification
  testSeqOf: Test constrained, extensible sizes
  [snmp/agent] Some restructuring of test suite
  Clean up testSeqOf
  Extend tests cases for BIT STRING
  Improve tests of ENUMERATED
  asn1ct_check: Eliminate useless Per argument from complist_as_tuple()
  asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type
  asn1ct_gen_per: Remove useless renewal of 'enumval'
  Fix encoding of semi-constrained, extensible INTEGERs
  PER/UPER: Fix decoding of semi-constrained INTEGERs
  testPrim: Simplify test cases using a roundtrip function
  BER: Fix handling of a constructed default value for a class
  PER: Generate code for deep table constraints at compile-time
  Normalize data representation for table constraints
  asn1ct: Simplify check_value/2
  Extend tests to cover more code in asn1ct_check
  Clean up checking of values for ENUMERATEDs
  Introduce a new mechanism for structured error handling
  asn1_db: Make dbput/3 and dbsave/2 asynchronous
  ...

1 files changed, 77 insertions, 15 deletions

diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 0a437e12df..53e5043cb7 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -39,21 +39,6 @@ RANAP-PDU ::= CHOICE {
 
 CLASS2 ::= RANAP-ELEMENTARY-PROCEDURE
 
-MY-CLASS ::= CLASS {
-    &integerValue      INTEGER UNIQUE,
-    &booleanValue      BOOLEAN,
-    &stringValue       PrintableString
-    }
-
-myobject MY-CLASS ::= {
-    &integerValue      12,
-    &booleanValue      TRUE,
-    &stringValue       "hejsan"
-    }
-MyObjectSet MY-CLASS ::= {
-    myobject
-    }
-
 InitiatingMessage  ::= SEQUENCE {
     procedureCode  RANAP-ELEMENTARY-PROCEDURE.&procedureCode	({RANAP-ELEMENTARY-PROCEDURES}),
     criticality	RANAP-ELEMENTARY-PROCEDURE.&criticality		({RANAP-ELEMENTARY-PROCEDURES}{@procedureCode}),
@@ -148,6 +133,83 @@ id-Iu-Release3				INTEGER ::= 3
 id-Iu-Release4				INTEGER ::= 4
 id-Iu-Release5				INTEGER ::= 5
 
+--
+-- MY-CLASS
+--
+
+Seq ::= SEQUENCE {
+    int INTEGER,
+    str OCTET STRING
+}
+
+MY-CLASS ::= CLASS {
+    &Count             DEFAULT INTEGER,
+    &integerValue      INTEGER UNIQUE,
+    &booleanValue      BOOLEAN,
+    &stringValue       PrintableString
+}
+
+myobject MY-CLASS ::= {
+    &integerValue      12,
+    &booleanValue      TRUE,
+    &stringValue       "hejsan"
+}
+
+myotherobject MY-CLASS ::= {
+    &Count             Seq,
+    &integerValue      42,
+    &booleanValue      FALSE,
+    &stringValue       "hoppsan"
+}
+
+MyObjectSet MY-CLASS ::= {
+    myobject | myotherobject |
+    {
+        -- Each character will be encoded in 3 bits in UPER, 4 bits in PER.
+	&Count             NumericString (FROM("01234567") ^ SIZE(8)),
+	&integerValue      43,
+	&booleanValue      TRUE,
+	&stringValue       "tjosan"
+    }
+}
+
+MyPdu ::= SEQUENCE {
+    count MY-CLASS.&Count ({MyObjectSet}{@int}),
+    int   MY-CLASS.&integerValue ({MyObjectSet}),
+    bool  MY-CLASS.&booleanValue ({MyObjectSet}{@int}),
+    str   MY-CLASS.&stringValue ({MyObjectSet}{@int})
+}
+
+Seq2 ::= SEQUENCE {
+   int MY-CLASS.&integerValue ({MyObjectSet}),
+   seqof SEQUENCE (1..10) OF MY-CLASS.&booleanValue ({MyObjectSet}{@int}),
+   setof SET (1..10) OF MY-CLASS.&booleanValue ({MyObjectSet}{@int})
+}
+
+--
+-- Class with constructed default
+--
+
+CONSTRUCTED-DEFAULT ::= CLASS {
+  &id INTEGER UNIQUE,
+  &Type DEFAULT SEQUENCE { a INTEGER, b BOOLEAN },
+  &ok BOOLEAN DEFAULT TRUE
+}
+
+constructed1 CONSTRUCTED-DEFAULT ::= { &id 1 }
+constructed2 CONSTRUCTED-DEFAULT ::= { &id 2, &ok false }
+
+ConstructedDefaultSet CONSTRUCTED-DEFAULT ::= {
+  constructed1 |
+  constructed2 |
+  { &id 3, &Type BOOLEAN }
+}
+
+ConstructedPdu ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+}
+
 END