changed: #findTokens:
authorClaus Gittinger <cg@exept.de>
Mon, 05 Sep 2011 04:29:43 +0200
changeset 13624 5670d4c4b06a
parent 13623 46625f58d8ee
child 13625 fffe5dbb451b
changed: #findTokens:
CharacterArray.st
--- a/CharacterArray.st	Sun Sep 04 11:15:48 2011 +0200
+++ b/CharacterArray.st	Mon Sep 05 04:29:43 2011 +0200
@@ -282,6 +282,7 @@
     "Created: 3.8.1997 / 18:16:40 / cg"
 ! !
 
+
 !CharacterArray class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -676,6 +677,7 @@
     ^ self == CharacterArray
 ! !
 
+
 !CharacterArray methodsFor:'Compatibility-ANSI'!
 
 addLineDelimiters
@@ -936,14 +938,22 @@
 "/    ^ self size + 1
 !
 
-findTokens:delimiters
+findTokens:delimiterOrDelimiters
     "cg: I am not sure, if this is really the squeak semantics (w.r.t. empty fields)"
 
-    ^ self asCollectionOfSubstringsSeparatedByAny:delimiters
+    delimiterOrDelimiters size == 0 ifTrue:[
+        ^ self asCollectionOfSubstringsSeparatedBy:delimiterOrDelimiters
+    ] ifFalse:[
+        ^ self asCollectionOfSubstringsSeparatedByAny:delimiterOrDelimiters
+    ].
 
     "
      'a|b#c||e' findTokens:#($# $|)
-    "
+     'a|b#c||e' findTokens:$|
+    "
+
+    "Modified: / 04-09-2011 / 20:31:21 / cg"
+    "Modified (comment): / 05-09-2011 / 04:25:28 / cg"
 !
 
 includesSubString:aString
@@ -1508,6 +1518,7 @@
 ! !
 
 
+
 !CharacterArray methodsFor:'character searching'!
 
 includesMatchCharacters
@@ -5872,11 +5883,11 @@
 !CharacterArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.458 2011-08-21 10:32:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.459 2011-09-05 02:29:43 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.458 2011-08-21 10:32:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.459 2011-09-05 02:29:43 cg Exp $'
 ! !
 
 CharacterArray initialize!