[svn:parrot] r46989 - in branches/ops_massacre: . runtime/parrot/library runtime/parrot/library/HTTP t/compilers/imcc/syn t/op tools/util

plobsing at svn.parrot.org plobsing at svn.parrot.org
Tue May 25 09:27:22 UTC 2010


Author: plobsing
Date: Tue May 25 09:27:21 2010
New Revision: 46989
URL: https://trac.parrot.org/parrot/changeset/46989

Log:
fix some tests after removing io ops

Modified:
   branches/ops_massacre/MANIFEST
   branches/ops_massacre/runtime/parrot/library/HTTP/Message.pir
   branches/ops_massacre/runtime/parrot/library/parrotlib.pir
   branches/ops_massacre/t/compilers/imcc/syn/tail.t
   branches/ops_massacre/t/op/stringu.t
   branches/ops_massacre/tools/util/pgegrep

Modified: branches/ops_massacre/MANIFEST
==============================================================================
--- branches/ops_massacre/MANIFEST	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/MANIFEST	Tue May 25 09:27:21 2010	(r46989)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Tue May 25 01:28:25 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue May 25 09:26:39 2010 UT
 #
 # See below for documentation on the format of this file.
 #
@@ -1265,6 +1265,7 @@
 src/dynoplibs/bit.ops                                       []
 src/dynoplibs/debug.ops                                     []
 src/dynoplibs/deprecated.ops                                []
+src/dynoplibs/io.ops                                        []
 src/dynoplibs/math.ops                                      []
 src/dynoplibs/obscure.ops                                   []
 src/dynoplibs/sys.ops                                       []
@@ -1664,6 +1665,7 @@
 t/dynoplibs/deprecated.t                                    [test]
 t/dynoplibs/math.t                                          [test]
 t/dynoplibs/obscure.t                                       [test]
+t/dynoplibs/sysinfo.t                                       [test]
 t/dynoplibs/time.t                                          [test]
 t/dynoplibs/trans-infnan.t                                  [test]
 t/dynoplibs/trans-old.t                                     [test]
@@ -1793,7 +1795,6 @@
 t/op/cmp-nonbranch.t                                        [test]
 t/op/comp.t                                                 [test]
 t/op/copy.t                                                 [test]
-t/op/debuginfo.t                                            [test]
 t/op/errorson.t                                             [test]
 t/op/exceptions.t                                           [test]
 t/op/exit.t                                                 [test]
@@ -1824,7 +1825,6 @@
 t/op/string_cs.t                                            [test]
 t/op/string_mem.t                                           [test]
 t/op/stringu.t                                              [test]
-t/op/sysinfo.t                                              [test]
 t/op/time.t                                                 [test]
 t/op/time_old.t                                             [test]
 t/op/vivify.t                                               [test]

Modified: branches/ops_massacre/runtime/parrot/library/HTTP/Message.pir
==============================================================================
--- branches/ops_massacre/runtime/parrot/library/HTTP/Message.pir	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/runtime/parrot/library/HTTP/Message.pir	Tue May 25 09:27:21 2010	(r46989)
@@ -18,10 +18,10 @@
 
 =cut
 
-.loadlib 'sys_ops'
 .namespace ['HTTP';'Date']
 
 .include 'tm.pasm'
+.loadlib 'sys_ops'
 
 .sub 'time2str'
     .param int time

Modified: branches/ops_massacre/runtime/parrot/library/parrotlib.pir
==============================================================================
--- branches/ops_massacre/runtime/parrot/library/parrotlib.pir	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/runtime/parrot/library/parrotlib.pir	Tue May 25 09:27:21 2010	(r46989)
@@ -194,7 +194,8 @@
 
     $S0 = concat path, name
     $P0 = new ['OS']
-    $I0 = $P0.'stat'($S0, 0)
+    $P1 = $P0.'stat'($S0)
+    $I0 = $P1[0]
     if $I0 goto OK
     null $S0
 OK:

