#TUNING by cg
authorClaus Gittinger <cg@exept.de>
Fri, 22 Mar 2019 13:31:52 +0100
changeset 23950 308a94fcf0cd
parent 23949 320a57c5dad1
child 23951 1cbf730208f8
#TUNING by cg class: Character changed: #, isString -> isStringLike
Character.st
--- a/Character.st	Fri Mar 22 13:31:18 2019 +0100
+++ b/Character.st	Fri Mar 22 13:31:52 2019 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
@@ -699,7 +701,6 @@
 ! !
 
 
-
 !Character methodsFor:'accessing'!
 
 codePoint
@@ -860,8 +861,8 @@
 
     "
       (Character value:345) sameAs:(Character value:345)
-      $Ж sameAs:$ж 
-      $ж sameAs:$Ж 
+      $Ж sameAs:$ж 
+      $ж sameAs:$Ж 
     "
 
     "Modified (comment): / 28-03-2017 / 16:19:48 / stefan"
@@ -1559,7 +1560,7 @@
     ^ s contents
 
     "
-     'ä' utf8Encoded
+     'ä' utf8Encoded
      'a' utf8Encoded
     "
 
@@ -1569,7 +1570,7 @@
 withoutDiacritics
     <resource: #todo>
     "return a character with same letter as the receiver, but in without diacritics modifiers
-     (mapping e.g. Ä to A).
+     (mapping e.g. Ä to A).
      Returns the receiver if it has no diacritics modifiers."
 
     ^ self shouldImplement
@@ -1591,31 +1592,31 @@
     // fast code for common cases
     val = __intVal(__characterVal(self));
     if (val <= 0xFF) {
-	if (__isCharacter(aStringOrCharacter)) {
-	    unsigned INT val2 = __intVal(__characterVal(aStringOrCharacter));
-
-	    if (val2 <= 0xFF) {
-		char buffer[2];
-
-		buffer[0] = val;
-		buffer[1] = val2;
-		s = __MKSTRING_L(buffer, 2);
-		if (s != nil) {
-		    RETURN (s);
-		}
-	    }
-	} else {
-	    if (__isString(aStringOrCharacter)) {
-		int strSize = __stringSize(aStringOrCharacter);
-
-		s = __MKEMPTYSTRING(strSize+1);
-		if (s != nil) {
-		    __StringInstPtr(s)->s_element[0] = val;
-		    memcpy(__StringInstPtr(s)->s_element+1, __stringVal(aStringOrCharacter), strSize+1); // copies 0-byte too
-		    RETURN (s);
-		}
-	    }
-	}
+        if (__isCharacter(aStringOrCharacter)) {
+            unsigned INT val2 = __intVal(__characterVal(aStringOrCharacter));
+
+            if (val2 <= 0xFF) {
+                char buffer[2];
+
+                buffer[0] = val;
+                buffer[1] = val2;
+                s = __MKSTRING_L(buffer, 2);
+                if (s != nil) {
+                    RETURN (s);
+                }
+            }
+        } else {
+            if (__isStringLike(aStringOrCharacter)) {
+                int strSize = __stringSize(aStringOrCharacter);
+
+                s = __MKEMPTYSTRING(strSize+1);
+                if (s != nil) {
+                    __StringInstPtr(s)->s_element[0] = val;
+                    memcpy(__StringInstPtr(s)->s_element+1, __stringVal(aStringOrCharacter), strSize+1); // copies 0-byte too
+                    RETURN (s);
+                }
+            }
+        }
     }
 %}.
     ^ self asString , aStringOrCharacter
@@ -1629,6 +1630,8 @@
       Time millisecondsToRun:[ 10000000 timesRepeat:[ 'a' , 'b' ]]
       Time millisecondsToRun:[ 10000000 timesRepeat:[ 'a' , $b ]]
     "
+
+    "Modified: / 22-03-2019 / 03:00:09 / Claus Gittinger"
 !
 
 copy
@@ -2755,9 +2758,9 @@
 
     "
      $e asNonDiacritical
-     $é asNonDiacritical
-     $ä asNonDiacritical
-     $å asNonDiacritical
+     $é asNonDiacritical
+     $ä asNonDiacritical
+     $Ã¥ asNonDiacritical
     "
 !