Author: pmichaud
Date: Thu Mar 16 10:58:55 2006
New Revision: 11912
Modified:
trunk/compilers/pge/PGE/Exp.pir
trunk/compilers/pge/PGE/Match.pir
trunk/compilers/pge/PGE/Rule.pir
trunk/t/compilers/pge/p5regexp/p5rx.t
Log:
* Eliminated use of getprop/delprop
* Converted Perl* objects to parrot objects
Modified: trunk/compilers/pge/PGE/Exp.pir
==============================================================================
--- trunk/compilers/pge/PGE/Exp.pir (original)
+++ trunk/compilers/pge/PGE/Exp.pir Thu Mar 16 10:58:55 2006
@@ -378,7 +378,7 @@
emit(code, " lastpos = length target")
emit(code, " ustack = new .ResizablePMCArray")
emit(code, " gpad = new .ResizablePMCArray")
- emit(code, " rcache = new .PerlHash")
+ emit(code, " rcache = new .Hash")
emit(code, " captscope = mob")
emit(code, " pos = mfrom")
emit(code, " if pos >= 0 goto try_at_pos")
Modified: trunk/compilers/pge/PGE/Match.pir
==============================================================================
--- trunk/compilers/pge/PGE/Match.pir (original)
+++ trunk/compilers/pge/PGE/Match.pir Thu Mar 16 10:58:55 2006
@@ -12,7 +12,7 @@
.sub "__onload" :load
.local pmc base
- $P0 = getclass "PerlHash"
+ $P0 = getclass "Hash"
base = subclass $P0, "PGE::Match"
addattribute base, "$:target" # target
addattribute base, "$:from" # start of match
@@ -51,7 +51,7 @@
if $I0 goto newfrom_mob
target = new .String
assign target, mob
- from = new .PerlInt
+ from = new .Integer
from = -1
if has_grammar goto new_me
grammar = "PGE::Rule"
@@ -68,7 +68,7 @@
me = new $I0
setattribute me, "PGE::Match\x0$:target", target
setattribute me, "PGE::Match\x0$:from", from
- pos = new .PerlInt
+ pos = new .Integer
pos = -1
setattribute me, "PGE::Match\x0$:pos", pos
if has_fromd == 0 goto end
@@ -233,7 +233,7 @@
.local pmc capt
capt = getattribute self, "PGE::Match\x0@:capt"
unless_null capt, set_1
- capt = new .PerlArray
+ capt = new .ResizablePMCArray
setattribute self, "PGE::Match\x0@:capt", capt
set_1:
capt[key] = val
Modified: trunk/compilers/pge/PGE/Rule.pir
==============================================================================
--- trunk/compilers/pge/PGE/Rule.pir (original)
+++ trunk/compilers/pge/PGE/Rule.pir Thu Mar 16 10:58:55 2006
@@ -388,11 +388,6 @@
.local string nextchars
.const .Sub corou = "ws_corou"
nextchars = ""
- $P0 = interpinfo .INTERPINFO_CURRENT_SUB
- $P1 = getprop "nextchars", $P0
- if_null $P1, ws_1
- delprop $P0, "nextchars"
- nextchars = $P1
ws_1:
$P0 = find_global "PGE::Match", "newfrom"
(mob, target, mfrom, mpos) = $P0(mob)
Modified: trunk/t/compilers/pge/p5regexp/p5rx.t
==============================================================================
--- trunk/t/compilers/pge/p5regexp/p5rx.t (original)
+++ trunk/t/compilers/pge/p5regexp/p5rx.t Thu Mar 16 10:58:55 2006
@@ -95,7 +95,7 @@
## todo these failing tests to prevent noise
my @todo_tests = qw/
81 82 88 99 100 130 131 132 133 134 139 140 141 142 156 157
- 160 161 162 163 164 171 172 184 185 232 233 234 241 243 244
+ 160 161 162 163 164 171 172 184 185 223 232 233 234 241 243 244
246 247 253 254 256 257 260 261 396 397 398 407 419 422 428
429 432 435 439 440 441 442 443 444 445 446 447 448 449 452
453 454 455 481 482 485 491 493 495 498 500 501 503 504 505
