Remove the obsolete and deprecated 'keyed_list' option

The 'keyed_list' was only supported for the 'ber' and 'ber_bin'
backends and has been undocumented for a long time. Also remove
the note in the documentation about the feature.

5 files changed, 6 insertions, 124 deletions

diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 1b399fb641..09b9e7315a 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -1287,14 +1287,6 @@ Pdu ::= SEQUENCE {
       <p>Values can be assigned in Erlang as shown below:</p>
       <pre>
 MyPdu = #'Pdu'{a=22,b=77.99,c={0,1,2,3,4},d='NULL'}.      </pre>
-<note>
-  <p>
-    In very early versions of the asn1 compiler it was also possible to 
-    specify the values of the components in 
-    a SEQUENCE or a SET as a list of tuples <c>{ComponentName,Value}</c>. 
-    This is no longer supported.
-  </p>
-</note>
       <p>The decode functions will return a record as result when decoding 
         a <c>SEQUENCE</c> or a <c>SET</c>.
                 <marker id="DEFAULT"></marker>
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 8e971a1c76..47b4299971 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -1115,7 +1115,6 @@ remove_asn_flags(Options) ->
 	  X /= optimize,
 	  X /= compact_bit_string,
 	  X /= debug,
-	  X /= keyed_list,
 	  X /= asn1config,
 	  X /= record_name_prefix].
 	  
@@ -1125,12 +1124,6 @@ debug_on(Options) ->
 	    put(asndebug,true);
 	_ ->
 	    true
-    end,
-    case lists:member(keyed_list,Options) of
-	true ->
-	    put(asn_keyed_list,true);
-	_ ->
-	    true
     end.
 
 igorify_options(Options) ->
@@ -1151,8 +1144,7 @@ generated_file(Name,Options) ->
     end.
 
 debug_off(_Options) ->
-    erase(asndebug),
-    erase(asn_keyed_list).
+    erase(asndebug).
 
 
 outfile(Base, Ext, Opts) ->
diff --git a/lib/asn1/src/asn1ct_gen_ber.erl b/lib/asn1/src/asn1ct_gen_ber.erl
index 491ebcb8fd..b54b9febe5 100644
--- a/lib/asn1/src/asn1ct_gen_ber.erl
+++ b/lib/asn1/src/asn1ct_gen_ber.erl
@@ -106,22 +106,7 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 	    emit([nl,"%%================================",nl]),
 	    case lists:member(InnerType,['SET','SEQUENCE']) of
 		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when is_list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
+		    true;
 		_ ->
 		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
 			  "'({'",asn1ct_gen:list2name(Typename),
@@ -160,22 +145,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
     emit([nl,"%%================================",nl]),
     case lists:member(InnerType,['SET','SEQUENCE']) of
 	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when is_list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
+	    true;
 	_ ->
 	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
 		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
@@ -1673,19 +1643,6 @@ mkfuncname(WhatKind,DecOrEnc) ->
 	    
     end.
 
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
 get_constraint(C,Key) ->
     case lists:keysearch(Key,1,C) of
 	false ->
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 3ccfca3784..e20c2ead37 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -116,22 +116,7 @@ gen_encode(Erules,Typename,Type) when is_record(Type,type) ->
 	    end,
 	    case lists:member(InnerType,['SET','SEQUENCE']) of
 		true -> 
-		    case get(asn_keyed_list) of
-			true ->
-			    CompList = 
-				case Type#type.def of
-				    #'SEQUENCE'{components=Cl} -> Cl;
-				    #'SET'{components=Cl} -> Cl
-				end,
-			    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-				  "'(Val, TagIn",ObjFun,
-				  ") when is_list(Val) ->",nl]),
-			    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-				  "'(?RT_BER:fixoptionals(",
-				  {asis,optionals(CompList)},
-				  ",Val), TagIn",ObjFun,");",nl,nl]);
-			_ -> true
-		    end;
+		    true;
 		_ ->
 		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
 			  "'({'",asn1ct_gen:list2name(Typename),
@@ -175,22 +160,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
 
     case lists:member(InnerType,['SET','SEQUENCE']) of
 	true -> 
-	    case get(asn_keyed_list) of
-		true ->
-		    CompList = 
-			case Type#type.def of
-			    #'SEQUENCE'{components=Cl} -> Cl;
-			    #'SET'{components=Cl} -> Cl
-			end,
-
-		    emit([nl,"'enc_",asn1ct_gen:list2name(Typename),
-			  "'(Val, TagIn) when is_list(Val) ->",nl]),
-		    emit(["    'enc_",asn1ct_gen:list2name(Typename),
-			  "'(?RT_BER:fixoptionals(",
-			  {asis,optionals(CompList)},
-			  ",Val), TagIn);",nl,nl]);
-		_ -> true
-	    end;
+	    true;
 	_ ->
 	    emit({nl,"'enc_",asn1ct_gen:list2name(Typename),
 		  "'({'",asn1ct_gen:list2name(Typename),"',Val}, TagIn) ->",nl}),
@@ -1772,19 +1742,6 @@ mkfuncname(WhatKind,DecOrEnc) ->
 	    
     end.
 
-optionals(L) -> optionals(L,[],1).
-
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{name=Name,prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{name=Name,prop={'DEFAULT',_}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Name,Pos}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
-    lists:reverse(Acc).
-
 get_constraint(C,Key) ->
     case lists:keysearch(Key,1,C) of
 	false ->
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 79c7bf1476..b4329e9667 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -76,8 +76,7 @@ groups() ->
      {ber, parallel([]),
       [ber_choiceinseq,
        % Uses 'SOpttest'
-       {group, [], [ber_optional,
-                    ber_optional_keyed_list]}]},
+       ber_optional]},
 
      {app_test, [], [{asn1_app_test, all}]},
 
@@ -685,21 +684,6 @@ ber_optional(Config, Rule, Opts) ->
     V2 = asn1_wrapper:decode('SOpttest', 'S', Bytes),
     V = element(2, V2).
 
-ber_optional_keyed_list(Config) ->
-    test(Config, fun ber_optional_keyed_list/3, [ber, ber_bin]).
-ber_optional_keyed_list(Config, Rule, Opts) ->
-    asn1_test_lib:compile("SOpttest", Config, [Rule, keyed_list|Opts]),
-    Vrecord = {'S', {'A', 10,           asn1_NOVALUE, asn1_NOVALUE},
-        {'B', asn1_NOVALUE, asn1_NOVALUE, asn1_NOVALUE},
-        {'C', asn1_NOVALUE, 111,          asn1_NOVALUE}},
-    V = [{a, [{scriptKey, 10}]},
-        {b, []},
-        {c, [{callingPartysCategory, 111}]}],
-    {ok, B} = asn1_wrapper:encode('SOpttest', 'S', V),
-    Bytes = lists:flatten(B),
-    V2 = asn1_wrapper:decode('SOpttest', 'S', Bytes),
-    Vrecord = element(2, V2).
-
 %% records used by test-case default
 -record('Def1', {bool0,
                  bool1 = asn1_DEFAULT,