Perlito5 - js3 - "use", eval-string work

fglock · Sep 29, 2012 · c0ab727 · c0ab727
1 parent 2144d48
commit c0ab727
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/perlito5.pl b/perlito5.pl
diff --git a/src5/lib/Perlito5/Javascript3/Emitter.pm b/src5/lib/Perlito5/Javascript3/Emitter.pm
@@ -1349,7 +1349,7 @@ package Perlito5::AST::Apply;
                 # "use 5.006" -- XXX this should be tested at parse time instead
                 return '1';
             }
-            'p5pkg["Perlito5::Grammar::Use"]["require"]([' 
+            'p5pkg["Perlito5::Grammar::Use"].require([' 
                 . Perlito5::Javascript3::to_str( $self->{arguments}[0] ) . ', ' 
                 . ($self->{arguments}[0]{bareword} ? 1 : 0) 
             . '])';

diff --git a/src5/lib/Perlito5/Javascript3/Runtime.pm b/src5/lib/Perlito5/Javascript3/Runtime.pm
@@ -737,11 +737,12 @@ p5a_to_h = function(a) {
 if (isNode) {
     var fs = require("fs");
     p5make_sub("Perlito5::IO", "slurp", function(List__) {
-        return fs.readFileSync(List__[0],"utf8");
+        var filename = p5str(List__[0]);
+        return fs.readFileSync(filename, "utf8");
     });
 } else {
     p5make_sub("Perlito5::IO", "slurp", function(List__) {
-        var filename = List__[0];
+        var filename = p5str(List__[0]);
         if (typeof readFile == "function") {
             return readFile(filename);
         }