Merge branch 'nom' into newio

rakudo · Nov 27, 2014 · 6c09d1e · 6c09d1e
2 parents 8af1338 + 482cc32
commit 6c09d1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -1052,7 +1052,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
 
     method statement_control:sym<loop>($/) {
         my $block := pblock_immediate($<block>.ast);
-        my $cond := $<e2> ?? $<e2>.ast !! QAST::Var.new(:name<True>, :scope<lexical>);
+        my $cond := $<e2> ?? $<e2>.ast !! QAST::IVal.new( :value(1) );
         my $loop := QAST::Op.new( $cond, :op('while'), :node($/) );
         $loop.push($block);
         if $<e3> {

diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -329,7 +329,9 @@ my class IO::Path is Cool {
         my str $cwd = nqp::cwd();
         nqp::chdir(nqp::unbox_s($.abspath));
 #?endif
-        my $abspath-sep := $.abspath ~ $!SPEC.dir-sep;
+        my $abspath-sep := $.abspath eq $!SPEC.dir-sep
+          ?? $!SPEC.dir-sep
+          !! $.abspath ~ $!SPEC.dir-sep;
 
 #?if parrot
         my Mu $RSA := pir::new__PS('OS').readdir(nqp::unbox_s($.abspath));

diff --git a/t/spectest.data b/t/spectest.data
@@ -601,7 +601,7 @@ S17-channel/earliest.t   # conc
 S17-lowlevel/thread.t    # conc
 S17-procasync/basic.t    # moar
 # S17-procasync/print.t    # moar
-S17-procasync/kill.t     # moar
+# S17-procasync/kill.t     # moar
 S17-promise/allof.t      # conc
 S17-promise/anyof.t      # conc
 S17-promise/basic.t      # conc