diff options
| author | Björn Gustavsson <[email protected]> | 2014-11-03 15:51:40 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-12 11:40:26 +0100 |
| commit | d17a84df58177143c89180aeb85373e0d5504210 (patch) | |
| tree | 644bee3b5cb934dd2c0ba2a36a64aa47967622c2 | |
| parent | 6a72b71b69f1a41166cb6984607cca7bbbe38f43 (diff) | |
| download | otp-d17a84df58177143c89180aeb85373e0d5504210.tar.gz otp-d17a84df58177143c89180aeb85373e0d5504210.tar.bz2 otp-d17a84df58177143c89180aeb85373e0d5504210.zip | |
Correct another bug with instantiated types
a1260b2ffa60581ce3af0728320b593cca3fd7b0 fixed a problem with
expansion of parameterized types, but it didn't go all the way.
The compiler would still crash if we attempted to define a value
using the instantiated type.
| -rw-r--r-- | lib/asn1/src/asn1ct_check.erl | 4 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 | 3 | ||||
| -rw-r--r-- | lib/asn1/test/testParamBasic.erl | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 318564df93..cb94b2efba 100644 --- a/lib/asn1/src/asn1ct_check.erl +++ b/lib/asn1/src/asn1ct_check.erl @@ -3163,9 +3163,11 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) -> constraint=Instance#type.constraint, inlined=yes}; - OCFT=#'ObjectClassFieldType'{classname=ClRef} -> + #'ObjectClassFieldType'{classname=ClRef0}=OCFT0 -> %% this case occures in a SEQUENCE when %% the type of the component is a ObjectClassFieldType + ClRef = match_parameter(S, ClRef0), + OCFT = OCFT0#'ObjectClassFieldType'{classname=ClRef}, ClassSpec = check_class(S,ClRef), NewTypeDef = maybe_open_type(S,ClassSpec, diff --git a/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 b/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 index f175aabd26..d203b6c816 100644 --- a/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ParamBasic.asn1 @@ -42,6 +42,9 @@ SIGNATURE-ALGORITHM ::= CLASS { KEY &id CONTAINING &Type } +alg-seq-1 AnAlgorithm ::= { algorithm 1, type 42 } +alg-seq-2 AnAlgorithm ::= { algorithm 2, type TRUE } + -- -- Test that indirect classes references are resolved. -- diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl index ab5bf70e55..5f6116bba4 100644 --- a/lib/asn1/test/testParamBasic.erl +++ b/lib/asn1/test/testParamBasic.erl @@ -46,13 +46,14 @@ main(Rules) -> roundtrip('AnAlgorithm', {'AnAlgorithm',1,42}), roundtrip('AnAlgorithm', {'AnAlgorithm',2,true}), roundtrip('AnAlgorithm', {'AnAlgorithm',2,false}), + {'AnAlgorithm',1,42} = 'ParamBasic':'alg-seq-1'(), + {'AnAlgorithm',2,true} = 'ParamBasic':'alg-seq-2'(), roundtrip('Seq', {'Seq', {'Seq_c1',{2,1,1},42}, {'Seq_c2',{2,1,1,1},asn1_NOVALUE}}), {_,{2,9,9,9,7},'NULL'} = 'ParamBasic':'algid-hmacWithSHA1'(), - ok. roundtrip(Type, Value) -> |