Author: particle
Date: Thu Mar 9 18:27:01 2006
New Revision: 11845
Modified:
trunk/t/pmc/hash.t
trunk/t/pmc/intlist.t
trunk/t/pmc/iterator.t
trunk/t/pmc/managedstruct.t
trunk/t/pmc/multiarray.t
trunk/t/pmc/objects.t
trunk/t/pmc/prop.t
trunk/t/pmc/resizablebooleanarray.t
trunk/t/pmc/resizablestringarray.t
trunk/t/pmc/sub.t
Log:
t: convert usage of Perl* PMCs to core PMCs where appropriate
Modified: trunk/t/pmc/hash.t
==============================================================================
--- trunk/t/pmc/hash.t (original)
+++ trunk/t/pmc/hash.t Thu Mar 9 18:27:01 2006
@@ -657,8 +657,8 @@
pasm_output_is(<<CODE, <<OUTPUT, "Setting & getting non-scalar PMCs");
new P0,.Hash
- new P1,.PerlArray
- new P2,.PerlArray
+ new P1,.ResizablePMCArray
+ new P2,.ResizablePMCArray
set P1[4],"string"
set P0["one"],P1
set P2,P0["one"]
@@ -674,7 +674,7 @@
new P0, .Hash
set S0, "a"
set P0[S0], S0
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
set P2, 2
set P0["b"], P2
@@ -742,7 +742,7 @@
pasm_output_is(<<'CODE', <<OUTPUT, "Compound keys");
new P0, .Hash
new P1, .Hash
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
set P1["b"], "ab"
set P0["a"], P1
set S0, P0["a";"b"]
@@ -1143,13 +1143,13 @@
.local pmc inner_hash
inner_hash = new Hash
.local pmc inner_array
- inner_array = new PerlArray
+ inner_array = new ResizablePMCArray
.local string elem_string
.local int elem_int
.local pmc elem_pmc
.local num elem_num
- # setting and retrieving strings in an inner PerlArray
+ # setting and retrieving strings in an inner ResizablePMCArray
inner_array[128] = 'inner_array:128'
outer_hash['inner_array'] = inner_array
elem_string = outer_hash['inner_array';128]
@@ -1171,7 +1171,7 @@
print elem_string
print "\n"
- # setting and retrieving integer in an inner PerlArray
+ # setting and retrieving integer in an inner ResizablePMCArray
inner_array[130] = 130
outer_hash['inner_array'] = inner_array
elem_int = outer_hash['inner_array';130]
@@ -1193,7 +1193,7 @@
print elem_int
print "\n"
- # setting and retrieving a PMC in an inner PerlArray
+ # setting and retrieving a PMC in an inner ResizablePMCArray
.local pmc in_pmc
in_pmc = new String
in_pmc = 'inner_array:132'
@@ -1221,7 +1221,7 @@
print elem_string
print "\n"
- # setting and retrieving a float in an inner PerlArray
+ # setting and retrieving a float in an inner ResizablePMCArray
inner_array[134] = 134.134
outer_hash['inner_array'] = inner_array
elem_num = outer_hash['inner_array';134]
Modified: trunk/t/pmc/intlist.t
==============================================================================
--- trunk/t/pmc/intlist.t (original)
+++ trunk/t/pmc/intlist.t Thu Mar 9 18:27:01 2006
@@ -180,7 +180,7 @@
mod I9, I0, 100
ne I9, 0, lp1
# force GC => 142 DOD + 142 collects / 10^5 accesses
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
set P1[I0], I0
concat S0, S1, S1
set S2, S0
@@ -220,8 +220,8 @@
mod I9, I0, 100
ne I9, 0, lp1
# force GC => 124 DOD + 124 collects / 10^5 accesses
- # need .PerlArray here - it auto extends - intlist doesnt
- new P1, .PerlArray
+ # need .ResizablePMCArray here - it auto extends - intlist doesnt
+ new P1, .ResizablePMCArray
set P1[I0], I0
concat S0, S1, S1
set S2, S0
Modified: trunk/t/pmc/iterator.t
==============================================================================
--- trunk/t/pmc/iterator.t (original)
+++ trunk/t/pmc/iterator.t Thu Mar 9 18:27:01 2006
@@ -107,10 +107,10 @@
ok 12
OUTPUT
-pasm_output_is(<<'CODE', <<'OUTPUT', "PerlHash iter 1");
+pasm_output_is(<<'CODE', <<'OUTPUT', "Hash iter 1");
.include "iterator.pasm"
- new P0, .PerlHash # empty Hash
- new P2, .PerlHash # Hash with 2 elements
+ new P0, .Hash # empty Hash
+ new P2, .Hash # Hash with 2 elements
set P2["ab"], 100
set P2["xy"], "value"
set I0, P2
Modified: trunk/t/pmc/managedstruct.t
==============================================================================
--- trunk/t/pmc/managedstruct.t (original)
+++ trunk/t/pmc/managedstruct.t Thu Mar 9 18:27:01 2006
@@ -48,7 +48,7 @@
pasm_output_is(<<'CODE', <<'OUTPUT', "element access - float, double");
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
.include "datatypes.pasm"
push P2, .DATATYPE_FLOAT
push P2, 2 # 2 elem array
@@ -84,7 +84,7 @@
OUTPUT
pasm_output_like(<<'CODE', <<'OUTPUT', "element access - char, short");
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
.include "datatypes.pasm"
push P2, .DATATYPE_CHAR
push P2, 2 # 2 elem char array
@@ -103,7 +103,7 @@
print I0
print " "
# now acces that as a short
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
push P2, .DATATYPE_SHORT
push P2, 1
push P2, 0
@@ -181,7 +181,7 @@
pasm_output_is(<<'CODE', <<'OUTPUT', "nested struct offsets");
# the nested structure
.include "datatypes.pasm"
- new P3, .PerlArray
+ new P3, .ResizablePMCArray
push P3, .DATATYPE_INT
push P3, 0
push P3, 0
@@ -190,7 +190,7 @@
push P3, 0
new P4, .UnManagedStruct, P3
# outer structure
- new P2, .PerlArray
+ new P2, .ResizablePMCArray
push P2, .DATATYPE_INT
push P2, 0
push P2, 0
Modified: trunk/t/pmc/multiarray.t
==============================================================================
--- trunk/t/pmc/multiarray.t (original)
+++ trunk/t/pmc/multiarray.t Thu Mar 9 18:27:01 2006
@@ -24,7 +24,7 @@
=cut
pasm_output_is(<<'CODE', <<'OUTPUT', "multiarray creation");
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
# intial size
set P1[0], 0
set P1[1], 50
@@ -45,7 +45,7 @@
OUTPUT
pasm_output_is(<<'CODE', <<'OUTPUT', "multiarray access 2d");
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
# intial size
set P1[0], 0
set P1[1], 100
@@ -102,7 +102,7 @@
OUTPUT
pasm_output_is(<<'CODE', <<'OUTPUT', "multiarray access 3d");
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
# initial size
set P1[0], 0
set P1[1], 200
Modified: trunk/t/pmc/objects.t
==============================================================================
--- trunk/t/pmc/objects.t (original)
+++ trunk/t/pmc/objects.t Thu Mar 9 18:27:01 2006
@@ -1926,7 +1926,7 @@
a = getattribute o, "a"
print a
h = new .Hash
- $P0 = new .PerlString
+ $P0 = new .String
$P0 = "ok 2\n"
h['a'] = $P0
$I0 = find_type 'Foo'
@@ -1944,7 +1944,7 @@
.return ()
set_default:
- $P0 = new .PerlString
+ $P0 = new .String
$P0 = "ok 1\n"
setattribute self, 'a', $P0
.end
Modified: trunk/t/pmc/prop.t
==============================================================================
--- trunk/t/pmc/prop.t (original)
+++ trunk/t/pmc/prop.t Thu Mar 9 18:27:01 2006
@@ -75,7 +75,7 @@
OUTPUT
pasm_output_is(<<'CODE', <<'OUTPUT', "resetting a property");
- new P0, .PerlArray
+ new P0, .ResizablePMCArray
new P1, .String
new P2, .String
new P3, .String
Modified: trunk/t/pmc/resizablebooleanarray.t
==============================================================================
--- trunk/t/pmc/resizablebooleanarray.t (original)
+++ trunk/t/pmc/resizablebooleanarray.t Thu Mar 9 18:27:01 2006
@@ -629,7 +629,7 @@
mod I9, I0, 100
ne I9, 0, lp1
# force GC => 142 DOD + 142 collects / 10^5 accesses
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
set P1[I0], I0
concat S0, S1, S1
set S2, S0
Modified: trunk/t/pmc/resizablestringarray.t
==============================================================================
--- trunk/t/pmc/resizablestringarray.t (original)
+++ trunk/t/pmc/resizablestringarray.t Thu Mar 9 18:27:01 2006
@@ -733,7 +733,7 @@
mod I9, I0, 100
ne I9, 0, lp1
# force GC => 142 DOD + 142 collects / 10^5 accesses
- new P1, .PerlArray
+ new P1, .ResizablePMCArray
set P1[I0], I0
concat S0, S1, S1
set S2, S0
Modified: trunk/t/pmc/sub.t
==============================================================================
--- trunk/t/pmc/sub.t (original)
+++ trunk/t/pmc/sub.t Thu Mar 9 18:27:01 2006
@@ -355,7 +355,7 @@
end
.pcc_sub :outer(main) f2:
- new P1, .PerlUndef
+ new P1, .Undef
end
CODE
ok 1
@@ -382,7 +382,7 @@
end
.pcc_sub f2:
- new P1, .PerlUndef
+ new P1, .Undef
end
CODE
ok 1
@@ -724,7 +724,7 @@
_f1()
.end
.sub _f1
- $P0 = new PerlUndef
+ $P0 = new .Undef
print $P0
.end
CODE
@@ -735,7 +735,7 @@
.sub _main :main
.include "warnings.pasm"
_f1()
- $P0 = new PerlUndef
+ $P0 = new .Undef
print $P0
print "ok\n"
.end
@@ -750,7 +750,7 @@
.sub _main :main
.include "warnings.pasm"
_f1()
- $P0 = new PerlUndef
+ $P0 = new .Undef
print "back\n"
print $P0
print "ok\n"
@@ -758,7 +758,7 @@
.sub _f1
warningson .PARROT_WARNINGS_UNDEF_FLAG
_f2()
- $P0 = new PerlUndef
+ $P0 = new .Undef
print $P0
.end
.sub _f2
