String.st
branchjv
changeset 17972 bb9b8fd2fe2a
parent 17966 8b5df02e171f
child 17973 e0f785bb3fc7
--- a/String.st	Tue Sep 25 17:09:50 2012 +0100
+++ b/String.st	Thu Sep 27 20:33:09 2012 +0100
@@ -11,7 +11,7 @@
 "
 "{ Package: 'stx:libbasic' }"
 
-CharacterArray variableByteSubclass:#String
+CharacterArray subclass:#String
 	instanceVariableNames:''
 	classVariableNames:'CRLF CR LF TAB'
 	poolDictionaries:''
@@ -44,55 +44,6 @@
 %}
 ! !
 
-!String primitiveFunctions!
-%{
-
-static int
-nextOnKeyboard(char1, char2)
-{
-    /* compare two characters if they are next to each other on a (US-) keyboard */
-
-    static char *us_keys[] = { "1234567890-",
-			    "*qwertyuiop",
-			    "**asdfghjkl:",
-			    "***zxcvbnm",
-			    0 };
-    static char *de_keys[] = { "1234567890-",
-			    "*qwertzuiop",
-			    "**asdfghjkl:",
-			    "***yxcvbnm",
-			    0 };
-    char **keys = us_keys;
-    char **line1, **line2;
-    char *col1, *col2;
-    int diff;
-
-    for (line1 = keys; *line1 != 0; line1++) {
-	for (col1 = *line1; *col1 != 0 && *col1 != char1; col1++)
-	    continue;
-    }
-    if (*col1 == 0)
-	return(0);
-
-    for (line2 = keys; *line2 != 0; line2++) {
-	for (col2 = *line2; *col2 != 0 && *col2 != char2; col2++)
-	    continue;
-    }
-    if (*col2 == 0)
-	return(0);
-
-    diff = col1 - col2;
-    if (diff > 1 || diff < -1)
-	return(0);
-
-    diff = line1 - line2;
-    if (diff > 1 || diff < -1)
-	return(0);
-    return(1);
-}
-%}
-! !
-
 !String class methodsFor:'documentation'!
 
 copyright
@@ -493,8 +444,6 @@
     ^ TAB
 ! !
 
-
-
 !String class methodsFor:'queries'!
 
 defaultPlatformClass
@@ -514,16 +463,6 @@
     "Modified: 23.4.1996 / 16:00:38 / cg"
 ! !
 
-
-
-
-
-
-
-
-
-
-
 !String methodsFor:'Compatibility-VW5.4'!
 
 asGUID
@@ -717,7 +656,6 @@
     "
 ! !
 
-
 !String methodsFor:'character searching'!
 
 identityIndexOf:aCharacter
@@ -2651,7 +2589,6 @@
     ^ super simpleDeepCopy
 ! !
 
-
 !String methodsFor:'filling & replacing'!
 
 atAllPut:aCharacter
@@ -3072,7 +3009,7 @@
 
 %{  /* NOCONTEXT */
 
-    if (__isStringLike(self) == String) {
+    if (__isStringLike(self)) {
         if (@global(Stderr) == nil) {
             console_fprintf(stderr, "%s\n" , __stringVal(self));
             console_fflush(stderr);
@@ -3358,7 +3295,6 @@
     ^ String
 ! !
 
-
 !String methodsFor:'sorting & reordering'!
 
 reverse
@@ -3389,7 +3325,6 @@
     ^ super reverse
 ! !
 
-
 !String methodsFor:'substring searching'!
 
 indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
@@ -3870,13 +3805,13 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.290 2012/08/23 15:47:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.291 2012/09/14 13:31:18 stefan Exp $'
 !
 
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/String.st,v 1.290 2012/08/23 15:47:22 cg Exp '
+    ^ '§Header: /cvs/stx/stx/libbasic/String.st,v 1.291 2012/09/14 13:31:18 stefan Exp §'
 !
 
 version_SVN
-    ^ '$Id:: String.st 10844 2012-09-07 16:24:32Z vranyj1                                                                           $'
+    ^ '$Id:: String.st 10852 2012-09-27 19:33:09Z vranyj1                                                                           $'
 ! !