enable $*CWD & cwd() on rakudo.jvm

rakudo · Jun 30, 2013 · 5679414 · 5679414
1 parent 718f45a
commit 5679414
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/core/IO.pm b/src/core/IO.pm
@@ -566,16 +566,16 @@ multi sub spurt(Cool $filename,
 
 proto sub cwd(|) { * }
 multi sub cwd() {
-#?if parrot
     return nqp::p6box_s(
+#?if parrot
 		pir::trans_encoding__Ssi(
 			nqp::cwd(),
-			pir::find_encoding__Is('utf8')));
+			pir::find_encoding__Is('utf8'))
 #?endif
 #?if !parrot
-    die "cwd is NYI on JVM backend";
+			nqp::cwd(),
 #?endif
-
+    );
     CATCH {
         default {
             X::IO::Cwd.new(

diff --git a/src/core/terms.pm b/src/core/terms.pm
@@ -116,12 +116,22 @@ sub term:<time>() { nqp::p6box_i(nqp::time_i()) }
     nqp::bindkey(nqp::who(PROCESS), '$OSVER', $OSVER);
 #?endif
 
-#?if !jvm
-    my $CWD = nqp::p6box_s(pir::trans_encoding__Ssi(
-        pir::new__PS('OS').cwd,
-        pir::find_encoding__Is('utf8'))).path;
+    ## duplicate src/core/IO.pm::cwd
+    my $CWD = nqp::p6box_s(
+#?if parrot
+        pir::trans_encoding__Ssi(
+            nqp::cwd(),
+            pir::find_encoding__Is('utf8'))
+#?endif
+#?if !parrot
+            nqp::cwd(),
+#?endif
+    );
+
     nqp::bindkey(nqp::who(PROCESS), '$CWD', $CWD);
 
+#?if !jvm
+
     my @INC;
     @INC.push(%ENV<RAKUDOLIB>.split($VM<config><osname> eq 'MSWin32' ?? ';' !! ':')) if %ENV<RAKUDOLIB>;
     @INC.push(%ENV<PERL6LIB>.split($VM<config><osname> eq 'MSWin32' ?? ';' !! ':')) if %ENV<PERL6LIB>;