diff options
| author | Kenneth Lundin <[email protected]> | 2010-09-01 15:09:31 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2010-09-23 16:45:58 +0200 |
| commit | 4774bef8375d7c15c4d52a181acad118543e1e38 (patch) | |
| tree | 694ebb1bcd97a6545a38ebd91f59e5bf0535f7fb /lib/asn1/test/testINSTANCE_OF.erl | |
| parent | 5ddf44bb91540fd88e604f077d71482c40185cd8 (diff) | |
| download | otp-4774bef8375d7c15c4d52a181acad118543e1e38.tar.gz otp-4774bef8375d7c15c4d52a181acad118543e1e38.tar.bz2 otp-4774bef8375d7c15c4d52a181acad118543e1e38.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/test/testINSTANCE_OF.erl')
| -rw-r--r-- | lib/asn1/test/testINSTANCE_OF.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl index 2a3a5c333b..7f5b634e06 100644 --- a/lib/asn1/test/testINSTANCE_OF.erl +++ b/lib/asn1/test/testINSTANCE_OF.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2003-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2003-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% %% %% @@ -73,17 +73,17 @@ test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4}, test_encdec(Erule,Res) -> {error,{Erule,Res}}. -wrap(ber,Int) when list(Int) -> +wrap(ber,Int) when is_list(Int) -> binary_to_list(list_to_binary(Int)); -wrap(per,Int) when list(Int) -> +wrap(per,Int) when is_list(Int) -> binary_to_list(list_to_binary(Int)); -wrap(ber_bin,Int) when list(Int) -> +wrap(ber_bin,Int) when is_list(Int) -> list_to_binary(Int); -wrap(ber_bin_v2,Int) when list(Int) -> +wrap(ber_bin_v2,Int) when is_list(Int) -> list_to_binary(Int); -wrap(per_bin,Int) when list(Int) -> +wrap(per_bin,Int) when is_list(Int) -> list_to_binary(Int); -wrap(uper_bin,Int) when list(Int) -> +wrap(uper_bin,Int) when is_list(Int) -> list_to_binary(Int); wrap(_,Int) -> Int. |