Perlito5 - "do FILE" fix

fglock · May 12, 2015 · 153ee95 · 153ee95
1 parent 7addc1d
commit 153ee95
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 14 deletions.
diff --git a/perlito5.pl b/perlito5.pl
diff --git a/src5/lib/Perlito5/Grammar/Use.pm b/src5/lib/Perlito5/Grammar/Use.pm
@@ -303,6 +303,25 @@ sub require {
     }
 }
 
+sub do_file {
+    my $filename = shift;
+    eval {
+        filename_lookup($filename);
+        1;
+    } or do {
+        $INC{$filename} = undef;
+        $@ = '';
+        $! = 'No such file or directory';
+        return 'undef';
+    };
+    my $realfilename = $INC{$filename};
+    open FILE, '<', $realfilename
+      or die "Cannot read $realfilename: $!\n";
+    local $/ = undef;
+    my $source = <FILE>;
+    close FILE;
+    return $source;
+}
 
 Perlito5::Grammar::Statement::add_statement( 'no'  => \&stmt_use );
 Perlito5::Grammar::Statement::add_statement( 'use' => \&stmt_use );

diff --git a/src5/lib/Perlito5/Javascript2/Emitter.pm b/src5/lib/Perlito5/Javascript2/Emitter.pm
@@ -2150,8 +2150,8 @@ package Perlito5::AST::Apply;
                     namespace => '',
                     arguments => [
                        Perlito5::AST::Apply->new(
-                          code => 'slurp',
-                          namespace => 'Perlito5::IO',
+                          code => 'do_file',
+                          namespace => 'Perlito5::Grammar::Use',
                           arguments => $self->{arguments}
                         )
                     ]

diff --git a/src5/lib/Perlito5/Javascript2/IO.pm b/src5/lib/Perlito5/Javascript2/IO.pm
@@ -458,10 +458,6 @@ if (isNode) {
         }
     };
 
-    p5typeglob_set("Perlito5::IO", "slurp", function(List__) {
-        return fs.readFileSync(List__[0],"utf8");
-    });
-
 } else {
     // not running in node.js
     p5typeglob_set("Perlito5::IO", "print", function (filehandle, List__, p5want) {

diff --git a/src5/lib/Perlito5/Javascript3/Emitter.pm b/src5/lib/Perlito5/Javascript3/Emitter.pm
@@ -1656,8 +1656,8 @@ package Perlito5::AST::Apply;
                     namespace => '',
                     arguments => [
                        Perlito5::AST::Apply->new(
-                          code => 'slurp',
-                          namespace => 'Perlito5::IO',
+                          code => 'do_file',
+                          namespace => 'Perlito5::Grammar::Use',
                           arguments => $self->{arguments}
                         )
                     ]

diff --git a/src5/lib/Perlito5/XS/Emitter.pm b/src5/lib/Perlito5/XS/Emitter.pm
@@ -494,8 +494,8 @@ package Perlito5::AST::Apply;
                     namespace => '',
                     arguments => [
                        Perlito5::AST::Apply->new(
-                          code => 'slurp',
-                          namespace => 'Perlito5::IO',
+                          code => 'do_file',
+                          namespace => 'Perlito5::Grammar::Use',
                           arguments => $self->{arguments}
                         )
                     ]