Refactor code generation options

Most options to the code generation pass are passed through the
process dictionary. At the same time, an Erule or Erules argument
is passed to most code generation functions. The Erule argument
is only an atom indicating the encoding rules ('ber', 'per', or
'uper').

Introduce a new record #gen{} to contain code generation options
and parameters. Pass it as the Erule argument (renaming it to Gen
in functions that we will have to touch anyway). In this commit,
eliminate the use of the variable 'encoding_options' in the process
dictionary.

6 files changed, 305 insertions, 313 deletions

diff --git a/lib/asn1/src/asn1_records.hrl b/lib/asn1/src/asn1_records.hrl
index af10c1771c..4b800f17c7 100644
--- a/lib/asn1/src/asn1_records.hrl
+++ b/lib/asn1/src/asn1_records.hrl
@@ -96,6 +96,16 @@
 	 error_context				%Top-level thingie (contains line numbers)
 	}).
 
+%% Code generation parameters and options.
+-record(gen,
+        {erule=ber :: 'ber' | 'per',
+         der=false :: boolean(),
+         aligned=false :: boolean(),
+         rec_prefix="" :: string(),
+         macro_prefix="" :: string(),
+         options=[] :: [any()]
+        }).
+
 %% state record used by back-end at partial decode
 %% active is set to 'yes' when a partial decode function is generated.
 %% prefix is set to 'dec-inc-' or 'dec-partial-' is for
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 4e030861f5..c5e32cdc96 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -838,33 +838,47 @@ generate({M,GenTOrV}, OutFile, EncodingRule, Options) ->
     debug_on(Options),
     setup_bit_string_format(Options),
     setup_legacy_erlang_types(Options),
-    put(encoding_options,Options),
     asn1ct_table:new(check_functions),
 
+    Gen = init_gen_record(EncodingRule, Options),
+
     %% create decoding function names and taglists for partial decode
-    case (catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options)) of
-        {error, Reason}  -> warning("Error in configuration file: ~n~p~n",
-                                    [Reason], Options,
-                                    "Error in configuration file");
-        _                -> ok
+    try
+        specialized_decode_prepare(Gen, M)
+    catch
+        throw:{error, Reason} ->
+            warning("Error in configuration file: ~n~p~n",
+                    [Reason], Options,
+                    "Error in configuration file")
     end,
 
