File 2436-Remove-the-debug-option.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2436-Remove-the-debug-option.patch of Package erlang (Revision b1dff5cbf87755f120bfe931af793e05)

Currently displaying revision b1dff5cbf87755f120bfe931af793e05 , Show latest

From 4b51ea6aa2c4542ca83008cd4abb22169e481620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 14 Mar 2017 09:04:41 +0100
Subject: [PATCH 05/10] Remove the 'debug' option

The debug option no longer serves any useful purpose.
---
 lib/asn1/src/asn1ct.erl                        | 13 -------------
 lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl |  4 +---
 lib/asn1/src/asn1ct_constructed_per.erl        |  2 +-
 lib/asn1/src/asn1ct_gen.erl                    | 14 +-------------
 lib/asn1/src/asn1ct_gen_ber_bin_v2.erl         |  8 +-------
 lib/asn1/src/asn1ct_gen_per.erl                |  9 +--------
 6 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 9f77a557e..c9127266f 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -835,7 +835,6 @@ generate({M,CodeTuple}, OutFile, EncodingRule, Options) ->
     Code = #abst{name=M#module.name,
                  types=Types,values=Values,ptypes=Ptypes,
                  classes=Classes,objects=Objects,objsets=ObjectSets},
-    debug_on(Options),
     setup_bit_string_format(Options),
     setup_legacy_erlang_types(Options),
     asn1ct_table:new(check_functions),
@@ -855,7 +854,6 @@ generate({M,CodeTuple}, OutFile, EncodingRule, Options) ->
     end,
 
     asn1ct_gen:pgen(OutFile, Gen, Code),
-    debug_off(Options),
     cleanup_bit_string_format(),
     erase(tlv_format), % used in ber
     erase(class_default_type),% used in ber
@@ -1151,17 +1149,6 @@ is_asn1_flag(verbose) -> true;
 %% 'warnings_as_errors' is intentionally passed through to the compiler.
 is_asn1_flag(_) -> false.
 
-debug_on(Options) ->
-    case lists:member(debug,Options) of
-	true ->
-	    put(asndebug,true);
-	_ ->
-	    true
-    end.
-
-debug_off(_Options) ->
-    erase(asndebug).
-
 
 outfile(Base, Ext, Opts) ->
 %    io:format("Opts. ~p~n",[Opts]),
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 16af09bca..f13668e27 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/1]).
+-import(asn1ct_gen, [emit/1,get_record_name_prefix/1]).
 
 -define(ASN1CT_GEN_BER,asn1ct_gen_ber_bin_v2).
 
