Skip to content

Introduce greaseBeginsWith: and greaseEndsWith: #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbrichau merged 8 commits into from
Mar 4, 2023
Merged

Introduce greaseBeginsWith: and greaseEndsWith: #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09c5d67
deprecate `beginsWithSubCollection:` and `endsWithSubCollection:` in …
Feb 5, 2023
5a570b8
Fix testNotPortableCollectionsRule
Feb 5, 2023
8ff1ded
add greaseBeginsWith: and greaseEndsWith: to Pharo 7 and 9 as well
Feb 5, 2023
7584246
add greaseBeginsWith: and greaseEndsWith: to Squeak
Feb 5, 2023
a17f250
code style
Feb 5, 2023
3688183
Fix slime rule in Pharo 7 and 9
Feb 5, 2023
e6ba7bd
adapt slime rule in Squeak as well
Feb 5, 2023
955fa54
added deprecation message in Pharo 9 and Squeak 6
Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ease-GemStone-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-gemstone-core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions ...Grease-GemStone-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-gemstone-core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...aro100-Core.package/SequenceableCollection.extension/instance/beginsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*Grease-Pharo100-Core
beginsWithSubCollection: aSequenceableCollection
"Some platforms implement #beginsWith: to answer true for an empty argument."
self
greaseDeprecatedApi: 'SequenceableCollection>>#beginsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseBegins:'.
aSequenceableCollection isEmpty ifTrue: [ ^ false ].
^ self beginsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...Pharo100-Core.package/SequenceableCollection.extension/instance/endsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*Grease-Pharo100-Core
endsWithSubCollection: aSequenceableCollection
"Some platforms implement #endsWith: to answer true for an empty argument."
self
greaseDeprecatedApi: 'SequenceableCollection>>#endsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseEndsWith:'.
aSequenceableCollection isEmpty ifTrue: [ ^ false ].
^ self endsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions ...ease-Pharo100-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo100-Core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions ...Grease-Pharo100-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo100-Core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
4 changes: 2 additions & 2 deletions ...ry/Grease-Pharo40-Slime.package/GRNotPortableCollectionsRule.class/instance/initialize.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ initialize
super initialize.
self rewriteRule
replace: '`@collection beginsWith: `@subCollection'
with: '`@collection beginsWithSubCollection: `@subCollection';
with: '`@collection greaseBeginsWith: `@subCollection';
replace: '`@collection endsWith: `@subCollection'
with: '`@collection endsWithSubCollection: `@subCollection'
with: '`@collection greaseEndsWith: `@subCollection'
5 changes: 5 additions & 0 deletions ...rease-Pharo70-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo70-Core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions .../Grease-Pharo70-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo70-Core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...haro90-Core.package/SequenceableCollection.extension/instance/beginsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*Grease-Pharo90-Core
beginsWithSubCollection: aSequenceableCollection

self
greaseDeprecatedApi: 'SequenceableCollection>>#beginsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseBeginsWith:'.
"Some platforms implement #beginsWith: to answer true for an empty argument."
^ self beginsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...-Pharo90-Core.package/SequenceableCollection.extension/instance/endsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*Grease-Pharo90-Core
endsWithSubCollection: aSequenceableCollection

