Author: leo
Date: Tue Oct 11 06:40:14 2005
New Revision: 9451
Modified:
trunk/t/pmc/bigint.t
trunk/t/pmc/builtin.t
trunk/t/pmc/complex.t
trunk/t/pmc/config.t
trunk/t/pmc/coroutine.t
trunk/t/pmc/delegate.t
trunk/t/pmc/eval.t
trunk/t/pmc/exception.t
trunk/t/pmc/fixedpmcarray.t
trunk/t/pmc/freeze.t
trunk/t/pmc/hash.t
trunk/t/pmc/integer.t
trunk/t/pmc/io.t
trunk/t/pmc/iter.t
trunk/t/pmc/mmd.t
trunk/t/pmc/n_arithmetics.t
trunk/t/pmc/nci.t
trunk/t/pmc/object-meths.t
trunk/t/pmc/objects.t
trunk/t/pmc/pair.t
trunk/t/pmc/perlhash.t
trunk/t/pmc/perlint.t
trunk/t/pmc/perlnum.t
trunk/t/pmc/perlstring.t
trunk/t/pmc/pmc.t
trunk/t/pmc/resizablepmcarray.t
trunk/t/pmc/sub.t
trunk/t/pmc/sys.t
Log:
[PATCH] @directive -> :directive - part 5 t/pmc
Courtesy of Jonathan Scott Duff <[EMAIL PROTECTED]>
Modified: trunk/t/pmc/bigint.t
==============================================================================
--- trunk/t/pmc/bigint.t (original)
+++ trunk/t/pmc/bigint.t Tue Oct 11 06:40:14 2005
@@ -593,7 +593,7 @@ end_yield:
goto forever
.end
-.sub main @MAIN
+.sub main :main
.local int i
.local pmc d
loop:
Modified: trunk/t/pmc/builtin.t
==============================================================================
--- trunk/t/pmc/builtin.t (original)
+++ trunk/t/pmc/builtin.t Tue Oct 11 06:40:14 2005
@@ -19,7 +19,7 @@ Tests builtin opcode-like methods.
use Parrot::Test tests => 4;
pir_output_is(<<'CODE', <<'OUT', "three ways to call a method");
-.sub main @MAIN
+.sub main :main
.local pmc x, y, cl, m
x = new Float
x = 1.0
@@ -46,7 +46,7 @@ method 0.540302
OUT
pir_output_is(<<'CODE', <<'OUT', "say");
-.sub main @MAIN
+.sub main :main
.local pmc io
$I0 = say "ok 1"
io = getstdout
@@ -66,7 +66,7 @@ OUT
SKIP: {
skip("bound methods - n/y", 2);
pir_output_is(<<'CODE', <<'OUT', "bound methods");
-.sub main @MAIN
+.sub main :main
.local pmc x, y, cl, m
x = new Float
x = 1.0
@@ -96,7 +96,7 @@ bound class m 0.540302
OUT
pir_output_is(<<'CODE', <<'OUT', "ParrotIO.puts");
-.sub main @MAIN
+.sub main :main
.local pmc o, m, cl
o = getstdout
$I0 = o."puts"("ok 1\n")
Modified: trunk/t/pmc/complex.t
==============================================================================
--- trunk/t/pmc/complex.t (original)
+++ trunk/t/pmc/complex.t Tue Oct 11 06:40:14 2005
@@ -740,7 +740,7 @@ ok 3
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "sub");
-.sub main @MAIN
+.sub main :main
.local pmc d, f, c
d = new Undef
f = new Float
@@ -768,7 +768,7 @@ Complex
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "i_sub");
-.sub main @MAIN
+.sub main :main
.local pmc f, c
f = new Float
f = 2.2
Modified: trunk/t/pmc/config.t
==============================================================================
--- trunk/t/pmc/config.t (original)
+++ trunk/t/pmc/config.t Tue Oct 11 06:40:14 2005
@@ -21,7 +21,7 @@ use Parrot::Config;
use Cwd qw(cwd);
pir_output_is(<<'CODE', <<'OUT', "get config hash");
-.sub main @MAIN
+.sub main :main
.include "iglobals.pasm"
.local pmc config_hash, interp
interp = getinterp
@@ -35,7 +35,7 @@ Hash
OUT
pir_output_is(<<'CODE', cwd, "prefix");
-.sub main @MAIN
+.sub main :main
.include "iglobals.pasm"
.local pmc config_hash, interp
interp = getinterp
@@ -46,7 +46,7 @@ pir_output_is(<<'CODE', cwd, "prefix");
CODE
pir_output_is(<<'CODE', <<'OUT', "load src/pbc from library path");
-.sub main @MAIN
+.sub main :main
load_bytecode "config.imc"
print "ok 1\n"
load_bytecode "config.pbc"
Modified: trunk/t/pmc/coroutine.t
==============================================================================
--- trunk/t/pmc/coroutine.t (original)
+++ trunk/t/pmc/coroutine.t Tue Oct 11 06:40:14 2005
@@ -456,7 +456,7 @@ OUTPUT
pir_output_is(<<'CODE', 'Coroutine', "Coro new - type");
-.sub main @MAIN
+.sub main :main
.local pmc c
c = global "coro"
typeof S0, c
@@ -475,7 +475,7 @@ CODE
pir_output_is(<<'CODE', '01234', "Coro new - yield");
-.sub main @MAIN
+.sub main :main
.local pmc c
c = global "coro"
loop:
@@ -521,7 +521,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "re-entering coro from another sub");
-.sub main @MAIN
+.sub main :main
.local pmc corou
.local int z
newsub corou, .Coroutine, _coroufn
Modified: trunk/t/pmc/delegate.t
==============================================================================
--- trunk/t/pmc/delegate.t (original)
+++ trunk/t/pmc/delegate.t Tue Oct 11 06:40:14 2005
@@ -150,7 +150,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "del
print "\n"
returncc
.end
-.sub __add @MULTI(pmc, int)
+.sub __add :multi(pmc, int)
.param pmc l
.param int r
.param pmc d
@@ -188,7 +188,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "del
print i
print "\n"
.end
-.sub __add @MULTI(delegate, pmc)
+.sub __add :multi(delegate, pmc)
.param pmc l
.param pmc r
.param pmc d
Modified: trunk/t/pmc/eval.t
==============================================================================
--- trunk/t/pmc/eval.t (original)
+++ trunk/t/pmc/eval.t Tue Oct 11 06:40:14 2005
@@ -124,7 +124,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PIR compiler sub");
-.sub test @MAIN
+.sub test :main
.local NCI compiler
find_global compiler, "xcompile"
compreg "XPASM", compiler
@@ -161,7 +161,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "bug #31467");
- .sub main @MAIN
+ .sub main :main
$P1 = new Hash
newsub $P0, .Sub, _builtin
$P1['builtin'] = $P0
@@ -194,7 +194,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "compile PAST in PIR");
-.sub main @MAIN
+.sub main :main
.local pmc past_compiler
past_compiler = compreg "PAST"
.local string past_source
@@ -234,7 +234,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "compile PAST in PASM in PIR");
-.sub test @MAIN
+.sub test :main
# PIR
.local pmc pasm_compiler
@@ -278,7 +278,7 @@ PIR: after
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PIR compiler sub PASM");
-.sub main @MAIN
+.sub main :main
register_compiler()
.local pmc compiler, invokable
@@ -317,7 +317,7 @@ ok 1
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PIR compiler sub PIR");
-.sub main @MAIN
+.sub main :main
register_compiler()
.local pmc compiler, invokable
@@ -352,7 +352,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "PIR
code = ".sub anonymous"
$S0 = counter
code .= $S0
- code .= " @ANON\n"
+ code .= " :anon\n"
code .= "print \""
code .= printme
code .= "\\n\"\n"
@@ -367,7 +367,7 @@ ok 1
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "eval.get_string");
-.sub main @MAIN
+.sub main :main
.local pmc f1, f2
.local pmc io
@@ -392,7 +392,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "eva
pir_compiler = compreg "PIR"
code = ".sub "
code .= name
- code .= " @LOAD\n"
+ code .= " :load\n"
code .= "print \""
code .= printme
code .= "\\n\"\n"
@@ -411,7 +411,7 @@ END {
};
pir_output_is(<<'CODE', <<'OUTPUT', "eval.freeze");
-.sub main @MAIN
+.sub main :main
.local pmc f, e
.local pmc io
f = compi("foo_1", "hello from foo_1")
@@ -444,7 +444,7 @@ written
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "eval.thaw");
-.sub main @MAIN
+.sub main :main
.local pmc io, e
.local string file
.local int size
Modified: trunk/t/pmc/exception.t
==============================================================================
--- trunk/t/pmc/exception.t (original)
+++ trunk/t/pmc/exception.t Tue Oct 11 06:40:14 2005
@@ -286,7 +286,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "set
# see also t/op/gc_14.imc
-.sub main @MAIN
+.sub main :main
.local pmc n
new_pad 0
$P0 = getinterp
Modified: trunk/t/pmc/fixedpmcarray.t
==============================================================================
--- trunk/t/pmc/fixedpmcarray.t (original)
+++ trunk/t/pmc/fixedpmcarray.t Tue Oct 11 06:40:14 2005
@@ -294,7 +294,7 @@ OUTPUT
pir_output_like(<<'CODE',
-.sub main @MAIN
+.sub main :main
.local pmc compares, cmp_fun
# XXX doesnt work wit prederef of JIT
bounds 1
@@ -381,7 +381,7 @@ OUTPUT
pir_output_like(<<'CODE', <<'OUTPUT', "Getting unitialized elements");
-.sub main @MAIN
+.sub main :main
.local pmc arr1
arr1 = new FixedPMCArray
arr1 = 2005
@@ -397,7 +397,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "Multi keys");
-.sub test @MAIN
+.sub test :main
.local pmc matrix, row
.local pmc elem_in_pmc
.local pmc elem_out_pmc
Modified: trunk/t/pmc/freeze.t
==============================================================================
--- trunk/t/pmc/freeze.t (original)
+++ trunk/t/pmc/freeze.t Tue Oct 11 06:40:14 2005
@@ -762,7 +762,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "freeze/thaw a ResizableBooleanArray");
-.sub test @MAIN
+.sub test :main
.local pmc original_arr, thawed_arr
.local string frozen_arr
original_arr = new ResizableBooleanArray
@@ -826,7 +826,7 @@ ResizableBooleanArray
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "freeze/thaw a ResizablePMCArray");
-.sub test @MAIN
+.sub test :main
.local pmc original_arr, thawed_arr
.local string frozen_arr
original_arr = new .ResizablePMCArray
Modified: trunk/t/pmc/hash.t
==============================================================================
--- trunk/t/pmc/hash.t (original)
+++ trunk/t/pmc/hash.t Tue Oct 11 06:40:14 2005
@@ -337,7 +337,7 @@ again:
ret:
.end
-.sub _main @MAIN
+.sub _main :main
new P30, .Hash
print "round 1\n"
I29 = 1
@@ -1315,7 +1315,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "iter");
-.sub __main__ @MAIN
+.sub __main__ :main
new P0, .Hash
set P0['a'], 'x'
iter P1, P0
@@ -1341,7 +1341,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "broken delete, thx to azuroth on irc");
.include "iterator.pasm"
-.sub main @MAIN
+.sub main :main
.local pmc thash
# just put in some dummy data...
Modified: trunk/t/pmc/integer.t
==============================================================================
--- trunk/t/pmc/integer.t (original)
+++ trunk/t/pmc/integer.t Tue Oct 11 06:40:14 2005
@@ -311,7 +311,7 @@ ok 4
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "n_<oper>");
-.sub main @MAIN
+.sub main :main
$P0 = new Integer
$P1 = new Integer
set $P0, 6
Modified: trunk/t/pmc/io.t
==============================================================================
--- trunk/t/pmc/io.t (original)
+++ trunk/t/pmc/io.t Tue Oct 11 06:40:14 2005
@@ -388,7 +388,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', 'puts method - PIR');
-.sub main @MAIN
+.sub main :main
.local string s
s = "ok 2\n"
.local pmc io
Modified: trunk/t/pmc/iter.t
==============================================================================
--- trunk/t/pmc/iter.t (original)
+++ trunk/t/pmc/iter.t Tue Oct 11 06:40:14 2005
@@ -1158,7 +1158,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "slice, get strings from array");
-.sub main @MAIN
+.sub main :main
.include "iterator.pasm"
.local pmc ar
ar = new PerlArray
@@ -1326,7 +1326,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "iter.next method");
-.sub main @MAIN
+.sub main :main
new $P0, .PerlString
set $P0, "abcdef"
iter $P1, $P0
Modified: trunk/t/pmc/mmd.t
==============================================================================
--- trunk/t/pmc/mmd.t (original)
+++ trunk/t/pmc/mmd.t Tue Oct 11 06:40:14 2005
@@ -364,7 +364,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUT', "first dynamic MMD call");
-.sub main @MAIN
+.sub main :main
.local pmc F, B, f, b, m, s
newclass F, "Foo"
f = new "Foo"
@@ -383,13 +383,13 @@ pir_output_is(<<'CODE', <<'OUT', "first
foo(b, f)
.end
-.sub foo method, @MULTI(Foo, Bar)
+.sub foo method, :multi(Foo, Bar)
.param pmc x
.param pmc y
print " Foo::foo\n"
.end
-.sub foo method, @MULTI(Bar, Foo)
+.sub foo method, :multi(Bar, Foo)
.param pmc x
.param pmc y
print " Bar::foo\n"
@@ -403,19 +403,19 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on argument count");
.namespace ["main"]
-.sub main @MAIN
+.sub main :main
p("ok 1\n")
p("-twice", "ok 2\n")
.end
.namespace [""]
-.sub p @MULTI(string)
+.sub p :multi(string)
.param string s
print s
.end
-.sub p @MULTI(string, string)
+.sub p :multi(string, string)
.param string opt
.param string s
if opt != '-twice' goto no_twice
@@ -433,19 +433,19 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on mative types");
.namespace ["main"]
-.sub main @MAIN
+.sub main :main
p("ok 1\n")
p(42)
.end
.namespace [""]
-.sub p @MULTI(string)
+.sub p :multi(string)
.param string s
print s
.end
-.sub p @MULTI(int)
+.sub p :multi(int)
.param int i
print i
print "\n"
@@ -457,7 +457,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on PMC types");
.namespace ["main"]
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -476,13 +476,13 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
.namespace [""]
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
@@ -496,7 +496,7 @@ OUT
pir_output_like(<<'CODE', <<'OUT', "MMD on PMC types, invalid");
.namespace ["main"]
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -517,13 +517,13 @@ pir_output_like(<<'CODE', <<'OUT', "MMD
.namespace [""]
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
@@ -538,7 +538,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on PMC types 3");
.namespace ["main"]
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -560,19 +560,19 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
.namespace [""]
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
.end
-.sub p @MULTI(Integer)
+.sub p :multi(Integer)
.param pmc p
print "Intege "
print p
@@ -588,7 +588,7 @@ Intege 42
OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on PMC types, global namespace");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -605,13 +605,13 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
p($P1)
.end
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
@@ -627,7 +627,7 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
.namespace ["Some"]
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -644,13 +644,13 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
p($P1)
.end
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
@@ -664,7 +664,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "MMD on PMC types - Any");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new PerlString
@@ -681,26 +681,26 @@ pir_output_is(<<'CODE', <<'OUT', "MMD on
.namespace [""]
-.sub p @MULTI(String)
+.sub p :multi(String)
.param pmc p
print "String "
print p
.end
-.sub p @MULTI(PerlString)
+.sub p :multi(PerlString)
.param pmc p
print "PerlSt "
print p
.end
-.sub p @MULTI(_)
+.sub p :multi(_)
.param pmc p
print "Any "
print p
print "\n"
.end
-.sub q @MULTI(pmc)
+.sub q :multi(pmc)
.param pmc p
print "Any "
print p
@@ -715,7 +715,7 @@ Any 43
OUT
pir_output_is(<<'CODE', <<'OUTPUT', "__add as function - Int, Float");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r
d = new Integer
l = new Integer
@@ -732,7 +732,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "__add as method");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r
l = new Integer
r = new Integer
@@ -748,7 +748,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "__add as method - inherited");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r
l = new PerlInt
r = new PerlInt
@@ -763,7 +763,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "__add as method - Int, Float");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r
l = new Integer
r = new Float
@@ -781,7 +781,7 @@ OUTPUT
SKIP: {
skip("bound method disabled", 1);
pir_output_is(<<'CODE', <<'OUTPUT', "bound __add method");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r, m
d = new Integer
l = new Integer
@@ -807,7 +807,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "Integer subclasses");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r, cl
cl = subclass "Integer", "AInt"
d = new "AInt"
@@ -841,7 +841,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "Integer subclasses, n_add");
-.sub main @MAIN
+.sub main :main
$P0 = subclass "Integer", "AInt"
$P0 = new "AInt"
$P1 = new Integer
@@ -853,7 +853,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "Int
print "\n"
.end
.namespace ["AInt"]
-.sub __add @MULTI(AInt, Integer)
+.sub __add :multi(AInt, Integer)
.param pmc l
.param pmc r
print l
@@ -873,7 +873,7 @@ OUTPUT
open P, ">$temp" or die "can't write $temp";
print P <<'EOF';
-.sub __add @MULTI(Integer, Integer)
+.sub __add :multi(Integer, Integer)
.param pmc l
.param pmc r
print l
@@ -907,21 +907,21 @@ SKIP: {
pir_output_is(<<'CODE', <<'OUTPUT', "mmd bug reported by Jeff");
.namespace ['Foo']
-.sub bar method, @MULTI(Foo, string)
+.sub bar method, :multi(Foo, string)
print "string\n"
.end
-.sub bar method, @MULTI(Foo, pmc)
+.sub bar method, :multi(Foo, pmc)
print "PMC\n"
.end
-.sub bar method, @MULTI(Foo)
+.sub bar method, :multi(Foo)
print "nothing\n"
.end
.namespace ['']
-.sub main @MAIN
+.sub main :main
newclass $P0, 'Foo'
$I0 = find_type 'Foo'
@@ -943,7 +943,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "use a core func for an object");
-.sub main @MAIN
+.sub main :main
.local pmc d, l, r, cl
cl = newclass "AInt"
addattribute cl, ".i"
@@ -998,17 +998,17 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "multisub vs find_name");
-.sub main @MAIN
+.sub main :main
$P0 = find_name "foo"
$S0 = classname $P0
print $S0
print "\n"
.end
-.sub foo method, @MULTI(string)
+.sub foo method, :multi(string)
.param pmc x
print " foo\n"
.end
-.sub foo method, @MULTI(pmc)
+.sub foo method, :multi(pmc)
.param pmc x
print " foo\n"
.end
Modified: trunk/t/pmc/n_arithmetics.t
==============================================================================
--- trunk/t/pmc/n_arithmetics.t (original)
+++ trunk/t/pmc/n_arithmetics.t Tue Oct 11 06:40:14 2005
@@ -24,7 +24,7 @@ use Test::More;
### Operations on a single INTVAL
###
pir_output_is(<<'CODE', <<OUTPUT, "take the negative of an Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
## negate zero.
set P0, 0
@@ -54,7 +54,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "take the absolute value of an Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
## find absolute zero (so to speak).
set P0, 0
@@ -87,7 +87,7 @@ OUTPUT
### first arg is Integer, second arg is Integer
###
pir_output_is(<<'CODE', <<OUTPUT, "add Integer to Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
set P0, 4000
P1 = new Integer
@@ -121,7 +121,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "subtract Integer from Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
set P0, 4000
P1 = new Integer
@@ -155,7 +155,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "multiply Integer with Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
set P0, 4000
P1 = new Integer
@@ -184,7 +184,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "divide Integer by Integer");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
set P0, 4000
P1 = new Integer
@@ -216,7 +216,7 @@ OUTPUT
### Operations on a single NUMVAL
###
pir_output_is(<<'CODE', <<OUTPUT, "negate a Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 0
P1 = n_neg P0
@@ -243,7 +243,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "take the absolute value of a Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Integer
set P0, 0
P1 = n_abs P0
@@ -273,7 +273,7 @@ OUTPUT
### FLOATVAL and INTVAL tests
###
pir_output_is(<<'CODE', <<OUTPUT, "add Integer to Float");
-.sub _main @MAIN
+.sub _main :main
P10 = new Integer
set P10, 4000
P0 = new Float
@@ -304,7 +304,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "subtract Integer from Float");
-.sub _main @MAIN
+.sub _main :main
P10 = new Integer
set P10, 4000
P0 = new Float
@@ -335,7 +335,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "multiply Float with Integer");
-.sub _main @MAIN
+.sub _main :main
P10 = new Integer
set P10, 4000
P0 = new Float
@@ -366,7 +366,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "divide Float by Integer");
-.sub _main @MAIN
+.sub _main :main
P10 = new Integer
set P10, 4000
P0 = new Float
@@ -405,7 +405,7 @@ OUTPUT
### FLOATVAL and FLOATVAL tests
###
pir_output_is(<<'CODE', <<OUTPUT, "add Float to Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 4000.246
P1 = new Float
@@ -432,7 +432,7 @@ OUTPUT
## This tests n_infix_ic_p_p_nc for n_add, n_sub, n_mul, and n_div. Note that
## there is no n_infix_ic_p_nc_p op; the PMC argument always comes first.
pir_output_is(<<'CODE', <<OUTPUT, "add/sub/mul/div of Float with constants");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 4000.246
P1 = new Float
@@ -458,7 +458,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "subtract Float from Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 4000.246
P1 = new Float
@@ -483,7 +483,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "multiply Float with Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 400.0246
P1 = new Float
@@ -508,7 +508,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "divide Float by Float");
-.sub _main @MAIN
+.sub _main :main
P0 = new Float
set P0, 4000.246
P1 = new Float
@@ -533,7 +533,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "verify new PMC");
-.sub main @MAIN
+.sub main :main
P0 = new Integer
P1 = P0
P0 = n_add P0, 1
@@ -553,7 +553,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', ".pragma n_operators");
.pragma n_operators 1
-.sub main @MAIN
+.sub main :main
P0 = new Integer
P1 = P0
P0 = P0 + 1
Modified: trunk/t/pmc/nci.t
==============================================================================
--- trunk/t/pmc/nci.t (original)
+++ trunk/t/pmc/nci.t Tue Oct 11 06:40:14 2005
@@ -36,7 +36,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -62,7 +62,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -124,7 +124,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -186,7 +186,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -211,7 +211,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -246,7 +246,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -270,7 +270,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -296,7 +296,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -376,7 +376,7 @@ OUTPUT
pir_output_is( << 'CODE', << 'OUTPUT', "nci_dd - PIR" );
-.sub test @MAIN
+.sub test :main
.local string library_name
library_name = 'libnci_test'
.local pmc libnci_test
@@ -400,7 +400,7 @@ OUTPUT
pir_output_is( << 'CODE', << "OUTPUT", "get_string()" );
-.sub test @MAIN
+.sub test :main
.local string library_name
library_name = 'libnci_test'
.local pmc libnci_test
@@ -1175,7 +1175,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -1339,7 +1339,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "nci_cb_C1 - PIR");
-.sub test @MAIN
+.sub test :main
# this flag will be set by the callback function
.local pmc cb_done
@@ -1478,7 +1478,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "nci
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# this flag will be set by the callback function
.local pmc cb_done
@@ -1682,7 +1682,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "nci_cb_D2 - PIR");
-.sub test @MAIN
+.sub test :main
# this flag will be set by the callback function
.local pmc cb_done
@@ -1761,7 +1761,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "nci
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# this flag will be set by the callback function
.local pmc cb_done
@@ -1851,7 +1851,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "nci
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# turn off JIT or special core - no events yet
bounds 1
@@ -2176,7 +2176,7 @@ pir_output_is( << 'CODE', << "OUTPUT", "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load library
.local pmc libnci_test
@@ -2230,7 +2230,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -2291,7 +2291,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -2322,7 +2322,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', "
.include "datatypes.pasm"
-.sub test @MAIN
+.sub test :main
# load libnci_test.so
.local string library_name
@@ -2372,7 +2372,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "opcode 'does'");
-.sub test @MAIN
+.sub test :main
.local pmc pmc1
pmc1 = new ParrotLibrary
.local int bool1
@@ -2394,7 +2394,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "conversion d <-> P");
-.sub test @MAIN
+.sub test :main
.local string library_name
library_name = 'libnci_test'
.local pmc libnci_test
@@ -2413,7 +2413,7 @@ CODE
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "conversion S <-> P");
-.sub test @MAIN
+.sub test :main
.local string library_name
library_name = 'libnci_test'
.local pmc libnci_test
@@ -2431,7 +2431,7 @@ ok worked
OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "conversion I <-> P");
-.sub test @MAIN
+.sub test :main
.local string library_name
library_name = 'libnci_test'
.local pmc libnci_test
Modified: trunk/t/pmc/object-meths.t
==============================================================================
--- trunk/t/pmc/object-meths.t (original)
+++ trunk/t/pmc/object-meths.t Tue Oct 11 06:40:14 2005
@@ -725,7 +725,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "sam
.end
.namespace [""]
-.sub _main @MAIN
+.sub _main :main
print "ok\n"
.end
CODE
@@ -824,7 +824,7 @@ bar
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "method cache invalidation");
-.sub main @MAIN
+.sub main :main
.local pmc o, cl
newclass cl, "Foo"
subclass cl, cl, "Bar"
@@ -874,7 +874,7 @@ OUTPUT
SKIP: {
skip("no bound NCI method", 1);
pir_output_is(<<'CODE', <<'OUTPUT', "bound NCI method");
-.sub main @MAIN
+.sub main :main
.local pmc s, l, f
s = new String
s = "ABC\n"
@@ -892,7 +892,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "tailcallmeth");
-.sub main @MAIN
+.sub main :main
.local pmc cl, o, n
cl = newclass "Foo"
addattribute cl, "n"
@@ -927,7 +927,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "pri
# \ /
# \ /
# F
-.sub main @MAIN
+.sub main :main
.local pmc A, B, C, D, E, F, m, p, it
newclass A, "A"
newclass B, "B"
@@ -958,7 +958,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "kind of a super");
-.sub main @MAIN
+.sub main :main
.local pmc cl, o
cl = subclass "String", "MyString"
o = new "MyString"
@@ -980,7 +980,7 @@ foofoo
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "super 1");
-.sub main @MAIN
+.sub main :main
.local pmc o, cl
cl = newclass 'Parent'
cl = subclass cl, 'Child'
Modified: trunk/t/pmc/objects.t
==============================================================================
--- trunk/t/pmc/objects.t (original)
+++ trunk/t/pmc/objects.t Tue Oct 11 06:40:14 2005
@@ -1245,7 +1245,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - subclass");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
getclass $P0, "Integer"
print "ok 1\n"
@@ -1269,7 +1269,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - instantiate");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
getclass $P0, "Integer"
print "ok 1\n"
@@ -1289,7 +1289,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - methods");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
getclass $P0, "Integer"
print "ok 1\n"
@@ -1342,7 +1342,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - mmd methods");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
getclass $P0, "Integer"
subclass MyInt, $P0, "MyInt"
@@ -1384,7 +1384,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - overridden mmd methods");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
getclass $P0, "Integer"
subclass MyInt, $P0, "MyInt"
@@ -1408,7 +1408,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "PMC
.end
.namespace ["MyInt"]
-.sub __add @MULTI(MyInt, MyInt)
+.sub __add :multi(MyInt, MyInt)
.param pmc self
.param pmc right
.param pmc dest
@@ -1429,7 +1429,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - derived 1");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
.local pmc MyInt2
getclass $P0, "Integer"
@@ -1493,7 +1493,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - derived 2");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
.local pmc MyInt2
getclass $P0, "Integer"
@@ -1571,7 +1571,7 @@ TODO: {
local $TODO = "methods can't be overridden in derived class only";
pir_output_is(<<'CODE', <<'OUTPUT', "PMC as classes - derived 3");
-.sub main @MAIN
+.sub main :main
.local pmc MyInt
.local pmc MyInt2
getclass $P0, "Integer"
@@ -1636,7 +1636,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "subclassing ParrotClass");
-.sub main @MAIN
+.sub main :main
.local pmc cl
.local pmc parent
parent = getclass "ParrotClass"
@@ -1683,7 +1683,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "instantiate - PIR");
-.sub main @MAIN
+.sub main :main
.local pmc cl
cl = subclass "Integer", "Foo"
.local pmc i
@@ -1714,7 +1714,7 @@ OUTPUT
{ local $TODO = "new Px, Ix: argcP is wrong in __init method";
pir_output_is(<<'CODE', <<'OUTPUT', "__init argcP");
-.sub main @MAIN
+.sub main :main
$P0 = newclass "Foo"
$I0 = find_type "Foo"
@@ -1782,7 +1782,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "namespace vs name");
-.sub main @MAIN
+.sub main :main
.local pmc o, cl, f
newclass cl, "Foo"
$I0 = find_type "Foo"
@@ -1832,7 +1832,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "subclassed Integer bug");
-.sub _main @MAIN
+.sub _main :main
.local pmc class
.local pmc a
.local pmc b
Modified: trunk/t/pmc/pair.t
==============================================================================
--- trunk/t/pmc/pair.t (original)
+++ trunk/t/pmc/pair.t Tue Oct 11 06:40:14 2005
@@ -37,7 +37,7 @@ ok 2
OUT
pir_output_is(<<'CODE', <<'OUT', 'methods');
-.sub main @MAIN
+.sub main :main
.local pmc p, kv
new p, .Pair
new $P1, .Integer
@@ -64,7 +64,7 @@ OUT
SKIP: {
skip("instantiate disabled", 1);
pir_output_is(<<'CODE', <<'OUT', 'instantiate, assign');
-.sub main @MAIN
+.sub main :main
.local pmc cl, p, kv, k, v
k = new .String
k = "key"
Modified: trunk/t/pmc/perlhash.t
==============================================================================
--- trunk/t/pmc/perlhash.t (original)
+++ trunk/t/pmc/perlhash.t Tue Oct 11 06:40:14 2005
@@ -1067,7 +1067,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "Setting with compound keys");
-.sub test @MAIN
+.sub test :main
.local pmc outer_hash
outer_hash = new PerlHash
.local pmc inner_hash
@@ -1224,7 +1224,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "check whether interface is done");
-.sub test @MAIN
+.sub test :main
.local pmc pmc1
pmc1 = new PerlHash
.local int bool1
@@ -1247,7 +1247,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "iter");
-.sub test @MAIN
+.sub test :main
new P0, .PerlHash
set P0['a'], 'x'
iter P1, P0
Modified: trunk/t/pmc/perlint.t
==============================================================================
--- trunk/t/pmc/perlint.t (original)
+++ trunk/t/pmc/perlint.t Tue Oct 11 06:40:14 2005
@@ -2015,7 +2015,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "check whether interface is done");
-.sub test @MAIN
+.sub test :main
.local pmc pmc1
pmc1 = new PerlInt
.local int bool1
@@ -2038,7 +2038,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "Fix for a minor problem");
-.sub test @MAIN
+.sub test :main
$P1 = new PerlInt
$P1 = 5
$P2 = new PerlNum
Modified: trunk/t/pmc/perlnum.t
==============================================================================
--- trunk/t/pmc/perlnum.t (original)
+++ trunk/t/pmc/perlnum.t Tue Oct 11 06:40:14 2005
@@ -1107,7 +1107,7 @@ TODO: {
no warnings 'once';
local $TODO = "pending PerlInt's numeric tower morphinc semantics";
pir_output_is(<<'CODE', <<'OUT', "perlint should morph to num on cos()ing");
-.sub main @MAIN
+.sub main :main
.local pmc x, y
# integer morphing for perlint
print "perlint morph"
Modified: trunk/t/pmc/perlstring.t
==============================================================================
--- trunk/t/pmc/perlstring.t (original)
+++ trunk/t/pmc/perlstring.t Tue Oct 11 06:40:14 2005
@@ -1987,7 +1987,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "lower method");
-.sub _main @MAIN
+.sub _main :main
.local pmc pmc1
pmc1 = new String
pmc1 = "ABCdef\n"
Modified: trunk/t/pmc/pmc.t
==============================================================================
--- trunk/t/pmc/pmc.t (original)
+++ trunk/t/pmc/pmc.t Tue Oct 11 06:40:14 2005
@@ -445,7 +445,7 @@ Integer
OUTPUT
output_is(<<'CODE', <<'OUT', ".const - Sub constant");
-.pcc_sub @MAIN main:
+.pcc_sub :main main:
print "ok 1\n"
.const .Sub P0 = "foo"
invokecc P0
@@ -481,7 +481,7 @@ Integer
OUT
pir_output_is(<<'CODE', <<'OUT', "pmc constant 1");
-.sub main @MAIN
+.sub main :main
.const Integer i = "42"
print i
print "\n"
@@ -491,7 +491,7 @@ CODE
OUT
pir_output_is(<<'CODE', <<'OUT', "pmc constant 2");
-.sub main @MAIN
+.sub main :main
.const .Integer i = "42"
print i
print "\n"
Modified: trunk/t/pmc/resizablepmcarray.t
==============================================================================
--- trunk/t/pmc/resizablepmcarray.t (original)
+++ trunk/t/pmc/resizablepmcarray.t Tue Oct 11 06:40:14 2005
@@ -341,7 +341,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "check whether interface is done");
-.sub test @MAIN
+.sub test :main
.local pmc pmc1
pmc1 = new ResizablePMCArray
.local int bool1
@@ -364,7 +364,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "inherited sort method");
-.sub test @MAIN
+.sub test :main
.local pmc ar
ar = new ResizablePMCArray
@@ -397,7 +397,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "push pmc");
-.sub test @MAIN
+.sub test :main
.local pmc pmc_arr, pmc_9999, pmc_10000
pmc_arr = new ResizablePMCArray
pmc_9999 = new Float
@@ -423,7 +423,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "push integer");
-.sub test @MAIN
+.sub test :main
.local pmc pmc_arr, pmc_9999
.local int int_10000
pmc_arr = new ResizablePMCArray
@@ -449,7 +449,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "push string");
-.sub test @MAIN
+.sub test :main
.local pmc pmc_arr, pmc_9999
.local string string_10000
pmc_arr = new ResizablePMCArray
@@ -475,7 +475,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "shift integer");
-.sub test @MAIN
+.sub test :main
.local pmc pmc_arr, elem
pmc_arr = new ResizablePMCArray
push pmc_arr, 4
@@ -588,7 +588,7 @@ OUT
pir_output_is(<< 'CODE', << 'OUTPUT', "push and pop");
-.sub test @MAIN
+.sub test :main
.local float f, f_elem
.local int i, i_elem, elements
.local pmc p, p_elem, pmc_arr
@@ -682,7 +682,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT', "unshift and shift");
-.sub test @MAIN
+.sub test :main
.local float f, f_elem
.local int i, i_elem, elements
.local pmc p, p_elem, pmc_arr
@@ -776,7 +776,7 @@ OUTPUT
# An Integer Matrix, as used by befunge as a playing field
pir_output_is(<< 'CODE', << 'OUTPUT', "multi key access");
-.sub test @MAIN
+.sub test :main
.local pmc matrix, row_in, row_out
matrix = new ResizablePMCArray
row_in = new ResizableIntegerArray
Modified: trunk/t/pmc/sub.t
==============================================================================
--- trunk/t/pmc/sub.t (original)
+++ trunk/t/pmc/sub.t Tue Oct 11 06:40:14 2005
@@ -527,7 +527,7 @@ ok 2
OUTPUT
output_is(<<'CODE', <<'OUT', "MAIN pragma, syntax only");
-.pcc_sub @MAIN _main:
+.pcc_sub :main _main:
print "ok\n"
end
CODE
@@ -536,13 +536,13 @@ OUT
open S, ">$temp" or die "Can't write $temp";
print S <<'EOF';
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
EOF
close S;
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode @LOAD');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode :load');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.pasm"
@@ -558,13 +558,13 @@ open S, ">$temp" or die "Can't write $te
print S <<'EOF';
.pcc_sub _error:
print "error\n"
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
EOF
close S;
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode @LOAD second sub');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode :load second sub');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.pasm"
@@ -578,7 +578,7 @@ OUTPUT
system(".$PConfig{slash}parrot$PConfig{exe} -o temp.pbc $temp");
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode @LOAD in pbc');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode :load in pbc');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.pbc"
@@ -592,7 +592,7 @@ OUTPUT
open S, ">$temp" or die "Can't write $temp";
print S <<'EOF';
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
.pcc_sub _sub2:
@@ -642,7 +642,7 @@ print S <<'EOF';
.pcc_sub _sub1:
print "in sub1\n"
returncc
- .pcc_sub @LOAD _sub2:
+ .pcc_sub :load _sub2:
print "in sub2\n"
returncc
EOF
@@ -686,10 +686,10 @@ OUTPUT
open S, ">$temp" or die "Can't write $temp";
print S <<'EOF';
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
- .pcc_sub @LOAD _sub2:
+ .pcc_sub :load _sub2:
print "in sub2\n"
returncc
EOF
@@ -733,39 +733,39 @@ in sub1
back
OUTPUT
-output_is(<<'CODE', <<'OUTPUT', '@MAIN pragma');
+output_is(<<'CODE', <<'OUTPUT', ':main pragma');
.pcc_sub _first:
print "first\n"
returncc
-.pcc_sub @MAIN _main:
+.pcc_sub :main _main:
print "main\n"
end
CODE
main
OUTPUT
-output_is(<<'CODE', <<'OUTPUT', 'two @MAIN pragmas');
+output_is(<<'CODE', <<'OUTPUT', 'two :main pragmas');
.pcc_sub _first:
print "first\n"
returncc
-.pcc_sub @MAIN _main:
+.pcc_sub :main _main:
print "main\n"
end
-.pcc_sub @MAIN _second:
+.pcc_sub :main _second:
print "second\n"
returncc
CODE
main
OUTPUT
-output_is(<<'CODE', <<'OUTPUT', '@MAIN pragma call subs');
+output_is(<<'CODE', <<'OUTPUT', ':main pragma call subs');
.pcc_sub _first:
print "first\n"
returncc
.pcc_sub _second:
print "second\n"
returncc
-.pcc_sub @MAIN _main:
+.pcc_sub :main _main:
print "main\n"
find_global P0, "_first"
invokecc P0
@@ -783,14 +783,14 @@ $temp = "temp.imc";
open S, ">$temp" or die "Can't write $temp";
print S <<'EOF';
.emit
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
.eom
EOF
close S;
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode @LOAD first sub - imc');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode :load first sub - imc');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.imc"
@@ -811,14 +811,14 @@ print S <<'EOF';
.emit
# LOAD or other pragmas are only evaluated on the first
# instruction of a compilation unit
- .pcc_sub @LOAD _sub1:
+ .pcc_sub :load _sub1:
print "in sub1\n"
returncc
.eom
EOF
close S;
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode @LOAD second sub - imc');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode :load second sub - imc');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.imc"
@@ -842,7 +842,7 @@ print S <<'EOF';
EOF
close S;
-output_is(<<'CODE', <<'OUTPUT', 'load_bytecode no @LOAD - imc');
+output_is(<<'CODE', <<'OUTPUT', 'load_bytecode no :load - imc');
.pcc_sub _main:
print "main\n"
load_bytecode "temp.imc"
@@ -855,7 +855,7 @@ OUTPUT
pir_output_like(<<'CODE', <<'OUTPUT', "warn on in main");
-.sub _main @MAIN
+.sub _main :main
.include "warnings.pasm"
warningson .PARROT_WARNINGS_UNDEF_FLAG
_f1()
@@ -869,7 +869,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "warn on in sub");
-.sub _main @MAIN
+.sub _main :main
.include "warnings.pasm"
_f1()
$P0 = new PerlUndef
@@ -884,7 +884,7 @@ ok
OUTPUT
pir_output_like(<<'CODE', <<'OUTPUT', "warn on in sub, turn off in f2");
-.sub _main @MAIN
+.sub _main :main
.include "warnings.pasm"
_f1()
$P0 = new PerlUndef
@@ -933,7 +933,7 @@ output_is(<<'CODE', <<'OUTPUT', "sub nam
.pcc_sub dummy:
print "never\n"
noop
-.pcc_sub @MAIN main:
+.pcc_sub :main main:
.include "interpinfo.pasm"
interpinfo P20, .INTERPINFO_CURRENT_SUB
print P20
@@ -957,7 +957,7 @@ main
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "sub names w newsub");
-.sub main @MAIN
+.sub main :main
.include "interpinfo.pasm"
$P0 = interpinfo .INTERPINFO_CURRENT_SUB
print $P0
@@ -980,7 +980,7 @@ mainfoobarfoo
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "caller introspection");
-.sub main @MAIN
+.sub main :main
.include "interpinfo.pasm"
# this test will fail when run with -Oc
# as the call chain is cut down with tail calls
@@ -1041,10 +1041,10 @@ OUTPUT
# its not captured by the test system
my $code = << 'CODE';
-.sub optc @IMMEDIATE, @POSTCOMP
+.sub optc :immediate, :postcomp
print "initial\n"
.end
-.sub _main @MAIN
+.sub _main :main
print "main\n"
.end
CODE
@@ -1052,12 +1052,12 @@ CODE
initial
main
OUTPUT
- my $descr = '@IMMEDIATE, @POSTCOMP';
+ my $descr = ':immediate, :postcomp';
if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r / )
{
TODO:
{
- local $TODO = "output from POSTCOMP is lost";
+ local $TODO = "output from :postcomp is lost";
output_is( $code, $output, $descr);
};
} else {
@@ -1065,8 +1065,8 @@ OUTPUT
}
}
-pir_output_like(<<'CODE', <<'OUTPUT', '@ANON');
-.sub main @MAIN
+pir_output_like(<<'CODE', <<'OUTPUT', ':anon');
+.sub main :main
"foo"()
print "ok\n"
$P0 = global "new"
@@ -1076,7 +1076,7 @@ pir_output_like(<<'CODE', <<'OUTPUT', '@
$P0 = global "foo"
.end
-.sub "foo" @ANON
+.sub "foo" :anon
print "foo\n"
"new"()
.end
@@ -1094,11 +1094,11 @@ OUTPUT
open S, ">test_l1.imc" or die "Can't write test_l1.imc";
print S <<'EOF';
-.sub l11 @LOAD
+.sub l11 :load
print "l11\n"
.end
-.sub l12 @LOAD
+.sub l12 :load
print "l12\n"
.end
EOF
@@ -1106,11 +1106,11 @@ close S;
open S, ">test_l2.imc" or die "Can't write test_l2.imc";
print S <<'EOF';
-.sub l21 @LOAD
+.sub l21 :load
print "l21\n"
.end
-.sub l22 @LOAD
+.sub l22 :load
print "l22\n"
.end
EOF
@@ -1121,8 +1121,8 @@ system(".$PConfig{slash}parrot$PConfig{e
END { unlink(qw/ test_l1.imc test_l2.imc test_l1.pbc test_l2.pbc /); };
-pir_output_is(<<'CODE', <<'OUTPUT', 'multiple @LOAD');
-.sub main @MAIN
+pir_output_is(<<'CODE', <<'OUTPUT', 'multiple :load');
+.sub main :main
print "main 1\n"
load_bytecode "test_l1.imc"
load_bytecode "test_l2.imc"
@@ -1146,7 +1146,7 @@ main 3
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "immediate code as const");
-.sub make_pi @IMMEDIATE, @ANON
+.sub make_pi :immediate, :anon
$N0 = atan 1.0, 1.0
$N0 *= 4
$P0 = new .Float
@@ -1154,7 +1154,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "imm
.return ($P0)
.end
-.sub main @MAIN
+.sub main :main
.const .Sub pi = "make_pi"
print pi
print "\n"
@@ -1164,7 +1164,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "immediate code as const - obj");
-.sub make_obj @IMMEDIATE, @ANON
+.sub make_obj :immediate, :anon
.local pmc cl, o
cl = newclass "Foo"
addattribute cl, 'x'
@@ -1175,7 +1175,7 @@ pir_output_is(<<'CODE', <<'OUTPUT', "imm
.return (o)
.end
-.sub main @MAIN
+.sub main :main
.const .Sub o = "make_obj"
$P0 = getattribute o, 'x'
print $P0
Modified: trunk/t/pmc/sys.t
==============================================================================
--- trunk/t/pmc/sys.t (original)
+++ trunk/t/pmc/sys.t Tue Oct 11 06:40:14 2005
@@ -25,10 +25,10 @@ END {
pir_output_is(<<'CODE', <<OUT, "spawnw, _config");
-.sub _test @MAIN
+.sub _test :main
.local pmc O
open O, "temp.imc", ">"
- print O, ".sub _main @MAIN\n"
+ print O, ".sub _main :main\n"
print O, "\tprint \"Hello, World!\\n\"\n"
print O, ".end\n"
close O
