Normalize data representation for table constraints

The name of the referenced object set name in #simpletableattributes{}
would when used by INSTANCE OF be an atom, but in all other cases
be a {Module,ObjectSetName} tuple. Simplify the code by always using
the latter format.

3 files changed, 29 insertions, 71 deletions

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index b6e2bc6e95..0a95cbd3b5 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -5136,7 +5136,8 @@ instance_of_constraints(S, [{simpletable,Type}]) ->
 			      [{innermost,
 				[#'Externalvaluereference'{module=ModuleName,
 							   value=type}]}]}],
-    TableCInf=#simpletableattributes{objectsetname=Name,
+    Mod = S#state.mname,
+    TableCInf=#simpletableattributes{objectsetname={Mod,Name},
 				     c_name='type-id',
 				     c_index=1,
 				     usedclassfield=id,
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 9a55b139b9..b318cd1920 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -114,30 +114,16 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 				   usedclassfield=UniqueFieldName,
 				   uniqueclassfield=UniqueFieldName,
 				   valueindex=ValueIndex} -> %% N is index of attribute that determines constraint
-		OSDef =
-		    case ObjectSetRef of
-			{Module,OSName} ->
-			    asn1_db:dbget(Module,OSName);
-			OSName ->
-			    asn1_db:dbget(get(currmod),OSName)
-		    end,
-%		io:format("currmod: ~p~nOSName: ~p~nAttrN: ~p~nN: ~p~nUniqueFieldName: ~p~n",
-%			  [get(currmod),OSName,AttrN,N,UniqueFieldName]),
+		{ObjSetMod,ObjSetName} = ObjectSetRef,
+		OSDef = asn1_db:dbget(ObjSetMod, ObjSetName),
 		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
 		    true ->
 			ObjectEncode = 
 			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
 								   AttrN])),
-			{ObjSetMod,ObjSetName} =
-			    case ObjectSetRef of
-				{M,O} ->
-				    {{asis,M},O};
-				_ ->
-				    {"?MODULE",ObjectSetRef}
-			    end,
-			emit([ObjectEncode," = ",nl]),
-			emit(["   ",ObjSetMod,":'getenc_",ObjSetName,"'(",{asis,UniqueFieldName},
-			      ", ",nl]),
+			emit([ObjectEncode," = ",nl,
+			     "   ",{asis,ObjSetMod},":'getenc_",ObjSetName,
+			     "'(",{asis,UniqueFieldName},", ",nl]),
 			ValueMatch = value_match(ValueIndex,
 						 lists:concat(["Cindex",N])),
 			emit([indent(35),ValueMatch,"),",nl]),
@@ -257,15 +243,9 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
 		{[{ObjSetRef,LeadingAttr,Term}],PostponedDecArgs} ->
 		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
 		    ValueMatch = value_match(ValueIndex,Term),
