Clean up comments

* Remove out-commented code
* Fix obvious typos and bad grammar
* Adhere to the conventions for when to use "%" and "%%".

1 files changed, 30 insertions, 110 deletions

diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 4f04b78241..e867b9606a 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -23,10 +23,9 @@
 
 %% Main Module for ASN.1 compile time functions
 
-%-compile(export_all).
 -export([check/2,storeindb/2,format_error/1]).
-%-define(debug,1).
 -include("asn1_records.hrl").
+
 %%% The tag-number for universal types
 -define(N_BOOLEAN, 1). 
 -define(N_INTEGER, 2). 
@@ -63,7 +62,8 @@
 -define(TAG_CONSTRUCTED(Num),
 	#tag{class='UNIVERSAL',number=Num,type='IMPLICIT',form=32}).
 
--record(newt,{type=unchanged,tag=unchanged,constraint=unchanged,inlined=no}). % used in check_type to update type and tag
+%% used in check_type to update type and tag
+-record(newt,{type=unchanged,tag=unchanged,constraint=unchanged,inlined=no}).
  
 check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) ->
     %%Predicates used to filter errors
@@ -561,7 +561,6 @@ check_class_fields(S,[F|Fields],Acc) ->
 			    D;
 			{undefined,user} -> 
 			    %% neither of {primitive,bif} or {constructed,bif}
-				    
 			    {_,D} = get_referenced_type(S,#'Externaltypereference'{module=S#state.mname,type=Type#type.def}),
 			    D;
 			_ ->
@@ -623,7 +622,6 @@ if_current_checked_type(S,#type{def=Def}) ->
     CurrentModule = S#state.mname,
     CurrentCheckedName = S#state.tname,
     MergedModules = S#state.inputmodules,
- %   CurrentCheckedModule = S#state.mname,
     case Def of
 	#'Externaltypereference'{module=CurrentModule,
 				 type=CurrentCheckedName} ->
@@ -656,7 +654,6 @@ check_pobjectset(S,PObjSet) ->
 	    ClassName = #'Externaltypereference'{module=Mod,
 						 type=get_datastr_name(Def)},
 	    {valueset,Set} = ValueSet,
-%	    ObjectSet = #'ObjectSet'{class={objectclassname,ClassName},
 	    ObjectSet = #'ObjectSet'{class=ClassName,
 				     set=Set},
 	    #pobjectsetdef{pos=Pos,name=Name,args=Args,class=Type#type.def,
