diff options
| author | Lukas Larsson <[email protected]> | 2011-07-05 16:09:30 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-08-01 16:38:19 +0200 |
| commit | 96bd7dd3b031f541158bac21df26b6a77f809909 (patch) | |
| tree | 7d825f590d7cbfca1b0547dafcd8d38c4660d36f /lib/asn1/src/asn1ct_constructed_per.erl | |
| parent | 02678feab82e52f8f1172eddba6560e880f68969 (diff) | |
| download | otp-96bd7dd3b031f541158bac21df26b6a77f809909.tar.gz otp-96bd7dd3b031f541158bac21df26b6a77f809909.tar.bz2 otp-96bd7dd3b031f541158bac21df26b6a77f809909.zip | |
Remove driver support for per encoding
Handle the new error messages from the asn1 nifs
Remove dead code for erlang optimized per decode
Diffstat (limited to 'lib/asn1/src/asn1ct_constructed_per.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_per.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl index a1c852b846..e07680f10b 100644 --- a/lib/asn1/src/asn1ct_constructed_per.erl +++ b/lib/asn1/src/asn1ct_constructed_per.erl @@ -935,8 +935,6 @@ gen_enc_line(Erule,TopType, Cname, Type, [], Pos,DynamicEnc,Ext) -> gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) -> Ctgenmod = list_to_atom(lists:concat(["asn1ct_gen_",per, asn1ct_gen:rt2ct_suffix()])), - Nif = lists:member(nif,get(encoding_options)) andalso - lists:member(optimize,get(encoding_options)), Atype = case Type of #type{def=#'ObjectClassFieldType'{type=InnerType}} -> @@ -960,9 +958,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) -> {Name,RestFieldNames} when is_atom(Name) -> emit({"?RT_PER:encode_open_type([],?RT_PER:complete(",nl}), emit({" ",Fun,"(",{asis,Name},", ", - Element,", ",{asis,RestFieldNames},")", - [",nif" || Nif == true], - "))"}); + Element,", ",{asis,RestFieldNames},")))"}); Other -> throw({asn1,{'internal error',Other}}) end @@ -973,9 +969,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) -> emit({"?RT_PER:encode_open_type([]," "?RT_PER:complete(",nl}), emit({" ",Fun,"(",{asis,PrimFieldName1}, - ", ",Element,", ",{asis,PFNList},")", - [",nif" || Nif == true], - "))"}) + ", ",Element,", ",{asis,PFNList},")))"}) end; _ -> CurrMod = get(currmod), @@ -1026,8 +1020,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) -> end, case Ext of {ext,_Ep2,_} -> - emit([[",nif" || Nif == true], - "))"]); + emit("))"); _ -> true end. gen_dec_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DecInfObj,Ext,NumberOfOptionals) -> |