[svn:parrot] r46243 - branches/codestring/src/pmc

[darbelo at svn.parrot.org]

Author: darbelo
Date: Mon May  3 17:53:28 2010
New Revision: 46243
URL: https://trac.parrot.org/parrot/changeset/46243

Log:
Undo codestring mis-merges darbelo--

Modified:
   branches/codestring/src/pmc/codestring.pmc

Modified: branches/codestring/src/pmc/codestring.pmc
==============================================================================
--- branches/codestring/src/pmc/codestring.pmc	Mon May  3 17:42:20 2010	(r46242)
+++ branches/codestring/src/pmc/codestring.pmc	Mon May  3 17:53:28 2010	(r46243)
@@ -232,6 +232,7 @@
 
 */
 
+
     VTABLE void set_string_native(STRING *value) {
         /* reuse our old stringBuilder */
         PMC *strings;
@@ -273,7 +274,7 @@
         jpos = Parrot_str_find_cclass(INTERP, enum_cclass_newline,
                                       str, 0, eos);
         while (jpos < eos) {
-            ++jpos;
+            jpos++;
             /* add the start of line position */
             VTABLE_push_integer(INTERP, linepos, jpos);
 
@@ -281,7 +282,7 @@
             if (jpos < eos
             && string_ord(INTERP, str, jpos - 1)     == 13
             && string_ord(INTERP, str, jpos)         == 10) {
-                ++jpos;
+                jpos++;
             }
             /* search for the next newline */
             jpos = Parrot_str_find_cclass(INTERP, enum_cclass_newline,
@@ -298,7 +299,7 @@
     count = VTABLE_elements(INTERP, linepos);
     while (line < count
           && VTABLE_get_integer_keyed_int(INTERP, linepos, line) <= pos)
-        ++line;
+        line++;
 
     RETURN(INTVAL line);
   }
@@ -323,7 +324,7 @@
     STRING * const counter_as_string = Parrot_str_from_int(INTERP, counter);
     UNUSED(SELF);
 
-    ++counter;
+    counter++;
 
     if (!has_fmt) {
         RETURN(STRING *counter_as_string);
@@ -425,7 +426,7 @@
     STRING *       prefix        = NULL;
     STRING *       out           = open_bracket;
 
-    for (index = 0; index < elements; ++index) {
+    for (index = 0; index < elements; index++) {
         PMC * const P0 = VTABLE_get_pmc_keyed_int(INTERP, args, index);
 
         if (!PMC_IS_NULL(P0)) {
@@ -433,7 +434,7 @@
                 const INTVAL elements2 = VTABLE_elements(INTERP, P0);
                 INTVAL index2;
 
-                for (index2 = 0; index2 < elements2; ++index2) {
+                for (index2 = 0; index2 < elements2; index2++) {
                     STRING *S0   = VTABLE_get_string_keyed_int(INTERP, P0, index2);
                     (STRING *S0) = PCCINVOKE(INTERP, SELF, "escape", STRING *S0);
                     if (prefix)