Item13893: Help out standard escapes

foswiki · Jan 22, 2016 · 409b0f4 · 409b0f4 · MichaelDaum · Jan 25, 2016
1 parent 3a6d2ed
commit 409b0f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/UnitTestContrib/test/unit/FuncTests.pm b/UnitTestContrib/test/unit/FuncTests.pm
@@ -2188,6 +2188,7 @@ $gt embed$gtembed$gt()embed
 $n$n!$n()gnnnnh
 $amp embed$ampembed$amp()embed
 $dollarlt
+$lt()()$n()()$gt()()
 TEST
     my $expected = <<'TEST';
 
@@ -2207,6 +2208,8 @@ $ embed$embed$embed
 gnnnnh
 & embed&embed&embed
 $lt
+<()
+()>()
 TEST
 
     #"

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -3782,37 +3782,30 @@ System.FormatTokens for a full list of supported tokens.
 sub expandStandardEscapes {
     my $text = shift;
 
-    # expand '$n()' and $n! to new line
-    $text =~ s/\$n\(\)/\n/gs;
-    $text =~ s/\$n(?=[^[:alpha:]]|$)/\n/gs;
-
-    # filler, useful for nested search
-    $text =~ s/\$nop(\(\))?//gs;
-
-    # $quot -> "
-    $text =~ s/\$quot(\(\))?/\"/gs;
-
-    # $comma -> ,
-    $text =~ s/\$comma(\(\))?/,/gs;
-
-    # $percent -> %
-    $text =~ s/\$perce?nt(\(\))?/\%/gs;
-
-    # $lt -> <
-    $text =~ s/\$lt(\(\))?/\</gs;
-
-    # $gt -> >
-    $text =~ s/\$gt(\(\))?/\>/gs;
-
-    # $amp -> &
-    $text =~ s/\$amp(\(\))?/\&/gs;
+    $text =~
+s/\$((n(?=[^[:alpha:]]|$))|n\(\)|nop|quot|comma|perce?nt|lt|gt|amp)(?:\(\))?/&mysubst($1)/gse;
 
     # $dollar -> $, done last to avoid creating the above tokens
     $text =~ s/\$dollar(\(\))?/\$/gs;
 
     return $text;
 }
 
+sub mysubst {
+    return '"' if $_[0] eq 'quot';
+    return '<' if $_[0] eq 'lt';
+    return '>' if $_[0] eq 'gt';
+    return '%' if ( $_[0] eq 'percent' | $_[0] eq 'percnt' );
+    return ',' if $_[0] eq 'comma';
+    return '&' if $_[0] eq 'amp';
+    return ''  if $_[0] eq 'nop';
+    return "\n" if ( $_[0] eq 'n' );
+
+   # SMELL. Since $n, the trailing () are required, the regex might match $n()()
+   # so this requires an exception.
+    return "\n()" if ( $_[0] eq 'n()' );
+}
+
 =begin TML
 
 ---++ ObjectMethod webExists( $web ) -> $boolean