Changeset 21621

Timestamp:

07/30/08 00:57:35 (5 months ago)

Author:

fglock

Message:

[v6.pm] require newer PCR

Location:

perl5/Pugs-Compiler-Perl6

Files:

• Makefile.PL (modified) (1 diff)
• lib/Pugs/Emitter/Perl6/Perl5.pm (modified) (1 diff)

perl5/Pugs-Compiler-Perl6/Makefile.PL

@@ -20 +20 @@
 all_from('lib/v6.pm');
 
-requires('Pugs::Compiler::Rule' => '0.35');
+requires('Pugs::Compiler::Rule' => '0.37');
 requires('Module::Compile'      => '0.20');
 requires('Scalar::Util'         => '0');

perl5/Pugs-Compiler-Perl6/lib/Pugs/Emitter/Perl6/Perl5.pm

@@ -1491 +1491 @@
             }
             my $regex = $rx->{rx};
-            $regex =~ s{\\}{\\\\}g;
-            $regex =~ s{/}{\\/}g;
-            # print "Regex: /$regex/\n";
-            my $code = Pugs::Compiler::RegexPerl5->compile( $regex )->{perl5};
+            my $code;
+            eval {
+                $code = Pugs::Compiler::RegexPerl5->compile( $regex, { compile_only => 1 } )->{perl5};
+                # print $code, "# $regex /end\n";
+            }
+            or do {
+                print "Error in perl 5 regex: $regex : $@\n";
+                die   "Error in perl 5 regex: $regex : $@\n";
+            };
             return '( $::_V6_MATCH_ = ' 
                         . $code 
                         . '->( __PACKAGE__, \\('._emit($n->{exp1}).') ) '
-                . ')';
+                 . ')';
         }
         if (   exists $n->{exp2}{int} && defined $n->{exp2}{int}