hg/stx-libbasic: comparison ReadEvalPrintLoop.st

equal deleted inserted replaced

-:b83f3a481878
+:a5b520826aad
 ! !
 !ReadEvalPrintLoop methodsFor:'directives'!
 askYesNo:message
-self errorStream show:message.
+stderr show:message.
 ^ (self inputStream nextLine withoutSeparators startsWith:'y').
 !
 cmd_apropos:lineStream
 "apropos directive; i.e.
 words := lineStream upToEnd asCollectionOfSubstringsSeparatedBy:$;.
 words := words select:[:each | each notEmpty].
 words := words select:[:each | each isBlank not].
 (words isEmpty) ifTrue:[
-self errorStream showCR:'? usage: #apropos <word> [; morewords]'.
+stderr showCR:'? usage: #apropos <word> [; morewords]'.
 ^ self.
 ].
 "/ search in classes:
 classNamesMatching := Smalltalk allClasses
 showIt := self askYesNo:(
 'apropos: there are %1 matching %2; list them all (y/n)? '
 bindWith:list size
 with:listName)
 ] ifFalse:[
-self errorStream showCR:'matching %1:' with:listName.
+stderr showCR:'matching %1:' with:listName.
 ].
 showIt ifTrue:[
 sortedList := list asOrderedCollection sort.
 longest := (list collect:[:nm | nm size]) max.
 limit := 78.
 numCols := (80 // (longest min:limit)) max:1.
 colWidth := (longest min:limit).
 sortedList slicesOf:numCols do:[:eachGroupOfN |
-self errorStream
+stderr
 spaces:2;
 nextPutLine:(
 (eachGroupOfN
 collect:[:nm |
 (nm contractTo:colWidth) paddedTo:colWidth
 !
 cmd_edit:lineStream
 "edit a class or selector in an external editor"
-|errStream classOrMethodName cls methodName selector
+|classOrMethodName cls methodName selector
 code isNewClass editFullClass tmpFile modifiedTime|
-errStream := self errorStream.
 isNewClass := editFullClass := false.
 lineStream skipSeparators.
 lineStream atEnd ifTrue:[
 ch isLetterOrDigit not and:[ch ~~ $_]
 ].
 "/
 (classOrMethodName isUppercaseFirst) ifTrue:[
 (cls := Smalltalk classNamed:classOrMethodName) isNil ifTrue:[
-errStream show:'edit: no such class: ',classOrMethodName,' ; create (y/n)? '.
+stderr show:'edit: no such class: ',classOrMethodName,' ; create (y/n)? '.
 (self inputStream nextLine withoutSeparators startsWith:'y') ifFalse:[^ self].
 isNewClass := true.
 code :=
 '"/ change the code as required, then save and exit the editor.
 "/ To cancel this edit, leave the editor WITHOUT saving.
 ].
 isNewClass ifFalse:[
 cls := cls ? lastEditedClass.
 cls isNil ifTrue:[
-errStream showCR:'edit usage:'.
+stderr showCR:'edit usage:'.
-errStream showCR:'   #edit className selector'.
+stderr showCR:'   #edit className selector'.
-errStream showCR:'   #edit className '.
+stderr showCR:'   #edit className '.
-errStream showCR:'   #edit selector (class as in previous edit)'.
+stderr showCR:'   #edit selector (class as in previous edit)'.
-errStream showCR:'   #edit          (class/method as in previous edit)'.
+stderr showCR:'   #edit          (class/method as in previous edit)'.
 ^ self.
 ].
 lastEditedClass := cls.
 lastEditedSelector := methodName.
 onError:[:status | false].
 (ok and:[tmpFile modificationTime ~= modifiedTime]) ifTrue:[
 isNewClass ifTrue:[
 Compiler evaluate:tmpFile contentsOfEntireFile.
-errStream showCR:'Class (re)defined.'
+stderr showCR:'Class (re)defined.'
 ] ifFalse:[
 editFullClass ifTrue:[
 tmpFile fileIn.
-errStream showCR:'Class (re)compiled.'
+stderr showCR:'Class (re)compiled.'
 ] ifFalse:[
 cls compile:tmpFile contentsOfEntireFile classified:'*as yet uncategorized'.
-errStream showCR:'Method (re)compiled.'
+stderr showCR:'Method (re)compiled.'
 ].
 ].
 ] ifFalse:[
-errStream showCR:'No change.'
+stderr showCR:'No change.'
 ].
 ] ensure:[
 tmpFile notNil ifTrue:[
 tmpFile remove
 ]
 "Created: / 07-12-2006 / 18:55:46 / cg"
 !
 cmd_help:lineStream
-self errorStream
+stderr
 nextPutAll:
 'Everything entered up to an empty line or a line ending in "." is called a "chunk" and evaluated.
 Lines starting with "#" (in the first column) are commands to the read-eval-print interpreter.
 Valid commands are:
 lang = 'javascript' ifTrue:[
 compiler := JavaScriptCompiler.
 ^ self.
 ].
-self errorStream
+stderr
 showCR:'? usage: #language smalltalk';
 showCR:'?    or: #language javascript'.
 !
 cmd_list:lineStream
 "list directive; i.e.
 #list <classname> ['class'] <selector>
 "
-|class selector source errStream|
+|class selector source|
-errStream := self errorStream.
 (self
 getClassNameAndSelectorFrom:lineStream
 specialWords:nil
 into:[:classArg :selectorArg |
 class := classArg.
 selector := selectorArg.
 ]) ifFalse:[^ self].
 selector isNil ifTrue:[
-errStream nextPutAll:(class definition); cr.
+stderr nextPutAll:(class definition); cr.
-errStream nextPutAll:(class commentOrDocumentationString); cr.
+stderr nextPutAll:(class commentOrDocumentationString); cr.
 ] ifFalse:[
 source := class sourceCodeAt:selector asSymbol.
 source isEmptyOrNil ifTrue:[
-errStream nextPutLine:'Sorry, no sourcecode found'
+stderr nextPutLine:'Sorry, no sourcecode found'
 ] ifFalse:[
-errStream nextPutAll:source; cr
+stderr nextPutAll:source; cr
 ].
 ].
 "
 self basicNew
 savedTraceFlag savedProfileFlag savedNoDebugger|
 lineStream skipSeparators.
 filename := lineStream upToEnd withoutSeparators.
 filename isEmptyOrNil ifTrue:[
-self errorStream showCR:'? usage: #read <filename>'.
+stderr showCR:'? usage: #read <filename>'.
 ^ self.
 ].
 currentDirectory := currentDirectory ? (Filename currentDirectory).
 StreamError ignoreIn:[
 newInput := filename readStream.
 ].
 newInput isNil ifTrue:[
-self errorStream showCR:('Could not find file: "',filename pathName,'"').
+stderr showCR:('Could not find file: "',filename pathName,'"').
 ^ self.
 ].
 [
 savedCurrentDirectory := currentDirectory.
 self answerPrompt:''.
 ].
 ^ self.
 ].
 ].
-self errorStream
+stderr
 showCR:'? usage: set/clear <flag>';
 showCR:'? (<flag> must be one of: print, nodebug, confirmdebug, trace, times, profile, chunk, prompt, answerprompt, editor)'.
 self cmd_show:('flags' readStream).
 "Modified: / 08-11-2016 / 22:49:17 / cg"
 show modules (= loaded packages)
 show variables
 etc.
 "
-|errStream what showAll ok|
+|what showAll ok|
-errStream := self errorStream.
 lineStream skipSeparators.
 what := lineStream nextAlphaNumericWord.
 ok := false.
 what notNil ifTrue:[
 showAll := (what startsWith:'all').
 (showAll or:[ what startsWith:'var' ]) ifTrue:[
-errStream showCR:'Variables:'; showCR:'----------'.
+stderr showCR:'Variables:'; showCR:'----------'.
 self showVariables.
 ok := true.
 ].
 (showAll or:[ what startsWith:'proc' ]) ifTrue:[
-errStream cr; showCR:'Threads:'; showCR:'--------'.
+stderr cr; showCR:'Threads:'; showCR:'--------'.
 MiniDebugger basicNew showProcesses.
 ok := true.
 ].
 ("showAll or:[" what startsWith:'pack' "]") ifTrue:[
-errStream cr; showCR:'Available Packages:'; showCR:'--------'.
+stderr cr; showCR:'Available Packages:'; showCR:'--------'.
 self showPackages.
 ok := true.
 ].
 (showAll or:[ what startsWith:'mod' ]) ifTrue:[
-errStream cr; showCR:'Modules:'; showCR:'--------'.
+stderr cr; showCR:'Modules:'; showCR:'--------'.
 self showModules.
 ok := true.
 ].
 (showAll or:[ what startsWith:'mem' ]) ifTrue:[
 |allMem|
-errStream cr; showCR:'Memory:'; showCR:'-------'.
+stderr cr; showCR:'Memory:'; showCR:'-------'.
 "/ allMem := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed
 "/                                     + ObjectMemory newSpaceUsed.
-errStream
+stderr
 "/ showCR:('overall: ',(allMem // 1024) printString,' Kb');
 showCR:('used   : ',(ObjectMemory bytesUsed // 1024) printString,' Kb');
 showCR:('free   : ',(ObjectMemory freeSpace // 1024) printString,' Kb');
 show:('minorGC: ',(ObjectMemory scavengeCount) printString);
 showCR:(' majorGC: ',(ObjectMemory garbageCollectCount) printString).
 ok := true.
 ].
 (showAll or:[ what startsWith:'flag' ]) ifTrue:[
-errStream cr; showCR:'Flags:'; showCR:'------'.
+stderr cr; showCR:'Flags:'; showCR:'------'.
-errStream
+stderr
 showCR:('print:       ',self printFlag printString);
 showCR:('nodebug:     ',self noDebugger printString);
 showCR:('confirmdebug:',self confirmDebugger printString);
 showCR:('trace :      ',(traceFlag ? false) printString);
 showCR:('timing:      ',(timingFlag ? false) printString);
 ok := true.
 ].
 ].
 ok ifFalse:[
-errStream showCR:'? usage: show <what>'.
+stderr showCR:'? usage: show <what>'.
-errStream showCR:'? (<what> must be one of: packages, modules, variables, flags, memory, processes)'.
+stderr showCR:'? (<what> must be one of: packages, modules, variables, flags, memory, processes)'.
 ].
 "
 self basicNew cmd_show:'packages' readStream
 "
 |pkg s defaultPrefix|
 lineStream skipSeparators.
 pkg := lineStream upToEnd withoutSeparators.
 pkg isEmpty ifTrue:[
-self errorStream
+stderr
 showCR:'? usage: #use <package>';
 showCR:'?    or: #use default <packagePrefix>'.
 ^ self.
 ].
 [
 Smalltalk loadPackage:pkg.
 ] on:PackageLoadError do:[:ex|
 "/ allow for some shortcuts...
 (pkg includes:$:) ifTrue:[
-self errorStream showCR:('Failed to load package: "',pkg,'"').
+stderr showCR:('Failed to load package: "',pkg,'"').
 ] ifFalse:[
 "/ try stx standard package
 pkg := (self defaultPackagePrefix), pkg.
 ex restart.
 ].
 s skipSeparators.
 cmd := s nextAlphaNumericWord.
 cmd notNil ifTrue:[
 AbortAllOperationRequest handle:[:ex |
-self errorStream showCR:('Directive aborted: ', ex description)
+stderr showCR:('Directive aborted: ', ex description)
 ] do:[
 Error handle:[:ex |
-self errorStream showCR:('Caught in directive: ', ex description).
+stderr showCR:('Caught in directive: ', ex description).
 ex suspendedContext fullPrintAll.
 ] do:[
 ControlInterrupt handle:[:ex |
 MiniDebugger enter.
-"/ self errorStream showCR:('Ignored in directive: ', ex description).
+"/ stderr showCR:('Ignored in directive: ', ex description).
 "/ ex reject.
 "/ ex proceed.
 ] do:[
 self
 perform:('cmd_',cmd) asMutator with:s
 ifNotUnderstood:[
-self errorStream
+stderr
 showCR:'?? invalid command: %1. Type "#help" for help.' with:cmd.
 ].
 ].
 ].
 ].
 ^ className
 ].
 class := Smalltalk classNamed:className.
 class isNil ifTrue:[
-self errorStream showCR:'no such class: ',className.
+stderr showCR:'no such class: ',className.
 ^ false.
 ].
 (wordStream atEnd not and:[wordStream peek = 'class']) ifTrue:[
 wordStream next.
 aBlock value:class value:selector.
 ^ true
 !
 showModules
-|errStream printModule|
+|printModule|
-errStream := self errorStream.
 printModule :=
 [:mod |
-errStream
+stderr
 show:'  ';
 show:(mod package "libraryName");
 showCR:' (',(mod type),')'.
 ].
-errStream nextPutLine:'builtIn:'.
+stderr nextPutLine:'builtIn:'.
 ((ObjectMemory binaryModuleInfo
 reject:[:m | m dynamic])
 asSortedCollection:[:a :b | a name < b name]) do:printModule.
-errStream nextPutLine:'dynamic:'.
+stderr nextPutLine:'dynamic:'.
 ((ObjectMemory binaryModuleInfo
 select:[:m | m dynamic])
 asSortedCollection:[:a :b | a name < b name]) do:printModule.
 "
 Smalltalk knownLoadablePackagesDo:[:packageID :type :path |
 all add:packageID
 ].
 all := all asOrderedCollection sort.
 all do:[:eachPackage |
-self errorStream show:eachPackage.
+stderr show:eachPackage.
 (Smalltalk isPackageLoaded:eachPackage) ifTrue:[
-self errorStream show:' (loaded)'.
+stderr show:' (loaded)'.
 ].
-self errorStream cr.
+stderr cr.
 ].
 "
 ReadEvalPrintLoop basicNew showPackages
 ReadEvalPrintLoop basicNew showModules
 showVariables
 Workspace notNil ifTrue:[
 Workspace workspaceVariables keys asOrderedCollection sort do:[:nm |
 |holder|
 holder := Workspace workspaceVariables at:nm.
-self errorStream
+stderr
 show:nm;
 show:' -> ';
 showCR:holder value printString.
 ].
 ].

changeset 22771	a5b520826aad
parent 22770	b83f3a481878
child 22772	d08c521eba2c