Rt120249

.stopwords

@@ -1,6 +1,10 @@
+404s
+0x
+1x
 AUTOHANDLERS
 Adminstrator
 ApacheModPerl
+ApacheModPerl2
 ApacheReload
 Autohandlers
 Bekman
@@ -26,6 +30,7 @@ Kumar
 LFU
 LogLevel
 MSIE
+MD5
 MailingLists
 Mallah
 MasonAllowGlobals
@@ -97,8 +102,10 @@ Subcomponents
 Subrequests
 TIEHASH
 USR
+USR1
 UserDir
 Vivek
+Win32
 ala
 apachectl
 apachehandler

dist.ini

@@ -6,8 +6,6 @@ license          = Perl_5
 copyright_year   = 1998
 copyright_holder = Jonathan Swartz
 
-version = 1.56
-
 [FileFinder::Filter / SkipApacheHandler]
 finder = :InstallModules
 skip = lib/HTML/Mason/ApacheHandler.pm
@@ -27,6 +25,7 @@ stopwords_file = .stopwords
 -remove = Test::Pod::No404s
 -remove = Test::Portability
 -remove = Test::Synopsis
+-remove = Test::CleanNamespaces
 
 [MetaNoIndex]
 directory = eg

lib/HTML/Mason.pm

@@ -2,7 +2,7 @@ package HTML::Mason;
 # Copyright (c) 1998-2005 by Jonathan Swartz. All rights reserved.
 # This program is free software; you can redistribute it and/or modify it
 # under the same terms as Perl itself.
-
+$HTML::Mason::VERSION = '1.56';
 use 5.006;
 
 use HTML::Mason::Interp;

lib/HTML/Mason/Apache/Request.pm

@@ -5,7 +5,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Apache::Request;
-
+$HTML::Mason::Apache::Request::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/CGIHandler.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::CGIHandler;
-
+$HTML::Mason::CGIHandler::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Cache/BaseCache.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Cache::BaseCache;
-
+$HTML::Mason::Cache::BaseCache::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Compiler.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Compiler;
-
+$HTML::Mason::Compiler::VERSION = '1.56';
 use strict;
 use warnings;
 use Data::Dumper;

lib/HTML/Mason/Compiler/ToObject.pm

@@ -3,7 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Compiler::ToObject;
-
+$HTML::Mason::Compiler::ToObject::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Component.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Component;
-
+$HTML::Mason::Component::VERSION = '1.56';
 use strict;
 use warnings;
 use File::Spec;

lib/HTML/Mason/Component/FileBased.pm

@@ -3,7 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Component::FileBased;
-
+$HTML::Mason::Component::FileBased::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Component/Subcomponent.pm

@@ -3,7 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Component::Subcomponent;
-
+$HTML::Mason::Component::Subcomponent::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/ComponentSource.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::ComponentSource;
-
+$HTML::Mason::ComponentSource::VERSION = '1.56';
 use strict;
 use warnings;
 use File::Basename;

lib/HTML/Mason/Escapes.pm

@@ -7,7 +7,7 @@
 #
 
 package HTML::Mason::Escapes;
-
+$HTML::Mason::Escapes::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Exceptions.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::Exceptions;
-
+$HTML::Mason::Exceptions::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/FakeApache.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::FakeApache;
-
+$HTML::Mason::FakeApache::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Handler.pm

@@ -9,7 +9,7 @@
 # 
 
 package HTML::Mason::Handler;
-
+$HTML::Mason::Handler::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Interp.pm

@@ -5,7 +5,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Interp;
-
+$HTML::Mason::Interp::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Lexer.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Lexer;
-
+$HTML::Mason::Lexer::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -391,8 +391,6 @@ sub match_substitute
            %>                   # Closing tag
           }xcigs )
     {
-        $self->{current}{lines} += tr/\n// foreach grep defined, ($1, $2);
-
         $self->{current}{compiler}->substitution( substitution => $1,
                                                   escape => $3 );
         return 1;

lib/HTML/Mason/MethodMaker.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::MethodMaker;
-
+$HTML::Mason::MethodMaker::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Params.pod

@@ -977,7 +977,7 @@ The class to use when creating a lexer. Defaults to L<HTML::Mason::Lexer|HTML::M
 =back
 
 The maximum recursion depth for the component stack, for the request
-stack, and for the inheritance stack. An error is signalled if the
+stack, and for the inheritance stack. An error is signaled if the
 maximum is exceeded.  Default is 32.
 
 

lib/HTML/Mason/Plugin.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::Plugin;
-
+$HTML::Mason::Plugin::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Plugin/Context.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::Plugin::Context;
-
+$HTML::Mason::Plugin::Context::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Request.pm

@@ -31,7 +31,7 @@
 #
 
 package HTML::Mason::Request;
-
+$HTML::Mason::Request::VERSION = '1.56';
 use strict;
 use warnings;
 
@@ -1752,7 +1752,7 @@ want to turn this off as a performance boost.
 =item max_recurse
 
 The maximum recursion depth for the component stack, for the request
-stack, and for the inheritance stack. An error is signalled if the
+stack, and for the inheritance stack. An error is signaled if the
 maximum is exceeded.  Default is 32.
 
 =item out_method

lib/HTML/Mason/Resolver.pm

@@ -3,7 +3,7 @@
 # under the same terms as Perl itself.
 
 package HTML::Mason::Resolver;
-
+$HTML::Mason::Resolver::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Resolver/File.pm

@@ -3,7 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Resolver::File;
-
+$HTML::Mason::Resolver::File::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Resolver/Null.pm

@@ -3,7 +3,7 @@
 # it under the same terms as Perl itself.
 
 package HTML::Mason::Resolver::Null;
-
+$HTML::Mason::Resolver::Null::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Tests.pm

@@ -1,5 +1,5 @@
 package HTML::Mason::Tests;
-
+$HTML::Mason::Tests::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Tools.pm

@@ -9,7 +9,7 @@
 #
 
 package HTML::Mason::Tools;
-
+$HTML::Mason::Tools::VERSION = '1.56';
 use strict;
 use warnings;
 

lib/HTML/Mason/Utils.pm

@@ -8,7 +8,7 @@
 #
 
 package HTML::Mason::Utils;
-
+$HTML::Mason::Utils::VERSION = '1.56';
 use HTML::Mason::Tools qw(compress_path);
 use strict;
 use warnings;

t/06-compiler.t

@@ -486,6 +486,20 @@ EOF
                       expect_error => qr/really #4 .* line 4/,
                     );
 
+#------------------------------------------------------------
+
+    $group->add_test( name => 'line_nums_multi-line_substitution_block',
+                      description => 'be sure line numbers aren\'t inflated by block size',
+                      component => <<'EOF',
+<% do {
+
+die "I'm at #3";
+
+} %>
+EOF
+                      expect_error => qr/at #3 .* line 3/,
+                    );
+
 #------------------------------------------------------------
 
     $group->add_test( name => 'attr_block_zero',