Changeset 21574

Timestamp:

07/27/08 18:44:51 (6 months ago)

Author:

fglock

Message:

[v6.pm] improved perl(), slurp()

Location:

perl5/Pugs-Compiler-Perl6/lib/Pugs

Files:

• Emitter/Perl6/Perl5.pm (modified) (2 diffs)
• Runtime/Perl6.pm (modified) (2 diffs)
• Runtime/Perl6Prelude.pm (modified) (2 diffs)

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

@@ -802 +802 @@
                 || $subname eq 'index' || $subname eq 'undef' || $subname eq 'rand' || $subname eq 'int' 
                 || $subname eq 'splice' || $subname eq 'keys' || $subname eq 'values' || $subname eq 'sort' 
-                || $subname eq 'chomp' || $subname eq 'lc' || $subname eq 'abs' 
+                || $subname eq 'chomp' || $subname eq 'lc' || $subname eq 'abs' || $subname eq 'sleep' 
                 ) 
             {
@@ -840 +840 @@
             if ($subname eq 'open') {
                 return 'Perl6::Internals::open('. _emit_parameter_capture( $n->{param} ) . ')';
+            }
+            if ($subname eq 'slurp') {
+                return 'Pugs::Runtime::Perl6::IO::slurp'. emit_parenthesis( $n->{param} );
             }
 

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

@@ -23 +23 @@
 sub perl {
     local $Data::Dumper::Terse    = 1;
-    my $can = UNIVERSAL::can($_[0] => 'perl');
-    if ($can) {
-        $can->($_[0]);
-    }
-    else {
-        Dumper($_[0]);
-    }
+    my $self = shift;
+    my $can = UNIVERSAL::can($self => 'perl');
+    my $v = $can
+        ? $can->($self)
+        : Dumper($self);
+    chomp $v;
+    return $v . ', ' . perl( @_ ) if @_;
+    return $v;
 }
 
@@ -184 +185 @@
     
     sub slurp {
-        my $self = $_[0];
-        my $content;
-        local $/; 
-        $content = <$self>;
-        return bless \$content, 'Pugs::Runtime::Perl6::Scalar';
+        if ( wantarray ) {
+            my @a;
+            if ( ref( $_[0] ) eq 'IO::File' ) {
+                my $f = shift;
+                @a = <$f>;
+            }
+            else {
+                local( @ARGV ) = ( @_ ); 
+                @a = <ARGV>;
+            }
+            chomp @a;
+            return @a;
+        }
+
+            if ( ref( $_[0] ) eq 'IO::File' ) {
+                return <$_[0]>;
+            }
+            else {
+                local( $/, @ARGV ) = ( undef, @_ ); 
+                return <ARGV>;
+            }
     }
 

perl5/Pugs-Compiler-Perl6/lib/Pugs/Runtime/Perl6Prelude.pm

@@ -15 +15 @@
 sub NaN is export { Pugs::Runtime::Perl6::NaN }
 
-sub slurp { ... } # Slurps in an entire file
+# sub slurp { ... } # Slurps in an entire file
 
 module Perl6::Internals;
@@ -21 +21 @@
 sub compile_pir($code) { ... }
 sub exit($status)   is export { use v5; CORE::exit($status); use v6; }
-sub sleep($seconds) is export { use v5; CORE::sleep($seconds); use v6; }
+# sub sleep($seconds) is export { use v5; CORE::sleep($seconds); use v6; }
 
 sub open($file) { use v5; my $fh = IO::File->new; $fh->open($file); $fh; use v6; }