[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Help-smalltalk] [RFC] #noneSatisfy: vs. #noneSatisfies:
From: |
Paolo Bonzini |
Subject: |
[Help-smalltalk] [RFC] #noneSatisfy: vs. #noneSatisfies: |
Date: |
Thu, 20 Mar 2008 09:46:13 +0100 |
User-agent: |
Thunderbird 2.0.0.12 (Macintosh/20080213) |
I'd appreciate a word from native English speakers. Squeak has
#noneSatisfy: but the correct one from the grammar POV seems
#noneSatisfies: to me.
Paolo
2008-03-19 Paolo Bonzini <address@hidden>
* kernel/Collection.st: Rename #noneSatisfy: to #noneSatisfies:.
diff --git a/kernel/Collection.st b/kernel/Collection.st
index 056a6d3..4d0fd3f 100644
--- a/kernel/Collection.st
+++ b/kernel/Collection.st
@@ -399,7 +399,7 @@ of objects.'>
^true
]
- noneSatisfy: aBlock [
+ noneSatisfies: aBlock [
"Search the receiver for an element for which aBlock returns true.
Answer true if none does, false otherwise."
diff --git a/packages/seaside/PORTING b/packages/seaside/PORTING
index 92a6726..1220c8d 100644
--- a/packages/seaside/PORTING
+++ b/packages/seaside/PORTING
@@ -102,6 +102,8 @@ for i in *.st Seaside-Tests-Functional.st; do
(Time secondClock)' \
-r'(address@hidden beginsWith: address@hidden )->
(address@hidden startsWith: address@hidden)' \
+ -r'(address@hidden noneSatisfy: address@hidden )->
+ (address@hidden noneSatisfies: address@hidden)' \
-r'(address@hidden asUnicode)->
(address@hidden codePoint)' \
-r'(address@hidden trimBlanks)->
diff --git a/packages/seaside/core/Seaside-Core.st
b/packages/seaside/core/Seaside-Core.st
index 864a377..ff75db5 100644
--- a/packages/seaside/core/Seaside-Core.st
+++ b/packages/seaside/core/Seaside-Core.st
@@ -3,7 +3,7 @@ String extend [
asCapitalizedPhrase [
<category: '*Seaside-Core'>
| read words currentWord capitalizedWord |
- (self noneSatisfy: [:ea | ea isLowercase]) ifTrue: [^self].
+ (self noneSatisfies: [:ea | ea isLowercase]) ifTrue: [^self].
words := WriteStream on: String new.
read := ReadStream on: self.
[read atEnd] whileFalse:
@@ -9534,7 +9534,7 @@ sub
self main = 'text' ifTrue: [^false].
self main = 'application' ifFalse: [^true].
subTypes := self sub findTokens: '+'.
- ^subTypes noneSatisfy: [:each | #('x-javascript' 'xml') includes: each]
+ ^subTypes noneSatisfies: [:each | #('x-javascript' 'xml') includes:
each]
]
isNonStandard [
diff --git a/packages/seaside/core/Seaside-Tests.st
b/packages/seaside/core/Seaside-Tests.st
index b6e43ef..37df882 100644
--- a/packages/seaside/core/Seaside-Tests.st
+++ b/packages/seaside/core/Seaside-Tests.st
@@ -2402,8 +2402,8 @@ TestCase subclass: WAFileLibraryTest [
testNoneStatisfy [
<category: 'testing'>
- self deny: (#(1 2 3) noneSatisfy: [:each | each even]).
- self assert: (#(1 3 5) noneSatisfy: [:each | each even])
+ self deny: (#(1 2 3) noneSatisfies: [:each | each even]).
+ self assert: (#(1 3 5) noneSatisfies: [:each | each even])
]
testStandardFiles [
- [Help-smalltalk] [RFC] #noneSatisfy: vs. #noneSatisfies:,
Paolo Bonzini <=