Remove unnecessary code duplication in gen_objset_{dec,enc}()

3 files changed, 48 insertions, 161 deletions

diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 7de80f216f..70a5451237 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -1107,54 +1107,29 @@ gen_objset_enc(_,_,{unique,undefined},_,_,_,_,_) ->
     %% There is no unique field in the class of this object set
     %% don't bother about the constraint
     [];
-gen_objset_enc(Erules,ObjSName,UniqueName,
-	       [{ObjName,Val,Fields},T|Rest],ClName,ClFields,
+gen_objset_enc(Erules, ObjSetName, UniqueName,
+	       [{ObjName,Val,Fields}|T], ClName, ClFields,
 	       NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
+    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl]),
     CurrMod = get(currmod),
     {InternalFunc,NewNthObj}=
 	case ObjName of
 	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Fields,ClFields,ObjSName,NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/3"}),
-		{[],NthObj};
-	    {ModuleName,Name} ->
-		emit_ext_fun(enc,ModuleName,Name),
-%		emit(["    {'",ModuleName,"', 'enc_",Name,"'}"]),
-		{[],NthObj};
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(Erules,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(_,ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    {InternalFunc,_} =
-	case ObjName of
-	    {no_mod,no_name} ->
 		gen_inlined_enc_funs(Fields,ClFields,ObjSetName,NthObj);
 	    {CurrMod,Name} ->
 		emit({"    fun 'enc_",Name,"'/3"}),
 		{[],NthObj};
 	    {ModuleName,Name} ->
 		emit_ext_fun(enc,ModuleName,Name),
-%		emit(["    {'",ModuleName,"', 'enc_",Name,"'}"]),
 		{[],NthObj};
 	    _ ->
 		emit({"    fun 'enc_",ObjName,"'/3"}),
 		{[],NthObj}
 	end,
-    emit([";",nl]),
-    emit_default_getenc(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    InternalFunc ++ Acc;
+    emit({";",nl}),
+    gen_objset_enc(Erules, ObjSetName, UniqueName, T, ClName, ClFields,
+		   NewNthObj, InternalFunc ++ Acc);
 %% See X.681 Annex E for the following case
 gen_objset_enc(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj,Acc) ->
@@ -1166,7 +1141,9 @@ gen_objset_enc(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
     emit({indent(6),"{Val,Len}",nl}),
     emit({indent(3),"end.",nl,nl}),
     Acc;
-gen_objset_enc(_,_,_,[],_,_,_,Acc) ->
+gen_objset_enc(_, ObjSetName, UniqueName, [], _, _, _, Acc) ->
+    emit_default_getenc(ObjSetName, UniqueName),
+    emit({".",nl,nl}),
     Acc.
 
 emit_ext_fun(EncDec,ModuleName,Name) ->
@@ -1344,8 +1321,8 @@ gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
     %% There is no unique field in the class of this object set
     %% don't bother about the constraint
     ok;
-gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj)->
+gen_objset_dec(Erules, ObjSName, UniqueName, [{ObjName,Val,Fields}|T],
+	       ClName, ClFields, NthObj)->
     emit(["'getdec_",ObjSName,"'(",{asis,UniqueName},",",
 	  {asis,Val},") ->",nl]),
     CurrMod = get(currmod),
@@ -1358,35 +1335,14 @@ gen_objset_dec(Erules,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
 		NthObj;
 	    {ModuleName,Name} ->
 		emit_ext_fun(dec,ModuleName,Name),
-%		emit(["    {'",ModuleName,"', 'dec_",Name,"'}"]),
 		NthObj;
 	    _ ->
 		emit(["    fun 'dec_",ObjName,"'/3"]),
 		NthObj
 	end,
     emit([";",nl]),
-    gen_objset_dec(Erules,ObjSName,UniqueName,[T|Rest],ClName,
-		   ClFields,NewNthObj);
-gen_objset_dec(_,ObjSetName,UniqueName,[{ObjName,Val,Fields}],
-	       _ClName,ClFields,NthObj) ->
-    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl]),
-    CurrMod = get(currmod),
-    case ObjName of
-	{no_mod,no_name} ->
-	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
-	{CurrMod,Name} ->
-	    emit(["    fun 'dec_",Name,"'/3"]);
-	{ModuleName,Name} ->
-	    emit_ext_fun(dec,ModuleName,Name);
-%		emit(["    {'",ModuleName,"', 'dec_",Name,"'}"]);
-	_ ->
-	    emit(["    fun 'dec_",ObjName,"'/3"])
-    end,
-    emit([";",nl]),
-    emit_default_getdec(ObjSetName,UniqueName),
-    emit([".",nl,nl]),
-    ok;
+    gen_objset_dec(Erules, ObjSName, UniqueName, T, ClName,
+		   ClFields, NewNthObj);
 gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj) ->
     emit(["'getdec_",ObjSetName,"'(_, _) ->",nl]),
@@ -1400,7 +1356,9 @@ gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	  indent(4),"end",nl]),
     emit([indent(2),"end.",nl,nl]),
     ok;
