Author: leo
Date: Tue Oct 11 06:45:38 2005
New Revision: 9452
Modified:
trunk/t/dynclass/foo.t
trunk/t/dynclass/gdbmhash.t
trunk/t/dynclass/pybuiltin.t
trunk/t/dynclass/pyclass.t
trunk/t/dynclass/pycomplex.t
trunk/t/dynclass/pyfunc.t
trunk/t/dynclass/pyint.t
Log:
[PATCH] @directive -> :directive - part 6 t/dynclass
Courtesy of Jonathan Scott Duff <[EMAIL PROTECTED]>
Modified: trunk/t/dynclass/foo.t
==============================================================================
--- trunk/t/dynclass/foo.t (original)
+++ trunk/t/dynclass/foo.t Tue Oct 11 06:45:38 2005
@@ -21,7 +21,7 @@ use Parrot::Config;
pir_output_is(<< 'CODE', << 'OUTPUT', "get_integer");
-.sub main @MAIN
+.sub main :main
loadlib P1, "foo"
find_type $I0, "Foo"
new $P1, $I0
@@ -35,7 +35,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "loadlib with relative pathname, no
ext");
-.sub main @MAIN
+.sub main :main
## load a relative pathname without the extension. loadlib will convert
the
## '/' characters to '\\' on windows.
$S0 = "runtime/parrot/dynext/foo"
@@ -53,7 +53,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "loadlib with absolute pathname, no
ext");
-.sub main @MAIN
+.sub main :main
## get cwd in $S0.
.include "iglobals.pasm"
$P11 = getinterp
@@ -78,7 +78,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "loadlib with relative pathname & ext");
-.sub main @MAIN
+.sub main :main
## get load_ext in $S0.
.include "iglobals.pasm"
$P11 = getinterp
@@ -101,7 +101,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "loadlib with absolute pathname & ext");
-.sub main @MAIN
+.sub main :main
## get cwd in $S0, load_ext in $S1.
.include "iglobals.pasm"
$P11 = getinterp
@@ -130,7 +130,7 @@ OUTPUT
SKIP: { skip("No BigInt Lib configured", 1) if !$PConfig{gmp};
pir_output_is(<< 'CODE', << 'OUTPUT', "inherited add");
-.sub _main @MAIN
+.sub _main :main
.local pmc d, l, r
$P0 = loadlib "foo"
print "ok\n"
@@ -155,7 +155,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "Foo subclass isa Integer");
-.sub main @MAIN
+.sub main :main
.local pmc F, f, d, r
loadlib F, "foo"
f = new "Foo"
@@ -175,7 +175,7 @@ pir_output_is(<< 'CODE', << 'OUTPUT', ".
# load our Foo test (pseudo) language
# it defines one PMC type "Foo"
.HLL "Fool", "foo"
-.sub main @MAIN
+.sub main :main
new $P1, "Foo" # load by name
$I1 = $P1
print $I1
@@ -187,7 +187,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', ".HLL 2");
.HLL "Fool", "foo"
-.sub main @MAIN
+.sub main :main
new $P1, .Foo # load by index
$I1 = $P1
print $I1
Modified: trunk/t/dynclass/gdbmhash.t
==============================================================================
--- trunk/t/dynclass/gdbmhash.t (original)
+++ trunk/t/dynclass/gdbmhash.t Tue Oct 11 06:45:38 2005
@@ -30,7 +30,7 @@ else {
# PIR fragment for setting up a GDBM Hash
my $new_hash_1 = << 'CODE';
-.sub test @MAIN
+.sub test :main
.local pmc gdbmhash_lib
gdbmhash_lib = loadlib "gdbmhash"
.local int gdbmhash_type
Modified: trunk/t/dynclass/pybuiltin.t
==============================================================================
--- trunk/t/dynclass/pybuiltin.t (original)
+++ trunk/t/dynclass/pybuiltin.t Tue Oct 11 06:45:38 2005
@@ -20,7 +20,7 @@ use Parrot::Test tests => 6;
use Parrot::Config;
pir_output_is(<< 'CODE', << 'OUTPUT', "autoload");
-.sub main @MAIN
+.sub main :main
new_pad 0
new $P0, "PyInt"
@@ -36,7 +36,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "delegating");
-.sub main @MAIN
+.sub main :main
new_pad 0
loadlib $P0, "python_group"
find_global P0, "PyBuiltin", "__load__"
@@ -97,7 +97,7 @@ OUTPUT
SKIP: { skip("No BigInt Lib configured", 1) if !$PConfig{gmp};
pir_output_is(<< 'CODE', << 'OUTPUT', "bigint");
-.sub main @MAIN
+.sub main :main
new_pad 0
loadlib $P0, "python_group"
find_global P0, "PyBuiltin", "__load__"
@@ -120,7 +120,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "range");
-.sub main @MAIN
+.sub main :main
new_pad 0
loadlib $P0, "python_group"
find_global P0, "PyBuiltin", "__load__"
@@ -175,7 +175,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "boolean");
-.sub main @MAIN
+.sub main :main
new_pad 0
loadlib $P0, "python_group"
find_global P0, "PyBuiltin", "__load__"
@@ -195,7 +195,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "boolean");
-.sub main @MAIN
+.sub main :main
new_pad 0
loadlib $P0, "python_group"
Modified: trunk/t/dynclass/pyclass.t
==============================================================================
--- trunk/t/dynclass/pyclass.t (original)
+++ trunk/t/dynclass/pyclass.t Tue Oct 11 06:45:38 2005
@@ -20,7 +20,7 @@ use Parrot::Test tests => 6;
pir_output_is(<< 'CODE', << 'OUTPUT', "attribute");
-.sub main @MAIN
+.sub main :main
loadlib $P0, "python_group"
getclass $P1, 'PyType'
@@ -61,7 +61,7 @@ pir_output_is(<< 'CODE', << 'OUTPUT', "m
end
.end
-.sub _m @ANON
+.sub _m :anon
find_type $I0, "PyInt"
new $P0, $I0
$P0 = 1
@@ -73,7 +73,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "classname");
-.sub main @MAIN
+.sub main :main
loadlib $P0, "python_group"
getclass $P1, 'PyType'
@@ -97,7 +97,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "delprop");
-.sub main @MAIN
+.sub main :main
loadlib $P0, "python_group"
getclass $P1, 'PyType'
@@ -137,7 +137,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "nested subclasses");
-.sub main @MAIN
+.sub main :main
loadlib $P0, "python_group"
getclass $P1, 'PyType'
@@ -179,7 +179,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "overriding builtins");
-.sub __main__ @MAIN
+.sub __main__ :main
new_pad 0
loadlib P1, 'python_group'
find_global P0, 'PyBuiltin', '__load__'
@@ -206,7 +206,7 @@ pir_output_is(<< 'CODE', << 'OUTPUT', "o
.return ()
.end
-.sub ___repr__ @ANON, method
+.sub ___repr__ :anon, method
find_type $I0, 'PyObject'
new $P0, $I0
find_type $I1, 'PyString'
Modified: trunk/t/dynclass/pycomplex.t
==============================================================================
--- trunk/t/dynclass/pycomplex.t (original)
+++ trunk/t/dynclass/pycomplex.t Tue Oct 11 06:45:38 2005
@@ -21,7 +21,7 @@ use Parrot::Test tests => 4;
pir_output_is(<< 'CODE', << 'OUTPUT', "eq");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
new $P1, "PyComplex"
new $P2, "PyComplex"
@@ -38,7 +38,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "sub");
-.sub main @MAIN
+.sub main :main
.local pmc d, i, c
d = new "PyObject"
i = new "PyInt"
@@ -67,7 +67,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "abs - test registered type");
.HLL "Python", "python_group"
-.sub main @MAIN
+.sub main :main
.local pmc d, c
c = new .PyComplex
c = "3+4j"
@@ -86,7 +86,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "n_abs - test registered type");
.pragma n_operators 1
.HLL "Python", "python_group"
-.sub main @MAIN
+.sub main :main
.local pmc d, c
c = new .PyComplex
c = "3+4j"
Modified: trunk/t/dynclass/pyfunc.t
==============================================================================
--- trunk/t/dynclass/pyfunc.t (original)
+++ trunk/t/dynclass/pyfunc.t Tue Oct 11 06:45:38 2005
@@ -20,7 +20,7 @@ use Parrot::Test tests => 4;
my $base = << 'CODE';
-.sub __main__ @MAIN
+.sub __main__ :main
new_pad 0
loadlib P1, "python_group"
Modified: trunk/t/dynclass/pyint.t
==============================================================================
--- trunk/t/dynclass/pyint.t (original)
+++ trunk/t/dynclass/pyint.t Tue Oct 11 06:45:38 2005
@@ -21,7 +21,7 @@ use Parrot::Config;
pir_output_is(<< 'CODE', << 'OUTPUT', "abs");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P1, $I0
@@ -42,7 +42,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "add");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -68,7 +68,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "and");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -97,7 +97,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "cmp");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -125,7 +125,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "div");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -154,7 +154,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "float");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -171,7 +171,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "floordiv");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -200,7 +200,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "hex");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -216,7 +216,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "int");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -233,7 +233,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "invert");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P1, $I0
@@ -254,7 +254,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "is");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
new $P0, "PyInt"
new $P1, "PyInt"
@@ -274,7 +274,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "lshift");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -303,7 +303,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "mod");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -332,7 +332,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "mul");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -361,7 +361,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "neg");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P1, $I0
@@ -382,7 +382,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "nonzero");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P1, $I0
@@ -400,7 +400,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "oct");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -416,7 +416,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "or");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -445,7 +445,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "pos");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P1, $I0
@@ -463,7 +463,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "pow");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -497,7 +497,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "repr");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -519,7 +519,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "rshift");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -548,7 +548,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "sub");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -574,7 +574,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "truediv");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -594,7 +594,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "xor");
-.sub main @MAIN
+.sub main :main
loadlib P1, "python_group"
find_type $I0, "PyInt"
new $P0, $I0
@@ -623,7 +623,7 @@ SKIP:
skip("No bigint support", 1) unless $PConfig{gmp};
pir_output_like(<< 'CODE', << 'OUTPUT', "sub - propagate to PyLong");
-.sub main @MAIN
+.sub main :main
.include "sysinfo.pasm"
.local pmc d, l, r
.local int b, i