-		    {ObjSetMod,ObjSetName} =
-			case ObjSetRef of
-			    {M,O} ->
-				{{asis,M},O};
-			    _ ->
-				{"?MODULE",ObjSetRef}
-			end,
+		    {ObjSetMod,ObjSetName} = ObjSetRef,
 		    emit([DecObj," =",nl,
-			  "   ",ObjSetMod,":'getdec_",ObjSetName,"'(",
+			  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
 			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
@@ -442,15 +422,9 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
 		{[{ObjSetRef,LeadingAttr,Term}],PostponedDecArgs} ->
 		    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
 		    ValueMatch = value_match(ValueIndex,Term),
-		    {ObjSetMod,ObjSetName} =
-			case ObjSetRef of
-			    {M,O} ->
-				{{asis,M},O};
-			    _ ->
-				{"?MODULE",ObjSetRef}
-			end,
+		    {ObjSetMod,ObjSetName} = ObjSetRef,
 		    emit([DecObj," =",nl,
-			  "   ",ObjSetMod,":'getdec_",ObjSetName,"'(",
+			  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
 			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
@@ -1259,15 +1233,9 @@ gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
 	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
 	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
 	    ValueMatch = value_match(ValIndex,Term),
-	    {ObjSetMod,ObjSetName} =
-		case OSet of
-		    {M,O} ->
-			{{asis,M},O};
-		    _ ->
-			{"?MODULE",OSet}
-		end,
-	    emit([",",nl,"ObjFun = ",ObjSetMod,":'getdec_",ObjSetName,"'(",
-		  {asis,UniqueFName},", ",ValueMatch,")"]);
+	    {ObjSetMod,ObjSetName} = OSet,
+	    emit([",",nl,"ObjFun = ",{asis,ObjSetMod},":'getdec_",ObjSetName,
+		  "'(",{asis,UniqueFName},", ",ValueMatch,")"]);
 	_ ->
 	    ok
     end,
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index 1edacd266a..9405d052db 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -143,19 +143,15 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 				   uniqueclassfield=UniqueFieldName,
 				   valueindex=ValueIndex
 				  } -> %% N is index of attribute that determines constraint
-		{{ObjSetMod,ObjSetName},OSDef} =
-		    case ObjectSet of
-			{Module,OSName} ->
-			    {{{asis,Module},OSName},asn1_db:dbget(Module,OSName)};
-			OSName ->
-			    {{"?MODULE",OSName},asn1_db:dbget(get(currmod),OSName)}
-		    end,
-		case (OSDef#typedef.typespec)#'ObjectSet'.gen of
+		{Module,ObjSetName} = ObjectSet,
+		#typedef{typespec=#'ObjectSet'{gen=Gen}} =
+		    asn1_db:dbget(Module, ObjSetName),
+		case Gen of
 		    true ->
 			ObjectEncode = 
 			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',AttrN])),
-			emit([ObjectEncode," = ",nl]),
-			emit(["  ",ObjSetMod,":'getenc_",ObjSetName,"'(",
+			emit([ObjectEncode," =",nl,
+			      "  ",{asis,Module},":'getenc_",ObjSetName,"'(",
 			      {asis,UniqueFieldName},", ",nl]),
 			El = make_element(N+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
 
@@ -176,7 +172,7 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 				notice_value_match()
 			end,
 			{AttrN,ObjectEncode};
-		    _ ->
+		    false ->
 			false
 		end;
 	    _  ->
@@ -364,14 +360,10 @@ gen_dec_constructed_imm_2(Typename, CompList,
 	{[{ObjSet,LeadingAttr,Term}],ListOfOpenTypes} ->
 	    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
 	    ValueMatch = value_match(ValueIndex,Term),
-	    {ObjSetMod,ObjSetName} =
-		case ObjSet of
-		    {M,O} -> {{asis,M},O};
-		    _ -> {"?MODULE",ObjSet}
-		end,
-	    emit({DecObj," =",nl,"   ",ObjSetMod,":'getdec_",ObjSetName,"'(",
-%		  {asis,UniqueFName},", ",Term,"),",nl}),
-		  {asis,UniqueFName},", ",ValueMatch,"),",nl}),
+	    {ObjSetMod,ObjSetName} = ObjSet,
+	    emit([DecObj," =",nl,
+		  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
+		  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
 	    gen_dec_listofopentypes(DecObj,ListOfOpenTypes,false)
     end,
     %% we don't return named lists any more   Cnames = mkcnamelist(CompList), 
@@ -1469,14 +1461,11 @@ gen_dec_line_dec_inf(Comp, DecInfObj) ->
 	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
 	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
 	    ValueMatch = value_match(ValIndex,Term),
-	    {ObjSetMod,ObjSetName} =
-		case OSet of
-		    {M,O} -> {{asis,M},O};
-		    _ -> {"?MODULE",OSet}
-		end,
-	    emit({",",nl,"ObjFun = ",ObjSetMod,
+	    {ObjSetMod,ObjSetName} = OSet,
+	    emit([",",nl,
+		  "ObjFun = ",{asis,ObjSetMod},
 		  ":'getdec_",ObjSetName,"'(",
-		  {asis,UniqueFName},", ",ValueMatch,")"});
+		  {asis,UniqueFName},", ",ValueMatch,")"]);
 	_ ->
 	    ok
     end.