Fix chomp on Win32, thus fixing basic-open.t.

rakudo · Jul 5, 2011 · 3d623cd · 3d623cd
1 parent 2cac886
commit 3d623cd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -19,8 +19,11 @@ my class Str {
     multi method perl(Str:D:) { "'" ~ self ~ "'" }
 
     method chomp() {
-        my $idx = self.chars - 1;
-        self.substr($idx) eq "\n" ?? self.substr(0, $idx) !! self;
+        my $n_idx = self.chars - 1;
+        my $rn_idx = $n_idx - 1;
+        self.substr($rn_idx) eq "\r\n" ?? self.substr(0, $rn_idx) !!
+        self.substr($n_idx)  eq "\n"   ?? self.substr(0, $n_idx)  !!
+        self;
     }
 
     method chop() {