diff options
| author | Björn Gustavsson <[email protected]> | 2013-03-05 12:36:09 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-05-31 14:52:18 +0200 |
| commit | f863775f492d31f4f38fc6e661dd6391810cfc37 (patch) | |
| tree | e10cba87579e4794ce39bb20cd8369df886ec397 /lib/asn1/src/asn1ct_constructed_per.erl | |
| parent | 015f4ede0aa6464c98cbfe00066907d097bc0a05 (diff) | |
| download | otp-f863775f492d31f4f38fc6e661dd6391810cfc37.tar.gz otp-f863775f492d31f4f38fc6e661dd6391810cfc37.tar.bz2 otp-f863775f492d31f4f38fc6e661dd6391810cfc37.zip | |
Introduce asn1ct_gen_per:gen_decode_external/3
Hiding the details of decoding an external type will facilitate
changing the calling convention in a future commit.
Diffstat (limited to 'lib/asn1/src/asn1ct_constructed_per.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_per.erl | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl index bcd0a01bbb..7c0c3aae9e 100644 --- a/lib/asn1/src/asn1ct_constructed_per.erl +++ b/lib/asn1/src/asn1ct_constructed_per.erl @@ -658,7 +658,6 @@ gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) -> Cont#type.def), Conttype = asn1ct_gen:get_inner(Cont#type.def), Ctgenmod = asn1ct_gen:ct_gen_module(Erule), - CurrMod = get(currmod), case asn1ct_gen:type(Conttype) of {primitive,bif} -> Ctgenmod:gen_dec_prim(Erule,Cont,"Bytes"), @@ -667,10 +666,9 @@ gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) -> NewTypename = [Constructed_Suffix|Typename], emit({"'dec_",asn1ct_gen:list2name(NewTypename), "'(Bytes, telltype",ObjFun,"),",nl}); - #'Externaltypereference'{module=CurrMod,type=EType} -> - emit({"'dec_",EType,"'(Bytes,telltype),",nl}); - #'Externaltypereference'{module=EMod,type=EType} -> - emit({"'",EMod,"':'dec_",EType,"'(Bytes,telltype),",nl}); + #'Externaltypereference'{}=Etype -> + asn1ct_gen_per:gen_dec_external(Etype, "Bytes"), + emit([com,nl]); 'ASN1_OPEN_TYPE' -> Ctgenmod:gen_dec_prim(Erule,#type{def='ASN1_OPEN_TYPE'}, "Bytes"), @@ -1504,16 +1502,10 @@ gen_dec_line_dec_inf(Comp, DecInfObj) -> gen_dec_line_other(Erule, Atype, TopType, Comp) -> #'ComponentType'{name=Cname,typespec=Type} = Comp, - CurrMod = get(currmod), case asn1ct_gen:type(Atype) of - #'Externaltypereference'{module=CurrMod,type=EType} -> - fun(BytesVar) -> - emit({"'dec_",EType,"'(",BytesVar,",telltype)"}) - end; - #'Externaltypereference'{module=Mod,type=EType} -> + #'Externaltypereference'{}=Etype -> fun(BytesVar) -> - emit({"'",Mod,"':'dec_",EType,"'(",BytesVar, - ",telltype)"}) + asn1ct_gen_per:gen_dec_external(Etype, BytesVar) end; {primitive,bif} -> case Atype of |