Changeset 21436 for perl5

Timestamp:

07/22/08 13:55:11 (4 months ago)

Author:

fglock

Message:

[PCR] better error message

Location:

perl5/Pugs-Compiler-Rule/lib/Pugs

Files:

• Emitter/Rule/Perl5/CharClass.pm (modified) (1 diff)
• Runtime/Regex.pm (modified) (2 diffs)

perl5/Pugs-Compiler-Rule/lib/Pugs/Emitter/Rule/Perl5/CharClass.pm

@@ -20 +20 @@
     $c =~ s/\s+$//;
     my $s = charnames::vianame($c);
-    return $s if $s;
+    return $s if defined $s;
     $s = charnames::vianame("LINE FEED (LF)") 
         if $c eq "LINE FEED" || $c eq "LF";

perl5/Pugs-Compiler-Rule/lib/Pugs/Runtime/Regex.pm

@@ -214 +214 @@
     return sub {
         #use charnames ':full';
-        my $bool = $_[7]{ignorecase}
-            ? substr( $_[0], $_[5] ) =~ m/(?i)$rx/
-            : substr( $_[0], $_[5] ) =~ m/$rx/;
-        $_[3] = Pugs::Runtime::Match->new({ 
+        my $bool;
+        eval {
+            $bool = $_[7]{ignorecase}
+                ? substr( $_[0], $_[5] ) =~ m/(?i)$rx/
+                : substr( $_[0], $_[5] ) =~ m/$rx/;
+            $_[3] = Pugs::Runtime::Match->new({ 
                 bool  => \$bool,
                 str   => \$_[0],
@@ -225 +227 @@
                 match => [],
             });
+            1;
+        } 
+        or do {
+            die "$@ in perl5 regex: /$rx/";
+        };
+        $_[3];
     };
 }