diff options
| author | Kenneth Lundin <[email protected]> | 2010-09-01 15:09:31 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-07 15:54:01 +0200 |
| commit | 210fbb984619e6a6bb1122b7a6f72f54fb72effb (patch) | |
| tree | fa5964ff764fa94e6125f6e4ca63546821be1a1a /lib/asn1/src/asn1ct_gen_ber.erl | |
| parent | 96db19557ac894cffcaa18e8f1191d387a5b05ea (diff) | |
| download | otp-210fbb984619e6a6bb1122b7a6f72f54fb72effb.tar.gz otp-210fbb984619e6a6bb1122b7a6f72f54fb72effb.tar.bz2 otp-210fbb984619e6a6bb1122b7a6f72f54fb72effb.zip | |
Add support for ExtensionAdditionGroup notation in nested types as well
In the previous version support for ExtensionAdditionGroups (i.e [[...]])
was added but it did not handle the occurence of the notation in nested types.
Now this is handled as well and the support is hopefully complete.
Also cleanup of warnings for obsolete guard functions in test suites.
Diffstat (limited to 'lib/asn1/src/asn1ct_gen_ber.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_ber.erl | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber.erl b/lib/asn1/src/asn1ct_gen_ber.erl index 7c432f29c3..8943541303 100644 --- a/lib/asn1/src/asn1ct_gen_ber.erl +++ b/lib/asn1/src/asn1ct_gen_ber.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% @@ -33,6 +33,7 @@ -export([gen_objectset_code/2, gen_obj_code/3]). -export([re_wrap_erule/1]). -export([unused_var/2]). +-export([extaddgroup2sequence/1]). -import(asn1ct_gen, [emit/1,demit/1]). @@ -1734,3 +1735,15 @@ get_object_field(Name,ObjectFields) -> {value,Field} -> Field; false -> false end. + +%% For BER the ExtensionAdditionGroup notation has no impact on the encoding/decoding +%% and therefore we only filter away the ExtensionAdditionGroup start and end markers +%% +extaddgroup2sequence(ExtList) when is_list(ExtList) -> + lists:filter(fun(#'ExtensionAdditionGroup'{}) -> + false; + ('ExtensionAdditionGroupEnd') -> + false; + (_) -> + true + end, ExtList). |