[Http-webtest-commits] CVS: HTTP-WebTest/lib/HTTP/WebTest Parser.pm,1.11,1.12

[Ilya M. <m_...@us...>]

Update of /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest
In directory usw-pr-cvs1:/tmp/cvs-serv751/lib/HTTP/WebTest

Modified Files:
	Parser.pm 
Log Message:
Fix line numbering in error messages


Index: Parser.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Parser.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Parser.pm	15 Jun 2002 19:42:36 -0000	1.11
--- Parser.pm	15 Jun 2002 20:09:16 -0000	1.12
***************
*** 58,62 ****
  	my $parse_pos = pos $data;
  
! 	# find rem\inder of string near error (without surrounding
  	# whitespace)
  	$data =~ /\G $reHS* (.*?) $reHS* $/mx;
--- 58,62 ----
  	my $parse_pos = pos $data;
  
! 	# find reminder of string near error (without surrounding
  	# whitespace)
  	$data =~ /\G $reHS* (.*?) $reHS* $/mx;
***************
*** 69,77 ****
  
  	# count lines
! 	my $line_num = 1;
! 	pos($data) = 0;
! 	while($data =~ m|\G .* \Q$/\E|gcx and pos($data) <= $parse_pos) {
! 	    $line_num ++;
! 	}
  
  	die <<MSG;
--- 69,74 ----
  
  	# count lines
! 	my $line_num = () = substr($data, 0, $parse_pos) =~ m|$|gmx;
! 	$line_num-- if $data =~ /\G \z/x;
  
  	die <<MSG;
***************
*** 102,106 ****
  
  	if($state == ST_FILE) {
! 	    if($_[0] =~ /\G \Z/gcx) {
  		# end of file
  		last PARSER;
--- 99,103 ----
  
  	if($state == ST_FILE) {
! 	    if($_[0] =~ /\G \z/gcx) {
  		# end of file
  		last PARSER;
***************
*** 138,142 ****
  		    _set_test_param($test, $name, $value);
  		} else {
! 		    die "Test parameter or test block is expected\n";
  		}
  	    }
--- 135,139 ----
  		    _set_test_param($test, $name, $value);
  		} else {
! 		    die "Test parameter or end_test is expected\n";
  		}
  	    }