Changeset 21650 for perl5

Timestamp:

07/31/08 14:12:56 (5 months ago)

Author:

fglock

Message:

[v6.pm] more tests

Location:

perl5/Pugs-Compiler-Perl6

Files:

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

perl5/Pugs-Compiler-Perl6/MANIFEST

@@ -164 +164 @@
 t/spec/S02-builtin_data_types/array_extending.t
 t/spec/S02-builtin_data_types/nested_arrays.t
+t/spec/S04-statements/do.t
 t/spec/S04-statements/until.t
 t/spec/S10-packages/import.t

perl5/Pugs-Compiler-Perl6/Makefile.PL

@@ -143 +143 @@
         $text =~ s/^\s*force_todo.*?\n/force_todo(18,34,40,51,57,66,67);\n/m;
     }
+    if ( $out eq 't/spec/S04-statements/do.t' ) {
+        $text = "force_todo(1..8,10..16,20..23);\n" . $text;
+        # redo works in perl5 blocks
+        $text =~ s/^([^\n]*?\; *redo\;)/ok( 0, "redo works in perl5 blocks", :todo ) ; # $1/mg;
+    }
     
     # add "use Test" to most files

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

@@ -836 +836 @@
         my $subname = $n->{sub}{bareword};
         if ( $subname ) {
+            if ($subname eq 'next') {
+                my $param = $n->{param} ? _emit( $n->{param} ) : '';
+                return " next $param ";
+            }
+            if ($subname eq 'redo') {
+                my $param = $n->{param} ? _emit( $n->{param} ) : '';
+                return " redo $param ";
+            }
+
             if ($subname eq 'defined') {
                 my $param = _emit( $n->{param} );
@@ -1117 +1126 @@
 
     if ( $n->{statement} eq 'do' ) {
-        return 'do ' . emit_block( $n->{exp1} );
+        return 'do { for($_) ' . emit_block( $n->{exp1} ) . ' }';
     }
     if ( $n->{statement} eq 'given' ) {