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_gen.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_gen.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl index aa2c3e52db..4615e2118a 100644 --- a/lib/asn1/src/asn1ct_gen.erl +++ b/lib/asn1/src/asn1ct_gen.erl @@ -936,19 +936,15 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) -> emit(["encoding_rule() ->",nl]), emit([" ",{asis,Erules},".",nl,nl]), NoFinalPadding = lists:member(no_final_padding,get(encoding_options)), - Nif = lists:member(nif,get(encoding_options)) andalso - lists:member(optimize,get(encoding_options)), Call = case Erules of per -> "?RT_PER:complete(encode_disp(Type,Data))"; - per_bin -> ["?RT_PER:complete(encode_disp(Type,Data)", - [",nif" || Nif == true],")"]; + per_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"]; ber -> "encode_disp(Type,Data)"; ber_bin -> "encode_disp(Type,Data)"; ber_bin_v2 -> "encode_disp(Type,Data)"; uper_bin when NoFinalPadding == true -> "?RT_PER:complete_NFP(encode_disp(Type,Data))"; - uper_bin -> ["?RT_PER:complete(encode_disp(Type,Data)", - [",nif" || Nif == true],")"] + uper_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"] end, EncWrap = case Erules of ber -> "wrap_encode(Bytes)"; |