self
greaseDeprecatedApi: 'SequenceableCollection>>#endsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseEndsWith:'.
"Some platforms implement #endsWith: to answer true for an empty argument."
^ self endsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions ...rease-Pharo90-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo90-Core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions .../Grease-Pharo90-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*Grease-Pharo90-Core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
4 changes: 2 additions & 2 deletions ...ry/Grease-Pharo90-Slime.package/GRNotPortableCollectionsRule.class/instance/initialize.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ initialize
super initialize.
self rewriteRule
replace: '`@collection beginsWith: `@subCollection'
with: '`@collection beginsWithSubCollection: `@subCollection';
with: '`@collection greaseBeginsWith: `@subCollection';
replace: '`@collection endsWith: `@subCollection'
with: '`@collection endsWithSubCollection: `@subCollection'
with: '`@collection greaseEndsWith: `@subCollection'
4 changes: 2 additions & 2 deletions repository/Grease-Slime.package/GRNotPortableCollectionsRule.class/instance/initialize.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ initialize
super initialize.
self rewriteRule
replace: '`@collection beginsWith: `@subCollection'
with: '`@collection beginsWithSubCollection: `@subCollection';
with: '`@collection greaseBeginsWith: `@subCollection';
replace: '`@collection endsWith: `@subCollection'
with: '`@collection endsWithSubCollection: `@subCollection'
with: '`@collection greaseEndsWith: `@subCollection'
5 changes: 5 additions & 0 deletions ...rease-Squeak5-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-squeak5-core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions .../Grease-Squeak5-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-squeak5-core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...queak6-Core.package/SequenceableCollection.extension/instance/beginsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*grease-squeak6-core
beginsWithSubCollection: aSequenceableCollection
self
greaseDeprecatedApi: 'SequenceableCollection>>#beginsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseBeginsWith:'.
"Some platforms implement #beginsWith: to answer true for an empty argument."
aSequenceableCollection isEmpty ifTrue: [ ^ false ].
^ self beginsWith: aSequenceableCollection
4 changes: 4 additions & 0 deletions ...-Squeak6-Core.package/SequenceableCollection.extension/instance/endsWithSubCollection..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*grease-squeak6-core
endsWithSubCollection: aSequenceableCollection
self
greaseDeprecatedApi: 'SequenceableCollection>>#endsWithSubCollection:'
details: 'Use SequenceableCollection>>#greaseEndsWith:'.
"Some platforms implement #endsWith: to answer true for an empty argument."
aSequenceableCollection isEmpty ifTrue: [ ^ false ].
^ self endsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions ...rease-Squeak6-Core.package/SequenceableCollection.extension/instance/greaseBeginsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-squeak6-core
greaseBeginsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self beginsWith: aSequenceableCollection
5 changes: 5 additions & 0 deletions .../Grease-Squeak6-Core.package/SequenceableCollection.extension/instance/greaseEndsWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*grease-squeak6-core
greaseEndsWith: aSequenceableCollection

aSequenceableCollection isEmpty ifTrue: [ ^ true ].
^ self endsWith: aSequenceableCollection
9 changes: 9 additions & 0 deletions ...-Core.package/GRAbstractSequenceableCollectionTest.class/instance/testGreaseBeginsWith.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tests
testGreaseBeginsWith
| collection |
collection := self arbitraryCollection.
self assert: (collection greaseBeginsWith: (collection copyWithout: collection last)).
self assert: (collection greaseBeginsWith: collection).
self deny: (collection greaseBeginsWith: (collection copyWith: collection first)).
self assert: (collection greaseBeginsWith: self emptyCollection).
self deny: (self emptyCollection greaseBeginsWith: collection)
9 changes: 9 additions & 0 deletions ...ts-Core.package/GRAbstractSequenceableCollectionTest.class/instance/testGreaseEndsWith.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tests
testGreaseEndsWith
| collection |
collection := self arbitraryCollection.
self assert: (collection greaseEndsWith: (collection copyWithout: collection first)).
self assert: (collection greaseEndsWith: collection).
self deny: (collection greaseEndsWith: (collection copyWith: collection first)).
self assert: (collection greaseEndsWith: self emptyCollection).
self deny: (self emptyCollection greaseEndsWith: collection)
4 changes: 2 additions & 2 deletions ...y/Grease-Tests-Slime.package/GRSlimeTest.class/instance/testNotPortableCollectionsRule.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ testNotPortableCollectionsRule
self
runTransformation: GRNotPortableCollectionsRule
changes: #(
'beginsWith1 ''abc'' beginsWithSubCollection: ''a'''
'endsWith1 ''abc'' endsWithSubCollection: ''a''')
'beginsWith1 ''abc'' greaseBeginsWith: ''a'''
'endsWith1 ''abc'' greaseEndsWith: ''a''')