Make various built-ins that should use $*OUT and $*ERR actually use t…

…hem.
rakudo · Apr 2, 2009 · db0264d · db0264d
1 parent ef59b9d
commit db0264d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/builtins/control.pir b/src/builtins/control.pir
@@ -401,7 +401,9 @@ on error.
     throw ex
     .return ()
   no_eh:
-    printerr message
+    .local pmc err
+    err = get_hll_global "$ERR"
+    err.'print'(message)
     .return ()
 .end
 

diff --git a/src/builtins/io.pir b/src/builtins/io.pir
@@ -14,7 +14,8 @@ src/builtins/io.pir - Perl6 builtins for I/O
 
 .sub 'print'
     .param pmc args            :slurpy
-    .local pmc it
+    .local pmc it, out
+    out = get_hll_global '$OUT'
     args.'!flatten'()
     it = iter args
   iter_loop:
@@ -23,7 +24,7 @@ src/builtins/io.pir - Perl6 builtins for I/O
     unless null $P0 goto iter_nonull
     $P0 = new 'Failure'
   iter_nonull:
-    print $P0
+    out.'print'($P0)
     goto iter_loop
   iter_end:
     .return (1)
@@ -32,8 +33,10 @@ src/builtins/io.pir - Perl6 builtins for I/O
 
 .sub 'say'
     .param pmc list            :slurpy
+    .local pmc it, out
+    out = get_hll_global '$OUT'
     'print'(list :flat)
-    print "\n"
+    out.'print'("\n")
     .return (1)
 .end
 
@@ -46,8 +49,10 @@ Parses a format string and prints formatted output according to it.
 
 .sub 'printf'
     .param pmc args            :slurpy
+    .local pmc it, out
+    out = get_hll_global '$OUT'
     $S0 = 'sprintf'(args :flat)
-    print $S0
+    out.'print'($S0)
     .return (1)
 .end
 

diff --git a/src/classes/Failure.pir b/src/classes/Failure.pir
@@ -89,7 +89,9 @@
     $P0 = self.'!exception'()
     $S0 = $P0['message']
     $S0 = concat $S0, "\n"
-    printerr $S0
+    .local pmc err
+    err = get_hll_global "$ERR"
+    err.'print'($S0)
   done:
 .end