@@ -1696,7 +1693,7 @@ check_value(OldS,V) when is_record(V,typedef) ->
 		    %% reference to class
 		    check_value(OldS,V#typedef{typespec=TS#'ObjectSet'{class=Eref}});
 		#typedef{typespec=HostType} ->
-		    % an ordinary value set with a type in #typedef.typespec
+		    %% an ordinary value set with a type in #typedef.typespec
 		    ValueSet0 = TS#'ObjectSet'.set,
 		    Constr = check_constraints(OldS, HostType, [ValueSet0]),
 		    Type = check_type(OldS,TSDef,TSDef#typedef.typespec),
@@ -2381,15 +2378,6 @@ normalize_s_of(SorS,S,Value,Type,NameList)
 
 
 %% normalize_restrictedstring handles all format of restricted strings.
-%% tuple case
-% normalize_restrictedstring(_S,[Int1,Int2],_) when is_integer(Int1),is_integer(Int2) ->
-%     {Int1,Int2};
-% %% quadruple case
-% normalize_restrictedstring(_S,[Int1,Int2,Int3,Int4],_) when is_integer(Int1),
-% 							   is_integer(Int2),
-% 							   is_integer(Int3),
-% 							   is_integer(Int4) ->
-%     {Int1,Int2,Int3,Int4};
 %% character string list case
 normalize_restrictedstring(S,[H|T],CType) when is_list(H);is_tuple(H) ->
     [normalize_restrictedstring(S,H,CType)|normalize_restrictedstring(S,T,CType)];
@@ -2491,7 +2479,7 @@ check_ptype(S,Type,Ts) when is_record(Ts,type) ->
 		  Ts#type{def=TDef}
 	  end,
     Ts2;
-%parameterized class
+%% parameterized class
 check_ptype(_S,_PTDef,Ts) when is_record(Ts,objectclass) ->
     throw({asn1_param_class,Ts}).
 
@@ -2506,8 +2494,6 @@ check_formal_parameter(_, #'Externaltypereference'{}) ->
 check_formal_parameter(S, #'Externalvaluereference'{value=Name}) ->
     asn1_error(S, {illegal_typereference,Name}).
 
-% check_type(S,Type,ObjSpec={{objectclassname,_},_}) ->
- %     check_class(S,ObjSpec);
 check_type(_S,Type,Ts) when is_record(Type,typedef),
 			   (Type#typedef.checked==true) ->
     Ts;
@@ -2606,7 +2592,6 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 			  constraint = NewC};
 		    _ ->
 			%% Here we only expand the tags and keep the ext ref.
-			    
 			NewExt = ExtRef#'Externaltypereference'{module=merged_mod(S,RefMod,Ext)},
 			TempNewDef#newt{
 			  type = check_externaltypereference(S,NewExt),
@@ -2749,7 +2734,6 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 		    case TopName of
 			[] ->
 			    [get_datastr_name(Type)];
-%			    [Type#typedef.name];
 			_ -> 
 			    TopName
 		    end,
@@ -2773,7 +2757,6 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 		    case TopName of
 			[] ->
 			    [get_datastr_name(Type)];
-%			    [Type#typedef.name];
 			_ -> 
 			    TopName
 		    end,
@@ -2898,8 +2881,6 @@ tablecinf_choose(#'SEQUENCE'{tablecinf=TCI}) ->
 
 get_innertag(_S,#'ObjectClassFieldType'{type=Type}) ->
     case Type of
-%	#type{tag=Tag} -> Tag;
-%	{fixedtypevaluefield,_,#type{tag=[]}=T} -> get_taglist(S,T);
 	{fixedtypevaluefield,_,#type{tag=Tag}} -> Tag;
 	{TypeFieldName,_} when is_atom(TypeFieldName) -> [];
 	_ -> []
@@ -3754,14 +3735,8 @@ check_reference(S,#'Externaltypereference'{pos=Pos,module=Emod,type=Name}) ->
 		{ok,Imodule} ->
 		    check_imported(S,Imodule,Name),
 		    #'Externaltypereference'{module=Imodule,type=Name};
-%% 		    case check_imported(S,Imodule,Name) of
-%% 			ok ->
-%% 			    #'Externaltypereference'{module=Imodule,type=Name};
-%% 			Err ->
-%% 			    Err
-%% 		    end;
 		_ ->
-		    %may be a renamed type in multi file compiling!
+		    %% may be a renamed type in multi file compiling!
 		    {M,T}=get_renamed_reference(S,Name,Emod),
 		    NewName = asn1ct:get_name_of_def(T),
 		    NewPos = asn1ct:get_pos_of_def(T),
@@ -4170,7 +4145,6 @@ iof_associated_type(S,[]) ->
 					    def=AssociateSeq}},
 	    asn1_db:dbput(S#state.mname,'INSTANCE OF',TypeDef),
 	    instance_of_decl(S#state.mname);
-%%	    put(instance_of,{generate,S#state.mname});
 	_ ->
 	    instance_of_decl(S#state.mname),
 	    ok
@@ -4199,14 +4173,12 @@ iof_associated_type1(S,C) ->
     ObjectIdentifier =
 	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
 				class=[],
-%%				fieldname=[{valuefieldreference,id}],
 				fieldname={id,[]},
 				type={fixedtypevaluefield,id,
 				      #type{def='OBJECT IDENTIFIER'}}},
     Typefield =
 	#'ObjectClassFieldType'{classname=TypeIdentifierRef,
 				class=[],
-%%				fieldname=[{typefieldreference,'Type'}],
 				fieldname={'Type',[]},
 				type=Typefield_type},
     IOFComponents0 =
@@ -4360,11 +4332,11 @@ check_boolean(_S,_Constr) ->
 check_octetstring(_S,_Constr) ->
     ok.
 
-% check all aspects of a SEQUENCE
-% - that all component names are unique
-% - that all TAGS are ok (when TAG default is applied)
-% - that each component is of a valid type
-% - that the extension marks are valid
+%% check all aspects of a SEQUENCE
+%% - that all component names are unique
+%% - that all TAGS are ok (when TAG default is applied)
+%% - that each component is of a valid type
+%% - that the extension marks are valid
 
 check_sequence(S,Type,Comps)  ->
     Components = expand_components(S,Comps),    
@@ -4705,11 +4677,11 @@ check_objectidentifier(_S,_Constr) ->
 
 check_relative_oid(_S,_Constr) ->
     ok.
-% check all aspects of a CHOICE
-% - that all alternative names are unique
-% - that all TAGS are ok (when TAG default is applied)
-% - that each alternative is of a valid type
-% - that the extension marks are valid
+%% check all aspects of a CHOICE
+%% - that all alternative names are unique
+%% - that all TAGS are ok (when TAG default is applied)
+%% - that each alternative is of a valid type
+%% - that the extension marks are valid
 check_choice(S,Type,Components) when is_list(Components) ->
     Components1 = [C||C = #'ComponentType'{} <- Components],
     case check_unique(Components1,#'ComponentType'.name) of
@@ -5063,12 +5035,12 @@ remove_doubles1(El,L) ->
 %% referred to in the ObjectClassFieldType, and the name of the unique
 %% field of the class of the ObjectClassFieldType. 
 %%
-% %% The level information outermost/innermost must be kept. There are
-% %% at least two possibilities to cover here for an outermost case: 1)
-% %% Both the simple table and the component relation have a common path
-% %% at least one step below the outermost level, i.e. the leading
-% %% information shall be on a sub level. 2) They don't have any common
-% %% path.
+%% The level information outermost/innermost must be kept. There are
+%% at least two possibilities to cover here for an outermost case: 1)
+%% Both the simple table and the component relation have a common path
+%% at least one step below the outermost level, i.e. the leading
+%% information shall be on a sub level. 2) They don't have any common
+%% path.
 get_simple_table_info(S, Cs, AtLists) ->
     [get_simple_table_info1(S, Cs, AtList, []) || AtList <- AtLists].
 
@@ -5109,10 +5081,10 @@ simple_table_info(S,#'ObjectClassFieldType'{classname=ClRef,
 	    {_FirstFieldName,FieldNames} ->
 		lists:last(FieldNames)
 	end,
-    %%ObjectClassFieldName is the last element in the dotted
-    %%list of the ObjectClassFieldType. The last element may
-    %%be of another class, that is referenced from the class
-    %%of the ObjectClassFieldType
+    %% ObjectClassFieldName is the last element in the dotted list of
+    %% the ObjectClassFieldType. The last element may be of another
+    %% class, that is referenced from the class of the
+    %% ObjectClassFieldType
     ClassDef =
 	case ObjectClass of
 	    [] ->
@@ -5128,7 +5100,7 @@ simple_table_info(S,#'ObjectClassFieldType'{classname=ClRef,
 %% the "name path" in the at-list to the component relation constraint
 %% that must refer to a simple table constraint. The list is empty if
 %% no component relation constraints were found.
-%% 
+%%
 %% NamePath has the names of all components that are followed from the
 %% beginning of the search. CNames holds the names of all components
 %% of the start level, this info is used if an outermost at-notation
@@ -5141,6 +5113,7 @@ any_component_relation(S,[#'ComponentType'{name=CName,typespec=Type}|Cs],CNames,
 		%% whether this constraint is relevant for the level
 		%% where the search started
 		AtNot = extract_at_notation(AtNotation),
+
 		%% evaluate_atpath returns the relative path to the
 		%% simple table constraint from where the component
 		%% relation is found.
@@ -5246,12 +5219,10 @@ get_components(_,#'SET'{components=Cs}) ->
     tuple2complist(Cs);
 get_components(_,{'CHOICE',Cs}) ->
     tuple2complist(Cs);
-%do not step in inlined structures
+%%do not step in inlined structures
 get_components(any,{'SEQUENCE OF',T = #type{def=_Def,inlined=no}}) ->
-%    get_components(any,Def);
     T;
 get_components(any,{'SET OF',T = #type{def=_Def,inlined=no}}) ->
-%    get_components(any,Def);
     T;
 get_components(_,_) ->
     [].
@@ -5281,15 +5252,12 @@ extract_at_notation([{Level,ValueRefs}]) ->
 componentrelation1(S,C = #type{def=Def,constraint=Constraint,tablecinf=TCI},
 		   Path) ->
     Ret =
-%	case Constraint of
-%	    [{componentrelation,{_,_,ObjectSet},AtList}|_Rest] ->
 	case lists:keyfind(componentrelation, 1, Constraint) of
 	    {_,{_,_,ObjectSet},AtList} ->
 		[{_,AL=[#'Externalvaluereference'{}|_R1]}|_R2] = AtList,
 		%% Note: if Path is longer than one,i.e. it is within
 		%% an inner type of the actual level, then the only
 		%% relevant at-list is of "outermost" type.
-%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
 		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
 		AtPath = 
 		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
@@ -5375,7 +5343,6 @@ innertype_comprel1(S,T = #type{def=Def,constraint=Cons,tablecinf=TCI},Path) ->
 		%% relevent here.
 		[{_,AL=[#'Externalvaluereference'{value=_Attr}|_R1]}|_R2] 
 		    = AtList,
-%%		#'ObjectClassFieldType'{class=ClassDef} = Def,
 		ClassDef = get_ObjectClassFieldType_classdef(S,Def),
 		AtPath = 
 		    lists:map(fun(#'Externalvaluereference'{value=V})->V end,
@@ -5444,7 +5411,7 @@ leading_attr_index1(S,[C|Cs],Arg={ObjectSet,_,CDef,P},
 value_match(S,C,Name,SubAttr) ->
     value_match(S,C,Name,SubAttr,[]). % C has name Name
 value_match(_S,#'ComponentType'{},_Name,[],Acc) ->
-    Acc;% do not reverse, indexes in reverse order
+    Acc;                    % do not reverse, indexes in reverse order
 value_match(S,#'ComponentType'{typespec=Type},Name,[At|Ats],Acc) ->
     InnerType = asn1ct_gen:get_inner(Type#type.def),
     Components =
@@ -5514,8 +5481,6 @@ get_tableconstraint_info(S,Type,[C=#'ComponentType'{typespec=CheckedTs}|Cs],Acc)
 				  CheckedTs#type{
 				    def=NewOCFT
 				    }};
-%				    constraint=[{tableconstraint_info,
-%						 FieldRef}]}};
 	    {'SEQUENCE OF',SOType} when is_record(SOType,type),
 					(element(1,SOType#type.def)=='CHOICE') ->
 		CTypeList = element(2,SOType#type.def),
@@ -5618,51 +5583,6 @@ get_taglist1(S,[_H|Rest]) -> % skip EXTENSIONMARK
 get_taglist1(_S,[]) ->
     [].
 
-%% def_to_tag(S,Def) ->
-%%     case asn1ct_gen:def_to_tag(Def) of
-%% 	{'UNIVERSAL',T} ->
-%% 	    case asn1ct_gen:prim_bif(T) of
-%% 		true ->
-%% 		    ?TAG_PRIMITIVE(tag_number(T));
-%% 		_ ->
-%% 		    ?TAG_CONSTRUCTED(tag_number(T))
-%% 	    end;
-%% 	_ -> []
-%%     end.
-%% tag_number('BOOLEAN') -> 1;
-%% tag_number('INTEGER') -> 2;
-%% tag_number('BIT STRING') -> 3;
-%% tag_number('OCTET STRING') -> 4;
-%% tag_number('NULL') -> 5;
-%% tag_number('OBJECT IDENTIFIER') -> 6;
-%% tag_number('ObjectDescriptor') -> 7;
-%% tag_number('EXTERNAL') -> 8;
-%% tag_number('INSTANCE OF') -> 8;
-%% tag_number('REAL') -> 9;
-%% tag_number('ENUMERATED') -> 10;
-%% tag_number('EMBEDDED PDV') -> 11;
-%% tag_number('UTF8String') -> 12;
-%% %%tag_number('RELATIVE-OID') -> 13;
-%% tag_number('SEQUENCE') -> 16;
-%% tag_number('SEQUENCE OF') -> 16;
-%% tag_number('SET') -> 17;
-%% tag_number('SET OF') -> 17;
-%% tag_number('NumericString') -> 18;
-%% tag_number('PrintableString') -> 19;
-%% tag_number('TeletexString') -> 20;
-%% %%tag_number('T61String') -> 20;
-%% tag_number('VideotexString') -> 21;
-%% tag_number('IA5String') -> 22;
-%% tag_number('UTCTime') -> 23;
-%% tag_number('GeneralizedTime') -> 24;
-%% tag_number('GraphicString') -> 25;
-%% tag_number('VisibleString') -> 26;
-%% %%tag_number('ISO646String') -> 26;
-%% tag_number('GeneralString') -> 27;
-%% tag_number('UniversalString') -> 28;
-%% tag_number('CHARACTER STRING') -> 29;
-%% tag_number('BMPString') -> 30.
-
 merge_tags(T1, T2) when is_list(T2) ->
     merge_tags2(T1 ++ T2, []);
 merge_tags(T1, T2) ->