Character.st
changeset 16108 9147e2468e80
parent 16074 c45e7c47def3
child 16225 65bdbadae4f5
--- a/Character.st	Fri Feb 21 12:00:19 2014 +0100
+++ b/Character.st	Fri Feb 21 12:55:51 2014 +0100
@@ -305,6 +305,7 @@
     ^ self codePoint:anInteger
 ! !
 
+
 !Character class methodsFor:'accessing untypeable characters'!
 
 controlCharacter:char
@@ -351,6 +352,7 @@
     ^ self codePoint:41
 ! !
 
+
 !Character class methodsFor:'constants'!
 
 backspace
@@ -581,6 +583,7 @@
     "
 ! !
 
+
 !Character methodsFor:'Compatibility-Dolphin'!
 
 isAlphaNumeric
@@ -1425,31 +1428,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 sz = __stringSize(aStringOrCharacter);
-
-		s = __MKEMPTYSTRING(sz);
-		if (s != nil) {
-		    __StringInstPtr(s)->s_element[0] = val;
-		    memcpy(__StringInstPtr(s)->s_element+1, __stringVal(aStringOrCharacter), sz+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 (__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);
+                }
+            }
+        }
     }
 %}.
     ^ self asString , aStringOrCharacter
@@ -2881,9 +2884,10 @@
 !Character class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.150 2014-02-19 14:12:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.151 2014-02-21 11:55:51 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.150 2014-02-19 14:12:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Character.st,v 1.151 2014-02-21 11:55:51 cg Exp $'
 ! !
+