diff --git a/Collections/Collections.tex b/Collections/Collections.tex index 02e71a80..c25ea928 100644 --- a/Collections/Collections.tex +++ b/Collections/Collections.tex @@ -377,17 +377,17 @@ \section{Examples of key classes} Array withAll: #(7 3 1 3) --> #(7 3 1 3) OrderedCollection withAll: #(7 3 1 3) --> an OrderedCollection(7 3 1 3) SortedCollection withAll: #(7 3 1 3) --> a SortedCollection(1 3 3 7) -Set withAll: #(7 3 1 3) --> a Set(7 1 3) -Bag withAll: #(7 3 1 3) --> a Bag(7 1 3 3) +Set withAll: #(7 3 1 3) --> !\SqVersionSwitch{6.1}{a Set(1 3 7)}{a Set(7 1 3)}! +Bag withAll: #(7 3 1 3) --> !\SqVersionSwitch{6.1}{a Bag(1->1 3->2 7->1)}{a Bag(7 1 3 3)}! \end{code} \begin{code}{@TEST} Array newFrom: #(7 3 1 3) --> #(7 3 1 3) OrderedCollection newFrom: #(7 3 1 3) --> an OrderedCollection(7 3 1 3) SortedCollection newFrom: #(7 3 1 3) --> a SortedCollection(1 3 3 7) -Set newFrom: #(7 3 1 3) --> a Set(7 1 3) -Bag newFrom: #(7 3 1 3) --> a Bag(7 1 3 3) -Dictionary newFrom: {1 -> 7 . 2 -> 3 . 3 -> 1 . 4 -> 3} --> a Dictionary(1->7 2->3 3->1 4->3 ) +Set newFrom: #(7 3 1 3) --> !\SqVersionSwitch{6.1}{a Set(1 3 7)}{a Set(7 1 3)}! +Bag newFrom: #(7 3 1 3) --> !\SqVersionSwitch{6.1}{a Bag(1->1 3->2 7->1)}{a Bag(7 1 3 3)}! +Dictionary newFrom: {1 -> 7 . 2 -> 3 . 3 -> 1 . 4 -> 3} --> !\SqVersionSwitch{6.1}{a Dictionary(1->7 2->3 3->1 4->3)}{a Dictionary(1->7 2->3 3->1 4->3 )}! \end{code} \noindent Note that these two methods are not identical. diff --git a/Environment/Environment.tex b/Environment/Environment.tex index f16f117e..dc84575f 100644 --- a/Environment/Environment.tex +++ b/Environment/Environment.tex @@ -1119,6 +1119,7 @@ \subsection{From the debugger to tests and back again} StringTest >> #testSuffixFound. StringTest >> #testSuffixNotFound. StringTest >> #testShout. + StringTest compiledMethodAt: #testFindLiteralBooleanOrNil ifAbsent: []. StringTest >> #testPercentEncodingJa. } after: block]. String compile: 'suffix @@ -1135,6 +1136,7 @@ \subsection{From the debugger to tests and back again} . StringTest compile: 'testShout'. "To prevent a failure from this test" StringTest removeSelector: #testSuffixNotFound. + StringTest removeSelector: #testFindLiteralBooleanOrNil. StringTest removeSelector: #testPercentEncodingJa. "very slow" testRunner := TestRunner newForSuite: StringTest suite. testRunner runAll. diff --git a/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/instance/restoreMethods.after..st b/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/instance/restoreMethods.after..st index 68bc58b2..be4fd3ad 100644 --- a/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/instance/restoreMethods.after..st +++ b/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/instance/restoreMethods.after..st @@ -2,7 +2,7 @@ utils restoreMethods: compiledMethods after: aBlock | changeRecords | - changeRecords := compiledMethods + changeRecords := (compiledMethods copyWithout: nil) collect: [:method | method -> (method methodClass changeRecordsAt: method selector) first] as: Dictionary. ^ aBlock ensure: [ diff --git a/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/methodProperties.json b/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/methodProperties.json index 7fd1da82..a799bed0 100644 --- a/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/methodProperties.json +++ b/SmalltalkSources/SBE-Extract.package/SBEWorldHelper.class/methodProperties.json @@ -76,7 +76,7 @@ "prepareForScreenshotOfAll:" : "ct 1/17/2020 15:30", "recordScene:during:" : "ct 12/4/2019 10:20", "resourceDirectory" : "ct 11/18/2019 13:54", - "restoreMethods:after:" : "ct 10/22/2019 15:38", + "restoreMethods:after:" : "ct 12/16/2023 20:53", "runModal:" : "ct 10/18/2019 23:22", "runModal:then:" : "ct 10/15/2020 14:08", "scaleWindow:" : "ct 12/6/2019 12:56",