OTP-8463 Support for EXTENSIBILITY IMPLIED and SET/SEQ OF NamedType is

          added.

4 files changed, 195 insertions, 102 deletions

diff --git a/lib/asn1/src/Restrictions.txt b/lib/asn1/src/Restrictions.txt
index 73b725245d..ed5ac6181e 100644
--- a/lib/asn1/src/Restrictions.txt
+++ b/lib/asn1/src/Restrictions.txt
@@ -1,10 +1,12 @@
 The following restrictions apply to this implementation of the ASN.1 compiler:
 
-Supported encoding rules are: 
-BER
-PER (aligned)
+The ASN.1 2002 standard is not fully supported because there has been no need for that.
+It seems as if most ASN.1 specifications are still using the 1998 standard or older.
 
-PER (unaligned) IS NOT SUPPORTED
+Supported encoding rules are:
+BER, DER
+PER ALIGNED
+PER UNALIGNED
 
 Supported types are:
 
@@ -49,7 +51,7 @@ Files with ASN.1 source must have a suffix .asn1 the suffix .py used by the
 old ASN.1 compiler is supported in this version but will not be supported in the future.
 
 Generated files:
-X.asn1db	% the intermediate format of a compiled ASN.1 module 
+X.asn1db	% the intermediate format of a compiled ASN.1 module ,only used by the ASN.1 compiler.
 X.hrl		% generated Erlang include file for module X
 X.erl		% generated Erlang module with encode decode functions for
 		% ASN.1 module X
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index f0a48a086b..54a5c7e727 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.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%
 %%
 %%
