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.

4 files changed, 53 insertions, 46 deletions

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index e457e79c81..1fea80506e 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -549,14 +549,10 @@ check_class(S = #state{mname=M,tname=T},ClassSpec)
 	    #objectclass{fields=Def}; % in case of recursive definitions
 	Tref = #'Externaltypereference'{type=TName} ->
 	    {MName,RefType} = get_referenced_type(S,Tref),
-	    case is_class(S,RefType) of
-		true ->
-		    NewState = update_state(S#state{type=RefType,
-						    tname=TName},MName),
- 		    check_class(NewState,get_class_def(S,RefType));
-		_ ->
-		    error({class,{internal_error,RefType},S})
-	    end;
+	    #classdef{} = CD = get_class_def(S, RefType),
+	    NewState = update_state(S#state{type=RefType,
+					    tname=TName}, MName),
+	    check_class(NewState, CD);
 	{pt,ClassRef,Params} ->
 	    %% parameterized class
 	    {_,PClassDef} = get_referenced_type(S,ClassRef),
@@ -3003,9 +2999,9 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 			{TmpRefMod,TmpRefDef} ->
 			    {TmpRefMod,TmpRefDef,false}
 		    end,
-		case is_class(S,RefTypeDef) of
-		    true -> throw({asn1_class,RefTypeDef});
-		    _ -> ok
+		case get_class_def(S, RefTypeDef) of
+		    none -> ok;
+		    #classdef{} -> throw({asn1_class,RefTypeDef})
 		end,
 		Ct = TestFun(Ext),
 		{RefType,ExtRef} = 
@@ -3386,23 +3382,17 @@ get_type_from_object(S,Object,TypeField)
     ObjSpec = check_object(S,ObjectDef,ObjectDef#typedef.typespec),
     get_fieldname_element(S,ObjectDef#typedef{typespec=ObjSpec},TypeField).
     
-is_class(_S,#classdef{}) ->
-    true;
-is_class(S,#typedef{typespec=#type{def=Eref}}) 
-  when is_record(Eref,'Externaltypereference')->
-    is_class(S,Eref);
-is_class(S,Eref) when is_record(Eref,'Externaltypereference')->
-    {_,NextDef} = get_referenced_type(S,Eref),
-    is_class(S,NextDef);
-is_class(_,_) ->
-    false.
-
-get_class_def(_S,CD=#classdef{}) ->
+%% get_class_def(S, Type) -> #classdef{} | 'none'.
+get_class_def(S, #typedef{typespec=#type{def=#'Externaltypereference'{}=Eref}}) ->
+    {_,NextDef} = get_referenced_type(S, Eref),
+    get_class_def(S, NextDef);
+get_class_def(S, #'Externaltypereference'{}=Eref) ->
+    {_,NextDef} = get_referenced_type(S, Eref),
+    get_class_def(S, NextDef);
+get_class_def(_S, #classdef{}=CD) ->
     CD;
-get_class_def(S,#typedef{typespec=#type{def=Eref}})
-  when is_record(Eref,'Externaltypereference') ->
-    {_,NextDef} = get_referenced_type(S,Eref),
-    get_class_def(S,NextDef).
+get_class_def(_S, _) ->
+    none.
     
 maybe_illicit_implicit_tag(Kind,Tag) ->
     case Tag of
@@ -3644,18 +3634,16 @@ governor_category(S,#type{def=Eref})
     governor_category(S,Eref);
 governor_category(_S,#type{}) ->
     type;
-governor_category(S,Ref) when is_record(Ref,'Externaltypereference') ->
-    case is_class(S,Ref) of
-	true ->
-	    {class,Ref};
-	_ ->
+governor_category(S, #'Externaltypereference'{}=Ref) ->
+    case get_class_def(S, Ref) of
+	#classdef{pos=Pos,module=Mod,name=Name} ->
+	    {class,#'Externaltypereference'{pos=Pos,module=Mod,type=Name}};
+	none ->
 	    type
     end;
 governor_category(_,Class) 
   when Class == 'TYPE-IDENTIFIER'; Class == 'ABSTRACT-SYNTAX' ->
     class.
-%% governor_category(_,_) ->
-%%     absent.
 
 %% parameter_name_style(Param,Data) -> Result
 %% gets the Parameter and the name of the Data and if it exists tells
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 11d1b82fb4..888339a4d2 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -134,14 +134,13 @@ groups() ->
        testChoiceIndefinite,
        per_open_type,
        testInfObjectClass,
-       testParameterizedInfObj,
+       testParam,
        testFragmented,
        testMergeCompile,
        testobj,
        testDeepTConstr,
        testExport,
        testImport,
-       testParamBasic,
        testDER,
        testDEFAULT,
        testMvrasn6,
@@ -520,12 +519,6 @@ testSetDefault(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetDefault", Config, [Rule|Opts]),
     testSetDefault:main(Rule).
 
-testParamBasic(Config) ->
-    test(Config, fun testParamBasic/3, [ber,{ber,[der]},per,uper]).
-testParamBasic(Config, Rule, Opts) ->
-    asn1_test_lib:compile("ParamBasic", Config, [Rule|Opts]),
-    testParamBasic:main(Rule).
-
 testSetOptional(Config) -> test(Config, fun testSetOptional/3).
 testSetOptional(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetOptional", Config, [Rule|Opts]),
@@ -758,11 +751,12 @@ testInfObjectClass(Config, Rule, Opts) ->
     testInfObjectClass:main(Rule),
     testInfObj:main(Rule).
 
-testParameterizedInfObj(Config) ->
-    test(Config, fun testParameterizedInfObj/3).
-testParameterizedInfObj(Config, Rule, Opts) ->
-    Files = ["Param","Param2"],
+testParam(Config) ->
+    test(Config, fun testParam/3, [ber,{ber,[der]},per,uper]).
+testParam(Config, Rule, Opts) ->
+    Files = ["ParamBasic","Param","Param2"],
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
+    testParamBasic:main(Rule),
     testParameterizedInfObj:main(Config, Rule),
     asn1_test_lib:compile("Param", Config,
 			  [legacy_erlang_types,Rule|Opts]),
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
diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl
index 3db89ca174..39f7947e8d 100644
--- a/lib/asn1/test/testParamBasic.erl
+++ b/lib/asn1/test/testParamBasic.erl
@@ -43,6 +43,9 @@ main(Rules) ->
 			      #'T12'{number=11,string = <<10:4>>});
 	_ -> ok
     end,
+    roundtrip('AnAlgorithm', {'AnAlgorithm',1,42}),
+    roundtrip('AnAlgorithm', {'AnAlgorithm',2,true}),
+    roundtrip('AnAlgorithm', {'AnAlgorithm',2,false}),
     ok.
 
 roundtrip(Type, Value) ->