-gen_objset_dec(_,_,_,[],_,_,_) ->
+gen_objset_dec(_, ObjSetName, UniqueName, [], _, _, _) ->
+    emit_default_getdec(ObjSetName, UniqueName),
+    emit([".",nl,nl]),
     ok.
 
 emit_default_getdec(ObjSetName,UniqueName) ->
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 2fc970cad9..9c82337135 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -660,67 +660,40 @@ gen_objset_enc(_,_,{unique,undefined},_,_,_,_,_) ->
     %% There is no unique field in the class of this object set
     %% don't bother about the constraint
     [];
-gen_objset_enc(Erule,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
+gen_objset_enc(Erule, ObjSetName, UniqueName, [{ObjName,Val,Fields}|T],
+	       ClName, ClFields, NthObj, Acc)->
+    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
+	  ") ->",nl]),
     CurrMod = get(currmod),
     {InternalFunc,NewNthObj}=
 	case ObjName of
 	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Erule,Fields,ClFields,ObjSName,NthObj);
+		gen_inlined_enc_funs(Erule, Fields, ClFields,
+				     ObjSetName, NthObj);
 	    {CurrMod,Name} ->
 		emit({"    fun 'enc_",Name,"'/3"}),
 		{[],0};
 	    {ModName,Name} ->
 		emit_ext_encfun(ModName,Name),
-%		emit(["    {'",ModName,"', 'enc_",Name,"'}"]),
 		{[],0};
 	    _Other ->
 		emit({"    fun 'enc_",ObjName,"'/3"}),
 		{[],0}
 	end,
     emit({";",nl}),
