Correct expansion of parameterized types

Attempting to compile:

SomeType{SOME-CLASS-NAME, SOME-CLASS-NAME:SomeSet} ::= ...
        SEQUENCE {
            something   SOME-CLASS-NAME.&id({SomeSet})
        }

would crash the compiler, because the actual parameter for
SOME-CLASS-NAME was not substituted into the governor for
the SomeSet parameter.

While we are at it, combine the functionality of is_class/2
and get_class_def/2 (eliminating is_class/2). Most callers
call both function.

1 files changed, 22 insertions, 0 deletions

diff --git a/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 b/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1
index 491bdf8956..68fc782f33 100644
--- a/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1
@@ -20,4 +20,26 @@ T21 ::= General2{PrintableString}
 
 T22 ::= General2{BIT STRING}
 
+
+--
+-- Test a class parameter that is the governor for another parameter.
+--
+
+AlgorithmIdentifier{ALGORITHM-TYPE, ALGORITHM-TYPE:AlgorithmSet} ::=
+  SEQUENCE {
+     algorithm  ALGORITHM-TYPE.&id   ({AlgorithmSet}),
+     type       ALGORITHM-TYPE.&Type ({AlgorithmSet}{@algorithm})
+  }
+
+AnAlgorithm ::= AlgorithmIdentifier{ SIGNATURE-ALGORITHM,
+	                             { {KEY 1 CONTAINING INTEGER} |
+				       {KEY 2 CONTAINING BOOLEAN} } }
+
+SIGNATURE-ALGORITHM ::= CLASS {
+    &id    INTEGER UNIQUE,
+    &Type
+} WITH SYNTAX {
+    KEY &id CONTAINING &Type
+}
+
 END