[interchange] Escape more left braces

Josh Lavin interchange-cvs at icdevgroup.org
Tue Oct 24 16:32:26 UTC 2017


commit 4081aac8bbe81a9152904a8424723e9986dc467e
Author: Josh Lavin <digory at cpan.org>
Date:   Tue Oct 24 09:27:09 2017 -0700

    Escape more left braces
    
    unescaped is deprecated in Perl 5.26, fatal in 5.30

 lib/Vend/Form.pm        |    4 ++--
 lib/Vend/Interpolate.pm |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/lib/Vend/Form.pm b/lib/Vend/Form.pm
index ef9bde6..7f3d0e3 100644
--- a/lib/Vend/Form.pm
+++ b/lib/Vend/Form.pm
@@ -261,8 +261,8 @@ sub attr_list {
 	$body =~ s!\{([A-Z_]+)\}!$hash->{lc $1}!g;
 	$body =~ s!\{([A-Z_]+)\|($Some)\}!$hash->{lc $1} || $2!eg;
 	$body =~ s!\{([A-Z_]+)\s+($Some)\}! $hash->{lc $1} ? $2 : ''!eg;
-	1 while $body =~ s!\{([A-Z_]+)\?\}($Some){/\1\?\}! $hash->{lc $1} ? $2 : ''!eg;
-	1 while $body =~ s!\{([A-Z_]+)\:\}($Some){/\1\:\}! $hash->{lc $1} ? '' : $2!eg;
+	1 while $body =~ s!\{([A-Z_]+)\?\}($Some)\{/\1\?\}! $hash->{lc $1} ? $2 : ''!eg;
+	1 while $body =~ s!\{([A-Z_]+)\:\}($Some)\{/\1\:\}! $hash->{lc $1} ? '' : $2!eg;
 	return $body;
 }
 
diff --git a/lib/Vend/Interpolate.pm b/lib/Vend/Interpolate.pm
index 2b89b4e..13f5893 100644
--- a/lib/Vend/Interpolate.pm
+++ b/lib/Vend/Interpolate.pm
@@ -3794,8 +3794,8 @@ sub tag_attr_list {
 				  !eg;
 		$body =~ s!\{($Marker)\|($Some)\}!$hash->{lc $1} || $2!eg;
 		$body =~ s!\{($Marker)\s+($Some)\}! $hash->{lc $1} ? $2 : ''!eg;
-		1 while $body =~ s!\{($Marker)\?\}($Some){/\1\?\}! $hash->{lc $1} ? $2 : ''!eg;
-		1 while $body =~ s!\{($Marker)\:\}($Some){/\1\:\}! $hash->{lc $1} ? '' : $2!eg;
+		1 while $body =~ s!\{($Marker)\?\}($Some)\{/\1\?\}! $hash->{lc $1} ? $2 : ''!eg;
+		1 while $body =~ s!\{($Marker)\:\}($Some)\{/\1\:\}! $hash->{lc $1} ? '' : $2!eg;
 		$body =~ s!\{(\w+)\:+(\w+)\:+(.*?)\}! tag_data($1, $2, $3) !eg;
 	}
 	else {
@@ -3805,8 +3805,8 @@ sub tag_attr_list {
 			  !eg;
 	$body =~ s!\{($Codere)\|($Some)\}!$hash->{$1} || $2!eg;
 	$body =~ s!\{($Codere)\s+($Some)\}! $hash->{$1} ? $2 : ''!eg;
-	1 while $body =~ s!\{($Codere)\?\}($Some){/\1\?\}! $hash->{$1} ? $2 : ''!eg;
-	1 while $body =~ s!\{($Codere)\:\}($Some){/\1\:\}! $hash->{$1} ? '' : $2!eg;
+	1 while $body =~ s!\{($Codere)\?\}($Some)\{/\1\?\}! $hash->{$1} ? $2 : ''!eg;
+	1 while $body =~ s!\{($Codere)\:\}($Some)\{/\1\:\}! $hash->{$1} ? '' : $2!eg;
 	$body =~ s!\{(\w+)\:+(\w+)\:+(.*?)\}! tag_data($1, $2, $3) !eg;
 	}
 	return $body;



More information about the interchange-cvs mailing list