[svn:parrot] r36150 - in trunk/runtime/parrot/library: . PGE

[co...@cvs.perl.org]

Author: coke
Date: Thu Jan 29 09:56:36 2009
New Revision: 36150

Modified:
trunk/runtime/parrot/library/JSON.pir
trunk/runtime/parrot/library/PGE/Hs.pir

Log:
avoid usage of DEPRECATED Data::Escape library.

Modified: trunk/runtime/parrot/library/JSON.pir
==============================================================================
--- trunk/runtime/parrot/library/JSON.pir (original)
+++ trunk/runtime/parrot/library/JSON.pir Thu Jan 29 09:56:36 2009
@@ -355,8 +355,6 @@
.return (result)
.end

-.include 'library/Data/Escape.pir'
-
=back

=head1 TODO

Modified: trunk/runtime/parrot/library/PGE/Hs.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Hs.pir (original)
+++ trunk/runtime/parrot/library/PGE/Hs.pir Thu Jan 29 09:56:36 2009
@@ -54,7 +54,6 @@

.sub "__onload" :load
.local pmc load
- load_bytecode "Data/Escape.pir"
$P0 = get_class ['PGE';'Match']
.end

@@ -162,10 +161,9 @@
.local int ari, arc
.local int tmpi, cond
.local string tmps, key
- .local pmc capt, iter, subelm, elm, escape
+ .local pmc capt, iter, subelm, elm

out = ""
- escape = get_hll_global ["Data::Escape"], "String"

start:
out .= "PGE_Match "
@@ -212,7 +210,7 @@
unless cond goto subrules_fail
elm = capt[key]
out .= '("'
- tmps = escape(key)
+ tmps = escape key
out .= tmps
out .= '", '
bsr dumper
@@ -235,7 +233,8 @@
out .= tmps
ret
dumper_string:
- tmps = escape(elm)
+ $S0 = elm
+ tmps = escape $S0
out .= 'PGE_String "'
out .= tmps
out .= '"'