corrected WXDLLIMPEXP_ declaration for wxEventBlocker: it's part of core, not base

[wxWidgets.git] / tests / regex / regex.pl

diff --git a/tests/regex/regex.pl b/tests/regex/regex.pl
index 2402864171cdbb4ab3cb0b3c23841f1cfc47deba..d05363d8a4712aa0ae10f4e4feeb905fa71ed84d 100755 (executable)
--- a/tests/regex/regex.pl
+++ b/tests/regex/regex.pl
@@ -39,26 +39,26 @@ sub quotecxx {
                 "\013" => "v", '"' => '"', "\\" => "\\" );
 
     # working around lack of 'use encoding'
                 "\013" => "v", '"' => '"', "\\" => "\\" );
 
     # working around lack of 'use encoding'

-    $_ = pack "U0C*", unpack "C*", $_;
-    use utf8;
+    if (!$utf) {
+        $_ = pack "U0C*", unpack "C*", $_;
+        use utf8;
+    }

 
     s/[\000-\037"\\\177-\x{ffff}]/
         if ($esc{$&}) {
             "\\$esc{$&}";
 
     s/[\000-\037"\\\177-\x{ffff}]/
         if ($esc{$&}) {
             "\\$esc{$&}";

-        } elsif (ord($&) > 0x9f) {
-            if ($utf) {
-                $&;
-            } else {
-                sprintf "\\u%04x", ord($&);
-            }
+        } elsif (ord($&) > 0x9f && !$utf) {
+            sprintf "\\u%04x", ord($&);

         } else {
             sprintf "\\%03o", ord($&);
         }
     /ge;
 
     # working around lack of 'use encoding'
         } else {
             sprintf "\\%03o", ord($&);
         }
     /ge;
 
     # working around lack of 'use encoding'

-    no utf8;
-    $_ = pack "C*", unpack "C*", $_;
+    if (!$utf) {
+        no utf8;
+        $_ = pack "C*", unpack "C*", $_;
+    }

 
     return ($utf ? '"' : 'L"') . $_ . '"'
 }
 
     return ($utf ? '"' : 'L"') . $_ . '"'
 }