diff options
| author | Björn Gustavsson <[email protected]> | 2014-06-16 12:03:08 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-06-16 12:03:08 +0200 |
| commit | 26e63b26e605a74ba0a0a58c1fb1cb0ba358efed (patch) | |
| tree | 30b4f613f1d24c5db5d3827d48b74c6220a5cd03 /lib/asn1/src/asn1ct_constructed_per.erl | |
| parent | 5a2aedb547c7e878d3694e8695a7985192a0a4d7 (diff) | |
| parent | 0db2668288bf399983e0f6daac85b00d68ab0360 (diff) | |
| download | otp-26e63b26e605a74ba0a0a58c1fb1cb0ba358efed.tar.gz otp-26e63b26e605a74ba0a0a58c1fb1cb0ba358efed.tar.bz2 otp-26e63b26e605a74ba0a0a58c1fb1cb0ba358efed.zip | |
Merge branch 'bjorn/asn1/dialyzer-warnings/OTP-11372' into maint
* bjorn/asn1/dialyzer-warnings/OTP-11372: (23 commits)
BER: Eliminate dialyzer warnings for specialized decode functions
BER: Eliminate dialyzer warning for encoding of BIT STRINGs
BER: Optimize encoding of ENUMERATED
BER: Remove a redundant clause in encoding of open types
(U)PER: Fix decoding of named INTEGER
(U)PER: Fix encoding of a semi-constrained, named INTEGER
(U)PER: Optimize handling of named BIT STRING with a lower zero bound
PER: Optimize encoding of character strings with simple ranges
PER: Remove unnecessary clause for handling DEFAULT
(U)PER: Suppress dialyzer warnings for complete/1
Test suites: Add support for running Dialyzer on generated code
Improve tests of DEFAULT values
Correct OCTET STRING default when legacy_erlang_types is active
Remove old DEFAULT-checking code made obsolete in the previous commit
Rewrite the code for testing DEFAULT for DER
Test DEFAULT more thoroughly
Set.py: Correct illegal DEFAULT value
BER: Optimize decoding of ENUMERATED
BER: Suppress dialyzer warnings for encode_bit_string/4
BER: Inline testing of constraints when decoding
...
Diffstat (limited to 'lib/asn1/src/asn1ct_constructed_per.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_per.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl index ed3f6f886e..a91404ed54 100644 --- a/lib/asn1/src/asn1ct_constructed_per.erl +++ b/lib/asn1/src/asn1ct_constructed_per.erl @@ -426,8 +426,7 @@ gen_dec_open_type(Erule, Val, {Xmod,Xtype}, LeadingAttr, emit([Term," = ",{asis,F},"(",TmpTerm,", ",Val,")"]). dec_objset_optional(N, {'DEFAULT',Val}) -> - dec_objset_optional_1(N, Val), - dec_objset_optional_1(N, asn1_DEFAULT); + dec_objset_optional_1(N, Val); dec_objset_optional(N, 'OPTIONAL') -> dec_objset_optional_1(N, asn1_NOVALUE); dec_objset_optional(_N, mandatory) -> ok. |