@@ -5416,9 +5416,12 @@ instance_of_constraints(S,#constraint{c={simpletable,Type}}) ->
 %% assign values to un-numbered identifiers
 %% check that the constraints are allowed and correct
 %% put the updated info back into database
-check_enumerated(_S,[{Name,Number}|Rest],_Constr) when is_atom(Name), is_integer(Number)->
+check_enumerated(_S,[{Name,Number}|_Rest]= NNList,_Constr) when is_atom(Name), is_integer(Number)->
     %% already checked , just return the same list
-    [{Name,Number}|Rest]; 
+    NNList;
+check_enumerated(_S,{[{Name,Number}|_Rest],L}= NNList,_Constr) when is_atom(Name), is_integer(Number), is_list(L)->
+    %% already checked , contains extension marker, just return the same lists
+    NNList;
 check_enumerated(S,NamedNumberList,_Constr) ->
     check_enum(S,NamedNumberList,[],[],[]).
 
@@ -5568,14 +5571,14 @@ expand_components2(_S,{_,#typedef{typespec=#type{def=Seq}}})
     case Seq#'SEQUENCE'.components of
 	{R1,_Ext,R2} -> R1 ++ R2;
 	{Root,_Ext} -> Root;
-	Root -> Root
+	Root -> take_only_rootset(Root)
     end;
 expand_components2(_S,{_,#typedef{typespec=#type{def=Set}}})
   when is_record(Set,'SET') ->
     case Set#'SET'.components of
 	{R1,_Ext,R2} -> R1 ++ R2;
 	{Root,_Ext} -> Root;
-	Root -> Root
+	Root -> take_only_rootset(Root)
     end;
 expand_components2(_S,{_,#typedef{typespec=RefType=#type{def=#'Externaltypereference'{}}}}) ->
     [{'COMPONENTS OF',RefType}];
@@ -5591,6 +5594,12 @@ expand_components2(S,{_,ERef}) when is_record(ERef,'Externaltypereference') ->
 expand_components2(_S,Err) ->
     throw({error,{asn1,{illegal_COMPONENTS_OF,Err}}}).
 
+take_only_rootset([])->
+    [];
+take_only_rootset([#'EXTENSIONMARK'{}|_T])->
+    [];
+take_only_rootset([H|T]) ->
+    [H|take_only_rootset(T)].
 
 check_unique_sequence_tags(S,[#'ComponentType'{prop=mandatory}|Rest]) ->
     check_unique_sequence_tags(S,Rest);
@@ -5885,8 +5894,8 @@ check_relative_oid(_S,_Constr) ->
 % - that each alternative is of a valid type
 % - that the extension marks are valid
 check_choice(S,Type,Components) when is_list(Components) ->
-    case check_unique([C||C <- Components,
-			  is_record(C,'ComponentType')],#'ComponentType'.name) of
+    Components1 = [C||C = #'ComponentType'{} <- Components],
+    case check_unique(Components1,#'ComponentType'.name) of
 	[] -> 
     %%    sort_canonical(Components),
 	    Components2 = maybe_automatic_tags(S,Components),
@@ -5927,13 +5936,13 @@ maybe_automatic_tags(S,C) ->
 %% Pos == 1 for Root1, 2 for Ext, 3 for Root2
 tag_nums(Cl) ->
     tag_nums(Cl,0,0).
-tag_nums([{'EXTENSIONMARK',_,_}|Rest],Ext,Root2) ->
+tag_nums([#'EXTENSIONMARK'{}|Rest],Ext,Root2) ->
     tag_nums_ext(Rest,Ext,Root2);
 tag_nums([_|Rest],Ext,Root2) ->
     tag_nums(Rest,Ext+1,Root2+1);
 tag_nums([],Ext,Root2) ->
     [0,Ext,Root2].
-tag_nums_ext([{'EXTENSIONMARK',_,_}|Rest],Ext,Root2) ->
+tag_nums_ext([#'EXTENSIONMARK'{}|Rest],Ext,Root2) ->
     tag_nums_root2(Rest,Ext,Root2);
 tag_nums_ext([_|Rest],Ext,Root2) ->
     tag_nums_ext(Rest,Ext,Root2);
@@ -5983,7 +5992,7 @@ generate_automatic_tags1([],_) ->
 
 any_manual_tag([#'ComponentType'{typespec=#type{tag=[]}}|Rest]) ->
     any_manual_tag(Rest);
-any_manual_tag([{'EXTENSIONMARK',_,_}|Rest]) ->
+any_manual_tag([#'EXTENSIONMARK'{}|Rest]) ->
     any_manual_tag(Rest);
 any_manual_tag([_|_Rest]) ->
     true;
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl
index 9d2df72f5b..46d7ad6fdb 100644
--- a/lib/asn1/src/asn1ct_parser2.erl
+++ b/lib/asn1/src/asn1ct_parser2.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2000-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%
 %%
 %%
@@ -74,8 +74,9 @@ parse_ModuleDefinition([{typereference,L1,ModuleIdentifier}|Rest0]) ->
     {ExtensionDefault,Rest3} = 
 	case Rest2 of
 	    [{'EXTENSIBILITY',_L5}, {'IMPLIED',_L6}|Rest21] -> 
-		{'IMPLIED',Rest21};
-	    _  -> {false,Rest2}
+		put(extensiondefault,'IMPLIED'),{'IMPLIED',Rest21};
+	    _  -> 
+		put(extensiondefault,undefined),{undefined,Rest2}
 	end,
     case Rest3 of
 	[{'::=',_L7}, {'BEGIN',_L8}|Rest4] ->
@@ -416,7 +417,7 @@ parse_BuiltinType([{'CHARACTER',_},{'STRING',_}|Rest]) ->
     {#type{def='CHARACTER STRING'},Rest};
 
 parse_BuiltinType([{'CHOICE',_},{'{',_}|Rest]) ->
-    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest),
+    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest,get(extensiondefault)),
     case Rest2 of
 	[{'}',_}|Rest3] ->
 	    {#type{def={'CHOICE',AlternativeTypeLists}},Rest3};
@@ -427,7 +428,7 @@ parse_BuiltinType([{'CHOICE',_},{'{',_}|Rest]) ->
 parse_BuiltinType([{'EMBEDDED',_},{'PDV',_}|Rest]) ->
     {#type{def='EMBEDDED PDV'},Rest};
 parse_BuiltinType([{'ENUMERATED',_},{'{',_}|Rest]) ->
-    {Enumerations,Rest2} = parse_Enumerations(Rest),
+    {Enumerations,Rest2} = parse_Enumerations(Rest,get(extensiondefault)),
     case Rest2 of
 	[{'}',_}|Rest3] ->
 	    {#type{def={'ENUMERATED',Enumerations}},Rest3};
@@ -490,7 +491,8 @@ parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
 						ExceptionIdentification}]}},
 	     Rest3};
 	_ ->
-	    {ComponentTypeLists,Rest3}=parse_ComponentTypeLists2(Rest2,[#'EXTENSIONMARK'{pos=Line}]),
+	    {ComponentTypeLists,Rest3}=
+		parse_ComponentTypeLists2(Rest2,[#'EXTENSIONMARK'{pos=Line}]),
 	    case Rest3 of
 		[{'}',_}|Rest4] ->
 	    {#type{def=#'SEQUENCE'{components=ComponentTypeLists}},Rest4};
@@ -506,11 +508,29 @@ parse_BuiltinType([{'SEQUENCE',_},{'{',_}|Rest]) ->
     {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
     case Rest2  of
 	[{'}',_}|Rest3] ->
-	    {#type{def=#'SEQUENCE'{components=ComponentTypeLists}},Rest3};
+	    ComponentTypeLists2 =
+		case {[Ext||Ext = #'EXTENSIONMARK'{} <- ComponentTypeLists],
+		      get(extensiondefault)} of
+		    {[],'IMPLIED'} ->  ComponentTypeLists ++ [#'EXTENSIONMARK'{}];
+		    _ -> ComponentTypeLists
+		end,
+	    {#type{def=#'SEQUENCE'{components = ComponentTypeLists2}},
+	     Rest3};
 	_ ->
 	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
 			       [got,get_token(hd(Rest2)),expected,'}']}})
     end;
+
+parse_BuiltinType([{'SEQUENCE',_},{'OF',_},Id={identifier,_,_},Lt={'<',_}|Rest]) ->
+%% TODO: take care of the identifier for something useful
+    {Type,Rest2} = parse_SelectionType([Id,Lt|Rest]),
+    {#type{def={'SEQUENCE OF',#type{def=Type,tag=[]}}},Rest2};
+
+parse_BuiltinType([{'SEQUENCE',_},{'OF',_},{identifier,_,_} |Rest]) ->
+%% TODO: take care of the identifier for something useful
+    {Type,Rest2} = parse_Type(Rest),
+    {#type{def={'SEQUENCE OF',Type}},Rest2};
+
 parse_BuiltinType([{'SEQUENCE',_},{'OF',_}|Rest]) ->
     {Type,Rest2} = parse_Type(Rest),
     {#type{def={'SEQUENCE OF',Type}},Rest2};
@@ -533,11 +553,30 @@ parse_BuiltinType([{'SET',_},{'{',_}|Rest]) ->
     {ComponentTypeLists,Rest2} = parse_ComponentTypeLists(Rest),
     case Rest2  of
 	[{'}',_}|Rest3] ->
-	    {#type{def=#'SET'{components=ComponentTypeLists}},Rest3};
+	    ComponentTypeLists2 =
+		case {[Ext||Ext = #'EXTENSIONMARK'{} <- ComponentTypeLists],
+		      get(extensiondefault)} of
+		    {[],'IMPLIED'} ->  ComponentTypeLists ++ [#'EXTENSIONMARK'{}];
+		    _ -> ComponentTypeLists
+		end,
+	    {#type{def=#'SET'{components = ComponentTypeLists2}},
+	     Rest3};
 	_ ->
 	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
 			       [got,get_token(hd(Rest2)),expected,'}']}})
     end;
+
+parse_BuiltinType([{'SET',_},{'OF',_},Id={identifier,_,_},Lt={'<',_}|Rest]) ->
+%% TODO: take care of the identifier for something useful
+    {Type,Rest2} = parse_SelectionType([Id,Lt|Rest]),
+    {#type{def={'SET OF',#type{def=Type,tag=[]}}},Rest2};
+
+
+parse_BuiltinType([{'SET',_},{'OF',_},{identifier,_,_}|Rest]) ->
+%%TODO: take care of the identifier for something useful
+    {Type,Rest2} = parse_Type(Rest),
+    {#type{def={'SET OF',Type}},Rest2};
+
 parse_BuiltinType([{'SET',_},{'OF',_}|Rest]) ->
     {Type,Rest2} = parse_Type(Rest),
     {#type{def={'SET OF',Type}},Rest2};
@@ -563,48 +602,74 @@ parse_BuiltinType(Tokens) ->
 
 parse_TypeWithConstraint([{'SEQUENCE',_},Lpar = {'(',_}|Rest]) ->
     {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
+    Rest4 = case Rest2 of
+		[{'OF',_}, {identifier,_,_Id}|Rest3] ->
+%%% TODO: make some use of the identifier, maybe useful in the XML mapping
+		    Rest3;
+		[{'OF',_}|Rest3] ->
+		    Rest3;
+		_ ->
+		    throw({asn1_error,
+			   {get_line(hd(Rest2)),get(asn1_module),
+			    [got,get_token(hd(Rest2)),expected,'OF']}})
+	    end,
+    {Type,Rest5} = parse_Type(Rest4),
+    {#type{def = {'SEQUENCE OF',Type},
+	   constraint = merge_constraints([Constraint])},Rest5};
+
 parse_TypeWithConstraint([{'SEQUENCE',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
     {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
     #constraint{c=C} = Constraint,
     Constraint2 = Constraint#constraint{c={'SizeConstraint',C}},
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
+    Rest4 = case Rest2 of
+		[{'OF',_}, {identifier,_,_Id}|Rest3] ->
+%%% TODO: make some use of the identifier, maybe useful in the XML mapping
+		    Rest3;
+		[{'OF',_}|Rest3] ->
+		    Rest3;
+		_ ->
+		    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+				       [got,get_token(hd(Rest2)),expected,'OF']}})
+	    end,
+    {Type,Rest5} = parse_Type(Rest4),
+    {#type{def = {'SEQUENCE OF',Type}, constraint = merge_constraints([Constraint2])},Rest5};
+
 parse_TypeWithConstraint([{'SET',_},Lpar = {'(',_}|Rest]) ->
     {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
+    Rest4 = case Rest2 of
+		[{'OF',_}, {identifier,_,_Id}|Rest3] ->
+%%% TODO: make some use of the identifier, maybe useful in the XML mapping
+		    Rest3;
+		[{'OF',_}|Rest3] ->
+		    Rest3;
+		_ ->
+		    throw({asn1_error,
+			   {get_line(hd(Rest2)),get(asn1_module),
+			    [got,get_token(hd(Rest2)),expected,'OF']}})
+	    end,
+    {Type,Rest5} = parse_Type(Rest4),
+    {#type{def = {'SET OF',Type},
+	   constraint = merge_constraints([Constraint])},Rest5};
+
 parse_TypeWithConstraint([{'SET',_},{'SIZE',_},Lpar = {'(',_}|Rest]) ->
     {Constraint,Rest2} = parse_Constraint([Lpar|Rest]),
     #constraint{c=C} = Constraint,
     Constraint2 = Constraint#constraint{c={'SizeConstraint',C}},
-    case Rest2 of
-	[{'OF',_}|Rest3] ->
-	    {Type,Rest4} = parse_Type(Rest3),
-	    {#type{def = {'SET OF',Type}, constraint = merge_constraints([Constraint2])},Rest4};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,'OF']}})
-    end;
+    Rest4 = case Rest2 of
+		[{'OF',_}, {identifier,_,_Id}|Rest3] ->
+%%% TODO: make some use of the identifier, maybe useful in the XML mapping
+		    Rest3;
+		[{'OF',_}|Rest3] ->
+		    Rest3;
+		_ ->
+		    throw({asn1_error,
+			   {get_line(hd(Rest2)),get(asn1_module),
+			    [got,get_token(hd(Rest2)),expected,'OF']}})
+	    end,
+    {Type,Rest5} = parse_Type(Rest4),
+    {#type{def = {'SET OF',Type},
+	   constraint = merge_constraints([Constraint2])},Rest5};
+
 parse_TypeWithConstraint(Tokens) ->
     throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
 		       [got,get_token(hd(Tokens)),expected,
@@ -2259,8 +2324,8 @@ to_set(V) ->
 	ordsets:from_list([V]).
 
 
-parse_AlternativeTypeLists(Tokens) ->
-    {AlternativeTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
+parse_AlternativeTypeLists(Tokens,ExtensionDefault) ->
+    {AltTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
     {ExtensionAndException,Rest2} = 
 	case Rest1 of
 	    [{',',_},{'...',L1},{'!',_}|Rest12] ->
@@ -2272,26 +2337,36 @@ parse_AlternativeTypeLists(Tokens) ->
 	    _ ->
 		{[],Rest1}
 	end,
-    case ExtensionAndException of
-	[] ->
-	    {AlternativeTypeList,Rest2};
-	_ ->
-	    {ExtensionAddition,Rest3} = 
-		case Rest2 of
-		    [{',',_}|Rest23] ->
-			parse_ExtensionAdditionAlternativeList(Rest23);
-		    _ ->
-			{[],Rest2}
-		end,
-	    {OptionalExtensionMarker,Rest4} =
-		case Rest3 of
-		    [{',',_},{'...',L3}|Rest31] ->
-			{[#'EXTENSIONMARK'{pos=L3}],Rest31};
-		    _ ->
-			{[],Rest3}
-		end,
-	    {AlternativeTypeList ++ ExtensionAndException ++ ExtensionAddition ++ OptionalExtensionMarker, Rest4}
-    end.
+    {AltTypeList2,Rest5} =
+	case ExtensionAndException of
+	    [] ->
+		{AltTypeList,Rest2};
+	    _ ->
+		{ExtensionAddition,Rest3} =
+		    case Rest2 of
+			[{',',_}|Rest23] ->
+			    parse_ExtensionAdditionAlternativeList(Rest23);
+			_ ->
+			    {[],Rest2}
+		    end,
+		{OptionalExtensionMarker,Rest4} =
+		    case Rest3 of
+			[{',',_},{'...',L3}|Rest31] ->
+			    {[#'EXTENSIONMARK'{pos=L3}],Rest31};
+			_ ->
+			    {[],Rest3}
+		    end,
+		{AltTypeList ++ ExtensionAndException ++
+		 ExtensionAddition ++ OptionalExtensionMarker, Rest4}
+	end,
+    AltTypeList3 =
+	case [X || X=#'EXTENSIONMARK'{} <- AltTypeList2] of
+	    [] when ExtensionDefault == 'IMPLIED' ->
+		AltTypeList2 ++ [#'EXTENSIONMARK'{}];
+	    _ ->
+		AltTypeList2
+	end,
+    {AltTypeList3,Rest5}.
     
 
 parse_AlternativeTypeList(Tokens) ->
@@ -2512,35 +2587,39 @@ parse_SignedNumber(Tokens) ->
 		       [got,get_token(hd(Tokens)),expected,
 			[number,'-number']]}}).
 
-parse_Enumerations(Tokens=[{identifier,_,_}|_Rest]) ->
-    parse_Enumerations(Tokens,[]);
-parse_Enumerations([H|_T]) ->
+parse_Enumerations(Tokens=[{identifier,_,_}|_Rest],ExtensionDefault) ->
+    parse_Enumerations(Tokens,[],ExtensionDefault);
+parse_Enumerations([H|_T],_) ->
     throw({asn1_error,{get_line(H),get(asn1_module),
 		       [got,get_token(H),expected,identifier]}}).
 
-parse_Enumerations(Tokens = [{identifier,_,_},{'(',_}|_Rest], Acc) ->
+parse_Enumerations(Tokens = [{identifier,_,_},{'(',_}|_Rest], Acc, ExtensionDefault) ->
     {NamedNumber,Rest2} = parse_NamedNumber(Tokens),
     case Rest2 of
 	[{',',_}|Rest3] ->
-	    parse_Enumerations(Rest3,[NamedNumber|Acc]);
+	    parse_Enumerations(Rest3,[NamedNumber|Acc], ExtensionDefault);
+	_ when ExtensionDefault == 'IMPLIED'->
+	    {lists:reverse(['EXTENSIONMARK',NamedNumber|Acc]),Rest2};
 	_ ->
 	    {lists:reverse([NamedNumber|Acc]),Rest2}
     end;
-parse_Enumerations([{identifier,_,Id}|Rest], Acc) ->
+parse_Enumerations([{identifier,_,Id}|Rest], Acc, ExtensionDefault) ->
     case Rest of
 	[{',',_}|Rest2] ->
-	    parse_Enumerations(Rest2,[Id|Acc]);
+	    parse_Enumerations(Rest2,[Id|Acc], ExtensionDefault);
+	_ when ExtensionDefault == 'IMPLIED' ->
+	    {lists:reverse(['EXTENSIONMARK', Id |Acc]),Rest};
 	_ ->
 	    {lists:reverse([Id|Acc]),Rest}
     end;
-parse_Enumerations([{'...',_}|Rest], Acc) ->
+parse_Enumerations([{'...',_}|Rest], Acc, _ExtensionDefault) ->
     case Rest of
 	[{',',_}|Rest2] ->
-	    parse_Enumerations(Rest2,['EXTENSIONMARK'|Acc]);
+	    parse_Enumerations(Rest2,['EXTENSIONMARK'|Acc],undefined);
 	_ ->
 	    {lists:reverse(['EXTENSIONMARK'|Acc]),Rest}
     end;
-parse_Enumerations([H|_T],_) ->
+parse_Enumerations([H|_T],_,_) ->
     throw({asn1_error,{get_line(H),get(asn1_module),
 		       [got,get_token(H),expected,identifier]}}).
 
@@ -2915,6 +2994,7 @@ merge_constraints([],Cacc,Eacc) ->
 %%    lists:flatten(Cacc) ++ [{'Errors',Eacc}].
     lists:reverse(Cacc) ++ [{'Errors',Eacc}].
 
+
 fixup_constraint(C) ->
     case C of
 	{'SingleValue',SubType} when element(1,SubType) == 'ContainedSubtype' ->
diff --git a/lib/asn1/src/asn1ct_tok.erl b/lib/asn1/src/asn1ct_tok.erl
index 27116c46c5..f0ce31bdb2 100644
--- a/lib/asn1/src/asn1ct_tok.erl
+++ b/lib/asn1/src/asn1ct_tok.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%
 %%
 %%
@@ -327,7 +327,7 @@ reserved_word('COMPONENTS') -> true;
 reserved_word('CONSTRAINED') -> true;
 reserved_word('CONTAINING') -> true;
 reserved_word('DEFAULT') -> true;
-reserved_word('DEFINED') -> true;
+reserved_word('DEFINED') -> true; % not present in X.680 07/2002
 reserved_word('DEFINITIONS') -> true;
 reserved_word('EMBEDDED') -> true;
 reserved_word('ENCODED') -> true;
@@ -336,6 +336,7 @@ reserved_word('ENUMERATED') -> true;
 reserved_word('EXCEPT') -> true;
 reserved_word('EXPLICIT') -> true;
 reserved_word('EXPORTS') -> true;
+reserved_word('EXTENSIBILITY') -> true;
 reserved_word('EXTERNAL') -> true;
 reserved_word('FALSE') -> true;
 reserved_word('FROM') -> true;
@@ -343,9 +344,9 @@ reserved_word('GeneralizedTime') -> true;
 reserved_word('GeneralString') -> rstrtype;
 reserved_word('GraphicString') -> rstrtype;
 reserved_word('IA5String') -> rstrtype;
-% reserved_word('TYPE-IDENTIFIER') -> true; % impl as predef item
 reserved_word('IDENTIFIER') -> true;
 reserved_word('IMPLICIT') -> true;
+reserved_word('IMPLIED') -> true;
 reserved_word('IMPORTS') -> true;
 reserved_word('INCLUDES') -> true;
 reserved_word('INSTANCE') -> true;
@@ -379,6 +380,7 @@ reserved_word('T61String') -> rstrtype;
 reserved_word('TAGS') -> true;
 reserved_word('TeletexString') -> rstrtype;
 reserved_word('TRUE') -> true;
+%% reserved_word('TYPE-IDENTIFIER') -> true; % impl as predef item
 reserved_word('UNION') -> true;
 reserved_word('UNIQUE') -> true;
 reserved_word('UNIVERSAL') -> true;