[svn:parrot] r48175 - in branches/gsoc_nfg: include/parrot src/string

darbelo at svn.parrot.org darbelo at svn.parrot.org
Sun Jul 25 23:43:47 UTC 2010


Author: darbelo
Date: Sun Jul 25 23:43:46 2010
New Revision: 48175
URL: https://trac.parrot.org/parrot/changeset/48175

Log:
Delete misleading CHARSET_ macros that forwarded to the string's encoding.

Modified:
   branches/gsoc_nfg/include/parrot/charset.h
   branches/gsoc_nfg/src/string/api.c
   branches/gsoc_nfg/src/string/primitives.c

Modified: branches/gsoc_nfg/include/parrot/charset.h
==============================================================================
--- branches/gsoc_nfg/include/parrot/charset.h	Sun Jul 25 23:43:32 2010	(r48174)
+++ branches/gsoc_nfg/include/parrot/charset.h	Sun Jul 25 23:43:46 2010	(r48175)
@@ -254,15 +254,6 @@
 #define CHARSET_COMPUTE_HASH(interp, source, seed) ((source)->charset)->compute_hash((interp), (source), (seed))
 #define CHARSET_GET_PREFERRED_ENCODING(interp, source) ((source)->charset)->preferred_encoding
 
-#define CHARSET_TO_ENCODING(interp, source) ((source)->encoding)->to_encoding((interp), (source))
-#define CHARSET_COPY_TO_ENCODING(interp, source) ((source)->encoding)->copy_to_encoding((interp), (source))
-#define CHARSET_GET_CODEPOINT(interp, source, offset) ((source)->encoding)->get_codepoint((interp), (source), (offset))
-#define CHARSET_GET_BYTE(interp, source, offset) ((source)->encoding)->get_byte((interp), (source), (offset))
-#define CHARSET_SET_BYTE(interp, source, offset, value) ((source)->encoding)->set_byte((interp), (source), (offset), (value))
-#define CHARSET_CODEPOINTS(interp, source) ((source)->encoding)->codepoints((interp), (source))
-#define CHARSET_BYTES(interp, source) ((source)->encoding)->bytes((interp), (source))
-
-
 #endif /* PARROT_CHARSET_H_GUARD */
 
 /*

Modified: branches/gsoc_nfg/src/string/api.c
==============================================================================
--- branches/gsoc_nfg/src/string/api.c	Sun Jul 25 23:43:32 2010	(r48174)
+++ branches/gsoc_nfg/src/string/api.c	Sun Jul 25 23:43:46 2010	(r48175)
@@ -794,7 +794,7 @@
         if (encoding == Parrot_fixed_8_encoding_ptr)
             s->strlen = len;
         else
-            s->strlen = CHARSET_CODEPOINTS(interp, s);
+            s->strlen = ENCODING_CODEPOINTS(interp, s);
 
         return s;
     }
@@ -807,7 +807,7 @@
         if (encoding == Parrot_fixed_8_encoding_ptr)
             s->strlen = len;
         else
-            s->strlen = CHARSET_CODEPOINTS(interp, s);
+            s->strlen = ENCODING_CODEPOINTS(interp, s);
     }
     else
         s->strlen = s->bufused = 0;
@@ -865,7 +865,7 @@
 {
     ASSERT_ARGS(Parrot_str_indexed)
     ASSERT_STRING_SANITY(s);
-    return (INTVAL)CHARSET_GET_CODEPOINT(interp, s, idx);
+    return (INTVAL)ENCODING_GET_CODEPOINT(interp, s, idx);
 }
 
 
@@ -1272,7 +1272,7 @@
             (char *)src->strstart + end_byte,
             src->bufused - end_byte);
 
-    dest->strlen  = CHARSET_CODEPOINTS(interp, dest);
+    dest->strlen  = ENCODING_CODEPOINTS(interp, dest);
     dest->hashval = 0;
 
     return dest;
@@ -2836,7 +2836,7 @@
 
     /* Force validating the string */
     if (encoding != result->encoding)
