Author: leo
Date: Tue Oct 11 07:07:56 2005
New Revision: 9454
Modified:
trunk/t/op/calling.t
trunk/t/op/gc.t
trunk/t/op/integer.t
trunk/t/op/lexicals.t
trunk/t/op/literal.t
trunk/t/op/spawnw.t
trunk/t/op/string.t
trunk/t/op/string_cclass.t
trunk/t/op/string_cs.t
Log:
[PATCH] @directive -> :directive - part 8 t/op
Courtesy of Jonathan Scott Duff <[EMAIL PROTECTED]>
Modified: trunk/t/op/calling.t
==============================================================================
--- trunk/t/op/calling.t (original)
+++ trunk/t/op/calling.t Tue Oct 11 07:07:56 2005
@@ -252,7 +252,7 @@ back
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "use it in PIR");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -324,7 +324,7 @@ back
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "use it in PIR");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -341,7 +341,7 @@ hello
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "type conversion - autobox");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello"
find_name $P1, "foo"
@@ -364,7 +364,7 @@ hello 42 bar
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "type conversion - fetch");
-.sub main @MAIN
+.sub main :main
$P0 = new .String
$P0 = "hello"
$P1 = new .Integer
@@ -449,7 +449,7 @@ OUTPUT
SKIP: {
skip("arg count check disabled", 2);
pir_output_like(<<'CODE', <<'OUTPUT', "argc mismatch, too few");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -465,7 +465,7 @@ CODE
OUTPUT
pir_output_like(<<'CODE', <<'OUTPUT', "argc mismatch, too many");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -482,7 +482,7 @@ OUTPUT
}
pir_output_is(<<'CODE', <<'OUTPUT', "argc mismatch, optional");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -533,7 +533,7 @@ back
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "tailcall 1");
-.sub main @MAIN
+.sub main :main
.const .Sub f = "foo"
print "main\n"
get_results "(0)", $S0
@@ -559,7 +559,7 @@ bar_ret
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "tailcall 2 - pass arg");
-.sub main @MAIN
+.sub main :main
.const .Sub f = "foo"
print "main\n"
get_results "(0)", $S0
@@ -589,7 +589,7 @@ bar_ret
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "tailcall 3 - pass arg");
-.sub main @MAIN
+.sub main :main
.const .Sub f = "foo"
print "main\n"
get_results "(0)", $S0
@@ -658,7 +658,7 @@ back
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "empty args");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -677,7 +677,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "optional args");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -696,7 +696,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "optional, argcX");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
find_name $P1, "foo"
@@ -721,7 +721,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "pir uses no ops");
-.sub main @MAIN
+.sub main :main
$I0 = 77
foo(42, $I0)
print "back\n"
@@ -743,7 +743,7 @@ back
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "pir call evaled code");
-.sub main @MAIN
+.sub main :main
.local string s
s = ".sub foo\n"
s .= ".param int i\n"
@@ -768,7 +768,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "tailcall 4 - pir calls");
-.sub main @MAIN
+.sub main :main
.const .Sub f = "foo"
print "main\n"
$S0 = f()
@@ -794,7 +794,7 @@ bar_ret
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "type conversion - native");
-.sub main @MAIN
+.sub main :main
foo(42, "42", 42.20)
.end
.sub foo
@@ -823,7 +823,7 @@ OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "type conversion - PIR const");
.const int MYCONST = -2
-.sub main @MAIN
+.sub main :main
$P0 = new PerlString
"foo"(MYCONST)
.end
@@ -837,7 +837,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "optional args, :opt_flag");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "hello\n"
foo($P0)
@@ -860,7 +860,7 @@ hello
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "optional multiple :opt_flag");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
foo($P0, "ok 2\n", "ok 3\n")
@@ -899,7 +899,7 @@ ok 4
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "optional returns, void ret");
-.sub main @MAIN
+.sub main :main
.local pmc f
$I0 = 99
f = global "foo"
@@ -920,7 +920,7 @@ ok 1
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "tailcall 5 - arg/param conflict");
-.sub main @MAIN
+.sub main :main
.local pmc a, b
a = new Integer
a = 1
@@ -958,7 +958,7 @@ ok 2
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "OO argument passig");
-.sub main @MAIN
+.sub main :main
.local pmc cl, o, f
cl = newclass "Foo"
o = new "Foo"
@@ -996,7 +996,7 @@ OUTPUT
# see also tcl in leo-ctx5 by Coke; Date 28.08.2005
pir_output_is(<<'CODE', <<'OUTPUT', "bug - :slurpy promotes to :flatten");
-.sub main @MAIN
+.sub main :main
$P0 = new String
$P0 = "ok 1\n"
$P1 = new String
@@ -1022,7 +1022,7 @@ ok 2
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "taicall to NCI");
-.sub main @MAIN
+.sub main :main
.local pmc s
s = new .String
s = "OK 1\n"
Modified: trunk/t/op/gc.t
==============================================================================
--- trunk/t/op/gc.t (original)
+++ trunk/t/op/gc.t Tue Oct 11 07:07:56 2005
@@ -171,7 +171,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<OUTPUT, "vanishing return continuation in method
calls");
-.sub main @MAIN
+.sub main :main
.local pmc o, cl
cl = newclass "Foo"
@@ -444,7 +444,7 @@ pir_output_is(<<'CODE', <<OUTPUT, "Recur
# this did segfault with GC_DEBUG
-.sub main @MAIN
+.sub main :main
.local pmc n
new_pad 0
$P0 = getinterp
@@ -723,7 +723,7 @@ ok
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "verify deleg_pmc object marking");
-.sub main @MAIN
+.sub main :main
.local pmc cl, s, t
cl = subclass "String", "X"
addattribute cl, "o3"
@@ -766,7 +766,7 @@ ok 4
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "AddrRegistry 1");
-.sub main @MAIN
+.sub main :main
.local pmc a, reg, nil
reg = new .AddrRegistry
a = new .String
@@ -811,7 +811,7 @@ ok 5
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "AddrRegistry 2");
-.sub main @MAIN
+.sub main :main
.local pmc a, b, reg, nil
null nil
reg = new .AddrRegistry
@@ -835,7 +835,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "AddrRegistry 2");
-.sub main @MAIN
+.sub main :main
.local pmc a, b, c, reg, nil, it
null nil
reg = new .AddrRegistry
Modified: trunk/t/op/integer.t
==============================================================================
--- trunk/t/op/integer.t (original)
+++ trunk/t/op/integer.t Tue Oct 11 07:07:56 2005
@@ -338,7 +338,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "mod - negative, zero rest (#36003)");
-.sub test @MAIN
+.sub test :main
$I1 = mod 3, 3
print "3 mod 3 = "
Modified: trunk/t/op/lexicals.t
==============================================================================
--- trunk/t/op/lexicals.t (original)
+++ trunk/t/op/lexicals.t Tue Oct 11 07:07:56 2005
@@ -445,7 +445,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "current pad depth");
-.sub main @MAIN
+.sub main :main
new_pad 0
new_pad -1
$P0 = peek_pad
Modified: trunk/t/op/literal.t
==============================================================================
--- trunk/t/op/literal.t (original)
+++ trunk/t/op/literal.t Tue Oct 11 07:07:56 2005
@@ -44,7 +44,7 @@ CODE
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "integer literals in PIR");
-.sub test @MAIN
+.sub test :main
print 0x2A
print "\n"
print 0X2A
Modified: trunk/t/op/spawnw.t
==============================================================================
--- trunk/t/op/spawnw.t (original)
+++ trunk/t/op/spawnw.t Tue Oct 11 07:07:56 2005
@@ -134,7 +134,7 @@ return code: 3
OUTPUT
pir_output_is(<<'CODE', <<'OUTPUT', "grow argv buffer");
-.sub test @MAIN
+.sub test :main
.local pmc args
$S0 = "exit length(qq{"
Modified: trunk/t/op/string.t
==============================================================================
--- trunk/t/op/string.t (original)
+++ trunk/t/op/string.t Tue Oct 11 07:07:56 2005
@@ -1464,7 +1464,7 @@ OUTPUT
pir_output_is(<< 'CODE', << 'OUTPUT',"index with different charsets");
-.sub test @MAIN
+.sub test :main
print "default - default:\n"
set S0, "Parrot"
Modified: trunk/t/op/string_cclass.t
==============================================================================
--- trunk/t/op/string_cclass.t (original)
+++ trunk/t/op/string_cclass.t Tue Oct 11 07:07:56 2005
@@ -22,7 +22,7 @@ use Parrot::Test tests => 6;
pir_output_is(<<'CODE', <<'OUT', "find_cclass, ascii");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S0 = ascii:"test_func(1)"
test( .CCLASS_WORD, $S0 )
@@ -54,7 +54,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "find_not_cclass, ascii");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S0 = ascii:"test_func(1)"
test( .CCLASS_WORD, $S0 )
@@ -86,7 +86,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "find_cclass, iso-8859-1");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S0 = iso-8859-1:"test_func(1)"
test( .CCLASS_WORD, $S0 )
@@ -118,7 +118,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "find_not_cclass, iso-8859-1");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S0 = iso-8859-1:"test_func(1)"
test( .CCLASS_WORD, $S0 )
@@ -150,7 +150,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "is_cclass, ascii");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S1 = ascii:"ab\nC_X34.\0 \t!"
test1( $S1 )
.end
@@ -213,7 +213,7 @@ OUT
pir_output_is(<<'CODE', <<'OUT', "is_cclass, iso-8859-1");
.include "cclass.pasm"
-.sub main @MAIN
+.sub main :main
$S1 = iso-8859-1:"ab\nC_X34.\0 \t!"
test1( $S1 )
.end
Modified: trunk/t/op/string_cs.t
==============================================================================
--- trunk/t/op/string_cs.t (original)
+++ trunk/t/op/string_cs.t Tue Oct 11 07:07:56 2005
@@ -463,7 +463,7 @@ iso-8859-1
OUTPUT
pir_output_is( <<'CODE', <<'OUTPUT', "bug #34661 literal" );
-.sub main @MAIN
+.sub main :main
$S0 = unicode:"\"]\nif I3 == "
print "ok 1\n"
.end
@@ -472,7 +472,7 @@ ok 1
OUTPUT
pir_output_is( <<'CODE', <<'OUTPUT', "todo #34660 hash" );
-.sub main @MAIN
+.sub main :main
$P0 = new Integer
$P0 = 42
store_global "Foo", unicode:"Bar", $P0
