[Http-webtest-commits] HTTP-WebTest/lib/HTTP/WebTest Parser.pm,1.17,1.18

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

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

Modified Files:
	Parser.pm 
Log Message:
Allow comments inside of list params


Index: Parser.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Parser.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Parser.pm	22 Jun 2002 20:08:38 -0000	1.17
--- Parser.pm	22 Aug 2002 07:21:50 -0000	1.18
***************
*** 34,37 ****
--- 34,39 ----
  # sequence of any chars which doesn't contain ')', space chars and '=>'
  my $reWORD = qr/(?: (?: [^=)\s] | [^)\s] (?!>) )+ )/x;
+ # eat comments regexp
+ my $reCOMMENT = qr/(?: \s*? ^ \s* \# .* )+/mx;
  
  =head2 parse ($data)
***************
*** 56,60 ****
  	chomp $exc;
  
! 	my $parse_pos = pos $data;
  
  	# find reminder of string near error (without surrounding
--- 58,62 ----
  	chomp $exc;
  
! 	my $parse_pos = pos($data) || 0;
  
  	# find reminder of string near error (without surrounding
***************
*** 91,102 ****
    PARSER:
      while(1) {
  	# eat whitespace
  	$_[0] =~ /\G \s+/gcx;
  
- 	if($_[0] =~ /\G \#.*/gcx) {
- 	    # found comment - just ignore it
- 	    next;
- 	}
- 
  	if($state == ST_FILE) {
  	    if($_[0] =~ /\G \z/gcx) {
--- 93,102 ----
    PARSER:
      while(1) {
+ 	# eat whitespace and comments
+ 	$_[0] =~ /\G $reCOMMENT /gcx;
+ 
  	# eat whitespace
  	$_[0] =~ /\G \s+/gcx;
  
  	if($state == ST_FILE) {
  	    if($_[0] =~ /\G \z/gcx) {
***************
*** 193,196 ****
--- 193,199 ----
  
  	while(1) {
+ 	    # eat whitespace and comments
+ 	    $_[0] =~ /\G $reCOMMENT /gcx;
+ 
  	    # eat whitespace
  	    $_[0] =~ /\G \s+/gcx;