From e658648804e5e0282f4d8037f9614c1216ea6baf Mon Sep 17 00:00:00 2001
From: Steve Hancock <perltidy@users.sourceforge.net>
Date: Tue, 20 Oct 2020 16:37:14 -0700
Subject: [PATCH] updated sub AUTOLOAD

---
 lib/Perl/Tidy/VerticalAligner/Alignment.pm | 20 ++++++++++----------
 lib/Perl/Tidy/VerticalAligner/Line.pm      |  5 +----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
index 08afc517..74525b13 100644
--- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
@@ -23,10 +23,8 @@ use constant {
 };
 
 sub new {
-    my ( $caller, %arg ) = @_;
-    my $caller_is_obj = ref($caller);
-    my $class         = $caller_is_obj || $caller;
-    my $self          = bless [], $class;
+    my ( $class, %arg ) = @_;
+    my $self = bless [], $class;
     $self->[_column_]          = $arg{column};
     $self->[_starting_column_] = $arg{starting_column};
     $self->[_saved_column_]    = $arg{saved_column};
@@ -44,13 +42,15 @@ sub AUTOLOAD {
     our $AUTOLOAD;
     return if ( $AUTOLOAD =~ /\bDESTROY$/ );
     my ( $pkg, $fname, $lno ) = caller();
+    my $my_package = __PACKAGE__;
     print STDERR <<EOM;
-    ======================================================================
-    Unexpected call to Autoload looking for sub $AUTOLOAD
-    Called from package: '$pkg'  
-    Called from File '$fname'  at line '$lno'
-    This error is probably due to a recent programming change
-    ======================================================================
+======================================================================
+Error detected in package '$my_package', version $VERSION
+Received unexpected AUTOLOAD call for sub '$AUTOLOAD'
+Called from package: '$pkg'  
+Called from File '$fname'  at line '$lno'
+This error is probably due to a recent programming change
+======================================================================
 EOM
     exit 1;
 }
diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm
index 500b7907..f37de880 100644
--- a/lib/Perl/Tidy/VerticalAligner/Line.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Line.pm
@@ -62,10 +62,7 @@ EOM
 
     # Constructor may be called as a class method
     sub new {
-        my ( $caller, %arg ) = @_;
-        my $caller_is_obj = ref($caller);
-        my $class         = $caller_is_obj || $caller;
-        ##no strict "refs";
+        my ( $class, %arg ) = @_;
         my $self = bless [], $class;
 
         $self->[_jmax_]                      = $arg{jmax};
-- 
2.39.5