Squeak-dev January 2022

squeak-dev@lists.squeakfoundation.org

33 participants
362 discussions

The Trunk: SUnit-ct.138.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of SUnit to project The Trunk: http://source.squeak.org/trunk/SUnit-ct.138.mcz ==================== Summary ==================== Name: SUnit-ct.138 Author: ct Time: 31 January 2022, 8:38:14.044214 pm UUID: b34d72f7-2b2e-a642-9c1e-66cc7a361a00 Ancestors: SUnit-ct.136 Adds and tests #shouldRaiseError: as a convenience assertion that encapsulates the #exError abstraction. Adds an explaining comment on that abstraction (see TestResult exError and allErrors). Thanks to Marcel for the discussion! =============== Diff against SUnit-ct.136 =============== Item was added: + ----- Method: SUnitExtensionsTest>>shouldRaiseErrorTest (in category 'real tests') ----- + shouldRaiseErrorTest + + self shouldRaiseError: [ TestResult exError signal: 'any kind of error' ] + ! Item was added: + ----- Method: SUnitExtensionsTest>>testShouldRaiseError (in category 'tests') ----- + testShouldRaiseError + + | testCase testResult | + testCase := self class selector: #shouldRaiseErrorTest. + testResult := testCase run. + + self assert: (testResult passed includes: testCase). + self assert: 1 equals: testResult passed size. + self assert: testResult failures isEmpty. + self assert: testResult errors isEmpty.! Item was added: + ----- Method: TestCase>>shouldRaiseError: (in category 'asserting') ----- + shouldRaiseError: aBlock + + ^ self should: aBlock raise: TestResult exError + ! Item was changed: ----- Method: TestResult class>>allErrors (in category 'exceptions') ----- allErrors + "Answer an exception set for all common exceptions that can be raised when a typical error is detected in Squeak. This method decouples the testing framework from the exception handling system and allows clients to convert their tests to another Smalltalk dialect easily." ^ self exError, Warning, Halt ! Item was changed: ----- Method: TestResult class>>exError (in category 'exceptions') ----- exError + "Answer the exception class that represents a regular error in Squeak. This method decouples the testing framework from the exception handling system and allows clients to convert their tests to another Smalltalk dialect easily." ^Error !

1 0

The Trunk: Files-ct.189.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of Files to project The Trunk: http://source.squeak.org/trunk/Files-ct.189.mcz ==================== Summary ==================== Name: Files-ct.189 Author: ct Time: 31 January 2022, 8:03:16.983876 pm UUID: 6c263b96-030b-d044-934f-7e8c75af61f6 Ancestors: Files-mt.188 FileDirectory: Extracts idempotent #startUpDefaultDirectory from #startUp, which is not idempotent when the host system is Windows, where the source files must not be opened multiple times. Clients only interested in refreshing the default directory should send the new extracted message. See: http://lists.squeakfoundation.org/pipermail/squeak-dev/2022-January/218179.… =============== Diff against Files-mt.188 =============== Item was changed: + ----- Method: FileDirectory class>>startUp (in category 'system start up') ----- - ----- Method: FileDirectory class>>startUp (in category 'name utilities') ----- startUp - "Establish the platform-specific FileDirectory subclass. Do any platform-specific startup." - self setDefaultDirectoryClass. + self startUpDefaultDirectory. + Smalltalk openSourceFiles.! - self setDefaultDirectory: (self dirPathFor: Smalltalk imageName). - - Preferences startInUntrustedDirectory - ifTrue:[ "The SecurityManager may override the default directory to prevent unwanted write access etc." - self setDefaultDirectory: SecurityManager default untrustedUserDirectory. - "Make sure we have a place to go to" - DefaultDirectory assureExistence]. - Smalltalk openSourceFiles. - (Smalltalk classNamed: #DoItFirst) ifNotNil: [ :doit | doit perform: #reevaluateCwd ]. - ! Item was added: + ----- Method: FileDirectory class>>startUpDefaultDirectory (in category 'system start up') ----- + startUpDefaultDirectory + "Establish the platform-specific FileDirectory subclass. Do any platform-specific startup." + + self setDefaultDirectoryClass. + self setDefaultDirectory: (self dirPathFor: Smalltalk imageName). + + Preferences startInUntrustedDirectory + ifTrue:[ "The SecurityManager may override the default directory to prevent unwanted write access etc." + self setDefaultDirectory: SecurityManager default untrustedUserDirectory. + "Make sure we have a place to go to" + DefaultDirectory assureExistence]. + + (Smalltalk classNamed: #DoItFirst) ifNotNil: [ :doit | doit perform: #reevaluateCwd ].!

1 0

