The Trunk: System-dtl.1235.mcz

David T. Lewis uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-dtl.1235.mcz

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

Name: System-dtl.1235
Author: dtl
Time: 15 May 2021, 2:16:34.362599 pm
UUID: 0fa23815-1b1d-431f-ad7f-3b97f3a0cf08
Ancestors: System-dtl.1234

Clean up redundant fileIn methods and let SARInstaller use the same method as the rest of us.

=============== Diff against System-dtl.1234 ===============

Item was changed:
  ----- Method: PositionableStream>>fileInAnnouncing: (in category '*System-Changes-fileIn/Out') -----
  fileInAnnouncing: announcement
- "This is special for reading expressions from text that has been formatted
- with exclamation delimitors. The expressions are read and passed to the
- Compiler. Answer the result of compilation.  Put up a progress report with
-      the given announcement as the title."
 
+ ^ self fileInFor: nil announcing: announcement!
- | val |
- announcement
- displayProgressFrom: 0
- to: self size
- during:
- [:bar |
- [self atEnd] whileFalse:
- [bar value: self position.
- self skipSeparators.
-
- [ | chunk |
- val := (self peekFor: $!!)
- ifTrue: [ | ch |
- ch := self nextChunk.
- (self shouldIgnore: ch)
- ifTrue: [Transcript showln: 'Ignoring chunk: ', ch]
- ifFalse: [(Compiler evaluate: ch logged: true) scanFrom: self]]
- ifFalse:
- [chunk := self nextChunk.
- self checkForPreamble: chunk.
- Compiler evaluate: chunk logged: true]]
- on: InMidstOfFileinNotification
- do: [:ex | ex resume: true].
- self skipStyleChunk].
- self close].
- "Note:  The main purpose of this banner is to flush the changes file."
- Smalltalk logChange: '----End fileIn of ' , self name , '----'.
- self flag: #ThisMethodShouldNotBeThere. "sd"
- ^val!

Item was changed:
  ----- Method: PositionableStream>>fileInFor:announcing: (in category '*System-Changes-fileIn/Out') -----
  fileInFor: client announcing: announcement
  "This is special for reading expressions from text that has been formatted
  with exclamation delimitors. The expressions are read and passed to the
  Compiler. Answer the result of compilation.  Put up a progress report with
+      the given announcement as the title."
+
-      the given announcement as the title.
- Does NOT handle preambles or postscripts specially."
  | val |
+ announcement
- announcement
  displayProgressFrom: 0
  to: self size
+ during:
+ [:bar |
+ [self atEnd] whileFalse:
+ [bar value: self position.
+ self skipSeparators.
+
+ [ | chunk |
+ val := (self peekFor: $!!)
+ ifTrue: [ | ch |
+ ch := self nextChunk.
+ (self shouldIgnore: ch)
+ ifTrue: [Transcript showln: 'Ignoring chunk: ', ch]
+ ifFalse: [(Compiler evaluate: ch for: client logged: true) scanFrom: self]]
+ ifFalse:
+ [chunk := self nextChunk.
+ self checkForPreamble: chunk.
+ Compiler evaluate: chunk for: client logged: true]]
+ on: InMidstOfFileinNotification
+ do: [:ex | ex resume: true].
+ self skipStyleChunk].
+ self close].
- during:
- [:bar |
- [self atEnd]
- whileFalse:
- [bar value: self position.
- self skipSeparators.
- [ | chunk |
- val := (self peekFor: $!!) ifTrue: [
- (Compiler evaluate: self nextChunk for: client logged: false) scanFrom: self
- ] ifFalse: [
- chunk := self nextChunk.
- self checkForPreamble: chunk.
- Compiler evaluate: chunk for: client logged: true ].
- ] on: InMidstOfFileinNotification
-  do: [ :ex | ex resume: true].
- self atEnd ifFalse: [ self skipStyleChunk ]].
- self close].
  "Note:  The main purpose of this banner is to flush the changes file."
  Smalltalk logChange: '----End fileIn of ' , self name , '----'.
+ self flag: #ThisMethodShouldNotBeThere. "sd"
+ ^val!
- ^ val!