@@ -279,7 +279,6 @@ gen_decode_sequence(Gen, Typename, #type{}=D) ->
 			  ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
-	    demit(["Result = "]), %dbg
 	    %% return value as record
 	    case Ext of
 		{ext,_,_} -> 
@@ -503,7 +502,6 @@ gen_decode_set(Gen, Typename, #type{}=D) ->
 			  ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
-	    demit(["Result = "]), %dbg
 	    %% return value as record
 	    case Ext of
 		Extnsn when Extnsn =/= noext -> 
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index 0f68533f8..c745f30e8 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -32,7 +32,7 @@
 -include("asn1_records.hrl").
 %-compile(export_all).
 
--import(asn1ct_gen, [emit/1,demit/1,get_record_name_prefix/1]).
+-import(asn1ct_gen, [emit/1,get_record_name_prefix/1]).
 
 -type type_name() :: any().
 
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 9f628c7b0..8b101bbd7 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -22,8 +22,7 @@
 
 -include("asn1_records.hrl").
 
--export([demit/1,
-	 emit/1,
+-export([emit/1,
 	 open_output_file/1,close_output_file/0,
 	 get_inner/1,type/1,def_to_tag/1,prim_bif/1,
 	 list2name/1,
@@ -954,17 +953,6 @@ hrl_protector(OutFile) ->
      end || C <- P].
 
 
-%% EMIT functions ************************
-%% ***************************************
-
-						% debug generation
-demit(Term) ->
-    case get(asndebug) of
-	true -> emit(Term);
-	_ ->true
-    end.
-
-						% always generation
 emit(Term) ->
     ok = file:write(get(gen_file_out), do_emit(Term)).
 
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index dc3aad977..5bbb3ff52 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -35,7 +35,7 @@
 -export([extaddgroup2sequence/1]).
 -export([dialyzer_suppressions/1]).
 
--import(asn1ct_gen, [emit/1,demit/1]).
+-import(asn1ct_gen, [emit/1]).
 
 						% the encoding of class of tag bits 8 and 7
 -define(UNIVERSAL,   0).
@@ -338,7 +338,6 @@ gen_decode(Erules,Type) when is_record(Type,typedef) ->
           FuncName,"(Tlv) ->",nl,
           "   ",FuncName,"(Tlv, ",{asis,Tag},").",nl,nl,
           FuncName,"(Tlv, TagIn) ->",nl]),
-    dbdec(Type#typedef.name,"Tlv"),
     gen_decode_user(Erules,Type).
 
 gen_inc_decode(Erules,Type) when is_record(Type,typedef) ->
@@ -438,7 +437,6 @@ gen_decode(Erules,Typename,Type) when is_record(Type,type) ->
 		end,
 %	    emit([Prefix,asn1ct_gen:list2name(Typename),"'(Tlv, TagIn",ObjFun,") ->",nl]),
 	    emit([FunctionName,"'(Tlv, TagIn",ObjFun,") ->",nl]),
-	    dbdec(Typename,"Tlv"),
 	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
 	Rec when is_record(Rec,'Externaltypereference') ->
 	    case {Typename,asn1ct:get_gen_state_field(namelist)} of
@@ -1530,10 +1528,6 @@ gen_internal_funcs(Erules,[TypeDef|Rest]) ->
     gen_internal_funcs(Erules,Rest).
 
 
-dbdec(Type,Arg) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[",Arg,"]),",nl}).
-
-
 decode_class('UNIVERSAL') ->
     ?UNIVERSAL;
 decode_class('APPLICATION') ->
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 024351092..b5bfeed76 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -35,7 +35,7 @@
 -export([extaddgroup2sequence/1]).
 -export([dialyzer_suppressions/1]).
 
--import(asn1ct_gen, [emit/1,demit/1]).
+-import(asn1ct_gen, [emit/1]).
 -import(asn1ct_func, [call/3]).
 
 
@@ -225,7 +225,6 @@ gen_objectset_code(_Erules, _ObjSet) ->
 gen_decode(Erules, #typedef{}=Type) ->
     DecFunc = dec_func(Type#typedef.name),
     emit([nl,nl,{asis,DecFunc},"(Bytes) ->",nl]),
-    dbdec(Type#typedef.name),
     gen_decode_user(Erules, Type).
 
 gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
@@ -246,17 +245,11 @@ gen_decode(Erules,Typename,Type) when is_record(Type,type) ->
 	    emit([nl,
 		  {asis,dec_func(asn1ct_gen:list2name(Typename))},
 		  "(Bytes",ObjFun,") ->",nl]),
-	    dbdec(Typename),
 	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
 	_ ->
 	    true
     end.
 
-dbdec(Type) when is_list(Type)->
-    demit({"io:format(\"decoding: ",asn1ct_gen:list2name(Type),"~w~n\",[Bytes]),",nl});
-dbdec(Type) ->
-    demit({"io:format(\"decoding: ",{asis,Type},"~w~n\",[Bytes]),",nl}).
-
 gen_decode_user(Erules,D) when is_record(D,typedef) ->
     Typename = [D#typedef.name],
     Def = D#typedef.typespec,
-- 
2.12.0

Places

File 2436-Remove-the-debug-option.patch of Package erlang (Revision b1dff5cbf87755f120bfe931af793e05)

Places