PCT: PAST.Compiler.escape in Winxed

parrot · Apr 26, 2012 · 0dd4cbb · 0dd4cbb
1 parent b23a097
commit 0dd4cbb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/compilers/pct/src/PAST/Compiler.pir b/compilers/pct/src/PAST/Compiler.pir
@@ -24,29 +24,6 @@ PAST::Compiler - PAST Compiler
 
 .namespace [ 'PAST';'Compiler' ]
 
-=item escape(str)
-
-Return C<str> as a PIR constant string.
-
-=cut
-
-.sub 'escape' :method
-    .param string str
-    .local string estr
-    estr = escape str
-    $I0 = index estr, "\\x"
-    if $I0 >= 0 goto unicode_prefix
-    $I0 = index estr, "\\u"
-    if $I0 >= 0 goto unicode_prefix
-    estr = concat '"', estr
-    goto done
-  unicode_prefix:
-    estr = concat 'unicode:"', estr
-  done:
-    estr = concat estr, '"'
-    .return (estr)
-.end
-
 =item unique([STR fmt])
 
 Generate a unique number that can be used as an identifier.

diff --git a/compilers/pct/src/PAST/Compiler.winxed b/compilers/pct/src/PAST/Compiler.winxed
@@ -211,6 +211,27 @@ Compile the abstract syntax tree given by C<past> into POST.
         var ret = self.as_post(past, 'v':[named('rtype')]);
         return ret;
     }
+
+/*
+=item escape(str)
+
+Return C<str> as a PIR constant string.
+
+=cut
+
+*/
+
+    function escape[method](string str) {
+        string estr = Winxed_Builtins.escape(str);
+        if (indexof(estr, "\\x") >= 0 || indexof(estr, "\\u") >= 0)
+            estr = 'unicode:"' + estr;
+        else
+            estr = '"' + estr;
+        estr += '"';
+        return estr;
+    }
+
+
 }
 
 /*