[squeak-dev] The Trunk: System-dtl.1165.mcz

commits at source.squeak.org commits at source.squeak.org
Sat Jun 13 01:56:32 UTC 2020

David T. Lewis uploaded a new version of System to project The Trunk:

==================== Summary ====================

Name: System-dtl.1165
Author: dtl
Time: 12 June 2020, 9:56:28.877275 pm
UUID: 939daf88-a16b-4749-b905-cbd7f529d0c3
Ancestors: System-dtl.1164

Fix a bug introduced in the last commit. If the readDocumentAtStartup preference is disabled, then adjust image argument list accordingly.

=============== Diff against System-dtl.1164 ===============

Item was changed:
  ----- Method: SmalltalkImage>>arguments (in category 'command line') -----
  	"Answer an array with all the command line arguments.
  	This does not include imagePath, documentPath nor any option."
  	"Smalltalk commandLine arguments"
  	| args strm |
  	args := self rawArguments.
  	(args includes: '--')
  		ifTrue: [ ^args copyAfter: self imageArgumentsMarker ].
  	strm := args readStream.
  	strm atEnd ifFalse: [ strm next. "skip image name"
+ 		(Preferences readDocumentAtStartup and: [ strm atEnd not ])
+ 			ifTrue: [ strm next "skip startup document name" ]].
- 		strm atEnd ifFalse: [ strm next "skip startup document name" ] ].
  	^ strm upToEnd.

Item was changed:
+ ----- Method: SmalltalkImage>>rawArguments (in category 'private') -----
- ----- Method: SmalltalkImage>>rawArguments (in category 'command line') -----
  	"Answer an array with all the command line arguments as delivered
  	from the VM. Any arguments for the VM itself will have been removed
  	(these are accessed with optionAt:)."
  	"Smalltalk commandLine rawArguments"
  	^Array streamContents: [:str |
  		| arg i |
  		i := 1.
  		[i > 998 or: [(arg := self getSystemAttribute: i) == nil]]
  				[str nextPut: arg.
  				i := i + 1]].!

More information about the Squeak-dev mailing list