-        result->strlen = CHARSET_CODEPOINTS(interp, result);
+        result->strlen = ENCODING_CODEPOINTS(interp, result);
 
     if (!CHARSET_VALIDATE(interp, result))
         Parrot_ex_throw_from_c_args(interp, NULL,
@@ -3300,7 +3300,7 @@
     }
 
     res->bufused  = pos - res->strstart;
-    res->strlen = CHARSET_CODEPOINTS(interp, res);
+    res->strlen = ENCODING_CODEPOINTS(interp, res);
 
     Parrot_gc_free_fixed_size_storage(interp, ar_len * sizeof (STRING *),
         chunks);

Modified: branches/gsoc_nfg/src/string/primitives.c
==============================================================================
--- branches/gsoc_nfg/src/string/primitives.c	Sun Jul 25 23:43:32 2010	(r48174)
+++ branches/gsoc_nfg/src/string/primitives.c	Sun Jul 25 23:43:46 2010	(r48175)
@@ -91,12 +91,12 @@
     const UINTVAL len = Parrot_str_byte_length(interp, string);
 
     /* Well, not right now */
-    UINTVAL codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+    UINTVAL codepoint = ENCODING_GET_BYTE(interp, string, *offset);
     ++*offset;
 
     switch (codepoint) {
       case 'x':
-        codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+        codepoint = ENCODING_GET_BYTE(interp, string, *offset);
         if (codepoint >= '0' && codepoint <= '9') {
             workchar = codepoint - '0';
         }
@@ -111,7 +111,7 @@
             ++*offset;
             workchar = 0;
             for (i = 0; i < 8 && *offset < len; ++i, ++*offset) {
-                codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+                codepoint = ENCODING_GET_BYTE(interp, string, *offset);
                 if (codepoint == '}') {
                     ++*offset;
                     return workchar;
@@ -145,7 +145,7 @@
         ++*offset;
         if (*offset < len) {
             workchar *= 16;
-            codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+            codepoint = ENCODING_GET_BYTE(interp, string, *offset);
             if (codepoint >= '0' && codepoint <= '9') {
                 workchar += codepoint - '0';
             }
@@ -165,7 +165,7 @@
         ++*offset;
         return workchar;
       case 'c':
-        codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+        codepoint = ENCODING_GET_BYTE(interp, string, *offset);
         if (codepoint >= 'A' && codepoint <= 'Z') {
             workchar = codepoint - 'A' + 1;
         }
@@ -181,7 +181,7 @@
         for (charcount = 0; charcount < 4; charcount++) {
             if (*offset < len) {
                 workchar *= 16;
-                codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+                codepoint = ENCODING_GET_BYTE(interp, string, *offset);
                 if (codepoint >= '0' && codepoint <= '9') {
                     workchar += codepoint - '0';
                 }
@@ -211,7 +211,7 @@
         for (charcount = 0; charcount < 8; charcount++) {
             if (*offset < len) {
                 workchar *= 16;
-                codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+                codepoint = ENCODING_GET_BYTE(interp, string, *offset);
                 if (codepoint >= '0' && codepoint <= '9') {
                     workchar += codepoint - '0';
                 }
@@ -247,7 +247,7 @@
         workchar = codepoint - '0';
         if (*offset < len) {
             workchar *= 8;
-            codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+            codepoint = ENCODING_GET_BYTE(interp, string, *offset);
             if (codepoint >= '0' && codepoint <= '7') {
                 workchar += codepoint - '0';
             }
@@ -261,7 +261,7 @@
         ++*offset;
         if (*offset < len) {
             workchar *= 8;
-            codepoint = CHARSET_GET_BYTE(interp, string, *offset);
+            codepoint = ENCODING_GET_BYTE(interp, string, *offset);
             if (codepoint >= '0' && codepoint <= '7') {
                 workchar += codepoint - '0';
             }


More information about the parrot-commits mailing list