--- a/Smalltalk.st Mon Dec 05 13:12:35 2011 +0100
+++ b/Smalltalk.st Tue Dec 06 13:28:53 2011 +0100
@@ -2734,27 +2734,27 @@
"/ If that happens, we restart the set-building here
"/
[(classes := CachedClasses) isNil] whileTrue:[
- CachedClasses := classes := IdentitySet new:NumberOfClassesHint.
- self keysAndValuesDo:[:eachName :eachGlobal |
- (eachGlobal notNil and:[eachGlobal isBehavior]) ifTrue:[
- "/ sigh - would like to skip over aliases
- "/ but this cannot be done simply by comparing
- "/ the classes name against the store-key
- "/ i.e. cannot do:
- "/ anObject name == sym ifTrue:[
- "/ classes add:anObject
- "/ ]
- "/ because that would lead to ignore all java
- "/ classes, which are stored under a different
- "/ key.
-
- (eachGlobal name == eachName
- or:[eachGlobal isJavaClass]) ifTrue:[
- classes add:eachGlobal
- ].
- ]
- ].
- NumberOfClassesHint := classes size.
+ CachedClasses := classes := IdentitySet new:NumberOfClassesHint.
+ self keysAndValuesDo:[:eachName :eachGlobal |
+ (eachGlobal notNil and:[eachGlobal isBehavior]) ifTrue:[
+ "/ sigh - would like to skip over aliases
+ "/ but this cannot be done simply by comparing
+ "/ the classes name against the store-key
+ "/ i.e. cannot do:
+ "/ anObject name == sym ifTrue:[
+ "/ classes add:anObject
+ "/ ]
+ "/ because that would lead to ignore all java
+ "/ classes, which are stored under a different
+ "/ key.
+
+ (eachGlobal name == eachName
+ or:[eachGlobal isJavaClass]) ifTrue:[
+ classes add:eachGlobal
+ ].
+ ]
+ ].
+ NumberOfClassesHint := classes size.
].
^ classes
@@ -2767,7 +2767,7 @@
Smalltalk allClasses asSortedCollection:[:a :b | a name < b name]
"
- "Modified: / 23.2.2000 / 10:49:46 / cg"
+ "Modified: / 06-12-2011 / 12:41:42 / cg"
!
allClassesAndMetaclasses
@@ -3548,6 +3548,7 @@
idx := CommandLineArguments indexOf:'--browserWindow:'.
IsPlugin := (idx ~~ 0).
IsPlugin ifTrue:[
+ 'Smalltalk [info]: startup browser window...' infoPrintCR.
self browserWindowStartup.
"/ not reached
].
@@ -3560,13 +3561,16 @@
"/ Therefore, it is now done by an extra user-process.
process := [
+ 'Smalltalk [info]: startup process 1 active.' infoPrintCR.
StartBlocks notNil ifTrue:[
+ 'Smalltalk [info]: execute startBlocks...' infoPrintCR.
StartBlocks do:[:aBlock|
aBlock value
].
StartBlocks := nil.
].
ImageStartBlocks notNil ifTrue:[
+ 'Smalltalk [info]: execute imageStartBlocks...' infoPrintCR.
ImageStartBlocks do:[:aBlock|
aBlock value
].
@@ -3635,14 +3639,17 @@
"/ Processor exitWhenNoMoreUserProcesses:true.
process := [
+ 'Smalltalk [info]: startup process 2 active.' infoPrintCR.
StandAlone ifTrue:[
AbortOperationRequest handle:[:ex |
'Smalltalk [info]: aborted - exit.' infoPrintCR.
OperatingSystem exit:1
] do:[
+ ('Smalltalk [info]: call ',StartupSelector,' of ',StartupClass name,' (1)') infoPrintCR.
StartupClass perform:StartupSelector withArguments:StartupArguments.
]
] ifFalse:[
+ ('Smalltalk [info]: call ',StartupSelector,' of ',StartupClass name,' (2)') infoPrintCR.
StartupClass perform:StartupSelector withArguments:StartupArguments.
].
@@ -3681,7 +3688,8 @@
"
((Display notNil and:[graphicalMode])
or:[process notNil
- or:[HeadlessOperation]]) ifTrue:[
+ or:[HeadlessOperation
+ or:[StandAlone]]]) ifTrue:[
Processor dispatchLoop.
"done - the last process finished"
'Smalltalk [info]: last process finished - exit.' infoPrintCR.
@@ -3695,7 +3703,7 @@
"Created: / 18-07-1996 / 21:07:39 / cg"
"Modified: / 09-09-1996 / 17:42:50 / stefan"
- "Modified: / 05-12-2011 / 12:11:10 / cg"
+ "Modified: / 06-12-2011 / 13:28:20 / cg"
!
openDisplay
@@ -7688,11 +7696,11 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.981 2011-12-05 12:12:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.982 2011-12-06 12:28:53 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.981 2011-12-05 12:12:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.982 2011-12-06 12:28:53 cg Exp $'
!
version_SVN