Modified: branches/ops_massacre/t/compilers/imcc/syn/tail.t
==============================================================================
--- branches/ops_massacre/t/compilers/imcc/syn/tail.t	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/t/compilers/imcc/syn/tail.t	Tue May 25 09:27:21 2010	(r46989)
@@ -15,6 +15,8 @@
 $ENV{TEST_PROG_ARGS} = '-Oc';
 
 pir_output_is( <<'CODE', <<'OUT', "tail call optimization, final position" );
+.loadlib 'io_ops'
+
 .sub _main :main
     $P1 = new 'Integer'
     $P1 = 20
@@ -97,6 +99,8 @@
 
 pir_output_is( <<'CODE', <<'OUT', "tail call optimization, intermediate position" );
 
+.loadlib 'io_ops'
+
 .sub _main :main
     $P1 = new 'Integer'
     $P1 = 20
@@ -171,6 +175,8 @@
 
 pir_output_is( <<'CODE', <<'OUT', "tail call optimization, implicit final return" );
 
+.loadlib 'io_ops'
+
 .sub _main :main
 
     $P1 = new 'Integer'
@@ -250,6 +256,8 @@
 
 pir_output_is( <<'CODE', <<'OUT', ":flatten in .return" );
 
+.loadlib 'io_ops'
+
 .sub _main :main
 
     $P1 = new 'Integer'

Modified: branches/ops_massacre/t/op/stringu.t
==============================================================================
--- branches/ops_massacre/t/op/stringu.t	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/t/op/stringu.t	Tue May 25 09:27:21 2010	(r46989)
@@ -25,11 +25,12 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "angstrom" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     chr $S0, 0x212B
-    print $P0, $S0
-    print $P0, "\n"
+    print $S0
+    print "\n"
     end
 .end
 CODE
@@ -38,8 +39,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "escaped angstrom" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"\x{212b}"
     print $S0
     print "\n"
@@ -51,8 +53,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "escaped angstrom 2" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\x{212b}"
     print $S0
     print "\n"
@@ -64,8 +67,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "escaped angstrom 3" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\x{212b}-aaaaaa"
     print $S0
     print "\n"
@@ -77,8 +81,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, 'escaped angstrom 3 \uhhhh' );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\u212b-aaaaaa"
     print $S0
     print "\n"
@@ -90,8 +95,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "MATHEMATICAL BOLD CAPITAL A" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\x{1d400}-aaaaaa"
     print $S0
     print "\n"
@@ -103,8 +109,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, 'MATHEMATICAL BOLD CAPITAL A \U' );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\U0001d400-aaaaaa"
     print $S0
     print "\n"
@@ -116,8 +123,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "two upscales" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\x{212b}-bbbbbb\x{1d400}-cccccc"
     print $S0
     print "\n"
@@ -133,8 +141,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, "two upscales - don't downscale" );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, unicode:"aaaaaa\x{1d400}-bbbbbb\x{212b}-cccccc"
     print $S0
     print "\n"
@@ -150,8 +159,9 @@
 
 pir_output_is( <<'CODE', <<OUTPUT, '\cX, \ooo' );
 .sub main :main
-    getstdout $P0
-    $P0.'encoding'("utf8")
+    $P0 = getinterp
+    $P1 = $P0.'stdhandle'(1)
+    $P1.'encoding'("utf8")
     set $S0, "ok 1\cJ"
     print $S0
     set $S0, "ok 2\012"

Modified: branches/ops_massacre/tools/util/pgegrep
==============================================================================
--- branches/ops_massacre/tools/util/pgegrep	Tue May 25 08:51:09 2010	(r46988)
+++ branches/ops_massacre/tools/util/pgegrep	Tue May 25 09:27:21 2010	(r46989)
@@ -81,6 +81,9 @@
 # Readability improved!
 .include 'hllmacros.pir'
 
+# for getstdin and friends
+.loadlib 'io_ops'
+
 .sub main :main
 	.param pmc argv # the script name, then our options.
 	.local string progname


More information about the parrot-commits mailing list