aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-03-13 08:41:31 +0100
committerBjörn Gustavsson <[email protected]>2013-05-31 14:52:20 +0200
commitdaa806bb0c40f19dba5382f5773a0064b8e25d53 (patch)
tree35b8d39ccd65c84c85a52ccee6ab7b8ace0373de
parent4dcde42e8a257b4992f29dc5f2acfd0d1f625d97 (diff)
downloadotp-daa806bb0c40f19dba5382f5773a0064b8e25d53.tar.gz
otp-daa806bb0c40f19dba5382f5773a0064b8e25d53.tar.bz2
otp-daa806bb0c40f19dba5382f5773a0064b8e25d53.zip
Eliminate handling of #pobjectdef{} from the backends
asn1ct_check does not pass #pobjectdef{} records on to the backends (all the original #pobjectdef{} records have been instantiated and changed to #objectdef{} records).
-rw-r--r--lib/asn1/src/asn1ct_gen_ber_bin_v2.erl4
-rw-r--r--lib/asn1/src/asn1ct_gen_per.erl4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index d4fd5247d7..52d8210321 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -650,9 +650,7 @@ gen_obj_code(Erules,_Module,Obj) when is_record(Obj,typedef) ->
ObjName,Fields,[]),
emit(nl),
gen_decode_constr_type(Erules,DecConstructed),
- emit_tlv_format_function();
-gen_obj_code(_Erules,_Module,Obj) when is_record(Obj,pobjectdef) ->
- ok.
+ emit_tlv_format_function().
gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
ObjName,ObjectFields,ConstrAcc) ->
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 4572d41711..23a6ce256c 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -287,9 +287,7 @@ gen_obj_code(Erules,_Module,Obj) when is_record(Obj,typedef) ->
ObjName, Fields, []),
emit(nl),
gen_decode_constr_type(Erules,DecConstructed),
- emit(nl);
-gen_obj_code(_,_,Obj) when is_record(Obj,pobjectdef) ->
- ok.
+ emit(nl).
gen_encode_objectfields(Erule, ClassName,