Various cleanups

bin/trepanpl

@@ -2,7 +2,9 @@
 # Standalone routine to invoke a Perl program under the debugger.
 
 # The usual boilerplate...
-use strict; use warnings; use English;
+use strict;
+use warnings;
+use English qw( -no_match_vars );
 
 use File::Basename; use File::Spec;
 

lib/Devel/Trepan/BrkptMgr.pm

@@ -1,10 +1,18 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
-use strict; use warnings; no warnings 'redefine';
-use English;
+
+package Devel::Trepan::BrkptMgr;
+
+use strict;
+use warnings;
+no warnings 'redefine';
+
+use English qw( -no_match_vars );
+
+# TODO : What is the meaning of this use lib? Can it be removed?
 use lib '../..';
+
 use Devel::Trepan::DB::Breakpoint;
-package Devel::Trepan::BrkptMgr;
 
 sub new($$) 
 {

lib/Devel/Trepan/CmdProcessor.pm

@@ -1,13 +1,23 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rocky@cpan.org> 
+package Devel::Trepan::CmdProcessor;
+
+use strict;
+use warnings;
+no warnings 'redefine';
+
 use feature ":5.10";  # Includes "state" feature.
-use Exporter;
 use feature 'switch';
-use warnings; use strict;
+
+use English qw( -no_match_vars );
+
+use Exporter;
 
 # Showing eval results can be done using either data dump package.
-require Data::Dumper; require Data::Dumper::Perltidy;
+require Data::Dumper;
+require Data::Dumper::Perltidy;
 
+# TODO : Shouldn't this use lib be removed?
 use lib '../..';
 require Devel::Trepan::BrkptMgr;
 require Devel::Trepan::DB::Display;
@@ -23,12 +33,7 @@ require Devel::Trepan::CmdProcessor::Load unless
     defined $Devel::Trepan::CmdProcessor::Load_seen;
 require Devel::Trepan::CmdProcessor::Running;
 require Devel::Trepan::CmdProcessor::Validate;
-use strict;
-use warnings;
-no warnings 'redefine';
 
-package Devel::Trepan::CmdProcessor;
-use English;
 use Devel::Trepan::Util qw(hash_merge uniq_abbrev);
 
 use vars qw(@EXPORT @ISA $eval_result);

lib/Devel/Trepan/CmdProcessor/Command/Action.pm

@@ -4,7 +4,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Action;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::Condition ;
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;

lib/Devel/Trepan/CmdProcessor/Command/Break.pm

@@ -6,7 +6,7 @@ use lib '../../../..';
 # require_relative '../../app/condition'
 
 package Devel::Trepan::CmdProcessor::Command::Break;
-use English;
+use English qw( -no_match_vars );
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command;
 unless (defined(@ISA)) {
     eval "use constant ALIASES    => qw(b);";

lib/Devel/Trepan/CmdProcessor/Command/Condition.pm

@@ -4,7 +4,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Condition;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::Condition ;
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;

lib/Devel/Trepan/CmdProcessor/Command/Delete.pm

@@ -4,7 +4,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Delete;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;
 

lib/Devel/Trepan/CmdProcessor/Command/Display.pm

@@ -4,7 +4,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Display;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::DB::Display ;
 use if !defined @ISA, Devel::Trepan::Condition ;

lib/Devel/Trepan/CmdProcessor/Command/List.pm

@@ -6,7 +6,7 @@ use lib '../../../..';
 # require_relative '../../app/condition'
 
 package Devel::Trepan::CmdProcessor::Command::List;
-use English;
+use English qw( -no_match_vars );
 use Devel::Trepan::DB::LineCache;
 use Devel::Trepan::CmdProcessor::Validate;
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command;

lib/Devel/Trepan/CmdProcessor/Command/Macro.pm

@@ -5,7 +5,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Macro;
-use English;
+use English qw( -no_match_vars );
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;
 unless (defined(@ISA)) {
     eval "use constant CATEGORY   => 'support';";

lib/Devel/Trepan/CmdProcessor/Command/Restart.pm

@@ -5,7 +5,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Restart;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;
 unless (defined(@ISA)) {

lib/Devel/Trepan/CmdProcessor/Command/Undisplay.pm

@@ -4,7 +4,7 @@ use warnings; no warnings 'redefine';
 use lib '../../../..';
 
 package Devel::Trepan::CmdProcessor::Command::Undisplay;
-use English;
+use English qw( -no_match_vars );
 
 use if !defined @ISA, Devel::Trepan::CmdProcessor::Command ;
 

lib/Devel/Trepan/CmdProcessor/Frame.pm

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rocky@cpan.org> 
-use strict; use warnings;
+
+package Devel::Trepan::CmdProcessor;
+
+use strict; 
+use warnings;
+
+# TODO : I don't think this use lib is a good idea.
 use lib '../../..';
 use Devel::Trepan::DB::Sub;
 use Devel::Trepan::Complete;
 
-package Devel::Trepan::CmdProcessor;
-use English;
+use English qw( -no_match_vars );
 
 sub adjust_frame($$$)
 {

lib/Devel/Trepan/CmdProcessor/Hook.pm

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rocky@cpan.org> 
-use strict; use warnings;
+package Devel::Trepan::CmdProcessor::Hook;
+
+use strict; 
+use warnings;
+
+# TODO : I don't think this lib is a good idea.
 use lib '../../..';
 
 use Class::Struct;
@@ -13,7 +18,6 @@ struct CmdProcessorHook => {
 };
 
 
-package Devel::Trepan::CmdProcessor::Hook;
 #  attr_accessor :list
 
 sub new($;$)

lib/Devel/Trepan/CmdProcessor/Location.pm

@@ -7,7 +7,7 @@ use lib '../../..';
 # require_relative '../app/default'
 
 package Devel::Trepan::CmdProcessor;
-use English;
+use English qw( -no_match_vars );
 use Cwd 'abs_path';
 
 use File::Basename;

lib/Devel/Trepan/CmdProcessor/Running.pm

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rocky@cpan.org> 
-use strict; use warnings;
+package Devel::Trepan::CmdProcessor;
 
+use strict;
+use warnings;
 use feature 'switch';
+
+# TODO : I don't think this use lib is a good idea.
 use lib '../../..';
 
 use Devel::Trepan::Position;
-package Devel::Trepan::CmdProcessor;
-use English;
-
-
+use English qw( -no_match_vars );
 
 # attr_accessor :stop_condition  # String or nil. When not nil
 #                                # this has to eval non-nil

lib/Devel/Trepan/CmdProcessor/Validate.pm

@@ -3,13 +3,16 @@
 # Trepan command input validation routines.  A String type is
 # usually passed in as the argument to validation routines.
 
-use strict; use warnings;
-use Exporter;
+package Devel::Trepan::CmdProcessor;
 
+use strict; 
+use warnings;
 use feature 'switch';
-use lib '../../..';
 
-package Devel::Trepan::CmdProcessor;
+use Exporter;
+
+# TODO : I don't think this use lib is a good idea.
+use lib '../../..';
 
 use Cwd 'abs_path';
 use Devel::Trepan::DB::Breakpoint;

lib/Devel/Trepan/Condition.pm

@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rocky@cpan.org>
-use strict; use warnings;
+
 package Devel::Trepan::Condition;
-use English;
+
+use strict;
+use warnings;
+use English qw( -no_match_vars );
+
 use vars qw(@EXPORT @ISA);
 @EXPORT    = qw( is_valid_condition );
 @ISA = qw(Exporter);

lib/Devel/Trepan/DB.pm

@@ -9,7 +9,7 @@ use lib '../..';
 package DB;
 use feature 'switch';
 use warnings; no warnings 'redefine';
-use English;
+use English qw( -no_match_vars );
 
 use vars qw($usrctxt $running $caller 
             $event @ret $ret $return_value @return_value
@@ -87,11 +87,11 @@ BEGIN {
 	require threads;
 	require threads::shared;
 	import threads::shared qw(share);
-	no strict; no warnings;
+	no strict;
+    no warnings;
 	$DBGR;
 	share(\$DBGR);
 	lock($DBGR);
-	use strict; use warnings;
 	print "Thread support enabled\n";
     } else {
 	*lock  = sub(*) {};

lib/Devel/Trepan/DB/Backtrace.pm

@@ -1,6 +1,6 @@
 package DB;
 use warnings; no warnings 'redefine';
-use English;
+use English qw( -no_match_vars );
 
 =head2 backtrace(skip[,count,scan_for_DB])
 

lib/Devel/Trepan/DB/Breakpoint.pm

@@ -39,9 +39,14 @@ sub icon_char($)
 }
 
 package DB;
+
 use vars qw($brkpt $package $lineno $max_bp $max_action);
-use strict; use warnings; no warnings 'redefine';
-use English;
+
+use strict;
+use warnings;
+no warnings 'redefine';
+
+use English qw( -no_match_vars );
 
 BEGIN {
     $DB::brkpt   = undef; # current breakpoint

lib/Devel/Trepan/DB/Display.pm

@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 # FIXME: Could combine manager code from breakpoints and display
-use strict; use warnings; no warnings 'redefine';
-use English;
+
+use strict;
+use warnings;
+no warnings 'redefine';
+
+use English qw( -no_match_vars );
 use lib '../..';
 
 use Class::Struct;
-use strict;
 
 struct DBDisplay => {
     number      => '$', # breakpoint/action number 

lib/Devel/Trepan/DB/Eval.pm

@@ -1,11 +1,15 @@
 # Eval part of Perl's Core DB.pm library and perl5db.pl with modification.
 
+# TODO : Shouldn't this use lib be removed?
 use lib '../..';
 
 package DB;
-use warnings; use strict;
-use English;
+
+use warnings;
+use strict;
 use feature 'switch';
+
+use English qw( -no_match_vars );
 use vars qw($eval_result @eval_result %eval_result
             $eval_str $eval_opts $event $return_type );
 
@@ -30,7 +34,8 @@ sub eval {
      $OUTPUT_FIELD_SEPARATOR, 
      $INPUT_RECORD_SEPARATOR, 
      $OUTPUT_RECORD_SEPARATOR, $WARNING) = @saved;
-    no strict; no warnings;
+    no strict;
+    no warnings;
     eval "$user_context $eval_str; &DB::save\n"; # '\n' for nice recursive debug
     _warnall($@) if $@;
 }