diff options
| author | Erlang/OTP <[email protected]> | 2017-07-26 11:46:19 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-07-26 11:46:19 +0200 |
| commit | 510fb192b7aa3b1da66a848c07b0bedf24478c6d (patch) | |
| tree | 81e16551819056b3d26f938b460b574eaf13e757 | |
| parent | d3b7a6fe8392f4fe2c58b3fb4eb0adcc62367d06 (diff) | |
| parent | dede6b114f0006c55f41063e73d4b28b29710b95 (diff) | |
| download | otp-510fb192b7aa3b1da66a848c07b0bedf24478c6d.tar.gz otp-510fb192b7aa3b1da66a848c07b0bedf24478c6d.tar.bz2 otp-510fb192b7aa3b1da66a848c07b0bedf24478c6d.zip | |
Merge branch 'sverker/asn1/missing-quotes/OTP-14519' into maint-20
* sverker/asn1/missing-quotes/OTP-14519:
asn1: Fix missing quotes of external encoding call
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 | 3 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl index 28b4e46b0c..82e9326294 100644 --- a/lib/asn1/src/asn1ct_gen_per.erl +++ b/lib/asn1/src/asn1ct_gen_per.erl @@ -101,7 +101,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) -> #'Externaltypereference'{module=CurrMod,type=Etype} -> emit([{asis,enc_func(Etype)},"(Val).",nl]); #'Externaltypereference'{module=Emod,type=Etype} -> - emit([{asis,Emod},":",enc_func(Etype),"(Val).",nl]) + emit([{asis,Emod},":",{asis,enc_func(Etype)},"(Val).",nl]) end. diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 index 32b8f75dde..dee3cd5048 100644 --- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 @@ -1,8 +1,9 @@ ImportsFrom DEFINITIONS AUTOMATIC TAGS ::= BEGIN -IMPORTS Int FROM ImportsFrom2; +IMPORTS Int, Quoted-Seq FROM ImportsFrom2; i Int ::= 42 +My-Seq ::= Quoted-Seq END diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 index b0c29d24ae..a8e619e215 100644 --- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 @@ -2,6 +2,11 @@ ImportsFrom2 DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS Int FROM ImportsFrom3; +Quoted-Seq ::= SEQUENCE { + x INTEGER(0..17), + y INTEGER(0..666) +} + LocalDef ::= OCTET STRING END |