-    Result = 
-	case (catch asn1ct_gen:pgen(OutFile,EncodingRule,
-				   M#module.name,GenTOrV,Options)) of
-	    {'EXIT',Reason2} ->
-		error("~p~n",[Reason2],Options),
-		{error,Reason2};
-	    _ ->
-		ok
-	end,
+    Res = case catch asn1ct_gen:pgen(OutFile, Gen, M#module.name, GenTOrV) of
+              {'EXIT',Reason2} ->
+                  error("~p~n",[Reason2],Options),
+                  {error,Reason2};
+              _ ->
+                  ok
+          end,
     debug_off(Options),
-    erase(encoding_options),
     cleanup_bit_string_format(),
     erase(tlv_format), % used in ber
     erase(class_default_type),% used in ber
     asn1ct_table:delete(check_functions),
-    Result.
+    Res.
+
+init_gen_record(EncodingRule, Options) ->
+    Erule = case EncodingRule of
+                uper -> per;
+                _ -> EncodingRule
+            end,
+    Der = proplists:get_bool(der, Options),
+    Aligned = EncodingRule =:= per,
+    RecPrefix = proplists:get_value(record_name_prefix, Options, ""),
+    MacroPrefix = proplists:get_value(macro_name_prefix, Options, ""),
+    #gen{erule=Erule,der=Der,aligned=Aligned,
+         rec_prefix=RecPrefix,macro_prefix=MacroPrefix,
+         options=Options}.
+
 
 setup_legacy_erlang_types(Opts) ->
     F = case lists:member(legacy_erlang_types, Opts) of
@@ -997,9 +1011,8 @@ input_file_type(File) ->
 		    end
 	    end;
 	".asn1config" ->
-	    case read_config_file(File,asn1_module) of
+	    case read_config_file_info(File, asn1_module) of
 		{ok,Asn1Module} -> 
-%		    put(asn1_config_file,File),
 		    input_file_type(Asn1Module);
 		Error ->
 		    Error
@@ -1370,25 +1383,26 @@ prepare_bytes(Bytes) -> list_to_binary(Bytes).
 vsn() ->
     ?vsn.
 
-specialized_decode_prepare(Erule,M,TsAndVs,Options) ->
-    case lists:member(asn1config,Options) of
+specialized_decode_prepare(#gen{erule=ber,options=Options}=Gen, M) ->
+    case lists:member(asn1config, Options) of
 	true ->
-	    partial_decode_prepare(Erule,M,TsAndVs,Options);
-	_ ->
+	    special_decode_prepare_1(Gen, M);
+	false ->
 	    ok
-    end.
+    end;
+specialized_decode_prepare(_, _) ->
+    ok.
+
 %% Reads the configuration file if it exists and stores information
 %% about partial decode and incomplete decode
-partial_decode_prepare(ber,M,TsAndVs,Options) when is_tuple(TsAndVs) ->
+special_decode_prepare_1(#gen{options=Options}=Gen, M) ->
     %% read configure file
-
-    ModName =
-	case lists:keysearch(asn1config,1,Options) of
-	    {value,{_,MName}} -> MName;
-	    _ -> M#module.name
-	end,
+    ModName = case lists:keyfind(asn1config, 1, Options) of
+                  {_,MName} -> MName;
+                  false -> M#module.name
+              end,
 %%    io:format("ModName: ~p~nM#module.name: ~p~n~n",[ModName,M#module.name]),
-    case read_config_file(ModName) of
+    case read_config_file(Gen, ModName) of
         no_config_file ->
             ok;
         CfgList ->
@@ -1407,11 +1421,7 @@ partial_decode_prepare(ber,M,TsAndVs,Options) when is_tuple(TsAndVs) ->
             Part_inc_tlv_tags = tlv_tags(CommandList2),
             save_config(partial_incomplete_decode,Part_inc_tlv_tags),
             save_gen_state(exclusive_decode,ExclusiveDecode,Part_inc_tlv_tags)
-    end;
-partial_decode_prepare(_,_,_,_) ->
-    ok.
-
-
+    end.
 
 %% create_partial_inc_decode_gen_info/2
 %%
@@ -1863,46 +1873,38 @@ tlv_tag1(<<0:1,PartialTag:7>>,Acc) ->
 tlv_tag1(<<1:1,PartialTag:7,Buffer/binary>>,Acc) ->
     tlv_tag1(Buffer,(Acc bsl 7) bor PartialTag).
     
-%% reads the content from the configuration file and returns the
-%% selected part choosen by InfoType. Assumes that the config file
+%% Reads the content from the configuration file and returns the
+%% selected part chosen by InfoType. Assumes that the config file
 %% content is an Erlang term.
-read_config_file(ModuleName,InfoType) when is_atom(InfoType) ->
-    CfgList = read_config_file(ModuleName),
-    get_config_info(CfgList,InfoType).
+read_config_file_info(ModuleName, InfoType) when is_atom(InfoType) ->
+    Name = ensure_ext(ModuleName, ".asn1config"),
+    CfgList = read_config_file0(Name, []),
+    get_config_info(CfgList, InfoType).
 
+read_config_file(#gen{options=Options}, ModuleName) ->
+    Name = ensure_ext(ModuleName, ".asn1config"),
+    Includes = [I || {i,I} <- Options],
+    read_config_file0(Name, ["."|Includes]).
 
-read_config_file(ModuleName) ->
-    case file:consult(lists:concat([ModuleName,'.asn1config'])) of
+read_config_file0(Name, [D|Dirs]) ->
+    case file:consult(filename:join(D, Name)) of
 	{ok,CfgList} ->
 	    CfgList;
 	{error,enoent} ->
-	    Options = get(encoding_options),
-	    Includes = [I || {i,I} <- Options],
-	    read_config_file1(ModuleName,Includes);
+            read_config_file0(Name, Dirs);
 	{error,Reason} ->
 	    Error = "error reading asn1 config file: " ++
 		file:format_error(Reason),
 	    throw({error,Error})
-    end.
-read_config_file1(ModuleName,[]) ->
-    case filename:extension(ModuleName) of
-	".asn1config" ->
-            no_config_file;
-	_ ->
-	    read_config_file(lists:concat([ModuleName,".asn1config"]))
     end;
-read_config_file1(ModuleName,[H|T]) ->
-%    File = filename:join([H,lists:concat([ModuleName,'.asn1config'])]),
-    File = filename:join([H,ModuleName]),
-    case file:consult(File) of
-	{ok,CfgList} ->
-	    CfgList;
-	{error,enoent} ->
-	    read_config_file1(ModuleName,T);
-	{error,Reason} ->
-	    Error = "error reading asn1 config file: " ++
-		file:format_error(Reason),
-	    throw({error,Error})
+read_config_file0(_, []) ->
+    no_config_file.
+
+ensure_ext(ModuleName, Ext) ->
+    Name = filename:join([ModuleName]),
+    case filename:extension(Name) of
+        Ext -> Name;
+        _ -> Name ++ Ext
     end.
     
 get_config_info(CfgList,InfoType) ->
@@ -2382,8 +2384,10 @@ format_error({write_error,File,Reason}) ->
     io_lib:format("writing output file ~s failed: ~s",
 		  [File,file:format_error(Reason)]).
 
-is_error(S) when is_record(S, state) ->
-    is_error(S#state.options);
+is_error(#state{options=Opts}) ->
+    is_error(Opts);
+is_error(#gen{options=Opts}) ->
+    is_error(Opts);
 is_error(O) ->
     lists:member(errors, O) orelse is_verbose(O).
 
@@ -2392,8 +2396,10 @@ is_warning(S) when is_record(S, state) ->
 is_warning(O) ->
     lists:member(warnings, O) orelse is_verbose(O).
 
-is_verbose(S) when is_record(S, state) ->
-    is_verbose(S#state.options);
+is_verbose(#state{options=Opts}) ->
+    is_verbose(Opts);
+is_verbose(#gen{options=Opts}) ->
+    is_verbose(Opts);
 is_verbose(O) ->
     lists:member(verbose, O).
 
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 325bea5879..cc1196c5cb 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -32,7 +32,7 @@
 
 -include("asn1_records.hrl").
 
--import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/0]).
+-import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/1]).
 
 -define(ASN1CT_GEN_BER,asn1ct_gen_ber_bin_v2).
 
@@ -225,7 +225,7 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
 	    _ ->
 		{false,false}
 	end,
-    RecordName = lists:concat([get_record_name_prefix(),
+    RecordName = lists:concat([get_record_name_prefix(Erules),
 			       asn1ct_gen:list2rname(Typename)]),
     case gen_dec_sequence_call(Erules,Typename,CompList2,Ext,DecObjInf) of
 	no_terms -> % an empty sequence	    
@@ -405,7 +405,7 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
 	    asn1ct_name:new(tlv)
 
     end,
-    RecordName = lists:concat([get_record_name_prefix(),
+    RecordName = lists:concat([get_record_name_prefix(Erules),
 			       asn1ct_gen:list2rname(Typename)]),
     case gen_dec_sequence_call(Erules,Typename,CompList,Ext,DecObjInf) of
 	no_terms -> % an empty sequence	    
@@ -504,10 +504,8 @@ gen_decode_sof(Erules,TypeName,_InnerTypeName,D) when is_record(D,type) ->
     emit([" || ",{curr,v}," <- ",{curr,tlv},"].",nl,nl,nl]).
     
 
-gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont) 
-  when is_record(Cont,type)->
-
-    {Objfun,Objfun_novar,EncObj} = 
+gen_encode_sof_components(Gen, Typename, SeqOrSetOf, #type{}=Cont) ->
+    {Objfun,Objfun_novar,EncObj} =
 	case Cont#type.tablecinf of
 	    [{objfun,_}|_R] ->
 		{", ObjFun",", _",{no_attr,"ObjFun"}};
@@ -517,20 +515,19 @@ gen_encode_sof_components(Erules,Typename,SeqOrSetOf,Cont)
     emit(["'enc_",asn1ct_gen:list2name(Typename),
 	  "_components'([]",Objfun_novar,", AccBytes, AccLen) -> ",nl]),
 
-    case catch lists:member(der,get(encoding_options)) of
-	true when SeqOrSetOf=='SET OF'->
+    case {Gen,SeqOrSetOf} of
+        {#gen{der=true},'SET OF'} ->
 	    asn1ct_func:need({ber,dynamicsort_SETOF,1}),
 	    emit([indent(3),
 		  "{dynamicsort_SETOF(AccBytes),AccLen};",nl,nl]);
-	_ ->
+	{_,_} ->
 	    emit([indent(3),"{lists:reverse(AccBytes),AccLen};",nl,nl])
     end,
     emit(["'enc_",asn1ct_gen:list2name(Typename),
 	  "_components'([H|T]",Objfun,",AccBytes, AccLen) ->",nl]),
     TypeNameSuffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,Cont#type.def),
-    gen_enc_line(Erules,Typename,TypeNameSuffix,Cont,"H",3,
-%		 mandatory,"{EncBytes,EncLen} = ",EncObj),
-		 mandatory,EncObj),
+    gen_enc_line(Gen, Typename, TypeNameSuffix, Cont, "H", 3,
+		 mandatory, EncObj),
     emit([",",nl]),
     emit([indent(3),"'enc_",asn1ct_gen:list2name(Typename),
 	  "_components'(T",Objfun,","]), 
@@ -1035,26 +1032,26 @@ gen_optormand_case('OPTIONAL', Erules, _TopType, _Cname, _Type, Element) ->
     emit([indent(9),"asn1_NOVALUE -> {",
 	  empty_lb(Erules),",0};",nl]),
     emit([indent(9),"_ ->",nl,indent(12)]);
-gen_optormand_case({'DEFAULT',DefaultValue}, Erules, _TopType,
+gen_optormand_case({'DEFAULT',DefaultValue}, Gen, _TopType,
 		   _Cname, Type, Element) ->
     CurrMod = get(currmod),
-    case catch lists:member(der,get(encoding_options)) of
-	true ->
+    case Gen of
+        #gen{erule=ber,der=true} ->
 	    asn1ct_gen_check:emit(Type, DefaultValue, Element);
-	_ ->
+	#gen{erule=ber,der=false} ->
 	    emit([" case ",Element," of",nl]),
 	    emit([indent(9),"asn1_DEFAULT -> {",
-		  empty_lb(Erules),
+		  empty_lb(Gen),
 		  ",0};",nl]),
 	    case DefaultValue of 
 		#'Externalvaluereference'{module=CurrMod,
 					  value=V} ->
 		    emit([indent(9),"?",{asis,V}," -> {",
-			  empty_lb(Erules),",0};",nl]);
+			  empty_lb(Gen),",0};",nl]);
 		_ ->
 		    emit([indent(9),{asis,
 				     DefaultValue}," -> {",
-			  empty_lb(Erules),",0};",nl])
+			  empty_lb(Gen),",0};",nl])
 	    end,
 	    emit([indent(9),"_ ->",nl,indent(12)])
     end.
@@ -1429,7 +1426,7 @@ mkfuncname(TopType,Cname,WhatKind,Prefix,Suffix) ->
 	    {F, "?MODULE", F}
     end.
 
-empty_lb(ber) ->
+empty_lb(#gen{erule=ber}) ->
     "<<>>".
 
 value_match(Index,Value) when is_atom(Value) ->
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index 1782ca11b4..4121146228 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -32,17 +32,26 @@
 -include("asn1_records.hrl").
 %-compile(export_all).
 
--import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/0]).
--import(asn1ct_func, [call/3]).
+-import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/1]).
+
+-type type_name() :: any().
 
 %% ENCODE GENERATOR FOR SEQUENCE TYPE  ** **********
 
 
-gen_encode_set(Erules,TypeName,D) ->
-    gen_encode_constructed(Erules,TypeName,D).
+-spec gen_encode_set(Gen, TypeName, #type{}) -> 'ok' when
+      Gen :: #gen{},
+      TypeName :: type_name().
+
+gen_encode_set(Gen, TypeName, D) ->
+    gen_encode_constructed(Gen, TypeName, D).
 
-gen_encode_sequence(Erules,TypeName,D) ->
-    gen_encode_constructed(Erules,TypeName,D).
+-spec gen_encode_sequence(Gen, TypeName, #type{}) -> 'ok' when
+      Gen :: #gen{},
+      TypeName :: type_name().
+
+gen_encode_sequence(Gen, TypeName, D) ->
+    gen_encode_constructed(Gen, TypeName, D).
 
 gen_encode_constructed(Erule, Typename, #type{}=D) ->
     asn1ct_name:start(),
@@ -303,7 +312,7 @@ gen_dec_constructed_imm(Erule, Typename, #type{}=D) ->
 				       DecObjInf, Ext, length(Optionals)),
     EmitObjSets = gen_dec_objsets_fun(Erule, ObjSetInfo),
     EmitPack = fun(_) ->
-                       gen_dec_pack(Typename, CompList)
+                       gen_dec_pack(Erule, Typename, CompList)
                end,
     RestGroup = {group,[{safe,EmitObjSets},{safe,EmitPack}]},
     [EmitExt,EmitOpt|EmitComp++[RestGroup]].
@@ -327,8 +336,8 @@ gen_dec_objsets_fun(Erule, ObjSetInfo) ->
             end
     end.
 
-gen_dec_pack(Typename, CompList) ->
-    RecordName = record_name(Typename),
+gen_dec_pack(Gen, Typename, CompList) ->
+    RecordName = record_name(Gen, Typename),
     case Typename of
 	['EXTERNAL'] ->
 	    emit({"   OldFormat={'",RecordName,
@@ -356,10 +365,10 @@ gen_dec_pack(Typename, CompList) ->
 %%  group. Such fake sequences never appear as a top type, and their
 %%  name always start with "ExtAddGroup".
 
-record_name(Typename0) ->
+record_name(Gen, Typename0) ->
     [TopType|Typename1] = lists:reverse(Typename0),
     Typename = filter_ext_add_groups(Typename1, [TopType]),
-    lists:concat([get_record_name_prefix(),
+    lists:concat([get_record_name_prefix(Gen),
 		  asn1ct_gen:list2rname(Typename)]).
 
 filter_ext_add_groups([H|T], Acc) when is_atom(H) ->
@@ -588,8 +597,7 @@ do_gen_decode_sof(Erules, Typename, SeqOrSetOf, D) ->
     emit([",",nl,
 	  {asis,F},"(",Num,", ",Buf,ObjFun,", [])"]).
 
-is_aligned(per) -> true;
-is_aligned(uper) -> false.
+is_aligned(#gen{erule=per,aligned=Aligned}) -> Aligned.
 
 gen_decode_length(Constraint, Erule) ->
     emit(["%% Length with constraint ",{asis,Constraint},nl]),
@@ -1089,27 +1097,31 @@ gen_dec_components_call(Erule, TopType, {Root,ExtList},
 			DecInfObj, Ext, NumberOfOptionals) ->
     gen_dec_components_call(Erule,TopType,{Root,ExtList,[]},
 			    DecInfObj,Ext,NumberOfOptionals);
-gen_dec_components_call(Erule,TopType,CL={Root1,ExtList,Root2},
-			DecInfObj,Ext,NumberOfOptionals) ->
+gen_dec_components_call(Gen, TopType, {Root1,ExtList,Root2}=CL,
+			DecInfObj, Ext, NumberOfOptionals) ->
     %% The type has extensionmarker
     OptTable = create_optionality_table(Root1++Root2),
     Init = {ignore,fun(_) -> {[],[]} end},
     {EmitRoot,Tpos} =
-	gen_dec_comp_calls(Root1++Root2, Erule, TopType, OptTable,
+	gen_dec_comp_calls(Root1++Root2, Gen, TopType, OptTable,
 			   DecInfObj, noext, NumberOfOptionals,
 			   1, []),
-    EmitGetExt = gen_dec_get_extension(Erule),
+    EmitGetExt = gen_dec_get_extension(Gen),
     {extgrouppos,ExtGroupPosLen}  = extgroup_pos_and_length(CL),
     NewExtList = wrap_extensionAdditionGroups(ExtList, ExtGroupPosLen),
-    {EmitExts,_} = gen_dec_comp_calls(NewExtList, Erule, TopType, OptTable,
+    {EmitExts,_} = gen_dec_comp_calls(NewExtList, Gen, TopType, OptTable,
 				      DecInfObj, Ext, NumberOfOptionals,
 				      Tpos, []),
     NumExtsToSkip = ext_length(ExtList),
     Finish =
 	fun(St) ->
 		emit([{next,bytes},"= "]),
-		call(Erule, skipextensions,
-		     [{curr,bytes},NumExtsToSkip+1,"Extensions"]),
+                Mod = case Gen of
+                          #gen{erule=per,aligned=false} -> uper;
+                          #gen{erule=per,aligned=true} -> per
+                      end,
+		asn1ct_func:call(Mod, skipextensions,
+                                 [{curr,bytes},NumExtsToSkip+1,"Extensions"]),
 		asn1ct_name:new(bytes),
 		St
 	end,
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index bfaffa13bf..a54cb0765e 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -34,10 +34,10 @@
 	 insert_once/2,
 	 ct_gen_module/1,
 	 index2suffix/1,
-	 get_record_name_prefix/0,
+	 get_record_name_prefix/1,
 	 conform_value/2,
 	 named_bitstring_value/2]).
--export([pgen/5,
+-export([pgen/4,
 	 mk_var/1, 
 	 un_hyphen_var/1]).
 -export([gen_encode_constructed/4,
@@ -45,23 +45,20 @@
 
 -define(SUPPRESSION_FUNC, 'dialyzer-suppressions').
 
+
 %% pgen(Outfile, Erules, Module, TypeOrVal, Options)
-%% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
-%% .hrl file is only generated if necessary
-%% Erules = per | ber
-%% Module = atom()
-%% TypeOrVal = {TypeList,ValueList}
-%% TypeList = ValueList = [atom()]
-%% Options = [Options] from asn1ct:compile()
-
-pgen(OutFile,Erules,Module,TypeOrVal,Options) ->
-    pgen_module(OutFile,Erules,Module,TypeOrVal,Options,true).
-
-
-pgen_module(OutFile,Erules,Module,
-	    TypeOrVal = {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets},
-	    Options,Indent) ->
-    N2nConvEnums = [CName|| {n2n,CName} <- get(encoding_options)],
+%% Generate Erlang module (.erl) and (.hrl) file corresponding to
+%% an ASN.1 module. The .hrl file is only generated if necessary.
+
+-spec pgen(Outfile, Gen, Module, Contents) -> 'ok' when
+      Outfile :: any(),
+      Gen :: #gen{},
+      Module :: module(),
+      Contents :: tuple().
+
+pgen(OutFile, #gen{options=Options}=Gen, Module, Contents) ->
+    {Types,_Values,_Ptypes,_Classes,_Objects,_ObjectSets} = Contents,
+    N2nConvEnums = [CName|| {n2n,CName} <- Options],
     case N2nConvEnums -- Types of
 	[] ->
 	    ok;
@@ -70,29 +67,27 @@ pgen_module(OutFile,Erules,Module,
 		   UnmatchedTypes})
     end,
     put(outfile,OutFile),
-    HrlGenerated = pgen_hrl(Erules,Module,TypeOrVal,Options,Indent),
+    HrlGenerated = pgen_hrl(Gen, Module, Contents),
     asn1ct_name:start(),
     ErlFile = lists:concat([OutFile,".erl"]),
     _ = open_output_file(ErlFile),
     asn1ct_func:start_link(),
-    gen_head(Erules,Module,HrlGenerated),
-    pgen_exports(Erules,Module,TypeOrVal),
-    pgen_dispatcher(Erules,Module,TypeOrVal),
+    gen_head(Gen, Module, HrlGenerated),
+    pgen_exports(Gen, Module, Contents),
+    pgen_dispatcher(Gen, Contents),
     pgen_info(),
-    pgen_typeorval(Erules,Module,N2nConvEnums,TypeOrVal),
-    pgen_partial_incomplete_decode(Erules),
-% gen_vars(asn1_db:mod_to_vars(Module)),
-% gen_tag_table(AllTypes),
+    pgen_typeorval(Gen, Module, N2nConvEnums, Contents),
+    pgen_partial_incomplete_decode(Gen),
     emit([nl,
 	  "%%%",nl,
 	  "%%% Run-time functions.",nl,
 	  "%%%",nl]),
-    dialyzer_suppressions(Erules),
+    dialyzer_suppressions(Gen),
     Fd = get(gen_file_out),
     asn1ct_func:generate(Fd),
     close_output_file(),
     _ = erase(outfile),
-    asn1ct:verbose("--~p--~n",[{generated,ErlFile}],Options).
+    asn1ct:verbose("--~p--~n", [{generated,ErlFile}], Gen).
 
 dialyzer_suppressions(Erules) ->
     emit([nl,
@@ -181,10 +176,10 @@ pgen_objectsets(Rtmod,Erules,Module,[H|T]) ->
     Rtmod:gen_objectset_code(Erules,TypeDef),
     pgen_objectsets(Rtmod,Erules,Module,T).
 
-pgen_partial_decode(Rtmod,Erule,Module) when Erule == ber ->
-    pgen_partial_inc_dec(Rtmod,Erule,Module),
-    pgen_partial_dec(Rtmod,Erule,Module);
-pgen_partial_decode(_,_,_) ->
+pgen_partial_decode(Rtmod, #gen{erule=ber}=Gen, Module) ->
+    pgen_partial_inc_dec(Rtmod, Gen, Module),
+    pgen_partial_dec(Rtmod, Gen, Module);
+pgen_partial_decode(_, _, _) ->
     ok.
 
 pgen_partial_inc_dec(Rtmod,Erules,Module) ->
@@ -225,7 +220,7 @@ pgen_partial_inc_dec1(Rtmod,Erules,Module,[P|Ps]) ->
 pgen_partial_inc_dec1(_,_,_,[]) ->
     ok.
 
-gen_partial_inc_dec_refed_funcs(Rtmod,Erule) when Erule == ber ->
+gen_partial_inc_dec_refed_funcs(Rtmod, #gen{erule=ber}=Gen) ->
     case asn1ct:next_refed_func() of
 	[] ->
 	    ok;
@@ -233,19 +228,17 @@ gen_partial_inc_dec_refed_funcs(Rtmod,Erule) when Erule == ber ->
 	    TypeDef = asn1_db:dbget(M,Name),
 	    asn1ct:update_gen_state(namelist,Pattern),
 	    asn1ct:set_current_sindex(Sindex),
-	    Rtmod:gen_inc_decode(Erule,TypeDef),
-	    gen_dec_part_inner_constr(Rtmod,Erule,TypeDef,[Name]),
-	    gen_partial_inc_dec_refed_funcs(Rtmod,Erule);
+	    Rtmod:gen_inc_decode(Gen, TypeDef),
+	    gen_dec_part_inner_constr(Rtmod, Gen, TypeDef, [Name]),
+	    gen_partial_inc_dec_refed_funcs(Rtmod, Gen);
 	{Name,Sindex,Pattern,Type} ->
 	    TypeDef=#typedef{name=asn1ct_gen:list2name(Name),typespec=Type},
 	    asn1ct:update_gen_state(namelist,Pattern),
 	    asn1ct:set_current_sindex(Sindex),
-	    Rtmod:gen_inc_decode(Erule,TypeDef),
-	    gen_dec_part_inner_constr(Rtmod,Erule,TypeDef,Name),
-	    gen_partial_inc_dec_refed_funcs(Rtmod,Erule)
-    end;
-gen_partial_inc_dec_refed_funcs(_,_) ->
-    ok.
+	    Rtmod:gen_inc_decode(Gen, TypeDef),
+	    gen_dec_part_inner_constr(Rtmod, Gen, TypeDef, Name),
+	    gen_partial_inc_dec_refed_funcs(Rtmod, Gen)
+    end.
 
 pgen_partial_dec(_Rtmod,Erules,_Module) ->
     Type_pattern = asn1ct:get_gen_state_field(type_pattern),
@@ -254,16 +247,16 @@ pgen_partial_dec(_Rtmod,Erules,_Module) ->
     pgen_partial_types(Erules,Type_pattern),
     ok.
 
-pgen_partial_types(Erules,Type_pattern)  ->
-    % until this functionality works on all back-ends
-    Options = get(encoding_options),
-    case lists:member(asn1config,Options) of
+pgen_partial_types(#gen{options=Options}=Gen, TypePattern)  ->
+    %% until this functionality works on all back-ends
+    case lists:member(asn1config, Options) of
 	true ->
-	    pgen_partial_types1(Erules,Type_pattern);
-	_ -> ok
+	    pgen_partial_types1(Gen, TypePattern);
+	false ->
+            ok
     end.
 
-    
+
 pgen_partial_types1(Erules,[{FuncName,[TopType|RestTypes]}|Rest]) ->
 %    emit([FuncName,"(Bytes) ->",nl]),
     CurrMod = get(currmod),
@@ -441,7 +434,8 @@ pgen_partial_incomplete_decode(Erule) ->
 	_ ->
 	    ok
     end.
-pgen_partial_incomplete_decode1(ber) ->
+
+pgen_partial_incomplete_decode1(#gen{erule=ber}) ->
     case asn1ct:read_config_data(partial_incomplete_decode) of
 	undefined ->
 	    ok;
@@ -451,7 +445,7 @@ pgen_partial_incomplete_decode1(ber) ->
     GeneratedFs= asn1ct:get_gen_state_field(gen_refed_funcs),
 %    io:format("GeneratedFs :~n~p~n",[GeneratedFs]),
     gen_part_decode_funcs(GeneratedFs,0);
-pgen_partial_incomplete_decode1(_) -> ok.
+pgen_partial_incomplete_decode1(#gen{}) -> ok.
 
 emit_partial_incomplete_decode({FuncName,TopType,Pattern}) ->
     TypePattern = asn1ct:get_gen_state_field(inc_type_pattern),
@@ -654,7 +648,8 @@ gen_decode_constructed(Erules,Typename,InnerType,D) when is_record(D,typedef) ->
     gen_decode_constructed(Erules,Typename,InnerType,D#typedef.typespec).
 
 
-pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
+pgen_exports(#gen{options=Options}=Gen, _Module, Contents) ->
+    {Types,Values,_,_,Objects,ObjectSets} = Contents,
     emit(["-export([encoding_rule/0,bit_string_format/0,",nl,
 	  "         legacy_erlang_types/0]).",nl]),
     emit(["-export([",{asis,?SUPPRESSION_FUNC},"/1]).",nl]),
@@ -662,21 +657,21 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
 	[] -> ok;
 	_ ->
 	    emit({"-export([",nl}),
-	    case Erules of
-		ber ->
+	    case Gen of
+		#gen{erule=ber} ->
 		    gen_exports1(Types,"enc_",2);
 		_ ->
 		    gen_exports1(Types,"enc_",1)
 	    end,
 	    emit({"-export([",nl}),
-	    case Erules of
-		ber ->
+	    case Gen of
+		#gen{erule=ber} ->
 		    gen_exports1(Types, "dec_", 2);
 		_ ->
 		    gen_exports1(Types, "dec_", 1)
 	    end
     end,
-    case [X || {n2n,X} <- get(encoding_options)] of
+    case [X || {n2n,X} <- Options] of
 	[] -> ok;
 	A2nNames ->
 	    emit({"-export([",nl}),
@@ -693,10 +688,10 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
     case Objects of
 	[] -> ok;
 	_ ->
-	    case erule(Erules) of
-		per ->
-		    ok;
-		ber ->
+            case Gen of
+                #gen{erule=per} ->
+                    ok;
+                #gen{erule=ber} ->
 		    emit({"-export([",nl}),
 		    gen_exports1(Objects,"enc_",3),
 		    emit({"-export([",nl}),
@@ -706,10 +701,10 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
     case ObjectSets of
 	[] -> ok;
 	_ ->
-	    case erule(Erules) of
-		per ->
-		    ok;
-		ber ->
+            case Gen of
+                #gen{erule=per} ->
+                    ok;
+                #gen{erule=ber} ->
 		    emit({"-export([",nl}),
 		    gen_exports1(ObjectSets, "getenc_",1),
 		    emit({"-export([",nl}),
@@ -735,16 +730,17 @@ gen_partial_inc_decode_exports() ->
 	{_,undefined} ->
 	    ok;
 	{Data,_} ->
-	    gen_partial_inc_decode_exports(Data),
+	    gen_partial_inc_decode_exports0(Data),
 	    emit(["-export([decode_part/2]).",nl])
     end.
-gen_partial_inc_decode_exports([]) ->
+
+gen_partial_inc_decode_exports0([]) ->
     ok;
-gen_partial_inc_decode_exports([{Name,_,_}|Rest]) ->
+gen_partial_inc_decode_exports0([{Name,_,_}|Rest]) ->
     emit(["-export([",Name,"/1"]),
     gen_partial_inc_decode_exports1(Rest);
-gen_partial_inc_decode_exports([_|Rest]) ->
-    gen_partial_inc_decode_exports(Rest).
+gen_partial_inc_decode_exports0([_|Rest]) ->
+    gen_partial_inc_decode_exports0(Rest).
 
 gen_partial_inc_decode_exports1([]) ->
     emit(["]).",nl]);
@@ -773,27 +769,27 @@ gen_selected_decode_exports1([{FuncName,_}|Rest]) ->
     emit([",",nl,"          ",FuncName,"/1"]),
     gen_selected_decode_exports1(Rest).
 
-pgen_dispatcher(Erules,_Module,{[],_Values,_,_,_Objects,_ObjectSets}) ->
+pgen_dispatcher(Erules, {[],_Values,_,_,_Objects,_ObjectSets}) ->
     gen_info_functions(Erules);
-pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
+pgen_dispatcher(Gen, {Types,_Values,_,_,_Objects,_ObjectSets}) ->
     emit(["-export([encode/2,decode/2]).",nl,nl]),
-    gen_info_functions(Erules),
+    gen_info_functions(Gen),
 
-    Options = get(encoding_options),
+    Options = Gen#gen.options,
     NoFinalPadding = lists:member(no_final_padding, Options),
     NoOkWrapper = proplists:get_bool(no_ok_wrapper, Options),
 
-    Call = case Erules of
-	       per ->
-		   asn1ct_func:need({Erules,complete,1}),
+    Call = case Gen of
+	       #gen{erule=per,aligned=true} ->
+		   asn1ct_func:need({per,complete,1}),
 		   "complete(encode_disp(Type, Data))";
-	       ber ->
+	       #gen{erule=ber} ->
 		   "iolist_to_binary(element(1, encode_disp(Type, Data)))";
-	       uper when NoFinalPadding == true ->
-		   asn1ct_func:need({Erules,complete_NFP,1}),
+	       #gen{erule=per,aligned=false} when NoFinalPadding ->
+		   asn1ct_func:need({uper,complete_NFP,1}),
 		   "complete_NFP(encode_disp(Type, Data))";
-	       uper ->
-		   asn1ct_func:need({Erules,complete,1}),
+	       #gen{erule=per,aligned=false} ->
+		   asn1ct_func:need({uper,complete,1}),
 		   "complete(encode_disp(Type, Data))"
 	   end,
 
@@ -809,36 +805,36 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
     end,
     emit([nl,nl]),
 
-    Return_rest = proplists:get_bool(undec_rest, Options),
-    Data = case {Erules,Return_rest} of
-	       {ber,true} -> "Data0";
-	       _ -> "Data"
+    ReturnRest = proplists:get_bool(undec_rest, Gen#gen.options),
+    Data = case Gen#gen.erule =:= ber andalso ReturnRest of
+	       true -> "Data0";
+	       false -> "Data"
 	   end,
 
     emit(["decode(Type,",Data,") ->",nl]),
     DecWrap =
-	case {Erules,Return_rest} of
-	    {ber,false} ->
+	case {Gen,ReturnRest} of
+	    {#gen{erule=ber},false} ->
 		asn1ct_func:need({ber,ber_decode_nif,1}),
 		"element(1, ber_decode_nif(Data))";
-	    {ber,true} ->
+	    {#gen{erule=ber},true} ->
 		asn1ct_func:need({ber,ber_decode_nif,1}),
 		emit(["{Data,Rest} = ber_decode_nif(Data0),",nl]),
 		"Data";
-	    _ ->
+	    {_,_} ->
 		"Data"
 	end,
     emit([case NoOkWrapper of
 	      false -> "try";
 	      true -> "case"
 	  end, " decode_disp(Type, ",DecWrap,") of",nl]),
-    case erule(Erules) of
-	ber ->
+    case Gen of
+	#gen{erule=ber} ->
 	    emit(["  Result ->",nl]);
-	per ->
+	#gen{erule=per} ->
 	    emit(["  {Result,Rest} ->",nl])
     end,
-    case Return_rest of
+    case ReturnRest of
 	false -> result_line(NoOkWrapper, ["Result"]);
 	true ->  result_line(NoOkWrapper, ["Result","Rest"])
     end,
@@ -849,14 +845,14 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	    emit([nl,"end.",nl,nl])
     end,
 
-    gen_decode_partial_incomplete(Erules),
+    gen_decode_partial_incomplete(Gen),
 
-    case Erules of
-	ber ->
+    case Gen of
+	#gen{erule=ber} ->
 	    gen_dispatcher(Types,"encode_disp","enc_",""),
 	    gen_dispatcher(Types,"decode_disp","dec_",""),
 	    gen_partial_inc_dispatcher();
-	_PerOrPer_bin -> 
+	#gen{} ->
 	    gen_dispatcher(Types,"encode_disp","enc_",""),
 	    gen_dispatcher(Types,"decode_disp","dec_","")
     end,
@@ -885,15 +881,20 @@ try_catch() ->
      "      end",nl,
      "end."].
 
-gen_info_functions(Erules) ->
+gen_info_functions(Gen) ->
+    Erule = case Gen of
+                #gen{erule=ber} -> ber;
+                #gen{erule=per,aligned=false} -> uper;
+                #gen{erule=per,aligned=true} -> per
+            end,
     emit(["encoding_rule() -> ",
-	  {asis,Erules},".",nl,nl,
+	  {asis,Erule},".",nl,nl,
 	  "bit_string_format() -> ",
 	  {asis,asn1ct:get_bit_string_format()},".",nl,nl,
 	  "legacy_erlang_types() -> ",
 	  {asis,asn1ct:use_legacy_types()},".",nl,nl]).
 
-gen_decode_partial_incomplete(ber) ->
+gen_decode_partial_incomplete(#gen{erule=ber}) ->
     case {asn1ct:read_config_data(partial_incomplete_decode),
 	  asn1ct:get_gen_state_field(inc_type_pattern)} of
 	{undefined,_} ->
@@ -931,7 +932,7 @@ gen_decode_partial_incomplete(ber) ->
 	    EmitCaseClauses(),
 	    emit([".",nl,nl])
     end;
-gen_decode_partial_incomplete(_Erule) ->
+gen_decode_partial_incomplete(#gen{}) ->
     ok.
 
 gen_partial_inc_dispatcher() ->
@@ -1092,22 +1093,22 @@ open_output_file(F) ->
 close_output_file() ->
     ok = file:close(erase(gen_file_out)).
 
-pgen_hrl(Erules,Module,TypeOrVal,Options,_Indent) ->
-    put(currmod,Module),
-    {Types,Values,Ptypes,_,_,_} = TypeOrVal,
+pgen_hrl(Gen, Module, Contents) ->
+    put(currmod, Module),
+    {Types,Values,Ptypes,_,_,_} = Contents,
     Ret =
-	case pgen_hrltypes(Erules,Module,Ptypes++Types,0) of
+	case pgen_hrltypes(Gen, Module, Ptypes++Types, 0) of
 	    0 -> 
 		case Values of
 		    [] ->
 			0;
 		    _ ->
 			open_hrl(get(outfile),get(currmod)),
-			pgen_macros(Erules,Module,Values),
+			pgen_macros(Gen, Module, Values),
 			1
 		end;
 	    X ->
-		pgen_macros(Erules,Module,Values),
+		pgen_macros(Gen, Module, Values),
 		X
 	end,
     case Ret of
@@ -1119,62 +1120,59 @@ pgen_hrl(Erules,Module,TypeOrVal,Options,_Indent) ->
 	    close_output_file(),
 	    asn1ct:verbose("--~p--~n",
 			   [{generated,lists:concat([get(outfile),".hrl"])}],
-			   Options),
+			   Gen),
 	    Y
     end.
 
 pgen_macros(_,_,[]) ->
     true;
-pgen_macros(Erules,Module,[H|T]) ->
-    Valuedef = asn1_db:dbget(Module,H),
-    gen_macro(Valuedef),
-    pgen_macros(Erules,Module,T).
+pgen_macros(Gen, Module, [H|T]) ->
+    Valuedef = asn1_db:dbget(Module, H),
+    gen_macro(Gen, Valuedef),
+    pgen_macros(Gen, Module, T).
 
 pgen_hrltypes(_,_,[],NumRecords) ->
     NumRecords;
-pgen_hrltypes(Erules,Module,[H|T],NumRecords) ->
-%    io:format("records = ~p~n",NumRecords),
-    Typedef = asn1_db:dbget(Module,H),
-    AddNumRecords = gen_record(Typedef,NumRecords),
-    pgen_hrltypes(Erules,Module,T,NumRecords+AddNumRecords).
+pgen_hrltypes(Gen, Module, [H|T], NumRecords) ->
+    Typedef = asn1_db:dbget(Module, H),
+    AddNumRecords = gen_record(Gen, Typedef, NumRecords),
+    pgen_hrltypes(Gen, Module, T, NumRecords+AddNumRecords).
 
 
 %% Generates a macro for value Value defined in the ASN.1 module
-gen_macro(Value) when is_record(Value,valuedef) ->
-    Prefix = get_macro_name_prefix(),
-    emit({"-define('",Prefix,Value#valuedef.name,"', ",
-	  {asis,Value#valuedef.value},").",nl}).
+gen_macro(Gen, #valuedef{name=Name,value=Value}) ->
+    Prefix = get_macro_name_prefix(Gen),
+    emit(["-define('",Prefix,Name,"', ",{asis,Value},").",nl]).
 
 %% Generate record functions **************
 %% Generates an Erlang record for each named and unnamed SEQUENCE and SET in the ASN.1 
 %% module. If no SEQUENCE or SET is found there is no .hrl file generated
 
 
-gen_record(Tdef,NumRecords) when is_record(Tdef,typedef) ->
+gen_record(Gen, #typedef{}=Tdef, NumRecords) ->
     Name = [Tdef#typedef.name],
     Type = Tdef#typedef.typespec,
-    gen_record(type,Name,Type,NumRecords);
-
-gen_record(Tdef,NumRecords) when is_record(Tdef,ptypedef) ->
+    gen_record(Gen, type, Name, Type, NumRecords);
+gen_record(Gen, #ptypedef{}=Tdef, NumRecords) ->
     Name = [Tdef#ptypedef.name],
     Type = Tdef#ptypedef.typespec,
-    gen_record(ptype,Name,Type,NumRecords).
-    
-gen_record(TorPtype,Name,[#'ComponentType'{name=Cname,typespec=Type}|T],Num) ->
-    Num2 = gen_record(TorPtype,[Cname|Name],Type,Num),
-    gen_record(TorPtype,Name,T,Num2);
-gen_record(TorPtype,Name,{Clist1,Clist2},Num)
+    gen_record(Gen, ptype, Name, Type, NumRecords).
+
+gen_record(Gen, TorPtype, Name,
+           [#'ComponentType'{name=Cname,typespec=Type}|T], Num) ->
+    Num2 = gen_record(Gen, TorPtype, [Cname|Name], Type, Num),
+    gen_record(Gen, TorPtype, Name, T, Num2);
+gen_record(Gen, TorPtype, Name, {Clist1,Clist2}, Num)
   when is_list(Clist1), is_list(Clist2) ->
-    gen_record(TorPtype,Name,Clist1++Clist2,Num);
-gen_record(TorPtype,Name,{Clist1,EClist,Clist2},Num) 
+    gen_record(Gen, TorPtype, Name, Clist1++Clist2, Num);
+gen_record(Gen, TorPtype, Name, {Clist1,EClist,Clist2}, Num)
   when is_list(Clist1), is_list(EClist), is_list(Clist2) ->
-    gen_record(TorPtype,Name,Clist1++EClist++Clist2,Num);
-gen_record(TorPtype,Name,[_|T],Num) -> % skip EXTENSIONMARK
-    gen_record(TorPtype,Name,T,Num);
-gen_record(_TorPtype,_Name,[],Num) ->
+    gen_record(Gen, TorPtype, Name, Clist1++EClist++Clist2, Num);
+gen_record(Gen, TorPtype, Name, [_|T], Num) -> % skip EXTENSIONMARK
+    gen_record(Gen, TorPtype, Name, T, Num);
+gen_record(_Gen, _TorPtype, _Name, [], Num) ->
     Num;
-
-gen_record(TorPtype,Name,Type,Num) when is_record(Type,type) ->    
+gen_record(Gen, TorPtype, Name, #type{}=Type, Num) ->
     Def = Type#type.def,
     Rec = case Def of
 	      Seq when is_record(Seq,'SEQUENCE') ->
@@ -1209,7 +1207,7 @@ gen_record(TorPtype,Name,Type,Num) when is_record(Type,type) ->
 		0 -> open_hrl(get(outfile),get(currmod));
 		_ -> true
 	    end,
-	    Prefix = get_record_name_prefix(),
+	    Prefix = get_record_name_prefix(Gen),
 	    emit({"-record('",Prefix,list2name(Name),"',{",nl}),
 	    RootList = case CompList of
 			   _ when is_list(CompList) ->
@@ -1260,33 +1258,28 @@ gen_record(TorPtype,Name,Type,Num) when is_record(Type,type) ->
 			emit({"}).",nl,nl}),
 			CompList
 		end,
-	    gen_record(TorPtype,Name,NewCompList,Num+1);
+	    gen_record(Gen, TorPtype, Name, NewCompList, Num+1);
 	{inner,{'CHOICE', CompList}} ->
-	    gen_record(TorPtype,Name,CompList,Num);
+	    gen_record(Gen, TorPtype, Name, CompList, Num);
 	{NewName,{_, CompList}} ->
-	    gen_record(TorPtype,NewName,CompList,Num)
+	    gen_record(Gen, TorPtype, NewName, CompList, Num)
     end;
-gen_record(_,_,_,NumRecords) -> % skip CLASS etc for now.
+gen_record(_, _, _, _, NumRecords) ->        % skip CLASS etc for now.
      NumRecords.
-		    
-gen_head(Erules,Mod,Hrl) ->
-    Options = get(encoding_options),
-    case Erules of
-	per ->
-	    emit(["%% Generated by the Erlang ASN.1 PER-"
-		  "compiler version, utilizing bit-syntax:",
-		  asn1ct:vsn(),nl]);
-	ber ->
-	    emit(["%% Generated by the Erlang ASN.1 BER_V2-"
-		  "compiler version, utilizing bit-syntax:",
-		  asn1ct:vsn(),nl]);
-	uper ->
-	    emit(["%% Generated by the Erlang ASN.1 UNALIGNED"
-		  " PER-compiler version, utilizing bit-syntax:",
-		  asn1ct:vsn(),nl])
-    end,
-    emit({"%% Purpose: encoder and decoder to the types in mod ",Mod,nl,nl}),
-    emit({"-module('",Mod,"').",nl}),
+
+gen_head(#gen{options=Options}=Gen, Mod, Hrl) ->
+    Name = case Gen of
+               #gen{erule=per,aligned=false} ->
+                   "PER (unaligned)";
+               #gen{erule=per,aligned=true} ->
+                   "PER (aligned)";
+               #gen{erule=ber} ->
+                   "BER"
+           end,
+    emit(["%% Generated by the Erlang ASN.1 ",Name,
+          "compiler. Version:",asn1ct:vsn(),nl,
+          "%% Purpose: encoder and decoder of the types in ",Mod,nl,nl,
+          "-module('",Mod,"').",nl]),
     put(currmod,Mod),
     emit({"-compile(nowarn_unused_vars).",nl}),
     emit({"-dialyzer(no_improper_lists).",nl}),
@@ -1297,7 +1290,7 @@ gen_head(Erules,Mod,Hrl) ->
     emit(["-asn1_info([{vsn,'",asn1ct:vsn(),"'},",nl,
 	  "            {module,'",Mod,"'},",nl,
 	  "            {options,",io_lib:format("~p",[Options]),"}]).",nl,nl]).
-			
+
 
 gen_hrlhead(Mod) ->
     emit({"%% Generated by the Erlang ASN.1 compiler version:",asn1ct:vsn(),nl}),
@@ -1585,27 +1578,19 @@ constructed_suffix('SEQUENCE OF',_) ->
 constructed_suffix('SET OF',_) -> 
     'SETOF'.
 
-erule(ber) -> ber;
-erule(per) -> per;
-erule(uper) -> per.
-
 index2suffix(0) ->
     "";
 index2suffix(N) ->
     lists:concat(["_",N]).
 
-ct_gen_module(ber) ->
+ct_gen_module(#gen{erule=ber}) ->
     asn1ct_gen_ber_bin_v2;
-ct_gen_module(per) ->
-    asn1ct_gen_per;
-ct_gen_module(uper) ->
+ct_gen_module(#gen{erule=per}) ->
     asn1ct_gen_per.
 
-ct_constructed_module(ber) ->
+ct_constructed_module(#gen{erule=ber}) ->
     asn1ct_constructed_ber_bin_v2;
-ct_constructed_module(per) ->
-    asn1ct_constructed_per;
-ct_constructed_module(uper) ->
+ct_constructed_module(#gen{erule=per}) ->
     asn1ct_constructed_per.
 
 get_constraint(C,Key) ->
@@ -1617,19 +1602,9 @@ get_constraint(C,Key) ->
 	{value,Cnstr} ->
 	    Cnstr
     end.
-    
-get_record_name_prefix() ->
-    case lists:keysearch(record_name_prefix,1,get(encoding_options)) of
-	false ->
-	    "";
-	{value,{_,Prefix}} ->
-	    Prefix
-    end.
 
-get_macro_name_prefix() ->
-    case lists:keysearch(macro_name_prefix,1,get(encoding_options)) of
-	false ->
-	    "";
-	{value,{_,Prefix}} ->
-	    Prefix
-    end.
+get_record_name_prefix(#gen{rec_prefix=Prefix}) ->
+    Prefix.
+
+get_macro_name_prefix(#gen{macro_prefix=Prefix}) ->
+    Prefix.
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index aa7223904e..9671a566bf 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -113,11 +113,7 @@ gen_encode_prim(Erules, D) ->
     Value = {var,atom_to_list(asn1ct_gen:mk_var(asn1ct_name:curr(val)))},
     gen_encode_prim(Erules, D, Value).
 
-gen_encode_prim(Erules, #type{}=D, Value) ->
-    Aligned = case Erules of
-		  uper -> false;
-		  per -> true
-	      end,
+gen_encode_prim(#gen{erule=per,aligned=Aligned}, #type{}=D, Value) ->
     Imm = gen_encode_prim_imm(Value, D, Aligned),
     asn1ct_imm:enc_cg(Imm, Aligned).
 
@@ -284,11 +280,7 @@ gen_dec_external(Ext, BytesVar) ->
 	      _ -> [{asis,Mod},":"]
 	  end,{asis,dec_func(Type)},"(",BytesVar,")"]).
 
-gen_dec_imm(Erule, #type{def=Name,constraint=C}) ->
-    Aligned = case Erule of
-		  uper -> false;
-		  per -> true
-	      end,
+gen_dec_imm(#gen{erule=per,aligned=Aligned}, #type{def=Name,constraint=C}) ->
     gen_dec_imm_1(Name, C, Aligned).
 
 gen_dec_imm_1('ASN1_OPEN_TYPE', Constraint, Aligned) ->