The Trunk: System-ct.1297.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-ct.1297.mcz ==================== Summary ==================== Name: System-ct.1297 Author: ct Time: 31 January 2022, 8:02:46.547876 pm UUID: 9f3500d4-cb3b-1f4c-9950-7f27f7b2f965 Ancestors: System-ct.1296 Fixes DoIt tests for Windows. Uses Files-ct.189 (FileDirectory class >> #startUpDefaultDirectory). See: http://lists.squeakfoundation.org/pipermail/squeak-dev/2022-January/218179.… =============== Diff against System-ct.1296 =============== Item was changed: ----- Method: DoItFirst>>parse: (in category 'evaluating') ----- parse: argumentList "Iterate over the argument list, creating actions blocks. Register each action block in the actions dictionary, and collect a list of the actions blocks to be evaluated now. If any action blocks will require files or directory initialization, send the appropriate startUp messages. Answer the list of action blocks to be evaluated." | args listOfBlocks needsFiles needsDirectory | needsFiles := needsDirectory := false. args := argumentList readStream. listOfBlocks := OrderedCollection new. [ args atEnd ] whileFalse: [ | key | (key := self keyFor: args next) caseOf: { [ #help ] -> [ self addFirst: [ self help ] to: listOfBlocks at: key. needsFiles := true] . [ #debug ] -> [ self addWithoutEvaluation: [ self debug ] at: key] . [ #doit ] -> [ | list | list := self nextTokensFrom: args. self add:[ self doIt: list ] to: listOfBlocks at: key. needsFiles := true] . [ #evaluate ] -> [ | arg | arg := args next. self add:[ self evaluateOption: arg ] to: listOfBlocks at: key. needsFiles := true] . [ #file ] -> [ | arg | arg := args next. self add:[ self evaluateFileContents: arg ] to: listOfBlocks at: key. needsFiles := true] . [ #filein ] -> [ | list | list := self nextTokensFrom: args. self add:[ self fileIn: list ] to: listOfBlocks at: key. needsFiles := needsDirectory := true] . [ #cwd ] -> [ | arg | arg := args next. self addFirst:[ self cwd: arg ] to: listOfBlocks at: key. needsFiles := needsDirectory := true] . } otherwise: [] ]. needsFiles ifTrue: [ FileStream startUp: true. "initialize stdout and stderr" ]. + needsDirectory ifTrue: [ FileDirectory startUpDefaultDirectory ]. + ^ listOfBlocks! - needsDirectory ifTrue: [ FileDirectory startUp "set default directory" ]. - ^ listOfBlocks. - !

1 0

The Trunk: Installer-Core-mt.444.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Marcel Taeumel uploaded a new version of Installer-Core to project The Trunk: http://source.squeak.org/trunk/Installer-Core-mt.444.mcz ==================== Summary ==================== Name: Installer-Core-mt.444 Author: mt Time: 31 January 2022, 1:59:06.923089 pm UUID: 19ed2eee-09fd-eb45-98b4-86d7cd0b1113 Ancestors: Installer-Core-cmm.443 Adds script to conveniently install "Squeak Inbox Talk", which is besides "Git Browser" the second external tool that can be beneficial for modern software development -- given that Nabble (i.e. forum.world.st) is not connected to squeak-dev and vm-dev anymore. Fixes label issue in "Tools" menu for "Git Browser". =============== Diff against Installer-Core-cmm.443 =============== Item was added: + ----- Method: Installer class>>installAndOpenSqueakInboxTalk (in category 'scripts') ----- + installAndOpenSqueakInboxTalk + "For more information on Squeak Inbox Talk, visit https://github.com/hpi-swa-lab/squeak-inbox-talk" + + self installSqueakInboxTalk. + (Smalltalk at: #TalkInboxBrowser) open.! Item was changed: ----- Method: Installer class>>installGitInfrastructure (in category 'scripts') ----- installGitInfrastructure | priorSetting | "for INIFileTest>>#testComplexRead" priorSetting := Scanner allowUnderscoreAsAssignment. [Scanner allowUnderscoreAsAssignment: true. (Smalltalk at: #Metacello) new baseline: 'Squot'; repository: 'github://hpi-swa/Squot:latest-release/src'; "repository: 'github://hpi-swa/Squot:develop/src';" load. + "Remove '(click to install)' note in 'Tools' menu." + TheWorldMainDockingBar updateInstances. + + ] ensure: [Scanner allowUnderscoreAsAssignment: priorSetting]! - ] ensure: [Scanner allowUnderscoreAsAssignment: priorSetting] - ! Item was added: + ----- Method: Installer class>>installSqueakInboxTalk (in category 'scripts') ----- + installSqueakInboxTalk + "For more information on Squeak Inbox Talk, visit https://github.com/hpi-swa-lab/squeak-inbox-talk" + + (Smalltalk at: #Metacello) new + baseline: 'SqueakInboxTalk'; + repository: 'github://hpi-swa-lab/squeak-inbox-talk:main/packages'; + load. + + "Remove '(click to install)' note in 'Tools' menu." + TheWorldMainDockingBar updateInstances.!

3 2

The Trunk: PreferenceBrowser-mt.128.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Marcel Taeumel uploaded a new version of PreferenceBrowser to project The Trunk: http://source.squeak.org/trunk/PreferenceBrowser-mt.128.mcz ==================== Summary ==================== Name: PreferenceBrowser-mt.128 Author: mt Time: 31 January 2022, 2:01:38.104089 pm UUID: 59284507-bd8a-6543-82fe-3a77a6f18a0a Ancestors: PreferenceBrowser-dtl.127 Complements Installer-Core-mt.444. Feel free to revise the help texts if you find a better phrasing. =============== Diff against PreferenceBrowser-dtl.127 =============== Item was changed: ----- Method: PreferenceWizardMorph>>initializePage99ExtraPackages (in category 'initialization - pages') ----- initializePage99ExtraPackages "Let the user install extra packages." | currentPage packagesList installButton | currentPage := self createPage. currentPage cellPositioning: #topCenter; addMorphBack: self createHorizontalSpacer; addMorphBack: ((self createLabel: 'Do you want to install extra packages?' color: Color white) hResizing: #shrinkWrap; yourself); addMorphBack: ((self createLabel: 'Note that the installation process requires a network connection with Internet access and might take several minutes.' color: (Color gray: 0.9)) hResizing: #rigid; vResizing: #shrinkWrap; width: (self defaultFont widthOf: $x) * 55; yourself). currentPage submorphs last text addAttribute: TextAlignment centered. currentPage submorphs last layoutChanged. currentPage addMorphBack: (self createVerticalSpace height: self layoutInset). packagesList := self createScrollPane. packagesList width: (self defaultFont widthOf: $x) * 40; hResizing: #rigid; vResizing: #spaceFill. packagesList scroller firstSubmorph addAllMorphsBack: { self createCheckbox: 'Latest system updates' translated for: #InstallLatestUpdates help: 'Install the latest patches for ' translated, SystemVersion current version. + self createCheckbox: 'Refactoring support in code browsers' translated for: #InstallRefactoringTools help: 'Refactoring is a process of re-writing or re-organizing text or code. The purpose of a refactor is to make the code or text more understandable and readable while exactly preserving its meaning and behavior' translated. + self createCheckbox: 'Autocomplete in code editors' translated for: #InstallAutoComplete help: 'Package that provides interactive, context-sensitive auto-completion for Squeak' translated. + self createCheckbox: 'Git support and browser' translated for: #InstallGitInfrastructure help: 'From the Git Browser, you can create new commits, synchronize with remote repositories (fetch, pull, push), manage and merge branches, switch between them, and compare different versions' translated. - self createCheckbox: 'Refactoring support in code browsers' translated for: #InstallRefactoringTools help: 'Refactoring is a process of re-writing or re-organizing text or code. The purpose of a refactor is to make the code or text more understandable and readable while exactly preserving its meaning and behavior.' translated. - self createCheckbox: 'Autocomplete in code editors' translated for: #InstallAutoComplete help: 'Package that provides interactive, context-sensitive auto-completion for Squeak.' translated. - self createCheckbox: 'Git support and browser' translated for: #InstallGitInfrastructure help: 'From the Git Browser, you can create new commits, synchronize with remote repositories (fetch, pull, push), manage and merge branches, switch between them, and compare different versions.' translated. self createCheckbox: 'Foreign function interface (FFI)' translated for: #InstallFFI help: 'FFI, the Squeak Foreign Function Interface, is used to call functions located in shared libraries that are not part of the Squeak VM nor its plugins' translated. + self createCheckbox: 'Access OS functions' translated for: #InstallOSProcess help: 'OSProcess provides access to operating system functions, including pipes and child process creation' translated. + self createCheckbox: 'Integrate Squeak''s mailing lists' translated for: #InstallSqueakInboxTalk help: 'Through Squeak Inbox Talk, you can engage with our community from within Squeak using tools that integrate our mailing lists such as squeak-dev and vm-dev' translated. - self createCheckbox: 'Access OS functions' translated for: #InstallOSProcess help: 'OSProcess provides access to operating system functions, including pipes and child process creation.' translated. }. currentPage addMorphBack: packagesList. currentPage addMorphBack: ((self createLabel: 'Find more on www.squeak.org/projects' color: (Color gray: 0.9)) hResizing: #shrinkWrap; yourself). installButton := (self createButton action: #installExtraPackages). currentPage addMorphBack: installButton. currentPage addMorphBack: (self createButton action: #showSqueak; label: 'No, maybe later.' translated). self setProperty: #checkInternet toValue: true. self checkInternetOn: installButton. ^ currentPage! Item was changed: ----- Method: PreferenceWizardMorph>>installExtraPackages (in category 'actions') ----- installExtraPackages "Removes the buttons and adds the progress bar during installation." | steps page | self removeProperty: #checkInternet. "No frequent checks for connectivity from here." steps := #( InstallLatestUpdates InstallMetacello InstallRefactoringTools InstallAutoComplete InstallGitInfrastructure InstallFFI + InstallOSProcess + InstallSqueakInboxTalk ) - InstallOSProcess ) select: [:ea | self perform: ('state', ea) asSymbol]. page := controlMorph firstSubmorph. page submorphs second hide. "question" page submorphs last delete. "url" page submorphs last delete. "no button" page submorphs last delete. "yes button" page submorphs last delete. "package list" self refreshWorld. [ PreferenceWizardProgressMorph install. page addMorphBack: PreferenceWizardProgressMorph uniqueInstance; addMorphBack: self createVerticalSpacer. steps do: [:step | self perform: step withFirstCharacterDownshifted asSymbol] displayingProgress: [:step | String streamContents: [:s | step findFeatureIndicesDo: [:start :end | s nextPutAll: (step copyFrom: start to: end); space]. s nextPutAll: '...']]. ] ensure: [ PreferenceWizardProgressMorph reset. self showSqueak].! Item was added: + ----- Method: PreferenceWizardMorph>>installSqueakInboxTalk (in category 'actions - packages') ----- + installSqueakInboxTalk + + Installer installSqueakInboxTalk.! Item was added: + ----- Method: PreferenceWizardMorph>>stateInstallSqueakInboxTalk (in category 'actions - packages') ----- + stateInstallSqueakInboxTalk + + ^ self + valueOfProperty: #InstallSqueakInboxTalk + ifAbsent: [false]! Item was added: + ----- Method: PreferenceWizardMorph>>toggleInstallSqueakInboxTalk (in category 'actions - packages') ----- + toggleInstallSqueakInboxTalk + + self + setProperty: #InstallSqueakInboxTalk + toValue: self stateInstallSqueakInboxTalk not. + self changed: #stateInstallSqueakInboxTalk.!

1 0

The Trunk: Morphic-mt.1864.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1864.mcz ==================== Summary ==================== Name: Morphic-mt.1864 Author: mt Time: 31 January 2022, 2:00:33.995089 pm UUID: ff70875a-4681-214c-bae9-6d1c2c88ac22 Ancestors: Morphic-mt.1863 Complements Installer-Core-mt.444. =============== Diff against Morphic-mt.1863 =============== Item was added: + ----- Method: TheWorldMainDockingBar>>installAndOpenSqueakInboxTalk (in category 'menu actions') ----- + installAndOpenSqueakInboxTalk + + (Smalltalk hasClassNamed: #TalkInboxBrowser) + ifFalse: [ (Project uiManager + confirm: 'Squeak Inbox Talk is not yet installed.\\Do you want to install it?\\(Note that this step requires an internet connection and\may take several minutes.)' withCRs translated + title: 'Confirm Installation Request' ) + ifTrue: [ Installer + ensureRecentMetacello; + installSqueakInboxTalk. + TheWorldMainDockingBar updateInstances ] + ifFalse: [ ^self ] ]. + (Smalltalk classNamed: #TalkInboxBrowser) open. + ! Item was added: + ----- Method: TheWorldMainDockingBar>>squeakInboxTalkMenuItemOn: (in category 'submenu - tools') ----- + squeakInboxTalkMenuItemOn: menu + + menu addItem: [:item | + item + contents: ((Smalltalk hasClassNamed: #TalkInboxBrowser) + ifTrue: ['Squeak Inbox Talk' translated] + ifFalse: ['Squeak Inbox Talk (click to install)' translated]); + help: 'Engage with our community from within Squeak using tools that integrate our mailing lists such as squeak-dev and vm-dev' translated; + icon: (self colorIcon: ((Smalltalk classNamed: #TalkInboxBrowser) ifNil: Model) + basicNew windowColorToUse); + target: self; + selector: #installAndOpenSqueakInboxTalk]! Item was changed: ----- Method: TheWorldMainDockingBar>>toolsMenuOn: (in category 'construction') ----- toolsMenuOn: aDockingBar aDockingBar addItem: [ :item | item contents: 'Tools' translated; addSubMenu: [ :menu | self browserMenuItemOn: menu; workspaceMenuItemOn: menu; transcriptMenuItemOn: menu; testRunnerMenuItemOn: menu; methodFinderMenuItemOn: menu; messageNamesMenuItemOn: menu. menu addLine. self simpleChangeSorterMenuItemOn: menu; dualChangeSorterMenuItemOn: menu; monticelloBrowserMenuItemOn: menu; + monticelloConfigurationsMenuItemOn: menu. - monticelloConfigurationsMenuItemOn: menu ; - gitInfrastructureMenuItemOn: menu. menu addLine. self + gitInfrastructureMenuItemOn: menu; + squeakInboxTalkMenuItemOn: menu. + menu addLine. + self processBrowserMenuItemOn: menu; preferenceBrowserMenuItemOn: menu; fileListMenuItemOn: menu. ] ]! Item was changed: + (PackageInfo named: 'Morphic') postscript: 'TheWorldMainDockingBar updateInstances.'! - (PackageInfo named: 'Morphic') postscript: '"Fixes custom edits that were not propagated properly to pluggable windows." - StringMorph allInstances do: [:ea | ea acceptContents].'!

1 0

The Trunk: SUnitGUI-ct.86.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of SUnitGUI to project The Trunk: http://source.squeak.org/trunk/SUnitGUI-ct.86.mcz ==================== Summary ==================== Name: SUnitGUI-ct.86 Author: ct Time: 31 January 2022, 1:21:40.607693 am UUID: a1c6ba52-df92-6346-b7a6-d2d4c37f158f Ancestors: SUnitGUI-ct.84 Revises widget names and help strings in TestRunner. Complements Tools-ct.1123. =============== Diff against SUnitGUI-ct.84 =============== Item was changed: ----- Method: TestRunner>>buildErrorListWith: (in category 'building') ----- buildErrorListWith: aBuilder ^ aBuilder pluggableListSpec new model: self; + name: #errorList; + help: 'Errors' translated; - name: 'Error List'; list: #errorList; menu: #errorMenu:; getIndex: #errorSelected; setIndex: #errorSelected:; yourself.! Item was changed: ----- Method: TestRunner>>buildFailureListWith: (in category 'building') ----- buildFailureListWith: aBuilder ^ aBuilder pluggableListSpec new model: self; + name: #failureList; + help: 'Failures' translated; - name: 'Failure List'; list: #failedList; menu: #failureMenu:; getIndex: #failedSelected; setIndex: #failedSelected:; yourself.!

1 0

The Trunk: Tools-ct.1123.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ct.1123.mcz ==================== Summary ==================== Name: Tools-ct.1123 Author: ct Time: 31 January 2022, 1:20:41.747693 am UUID: 4d7aacd6-8428-d046-954f-906f1fd1e8e7 Ancestors: Tools-ct.1122 Revises widget names and help strings in DependencyBrowser. Explanation: ToolBuilderSpec>>#name is just an identifier to be used in programmatic contexts. To communicate the meaning of a widget to the user, use ToolBuilderSpec>>#help instead. =============== Diff against Tools-ct.1122 =============== Item was changed: ----- Method: DependencyBrowser>>buildClassDepsWith: (in category 'toolbuilder') ----- buildClassDepsWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec model: self; + name: #classDepsList; + help: 'Required classes' translated; - name: 'Required Classes' ; list: #classDepsList; getIndex: #classDepsIndex; setIndex: #classDepsIndex:; menu: #classDepsMenu:; keyPress: #classDepsKey:from:. ^listSpec ! Item was changed: ----- Method: DependencyBrowser>>buildClassListWith: (in category 'toolbuilder') ----- buildClassListWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec model: self; + name: #classList; + help: 'Client classes' translated; - name: 'Client classes' ; list: #classList; getIndex: #classListIndex; setIndex: #classListIndex:; menu: #classListMenu:; keyPress: #classListKey:from:. ^listSpec ! Item was changed: ----- Method: DependencyBrowser>>buildMessageListWith: (in category 'toolbuilder') ----- buildMessageListWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec model: self; + name: #messageList; + help: 'Client methods' translated; - name: 'Client methods' ; list: #messageList; getIndex: #messageListIndex; setIndex: #messageListIndex:; menu: #messageListMenu:; keyPress: #messageListKey:from:. + ^listSpec! - ^listSpec - ! Item was changed: ----- Method: DependencyBrowser>>buildPackageDepsWith: (in category 'toolbuilder') ----- buildPackageDepsWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec model: self; + name: #packageDepsList; + help: 'Required Packages' translated; - name: 'Required Packages' ; list: #packageDepsList; getIndex: #packageDepsIndex; setIndex: #packageDepsIndex:; menu: #packageDepsMenu:; keyPress: #packageDepsKey:from:. ^listSpec ! Item was changed: ----- Method: DependencyBrowser>>buildPackageListWith: (in category 'toolbuilder') ----- buildPackageListWith: builder | listSpec | listSpec := builder pluggableListSpec new. listSpec model: self; + name: #packageList; + help: 'Packages' translated; - name: 'Packages' ; list: #packageList; getIndex: #packageListIndex; setIndex: #packageListIndex:; menu: #packageListMenu:; keyPress: #packageListKey:from:. ^listSpec !

1 0

The Inbox: System-dtl.1277.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

A new version of System was added to project The Inbox: http://source.squeak.org/inbox/System-dtl.1277.mcz ==================== Summary ==================== Name: System-dtl.1277 Author: dtl Time: 1 January 2022, 2:57:48.389886 pm UUID: 4d975f20-d62d-4b7e-8abb-bc511d976834 Ancestors: System-mt.1276 Look for the sources file in well-known locations on some platforms. For Unix, if not found in the usual locations then look in /usr/share/squeak and /usr/local/share/squeak. Hooks for other platforms may be added to SmalltalkImage>>sourcesFilePaths. Refactor to reduce duplication of logic in locateSourcesEntry and openSources:forImage: and to ensure that the full set of file paths is searched for stc compressed sources files prior to searching for regular sources files. =============== Diff against System-mt.1276 =============== Item was removed: - ----- Method: FileDirectory class>>openChanges:forImage: (in category '*System-Files') ----- - openChanges: changesName forImage: imageName - "find the changes file by looking in - a) the directory derived from the image name - b) the DefaultDirectory (which will normally be the directory derived from the image name or the SecurityManager's choice) - If an old file is not found in either place, check for a read-only file in the same places. If that fails, return nil" - | changes fd | - "look for the changes file or an alias to it in the image directory" - fd := FileDirectory on: (FileDirectory dirPathFor: imageName). - (fd fileExists: changesName) - ifTrue: [changes := fd oldFileNamed: changesName]. - changes ifNotNil:[^changes]. - - "look for the changes in the default directory" - fd := DefaultDirectory. - (fd fileExists: changesName) - ifTrue: [changes := fd oldFileNamed: changesName]. - changes ifNotNil:[^changes]. - - "look for read-only changes in the image directory" - fd := FileDirectory on: (FileDirectory dirPathFor: imageName). - (fd fileExists: changesName) - ifTrue: [changes := fd readOnlyFileNamed: changesName]. - changes ifNotNil:[^changes]. - - "look for read-only changes in the default directory" - fd := DefaultDirectory. - (fd fileExists: changesName) - ifTrue: [changes := fd readOnlyFileNamed: changesName]. - "this may be nil if the last try above failed to open a file" - ^changes - ! Item was removed: - ----- Method: FileDirectory class>>openSources:andChanges:forImage: (in category '*System-Files') ----- - openSources: sourcesName andChanges: changesName forImage: imageName - "Open the changes and sources files and install them in SourceFiles. Inform the user of problems regarding write permissions or CR/CRLF mixups." - "Note: SourcesName and imageName are full paths; changesName is a - local name." - | sources changes msg wmsg | - msg := 'Squeak cannot locate &fileRef. - - Please check that the file is named properly and is in the - same directory as this image.'. - wmsg := 'Squeak cannot write to &fileRef. - - Please check that you have write permission for this file. - - You won''t be able to save this image correctly until you fix this.'. - - sources := self openSources: sourcesName forImage: imageName. - changes := self openChanges: changesName forImage: imageName. - - ((sources == nil or: [sources atEnd]) - and: [Preferences valueOfFlag: #warnIfNoSourcesFile]) - ifTrue: [Smalltalk platformName = 'Mac OS' - ifTrue: [msg := msg , ' - Make sure the sources file is not an Alias.']. - self inform: (msg copyReplaceAll: '&fileRef' with: 'the sources file named ' , sourcesName)]. - - (changes == nil - and: [Preferences valueOfFlag: #warnIfNoChangesFile]) - ifTrue: [self inform: (msg copyReplaceAll: '&fileRef' with: 'the changes file named ' , changesName)]. - - ((Preferences valueOfFlag: #warnIfNoChangesFile) and: [changes notNil]) - ifTrue: [changes isReadOnly - ifTrue: [self inform: (wmsg copyReplaceAll: '&fileRef' with: 'the changes file named ' , changesName)]. - - ((changes next: 200) - includesSubstring: String crlf) - ifTrue: [self inform: 'The changes file named ' , changesName , ' - has been injured by an unpacking utility. Crs were changed to CrLfs. - Please set the preferences in your decompressing program to - "do not convert text files" and unpack the system again.']]. - - SourceFiles := Array with: sources with: changes! Item was removed: - ----- Method: FileDirectory class>>openSources:forImage: (in category '*System-Files') ----- - openSources: fullSourcesName forImage: imageName - "We first do a check to see if a compressed version ofthe sources file is present. - Open the .sources file read-only after searching in: - a) the directory where the VM lives - b) the directory where the image came from - c) the DefaultDirectory (which is likely the same as b unless the SecurityManager has changed it). - " - - | sources fd sourcesName | - (fullSourcesName endsWith: 'sources') ifTrue: - ["Look first for a sources file in compressed format." - sources := self openSources: (fullSourcesName allButLast: 7) , 'stc' - forImage: imageName. - sources ifNotNil: [^ CompressedSourceStream on: sources]]. - - sourcesName := FileDirectory localNameFor: fullSourcesName. - "look for the sources file or an alias to it in the VM's directory" - fd := FileDirectory on: Smalltalk vmPath. - (fd fileExists: sourcesName) - ifTrue: [sources := fd readOnlyFileNamed: sourcesName]. - sources ifNotNil: [^ sources]. - "look for the sources file or an alias to it in the image directory" - fd := FileDirectory on: (FileDirectory dirPathFor: imageName). - (fd fileExists: sourcesName) - ifTrue: [sources := fd readOnlyFileNamed: sourcesName]. - sources ifNotNil: [^ sources]. - "look for the sources in the current directory" - fd := DefaultDirectory. - (fd fileExists: sourcesName) - ifTrue: [sources := fd readOnlyFileNamed: sourcesName]. - "sources may still be nil here" - ^sources - ! Item was removed: - ----- Method: SmalltalkImage>>locateSourcesEntry (in category 'image, changes names') ----- - locateSourcesEntry - | sourcesFilename | - sourcesFilename := SourceFileVersionString , FileDirectory dot , 'sources'. - ^ {Smalltalk vmPath. - FileDirectory default fullName, FileDirectory slash} - detect: [ : each | (each , sourcesFilename) asDirectoryEntry notNil ] - ifFound: [ : foundPath | (foundPath , sourcesFilename) asDirectoryEntry ] - ifNone: [ nil ]! Item was added: + ----- Method: SmalltalkImage>>locateSourcesEntry: (in category 'image, changes names') ----- + locateSourcesEntry: sourcesFilename + "Locate sources file entry, looking first in the VM path directory, then in the image + directory, and finally in some well-known locations for various OS platforms" + + ^ self sourcesFilePaths + detect: [ : each | (each , sourcesFilename) asDirectoryEntry notNil ] + ifFound: [ : foundPath | (foundPath , sourcesFilename) asDirectoryEntry ] + ifNone: [ nil ]! Item was added: + ----- Method: SmalltalkImage>>openChanges:forImage: (in category 'image, changes names') ----- + openChanges: changesName forImage: imageName + "find the changes file by looking in + a) the directory derived from the image name + b) the DefaultDirectory (which will normally be the directory derived from the image name or the SecurityManager's choice) + If an old file is not found in either place, check for a read-only file in the same places. If that fails, return nil" + | changes fd | + "look for the changes file or an alias to it in the image directory" + fd := FileDirectory on: (FileDirectory dirPathFor: imageName). + (fd fileExists: changesName) + ifTrue: [changes := fd oldFileNamed: changesName]. + changes ifNotNil:[^changes]. + + "look for the changes in the default directory" + fd := FileDirectory default. + (fd fileExists: changesName) + ifTrue: [changes := fd oldFileNamed: changesName]. + changes ifNotNil:[^changes]. + + "look for read-only changes in the image directory" + fd := FileDirectory on: (FileDirectory dirPathFor: imageName). + (fd fileExists: changesName) + ifTrue: [changes := fd readOnlyFileNamed: changesName]. + changes ifNotNil:[^changes]. + + "look for read-only changes in the default directory" + fd := FileDirectory default. + (fd fileExists: changesName) + ifTrue: [changes := fd readOnlyFileNamed: changesName]. + "this may be nil if the last try above failed to open a file" + ^changes + ! Item was changed: ----- Method: SmalltalkImage>>openSourceFiles (in category 'sources, changes log') ----- openSourceFiles - self imageName = LastImageName ifFalse: ["Reset the author initials to blank when the image gets moved" LastImageName := self imageName. Utilities authorInitials: '']. + self + openSourcesAndChanges: self changesName - FileDirectory - openSources: self sourcesName - andChanges: self changesName forImage: LastImageName. SourceFileArray install! Item was added: + ----- Method: SmalltalkImage>>openSources (in category 'image, changes names') ----- + openSources + "Open a sources file from one of several possible locations. Check first for + a compressed sources file and use that if available." + + (self locateSourcesEntry: self sourcesCompressedFileName) + ifNotNil: [ :entry | ^ CompressedSourceStream on: entry readStream ]. + (self locateSourcesEntry: self sourcesFileName) + ifNotNil: [ :entry | ^ entry readStream ]. + ^nil. + ! Item was added: + ----- Method: SmalltalkImage>>openSourcesAndChanges:forImage: (in category 'image, changes names') ----- + openSourcesAndChanges: changesName forImage: imageName + "Open the changes and sources files and install them in SourceFiles. Inform the user of problems regarding write permissions or CR/CRLF mixups." + "Note: SourcesName and imageName are full paths; changesName is a + local name." + | sources changes msg wmsg | + msg := 'Squeak cannot locate &fileRef. + + Please check that the file is named properly and is in the + same directory as this image.'. + wmsg := 'Squeak cannot write to &fileRef. + + Please check that you have write permission for this file. + + You won''t be able to save this image correctly until you fix this.'. + + sources := Smalltalk openSources. + changes := Smalltalk openChanges: changesName forImage: imageName. + + ((sources == nil or: [sources atEnd]) + and: [Preferences valueOfFlag: #warnIfNoSourcesFile]) + ifTrue: [Smalltalk platformName = 'Mac OS' + ifTrue: [msg := msg , ' + Make sure the sources file is not an Alias.']. + self inform: (msg copyReplaceAll: '&fileRef' with: 'the sources file named ' , self sourcesName)]. + + (changes == nil + and: [Preferences valueOfFlag: #warnIfNoChangesFile]) + ifTrue: [self inform: (msg copyReplaceAll: '&fileRef' with: 'the changes file named ' , changesName)]. + + ((Preferences valueOfFlag: #warnIfNoChangesFile) and: [changes notNil]) + ifTrue: [changes isReadOnly + ifTrue: [self inform: (wmsg copyReplaceAll: '&fileRef' with: 'the changes file named ' , changesName)]. + + ((changes next: 200) + includesSubstring: String crlf) + ifTrue: [self inform: 'The changes file named ' , changesName , ' + has been injured by an unpacking utility. Crs were changed to CrLfs. + Please set the preferences in your decompressing program to + "do not convert text files" and unpack the system again.']]. + + SourceFiles := Array with: sources with: changes! Item was added: + ----- Method: SmalltalkImage>>sourcesCompressedFileName (in category 'image, changes names') ----- + sourcesCompressedFileName + ^SourceFileVersionString , FileDirectory dot, 'stc' + ! Item was added: + ----- Method: SmalltalkImage>>sourcesFileName (in category 'image, changes names') ----- + sourcesFileName + ^SourceFileVersionString , FileDirectory dot , 'sources' + ! Item was added: + ----- Method: SmalltalkImage>>sourcesFilePaths (in category 'image, changes names') ----- + sourcesFilePaths + "A list of likely locations for the sources file. Look first in the VM path directory, then + in the image directory, and finally in some well-known locations for this OS platform" + + | paths vmPath imagePath defaultPath | + paths := OrderedCollection new. + paths add: (vmPath := self vmPath). + paths add: (imagePath := self imagePath, FileDirectory slash). + imagePath = (defaultPath := FileDirectory default fullName, FileDirectory slash) + ifFalse: ["imagePath and defaultPath are usually the same" + paths add: defaultPath]. + ('/usr/*/lib/*' match: vmPath) + ifTrue: ["Unix platform with VM installed in system directories" + paths + add: '/usr/share/squeak/'; + add: '/usr/local/share/squeak/' ]. + "Well known paths for other platform types may be added here" + + ^paths + ! Item was changed: ----- Method: SmalltalkImage>>sourcesName (in category 'image, changes names') ----- sourcesName "Answer the full path to the version-stable source code if it exists, otherwise the desired location" + ^ (self locateSourcesEntry: self sourcesFileName) + ifNil: [ self vmPath , self sourcesFileName ] - ^ self locateSourcesEntry - ifNil: [ self vmPath , SourceFileVersionString , FileDirectory dot , 'sources' ] ifNotNil: [ : entry | entry fullName ]!

10 27

The Trunk: Tools-ct.1122.mcz
by commits＠source.squeak.org 31 Jan '22

31 Jan '22

Christoph Thiede uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ct.1122.mcz ==================== Summary ==================== Name: Tools-ct.1122 Author: ct Time: 31 January 2022, 12:09:47.193979 am UUID: a16ebf6e-8c03-a644-a2d8-1165ac1ef7ff Ancestors: Tools-mt.1121 Protects the debugger against evaluating a symbol label as a selector on the model. Formerly, the following would break your project with a recursive error: [] newProcess debugWithTitle: #myDebugger full: false Thanks to Marcel for the help! =============== Diff against Tools-mt.1121 =============== Item was changed: ----- Method: Debugger>>buildNotifierWith:label:message: (in category 'toolbuilder') ----- buildNotifierWith: builder label: label message: messageString | windowSpec listSpec textSpec panelSpec quads | windowSpec := builder pluggableWindowSpec new model: self; extent: self initialExtentForNotifier; + label: label asString; - label: label; children: OrderedCollection new. panelSpec := builder pluggablePanelSpec new. panelSpec children: OrderedCollection new. quads := self preDebugButtonQuads. (self interruptedContext selector == #doesNotUnderstand:) ifTrue: [ quads := quads copyWith: { 'Create'. #createMethod. #magenta. 'create the missing method' } ]. (#(#notYetImplemented #shouldBeImplemented #requirement) includes: self interruptedContext selector) ifTrue: [ quads := quads copyWith: { 'Create'. #createImplementingMethod. #magenta. 'implement the marked method' } ]. (self interruptedContext selector == #subclassResponsibility) ifTrue: [ quads := quads copyWith: { 'Create'. #createOverridingMethod. #magenta. 'create the missing overriding method' } ]. quads do:[:spec| | buttonSpec | buttonSpec := builder pluggableButtonSpec new. buttonSpec model: self. buttonSpec label: spec first. buttonSpec action: spec second. buttonSpec help: spec fourth. spec size >= 5 ifTrue: [buttonSpec enabled: spec fifth]. panelSpec children add: buttonSpec. ]. panelSpec layout: #horizontal. "buttons" panelSpec frame: self preDebugButtonQuadFrame. windowSpec children add: panelSpec. Preferences eToyFriendly | messageString notNil ifFalse:[ listSpec := builder pluggableListSpec new. listSpec model: self; list: #contextStackList; getIndex: #contextStackIndex; setIndex: #debugAt:; icon: #messageIconAt:; helpItem: #messageHelpAt:; frame: self contextStackFrame. windowSpec children add: listSpec. ] ifTrue:[ message := messageString. textSpec := builder pluggableTextSpec new. textSpec model: self; getText: #preDebugMessageString; setText: nil; selection: nil; menu: #debugProceedMenu:; frame: self contextStackFrame. windowSpec children add: textSpec. ]. ^windowSpec!

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
37
Older →

Jump to page: