[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Mon Jan 20 14:00:01 2003
User: jon
Date: 2003-01-20 18:59:18 GMT
Modified: lib/Vend Interpolate.pm
Log:
Allow [PREFIX-more-list] ... [/PREFIX-more-list] for nested loops.
Simplify a few regular expressions.
Revision Changes Path
2.143 +13 -7 interchange/lib/Vend/Interpolate.pm
rev 2.143, prev_rev 2.142
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.142
retrieving revision 2.143
diff -u -u -r2.142 -r2.143
--- Interpolate.pm 14 Jan 2003 02:25:53 -0000 2.142
+++ Interpolate.pm 20 Jan 2003 18:59:17 -0000 2.143
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.142 2003/01/14 02:25:53 mheins Exp $
+# $Id: Interpolate.pm,v 2.143 2003/01/20 18:59:17 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -27,7 +27,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.142 $, 10);
+$VERSION = substr(q$Revision: 2.143 $, 10);
@EXPORT = qw (
@@ -239,10 +239,10 @@
my $Spacef = '(?:%20|\s)+';
my $Spaceo = '(?:%20|\s)*';
-my $Optx = '(?:\s+)?([-\w:#=/.%]+)?';
+my $Optx = '\s*([-\w:#=/.%]+)?';
my $Optr = '(?:\s+([^]]+))?';
my $Mand = '\s+([-\w#/.]+)';
-my $Opt = '(?:\s+)?([-\w#/.]+)?';
+my $Opt = '\s*([-\w#/.]+)?';
my $T = '\]';
my $D = '[-_]';
@@ -254,9 +254,9 @@
my $XMandf = qr{(?:%20|\s)+([-\w#/.]+)};
my $XSpacef = qr{(?:%20|\s)+};
my $XSpaceo = qr{(?:%20|\s)*};
-my $XOptx = qr{(?:\s+)?([-\w:#=/.%]+)?};
+my $XOptx = qr{\s*([-\w:#=/.%]+)?};
my $XMand = qr{\s+([-\w#/.]+)};
-my $XOpt = qr{(?:\s+)?([-\w#/.]+)?};
+my $XOpt = qr{\s*([-\w#/.]+)?};
my $XD = qr{[-_]};
my $Gvar = qr{\@\@([A-Za-z0-9]\w+[A-Za-z0-9])\@\@};
my $Evar = qr{\@_([A-Za-z0-9]\w+[A-Za-z0-9])_\@};
@@ -5114,7 +5114,13 @@
$IE = qr(\[/if[-_]$Prefix)i;
my $new;
- $page =~ s!$QR{more_list}! tag_more_list($1,$2,$3,$4,$5,$opt,$6)!ge;
+ $page =~ s!
+ \[ ( $mprefix more[-_]list ) $Optx$Optx$Optx$Optx$Optx \]
+ ($Some)
+ \[/\1\]
+ !
+ tag_more_list($2,$3,$4,$5,$6,$opt,$7)
+ !xige;
$page =~ s!
\[ ( $mprefix on[-_]match )\]
($Some)