Changeset 468 for trunk/thune/series.c

Timestamp:

09/03/07 02:29:05 (15 months ago)

Author:

krobillard

Message:

Squashed commit of master.

Files:

• trunk/thune/series.c (modified) (3 diffs)

trunk/thune/series.c

@@ -3197 +3197 @@
 
 
-//#define REF_CASE_PART   a1+1
+void _lowercaseUcs16( uint16_t* it, uint16_t* end )
+{
+    int c;
+    while( it != end )
+    {
+        c = *it;
+        if( (c >= 'A') && (c <= 'Z') )
+            *it = c + 32;
+        else if( (c >= 0x00C0) && (c <= 0x00DE) && (c != 0x00D7) )
+            *it = c + 32;
+        else if( (c >= 0x0391) && (c <= 0x03AB) && (c != 0x03A2) )
+            *it = c + 32;
+        else if( (c >= 0x0410) && (c <= 0x042F) )
+            *it = c + 32;
+        else if( (c >= 0x0531) && (c <= 0x0556) )
+            *it = c + 48;
+        // TODO: Implement full lookup table.
+        ++it;
+    }
+}
+
+void _lowercaseAscii( char* it, char* end )
+{
+    int c;
+    while( it != end )
+    {
+        c = *it;
+        if( (c >= 'A') && (c <= 'Z') )
+            *it = c + ('a' - 'A');
+        ++it;
+    }
+}
+
 
 /*
@@ -3204 +3236 @@
 UR_CALL( uc_lowercase )
 {
+    int len;
+    int part;
+    char* cp;
+    char* end;
+    UString* str;
+
+#ifdef LANG_THUNE
+    if( ur_is(tos, UT_INT) )
+    {
+        UR_S_DROP;
+        part = ur_int(tos);
+        tos = ur_s_prev(tos);
+    }
+    else
+#endif
+    {
+        part = -1;
+    }
+
+    str = ur_stringSlice( ut, tos, &cp, &end );
+    if( str )
+    {
+        if( cp )
+        {
+            if( ur_encoding(tos) == UR_ENC_UTF16 )
+            {
+                uint16_t* cp16  = (uint16_t*) cp;
+                uint16_t* end16 = (uint16_t*) end;
+                if( part > -1 )
+                {
+                    len = end16 - cp16;
+                    if( part < len )
+                        end16 = cp16 + part;
+                }
+                _lowercaseUcs16( cp16, end16 );
+            }
+            else
+            {
+                if( part > -1 )
+                {
+                    len = end - cp;
+                    if( part < len )
+                        end = cp + part;
+                }
+                _lowercaseAscii( cp, end );
+            }
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "lowercase expected string!" );
+    }
+}
+
+
+void _uppercaseUcs16( uint16_t* it, uint16_t* end )
+{
     int c;
-    UString* str = ur_bin(tos);
-    char* cp  = str->ptr.c + tos->series.it;
-    char* end = str->ptr.c + str->used;
-
-    UR_CALL_UNUSED_TH
-#if 0
-    if( orRefineSet(REF_CASE_PART) )
-    {
-        char* pend;
-        UCell* a3 = tos + 2;
-        if( ur_ins(a3) < 0 )
-        {
-            ur_throwErr( 0, "/part less than zero." );
-            return;
-        }
-        pend = cp + ur_int(a3);
-        if( end > pend )
-            end = pend;
-    }
-#endif
-
-    while( cp != end )
-    {
-        c = *cp;
-        if( (c >= 'A') && (c <= 'Z') )
-            *cp = c + ('a' - 'A');
-        ++cp;
+    while( it != end )
+    {
+        c = *it;
+        if( (c >= 'a') && (c <= 'z') )
+            *it = c - 32;
+        else if( (c >= 0x00E0) && (c <= 0x00FE) && (c != 0x00F7) )
+            *it = c - 32;
+        else if( (c >= 0x03B1) && (c <= 0x03CB) && (c != 0x03C2) )
+            *it = c - 32;
+        else if( (c >= 0x0430) && (c <= 0x044F) )
+            *it = c - 32;
+        else if( (c >= 0x0561) && (c <= 0x0586) )
+            *it = c - 48;
+        // TODO: Implement full lookup table.
+        ++it;
+    }
+}
+
+void _uppercaseAscii( char* it, char* end )
+{
+    int c;
+    while( it != end )
+    {
+        c = *it;
+        if( (c >= 'a') && (c <= 'z') )
+            *it = c - ('a' - 'A');
+        ++it;
     }
 }
@@ -3238 +3327 @@
 /*
   (str -- str)
+  (str part -- str)
 */
 UR_CALL( uc_uppercase )
 {
-    int c;
-    UString* str = ur_bin(tos);
-    char* cp  = str->ptr.c + tos->series.it;
-    char* end = str->ptr.c + str->used;
-
-    UR_CALL_UNUSED_TH
-#if 0
-    if( orRefineSet(REF_CASE_PART) )
-    {
-        char* pend;
-        UCell* a3 = tos + 2;
-        if( ur_int(a3) < 0 )
-        {
-            ur_throwErr( 0, "/part less than zero." );
-            return;
-        }
-        pend = cp + ur_int(a3);
-        if( end > pend )
-            end = pend;
-    }
+    int len;
+    int part;
+    char* cp;
+    char* end;
+    UString* str;
+
+#ifdef LANG_THUNE
+    if( ur_is(tos, UT_INT) )
+    {
+        UR_S_DROP;
+        part = ur_int(tos);
+        tos = ur_s_prev(tos);
+    }
+    else
 #endif
-
-    while( cp != end )
-    {
-        c = *cp;
-        if( (c >= 'a') && (c <= 'z') )
-            *cp = c - ('a' - 'A');
-        ++cp;
+    {
+        part = -1;
+    }
+
+    str = ur_stringSlice( ut, tos, &cp, &end );
+    if( str )
+    {
+        if( cp )
+        {
+            if( ur_encoding(tos) == UR_ENC_UTF16 )
+            {
+                uint16_t* cp16  = (uint16_t*) cp;
+                uint16_t* end16 = (uint16_t*) end;
+                if( part > -1 )
+                {
+                    len = end16 - cp16;
+                    if( part < len )
+                        end16 = cp16 + part;
+                }
+                _uppercaseUcs16( cp16, end16 );
+            }
+            else
+            {
+                if( part > -1 )
+                {
+                    len = end - cp;
+                    if( part < len )
+                        end = cp + part;
+                }
+                _uppercaseAscii( cp, end );
+            }
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "uppercase expected string!" );
     }
 }