Changeset 21617

Timestamp:

07/29/08 20:52:35 (5 months ago)

Author:

fglock

Message:

[v6.pm] 0.030 # ~6200 tests pass

Location:

perl5/Pugs-Compiler-Perl6

Files:

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

perl5/Pugs-Compiler-Perl6/ChangeLog

@@ +1 @@
+0.030  2008-07-29
 - more operators
 

perl5/Pugs-Compiler-Perl6/MANIFEST

@@ -151 +151 @@
 t/regex/p6regex/p6regex.t
 t/regex/p6regex/regex_tests
+t/regex/perl5_1.t
+# t/regex/perl5_2.t
+# t/regex/perl5_3.t
+# t/regex/perl5_4.t
+t/regex/perl5_5.t
+t/regex/perl5_6.t
+t/regex/perl5_7.t
+t/regex/perl5_8.t
+t/regex/perl5_9.t
 t/regex/rx_perl5_escape.t
 t/regex/smartparse.t

perl5/Pugs-Compiler-Perl6/Makefile.PL

@@ -131 +131 @@
         $text =~ s/^\s*plan \d+;/plan 535;\nforce_todo(18..29,49..54,62,64,66,68,77,79,81..92,94..96,101..113,247,254..255,257,259..263,266,269,274,284,286,301,303..304,314,332..372,374..388,393..394,398,400..402,404..433,484..499,502,504,507,516..522,526..528$cpan_tester_errors);/m;
     }
+    if ( $out eq 't/regex/perl5_9.t' ) {
+        $text =~ s/^\s*plan \d+;/plan 84;/m;
+        $text =~ s/^\s*force_todo.*?\n/force_todo(18,34,40,51,57,66,67);\n/m;
+    }
     
     # add "use Test" to most files

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

@@ -1487 +1487 @@
                 my $regex = $rx->{rx};
                 # XXX: hack for /$pattern/
-                $regex = 'q{'.$regex.'}' unless $regex =~ m/^\$[\w\d]+/;
-                return '$::_V6_MATCH_ = Pugs::Compiler::Regex->compile( '.$regex.' )->match('._emit($n->{exp1}).')';
-            }
+                $regex = _emit_single_quoted( $regex ) unless $regex =~ m/^\$[\w\d]+/;
+                return '( $::_V6_MATCH_ = Pugs::Compiler::Regex->compile( '.$regex.' )->match('._emit($n->{exp1}).') )';
+            }
+            my $regex = $rx->{rx};
+            $regex =~ s{\\}{\\\\}g;
+            $regex =~ s{/}{\\/}g;
+            # print "Regex: /$regex/\n";
+            my $code = Pugs::Compiler::RegexPerl5->compile( $regex )->{perl5};
+            return '( $::_V6_MATCH_ = ' 
+                        . $code 
+                        . '->( __PACKAGE__, \\('._emit($n->{exp1}).') ) '
+                . ')';
         }
         if (   exists $n->{exp2}{int} && defined $n->{exp2}{int} 

perl5/Pugs-Compiler-Perl6/lib/v6.pm

@@ -1 +1 @@
 package v6;
-$v6::VERSION = '0.029';
+$v6::VERSION = '0.030';
 
 # Documentation in the __END__