-    gen_objset_enc(Erule,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		   NewNthObj,InternalFunc ++ Acc);
-gen_objset_enc(Erule,ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    {InternalFunc,_}=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Erule,Fields,ClFields,ObjSetName,NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/3"}),
-		{[],NthObj};
-	    {ModName,Name} ->
-		emit_ext_encfun(ModName,Name),
-%		emit(["    {'",ModName,"', 'enc_",Name,"'}"]),
-		{[],NthObj};
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit([";",nl]),
-    emit_default_getenc(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    InternalFunc++Acc;
+    gen_objset_enc(Erule, ObjSetName, UniqueName, T, ClName, ClFields,
+		   NewNthObj, InternalFunc ++ Acc);
 gen_objset_enc(Erule,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj,Acc) ->
     emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
     emit({indent(3),"fun(_, Val, _) ->",nl}),
-    case Erule of
-	uper ->
-	    emit([indent(6),"Val",nl]);
-	_ ->
-	    emit([indent(6),"[{octets,Val}]",nl])
-    end,
-    emit({indent(3),"end.",nl,nl}),
+    uper = Erule,
+    emit([indent(6),"Val",nl,
+	  indent(3),"end.",nl,nl]),
     Acc;
-gen_objset_enc(_,_,_,[],_,_,_,Acc) ->
+gen_objset_enc(_, ObjSetName, UniqueName, [], _, _, _, Acc) ->
+    emit_default_getenc(ObjSetName, UniqueName),
+    emit([".",nl,nl]),
     Acc.
 
 emit_ext_encfun(ModuleName,Name) ->
@@ -863,9 +836,8 @@ gen_objset_dec(_,{unique,undefined},_,_,_,_) ->
     %% There is no unique field in the class of this object set
     %% don't bother about the constraint
     ok;
-gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
-	       ClFields,NthObj)->
-
+gen_objset_dec(ObjSName, UniqueName, [{ObjName,Val,Fields}|T], ClName,
+	       ClFields, NthObj)->
     emit({"'getdec_",ObjSName,"'(",{asis,UniqueName},",",{asis,Val},
 	  ") ->",nl}),
     CurrMod = get(currmod),
@@ -878,35 +850,13 @@ gen_objset_dec(ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],ClName,
 		NthObj;
 	    {ModName,Name} ->
 		emit_ext_decfun(ModName,Name),
-%		emit(["    {'",ModName,"', 'dec_",Name,"'}"]),
 		NthObj;
 	    _Other ->
 		emit({"    fun 'dec_",ObjName,"'/4"}),
 		NthObj
     end,
     emit({";",nl}),
-    gen_objset_dec(ObjSName,UniqueName,[T|Rest],ClName,ClFields,NewNthObj);
-gen_objset_dec(ObjSetName,UniqueName,[{ObjName,Val,Fields}],_ClName,
-	       ClFields,NthObj) ->
-
-    emit({"'getdec_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl}),
-    CurrMod=get(currmod),
-    case ObjName of
-	{no_mod,no_name} ->
-	    gen_inlined_dec_funs(Fields,ClFields,ObjSetName,NthObj);
-	{CurrMod,Name} ->
-	    emit(["    fun 'dec_",Name,"'/4"]);
-	{ModName,Name} ->
-	    emit_ext_decfun(ModName,Name);
-%	    emit(["    {'",ModName,"', 'dec_",Name,"'}"]);
-	_Other ->
-	    emit({"    fun 'dec_",ObjName,"'/4"})
-    end,
-    emit([";",nl]),
-    emit_default_getdec(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    ok;
+    gen_objset_dec(ObjSName, UniqueName, T, ClName, ClFields, NewNthObj);
 gen_objset_dec(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
 	      _NthObj) ->
     emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
@@ -914,7 +864,9 @@ gen_objset_dec(ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,_ClFields,
     emit({indent(6),"{Bytes,Attr1}",nl}),
     emit({indent(3),"end.",nl,nl}),
     ok;
-gen_objset_dec(_,_,[],_,_,_) ->
+gen_objset_dec(ObjSetName, UniqueName, [], _, _, _) ->
+    emit_default_getdec(ObjSetName, UniqueName),
+    emit([".",nl,nl]),
     ok.
 
 emit_ext_decfun(ModuleName,Name) ->
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index 83f8feaf94..423d10ef14 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -928,54 +928,29 @@ gen_objset_enc(_Erule,_,{unique,undefined},_,_,_,_,_) ->
     %% There is no unique field in the class of this object set
     %% don't bother about the constraint
     [];
-gen_objset_enc(Erule,ObjSName,UniqueName,[{ObjName,Val,Fields},T|Rest],
-	       ClName,ClFields,NthObj,Acc)->
-    emit({"'getenc_",ObjSName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
+gen_objset_enc(Erule, ObjSetName, UniqueName, [{ObjName,Val,Fields}|T],
+	       ClName, ClFields, NthObj, Acc)->
+    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
+	  {asis,Val},") ->",nl]),
     CurrMod = get(currmod),
     {InternalFunc,NewNthObj}=
 	case ObjName of
 	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Erule,Fields,ClFields,ObjSName,NthObj);
+		gen_inlined_enc_funs(Erule, Fields, ClFields,
+				     ObjSetName, NthObj);
 	    {CurrMod,Name} ->
 		emit({"    fun 'enc_",Name,"'/3"}),
 		{[],NthObj};
 	    {ModName,Name} ->
 		emit_ext_encfun(ModName,Name),
-%		emit(["    {'",ModName,"', 'enc_",Name,"'}"]),
 		{[],NthObj};
 	    _ ->
 		emit({"    fun 'enc_",ObjName,"'/3"}),
 		{[],NthObj}
 	end,
     emit({";",nl}),
-    gen_objset_enc(Erule,ObjSName,UniqueName,[T|Rest],ClName,ClFields,
-		  NewNthObj,InternalFunc++Acc);
-gen_objset_enc(Erule,ObjSetName,UniqueName,
-	       [{ObjName,Val,Fields}],_ClName,ClFields,NthObj,Acc) ->
-
-    emit({"'getenc_",ObjSetName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl}),
-    CurrMod = get(currmod),
-    {InternalFunc,_}=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Erule,Fields,ClFields,ObjSetName,NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/3"}),
-		{[],NthObj};
-	    {ModName,Name} ->
-		emit_ext_encfun(ModName,Name),
-%		emit(["    {'",ModName,"', 'enc_",Name,"'}"]),
-		{[],NthObj};
-	    _ ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],NthObj}
-	end,
-    emit([";",nl]),
-    emit_default_getenc(ObjSetName,UniqueName),
-    emit({".",nl,nl}),
-    InternalFunc++Acc;
+    gen_objset_enc(Erule, ObjSetName, UniqueName, T, ClName, ClFields,
+		   NewNthObj, InternalFunc++Acc);
 gen_objset_enc(_Erule,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj,Acc) ->
     emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
@@ -993,7 +968,9 @@ gen_objset_enc(_Erule,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
     emit({indent(6),"end",nl}),
     emit({indent(3),"end.",nl,nl}),
     Acc;
-gen_objset_enc(_Erule,_,_,[],_,_,_,Acc) ->
+gen_objset_enc(_Erule, ObjSetName, UniqueName, [], _, _, _, Acc) ->
+    emit_default_getenc(ObjSetName, UniqueName),
+    emit([".",nl,nl]),
     Acc.
 
 emit_ext_encfun(ModuleName,Name) ->