[svn:parrot] r36266 - in trunk: runtime/parrot/library/Stream t/library

[coke at svn.parrot.org]

Author: coke
Date: Sun Feb  1 22:45:31 2009
New Revision: 36266
URL: https://trac.parrot.org/parrot/changeset/36266

Log:
Remove another usage of the DEPRECATED Data::Escape.

Minor update to test file to track new expected results of escaped "s

Modified:
   trunk/runtime/parrot/library/Stream/Base.pir
   trunk/t/library/streams.t

Modified: trunk/runtime/parrot/library/Stream/Base.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Base.pir	Sun Feb  1 22:35:33 2009	(r36265)
+++ trunk/runtime/parrot/library/Stream/Base.pir	Sun Feb  1 22:45:31 2009	(r36266)
@@ -27,7 +27,6 @@
 .sub onload :load :anon
     $P0 = get_class 'Stream::Base'
     unless null $P0 goto END
-    load_bytecode "library/Data/Escape.pir"
 
     newclass $P0, "Stream::Base"
     addattribute $P0, 'source'
@@ -89,16 +88,14 @@
 .sub dump :method
     .local string str
     .local int i
-    .local pmc escape
 
-    escape = get_hll_global ['Data::Escape'], 'String'
 LOOP:
     i = self."connected"()
     unless i goto END
     str = self."read"()
     if_null str, END
     print "read:["
-    str = escape( str )
+    str = escape str
     print str
     print "]\n"
     branch LOOP

Modified: trunk/t/library/streams.t
==============================================================================
--- trunk/t/library/streams.t	Sun Feb  1 22:35:33 2009	(r36265)
+++ trunk/t/library/streams.t	Sun Feb  1 22:45:31 2009	(r36266)
@@ -659,7 +659,7 @@
 read:[  264         Sarathy  5.6.1-TRIAL1  2000-Dec-18     The 5.6 maintenance track.]
 read:[  265                  5.6.1-TRIAL2  2001-Jan-31]
 read:[  266                  5.6.1-TRIAL3  2001-Mar-19]
-read:[  267                  5.6.1-foolish 2001-Apr-01     The "fools-gold" release.]
+read:[  267                  5.6.1-foolish 2001-Apr-01     The \"fools-gold\" release.]
 read:[  268                  5.6.1         2001-Apr-08]
 read:[  269         Rafael   5.6.2-RC1     2003-Nov-08]
 read:[  270                  5.6.2         2003-Nov-15     Fix new build issues]
@@ -1211,7 +1211,7 @@
 read:[intenance track.\n                 5.6.1-TRIAL2  20]
 read:[01-Jan-31\n                 5.6.1-TRIAL3  2001-Mar-]
 read:[19\n                 5.6.1-foolish 2001-Apr-01     ]
-read:[The "fools-gold" release.\n                 5.6.1  ]
+read:[The \"fools-gold\" release.\n                 5.6.1  ]
 read:[       2001-Apr-08\n        Rafael   5.6.2-RC1     ]
 read:[2003-Nov-08\n                 5.6.2         2003-No]
 read:[v-15     Fix new build issues\n        Jarkko   5.7]