From cf331721ede37300dff89362f14285949416b409 Mon Sep 17 00:00:00 2001
From: Kenneth Lundin <kenneth@erlang.org>
Date: Wed, 11 Aug 2010 16:53:56 +0200
Subject: Add support for Extension addition group

---
 lib/asn1/src/asn1ct_constructed_ber.erl | 41 ++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

(limited to 'lib/asn1/src/asn1ct_constructed_ber.erl')

diff --git a/lib/asn1/src/asn1ct_constructed_ber.erl b/lib/asn1/src/asn1ct_constructed_ber.erl
index 51a241ffbd..77b78dcac7 100644
--- a/lib/asn1/src/asn1ct_constructed_ber.erl
+++ b/lib/asn1/src/asn1ct_constructed_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%
 %%
 %%
@@ -71,13 +71,15 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 	    ok
     end,
 
-    {SeqOrSet,TableConsInfo,CompList} = 
+    {SeqOrSet,TableConsInfo,CompList0} =
 	case D#type.def of
 	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
 		{'SEQUENCE',TCI,CL};
 	    #'SET'{tablecinf=TCI,components=CL} -> 
 		{'SET',TCI,CL}
 	end,
+    %% filter away extensionAdditiongroup markers
+    CompList = filter_complist(CompList0),
     Ext = extensible(CompList),
     CompList1 = case CompList of
 		    {Rl1,El,Rl2} -> Rl1 ++ El ++ Rl2;
@@ -189,7 +191,11 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:start(),
     asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
+    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList0} = D#type.def,
+
+    %% filter away extensionAdditiongroup markers
+    CList = filter_complist(CList0),
+
     Ext = extensible(CList),
     {CompList,CompList2} = case CList of
 		   {Rl1,El,Rl2} -> {Rl1 ++ El ++ Rl2,CList};
@@ -369,7 +375,10 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:clear(),
     asn1ct_name:new(term),
     asn1ct_name:new(tag),
-    #'SET'{components=TCompList} = D#type.def,
+    #'SET'{components=TCompList0} = D#type.def,
+
+    %% filter away extensionAdditiongroup markers
+    TCompList = filter_complist(TCompList0),
     Ext = extensible(TCompList),
     ToOptional = fun(mandatory) ->
 			 'OPTIONAL';
@@ -1473,6 +1482,22 @@ extensible({RootList,ExtList}) ->
     {ext,length(RootList)+1,length(ExtList)};
 extensible({_Rl1,_ExtL,_Rl2}) ->
     extensible.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% filter away ExtensionAdditionGroup start and end marks since these
+%% have no significance for the BER encoding
+%%
+filter_complist(CompList) when is_list(CompList) ->
+    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
+			 false;
+		    ('ExtensionAdditionGroupEnd') ->
+			 false;
+		    (_) ->
+			 true
+		 end, CompList);
+filter_complist({Root,Ext}) ->
+    {Root,filter_complist(Ext)};
+filter_complist({Root1,Ext,Root2}) ->
+    {Root1,filter_complist(Ext),Root2}.
 
 print_attribute_comment(InnerType,Pos,Prop) ->
     CommentLine = "%%-------------------------------------------------",
-- 
cgit v1.2.3