[svn:parrot] r47547 - branches/gsoc_nfg/src/string

darbelo at svn.parrot.org darbelo at svn.parrot.org
Thu Jun 10 22:48:23 UTC 2010


Author: darbelo
Date: Thu Jun 10 22:48:23 2010
New Revision: 47547
URL: https://trac.parrot.org/parrot/changeset/47547

Log:
Add misssing interps and casts.

Modified:
   branches/gsoc_nfg/src/string/api.c

Modified: branches/gsoc_nfg/src/string/api.c
==============================================================================
--- branches/gsoc_nfg/src/string/api.c	Thu Jun 10 21:15:43 2010	(r47546)
+++ branches/gsoc_nfg/src/string/api.c	Thu Jun 10 22:48:23 2010	(r47547)
@@ -26,6 +26,7 @@
 #include "parrot/parrot.h"
 #include "private_cstring.h"
 #include "api.str"
+#include "grapheme.h"
 
 /* for parrot/interpreter.h */
 #if PARROT_CATCH_NULL
@@ -365,7 +366,7 @@
 
 #if PARROT_HAS_ICU
     if (s->encoding == Parrot_nfg_encoding_ptr)
-        result->extra = clone_grapheme_table(s->extra);
+        result->extra = clone_grapheme_table(interp, s->extra);
 #endif /* PARROT_HAS_ICU */
 
     return result;
@@ -502,12 +503,12 @@
         if (a->extra != NULL) {
             dest->extra = clone_grapheme_table(interp, a->extra);
             if (b->extra != NULL) {
-                dest->extra = grow_grapheme_table(interp, a->extra, b->used);
+                dest->extra = grow_grapheme_table(interp, a->extra, ((grapheme_table *)b->extra)->used);
                 merge_tables_and_fixup_string(interp, dest, b->extra, a->strlen);
             }
         }
         else {
-            dest->extra = clone_grapheme_table(b->extra);
+            dest->extra = clone_grapheme_table(interp, b->extra);
         }
     }
 #endif /* PARROT_HAS_ICU */


More information about the parrot-commits mailing list