From acfc726ba480fd083449172d5f19d3e61ff70c3c Mon Sep 17 00:00:00 2001 From: Philippe Marschall Date: Wed, 28 Aug 2019 10:14:56 +0200 Subject: [PATCH] 41 Remove #fixCallbackTemps Closes #41 --- .../instance/fixCallbackTemps.st | 3 --- .../monticello.meta/categories.st | 8 ++++---- .../instance/fixCallbackTemps.st | 3 --- .../instance/fixCallbackTemps.st | 4 ---- .../instance/fixCallbackTemps.st | 4 ---- .../instance/fixCallbackTemps.st | 4 ---- .../instance/fixCallbackTemps.st | 2 -- .../instance/fixCallbackTemps.st | 3 --- .../instance/fixCallbackTemps.st | 2 -- .../instance/fixCallbackTemps.st | 3 --- .../instance/fixCallbackTemps.st | 2 -- .../instance/fixCallbackTemps.st | 3 --- .../instance/fixCallbackTemps.st | 2 -- .../instance/fixCallbackTemps.st | 17 ----------------- .../instance/fixCallbackTemps.st | 3 --- .../instance/fixCallbackTemps.st | 2 -- .../instance/fixCallbackTemps.st | 3 --- .../instance/testFixCallbackTemps.st | 12 ------------ .../instance/testToDoClosures.st | 2 +- .../instance/testBlockValuableProtocol.st | 6 +++--- .../instance/testFixCallbackTemps.st | 9 --------- ...testMessageSendValueWithPossibleArguments.st | 4 +--- ...testMessageSendValueWithPossibleArguments.st | 4 +--- ...testMessageSendValueWithPossibleArguments.st | 4 +--- ...testMessageSendValueWithPossibleArguments.st | 4 +--- 25 files changed, 12 insertions(+), 101 deletions(-) delete mode 100644 repository/Grease-Core.package/GRDelayedSend.class/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-GemStone-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-GemStone240-Core.package/ExecutableBlock.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-GemStone300-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo30-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo30-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo60-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo60-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo70-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Pharo70-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Squeak5-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Squeak5-Core.package/BlockContext.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Squeak5-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Squeak6-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Squeak6-Core.package/MessageSend.extension/instance/fixCallbackTemps.st delete mode 100644 repository/Grease-Tests-Core.package/GRDelayedSendTest.class/instance/testFixCallbackTemps.st delete mode 100644 repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFixCallbackTemps.st diff --git a/repository/Grease-Core.package/GRDelayedSend.class/instance/fixCallbackTemps.st b/repository/Grease-Core.package/GRDelayedSend.class/instance/fixCallbackTemps.st deleted file mode 100644 index 22fda1a6..00000000 --- a/repository/Grease-Core.package/GRDelayedSend.class/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -fixCallbackTemps - "For polymorphism with BlockContext>>#fixCallbackTemps." \ No newline at end of file diff --git a/repository/Grease-Core.package/monticello.meta/categories.st b/repository/Grease-Core.package/monticello.meta/categories.st index ffa3065c..d33d6435 100644 --- a/repository/Grease-Core.package/monticello.meta/categories.st +++ b/repository/Grease-Core.package/monticello.meta/categories.st @@ -1,5 +1,5 @@ SystemOrganization addCategory: #'Grease-Core'! -SystemOrganization addCategory: 'Grease-Core-Collections'! -SystemOrganization addCategory: 'Grease-Core-Exceptions'! -SystemOrganization addCategory: 'Grease-Core-Text'! -SystemOrganization addCategory: 'Grease-Core-Utilities'! +SystemOrganization addCategory: #'Grease-Core-Collections'! +SystemOrganization addCategory: #'Grease-Core-Exceptions'! +SystemOrganization addCategory: #'Grease-Core-Text'! +SystemOrganization addCategory: #'Grease-Core-Utilities'! diff --git a/repository/Grease-GemStone-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-GemStone-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 338a23db..00000000 --- a/repository/Grease-GemStone-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*grease-gemstone-core -fixCallbackTemps - "For polymorphism with BlockContext>>#fixCallbackTemps." \ No newline at end of file diff --git a/repository/Grease-GemStone240-Core.package/ExecutableBlock.extension/instance/fixCallbackTemps.st b/repository/Grease-GemStone240-Core.package/ExecutableBlock.extension/instance/fixCallbackTemps.st deleted file mode 100644 index c058fbc4..00000000 --- a/repository/Grease-GemStone240-Core.package/ExecutableBlock.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,4 +0,0 @@ -*grease-gemStone240-core -fixCallbackTemps - "Fix the values of the temporary variables used in the block that are - ordinarily shared with the method in which the block is defined." \ No newline at end of file diff --git a/repository/Grease-GemStone300-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st b/repository/Grease-GemStone300-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 12355301..00000000 --- a/repository/Grease-GemStone300-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,4 +0,0 @@ -*grease-gemstone300-core -fixCallbackTemps - "Fix the values of the temporary variables used in the block that are - ordinarily shared with the method in which the block is defined." diff --git a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st b/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st deleted file mode 100644 index d46ed053..00000000 --- a/repository/Grease-GemStone330-Core.package/ExecBlock.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,4 +0,0 @@ -*grease-gemstone330-core -fixCallbackTemps - "Fix the values of the temporary variables used in the block that are - ordinarily shared with the method in which the block is defined." \ No newline at end of file diff --git a/repository/Grease-Pharo30-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo30-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st deleted file mode 100644 index a044e493..00000000 --- a/repository/Grease-Pharo30-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,2 +0,0 @@ -*Grease-Pharo30-Core -fixCallbackTemps \ No newline at end of file diff --git a/repository/Grease-Pharo30-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo30-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 2a299ce5..00000000 --- a/repository/Grease-Pharo30-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*Grease-Pharo30-Core -fixCallbackTemps - "for polymorphism with BlockContext >> #fixCallbackTemps" \ No newline at end of file diff --git a/repository/Grease-Pharo60-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo60-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 29e49456..00000000 --- a/repository/Grease-Pharo60-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,2 +0,0 @@ -*Grease-Pharo60-Core -fixCallbackTemps \ No newline at end of file diff --git a/repository/Grease-Pharo60-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo60-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 5c33248e..00000000 --- a/repository/Grease-Pharo60-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*Grease-Pharo60-Core -fixCallbackTemps - "for polymorphism with BlockContext >> #fixCallbackTemps" \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo70-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 2fcbf89e..00000000 --- a/repository/Grease-Pharo70-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,2 +0,0 @@ -*Grease-Pharo70-Core -fixCallbackTemps \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-Pharo70-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 2c0b14e8..00000000 --- a/repository/Grease-Pharo70-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*Grease-Pharo70-Core -fixCallbackTemps - "for polymorphism with BlockContext >> #fixCallbackTemps" \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st b/repository/Grease-Squeak5-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st deleted file mode 100644 index e22afa1b..00000000 --- a/repository/Grease-Squeak5-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,2 +0,0 @@ -*grease-squeak5-core -fixCallbackTemps \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/BlockContext.extension/instance/fixCallbackTemps.st b/repository/Grease-Squeak5-Core.package/BlockContext.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 113990d1..00000000 --- a/repository/Grease-Squeak5-Core.package/BlockContext.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,17 +0,0 @@ -*grease-squeak5-core -fixCallbackTemps - "Fix the values of the temporary variables used in the block that are - ordinarily shared with the method in which the block is defined. - - This is needed because Squeak is a crappy Smalltalk implementation - that does not have full blcck closures." - - | temps | - home := home copy. - home swapSender: nil. - home isMethodContext - ifFalse: [ ^ self ]. - temps := self tempVarRefs. - 1 to: home size do: [ :index | - (temps includes: index) - ifFalse: [ home tempAt: index put: nil ] ] \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-Squeak5-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 575f0180..00000000 --- a/repository/Grease-Squeak5-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*grease-squeak5-core -fixCallbackTemps - "for polymorphism with BlockContext >> #fixCallbackTemps" \ No newline at end of file diff --git a/repository/Grease-Squeak6-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st b/repository/Grease-Squeak6-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st deleted file mode 100644 index f4a0f6b1..00000000 --- a/repository/Grease-Squeak6-Core.package/BlockClosure.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,2 +0,0 @@ -*grease-squeak6-core -fixCallbackTemps \ No newline at end of file diff --git a/repository/Grease-Squeak6-Core.package/MessageSend.extension/instance/fixCallbackTemps.st b/repository/Grease-Squeak6-Core.package/MessageSend.extension/instance/fixCallbackTemps.st deleted file mode 100644 index 2903c4c3..00000000 --- a/repository/Grease-Squeak6-Core.package/MessageSend.extension/instance/fixCallbackTemps.st +++ /dev/null @@ -1,3 +0,0 @@ -*grease-squeak6-core -fixCallbackTemps - "for polymorphism with BlockContext >> #fixCallbackTemps" \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRDelayedSendTest.class/instance/testFixCallbackTemps.st b/repository/Grease-Tests-Core.package/GRDelayedSendTest.class/instance/testFixCallbackTemps.st deleted file mode 100644 index 876c2e8e..00000000 --- a/repository/Grease-Tests-Core.package/GRDelayedSendTest.class/instance/testFixCallbackTemps.st +++ /dev/null @@ -1,12 +0,0 @@ -tests-evaluating -testFixCallbackTemps - | send | - send := GRDelayedSend - receiver: 1 - selector: #+. - self assert: send fixCallbackTemps == send. - send := GRDelayedSend - receiver: 1 - selector: #+ - argument: 2. - self assert: send fixCallbackTemps == send \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRNumberTest.class/instance/testToDoClosures.st b/repository/Grease-Tests-Core.package/GRNumberTest.class/instance/testToDoClosures.st index 78af5425..0d989b13 100644 --- a/repository/Grease-Tests-Core.package/GRNumberTest.class/instance/testToDoClosures.st +++ b/repository/Grease-Tests-Core.package/GRNumberTest.class/instance/testToDoClosures.st @@ -7,5 +7,5 @@ testToDoClosures | collection | collection := OrderedCollection new. - 1 to: 5 do: [ :each | collection add: [ each ] fixCallbackTemps ]. + 1 to: 5 do: [ :each | collection add: [ each ] ]. self assert: (collection collect: [ :each | each value ]) asArray = #(1 2 3 4 5) \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testBlockValuableProtocol.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testBlockValuableProtocol.st index 4fc7e2c0..89d324a4 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testBlockValuableProtocol.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testBlockValuableProtocol.st @@ -4,11 +4,11 @@ testBlockValuableProtocol self assert: [ :x | x ] argumentCount = 1. self assert: [ :a :b | a + b ] argumentCount = 2. self - shouldnt: [ [ nil ] fixCallbackTemps ] + shouldnt: [ [ nil ] ] raise: Error. self - shouldnt: [ [ :x | x ] fixCallbackTemps ] + shouldnt: [ [ :x | x ] ] raise: Error. self - shouldnt: [ [ :a :b | a + b ] fixCallbackTemps ] + shouldnt: [ [ :a :b | a + b ] ] raise: Error \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFixCallbackTemps.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFixCallbackTemps.st deleted file mode 100644 index ae08b4f2..00000000 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFixCallbackTemps.st +++ /dev/null @@ -1,9 +0,0 @@ -tests -testFixCallbackTemps - "Make sure that #fixCallbackTemps is properly understood by block-contexts. Make sure that this is either a nop for Smalltalks with true block closures, or it properly fixes the context otherwise." - - | array blocks values | - array := #(1 2 3). - blocks := array collect: [ :each | [ each ] fixCallbackTemps ]. - values := blocks collect: [ :each | each value ]. - self assert: values = array \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st index d2d7a808..b1c2016e 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st @@ -24,12 +24,10 @@ testMessageSendValueWithPossibleArguments selector: #+. self assert: send argumentCount = 1. self assert: send arguments size = 0. - self assert: send fixCallbackTemps == send. send := MessageSend receiver: 1 selector: #+ argument: 2. self assert: send argumentCount isZero. - self assert: send arguments size = 1. - self assert: send fixCallbackTemps == send \ No newline at end of file + self assert: send arguments size = 1 \ No newline at end of file diff --git a/repository/Grease-Tests-Squeak-Core.package/GRSqueakPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st b/repository/Grease-Tests-Squeak-Core.package/GRSqueakPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st index d2d7a808..1f1bb911 100644 --- a/repository/Grease-Tests-Squeak-Core.package/GRSqueakPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st +++ b/repository/Grease-Tests-Squeak-Core.package/GRSqueakPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st @@ -24,12 +24,10 @@ testMessageSendValueWithPossibleArguments selector: #+. self assert: send argumentCount = 1. self assert: send arguments size = 0. - self assert: send fixCallbackTemps == send. send := MessageSend receiver: 1 selector: #+ argument: 2. self assert: send argumentCount isZero. - self assert: send arguments size = 1. - self assert: send fixCallbackTemps == send \ No newline at end of file + self assert: send arguments size = 1 diff --git a/repository/Grease-Tests-Squeak5-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st b/repository/Grease-Tests-Squeak5-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st index d2d7a808..1f1bb911 100644 --- a/repository/Grease-Tests-Squeak5-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st +++ b/repository/Grease-Tests-Squeak5-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st @@ -24,12 +24,10 @@ testMessageSendValueWithPossibleArguments selector: #+. self assert: send argumentCount = 1. self assert: send arguments size = 0. - self assert: send fixCallbackTemps == send. send := MessageSend receiver: 1 selector: #+ argument: 2. self assert: send argumentCount isZero. - self assert: send arguments size = 1. - self assert: send fixCallbackTemps == send \ No newline at end of file + self assert: send arguments size = 1 diff --git a/repository/Grease-Tests-Squeak6-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st b/repository/Grease-Tests-Squeak6-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st index d2d7a808..1f1bb911 100644 --- a/repository/Grease-Tests-Squeak6-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st +++ b/repository/Grease-Tests-Squeak6-Core.package/GRPharoPlatformTest.class/instance/testMessageSendValueWithPossibleArguments.st @@ -24,12 +24,10 @@ testMessageSendValueWithPossibleArguments selector: #+. self assert: send argumentCount = 1. self assert: send arguments size = 0. - self assert: send fixCallbackTemps == send. send := MessageSend receiver: 1 selector: #+ argument: 2. self assert: send argumentCount isZero. - self assert: send arguments size = 1. - self assert: send fixCallbackTemps == send \ No newline at end of file + self assert: send arguments size = 1