class: ObjectMemory
changed: #binaryModuleInfo
replaced class == String by isString (immutableStrings)
--- a/ObjectMemory.st Thu Sep 11 14:27:34 2014 +0200
+++ b/ObjectMemory.st Thu Sep 11 14:28:25 2014 +0200
@@ -5043,66 +5043,66 @@
modules := IdentityDictionary new.
self allBinaryModulesDo:[:idArg :nameArg :flagsArg :libName :timeStamp |
- |type subModuleName module dynamic infoRec handle pathName
- typeName name nameString|
-
- nameArg class == String ifFalse:[
- 'Error in binaryModuleInfo - skip entry' errorPrintCR.
- ] ifTrue:[
- name := nameArg.
- subModuleName := name asSymbol.
-
- idArg > 0 ifTrue:[
- dynamic := true.
- typeName := 'dynamic '.
- handle := ObjectFileLoader handleFromID:idArg.
- (handle isNil or:[(pathName := handle pathName) isNil]) ifTrue:[
- name := '?'
- ] ifFalse:[
- name := pathName asFilename baseName
- ]
- ] ifFalse:[
- dynamic := false.
- typeName := 'builtIn '.
- pathName := nil.
- libName isNil ifTrue:[
- name := subModuleName
- ] ifFalse:[
- name := libName
- ].
- ].
- nameString := typeName.
- libName isNil ifTrue:[
- nameString := nameString, 'module '
- ] ifFalse:[
- nameString := nameString, 'classLib '
- ].
- nameString := nameString , name.
-
- libName isNil ifTrue:[
- type := #classObject
- ] ifFalse:[
- type := #classLibrary
- ].
-
- infoRec := modules at:idArg ifAbsent:nil.
- infoRec notNil ifTrue:[
- infoRec classNames add:subModuleName.
- ] ifFalse:[
- infoRec := BinaryModuleDescriptor
- name:nameString
- type:type
- id:idArg
- dynamic:dynamic
- classNames:( (OrderedSet ? Set) with:subModuleName)
- handle:handle
- pathName:pathName
- libraryName:libName
- timeStamp:nil.
-
- modules at:idArg put:infoRec.
- ].
- ].
+ |type subModuleName module dynamic infoRec handle pathName
+ typeName name nameString|
+
+ nameArg isString ifFalse:[
+ 'Error in binaryModuleInfo - skip entry' errorPrintCR.
+ ] ifTrue:[
+ name := nameArg.
+ subModuleName := name asSymbol.
+
+ idArg > 0 ifTrue:[
+ dynamic := true.
+ typeName := 'dynamic '.
+ handle := ObjectFileLoader handleFromID:idArg.
+ (handle isNil or:[(pathName := handle pathName) isNil]) ifTrue:[
+ name := '?'
+ ] ifFalse:[
+ name := pathName asFilename baseName
+ ]
+ ] ifFalse:[
+ dynamic := false.
+ typeName := 'builtIn '.
+ pathName := nil.
+ libName isNil ifTrue:[
+ name := subModuleName
+ ] ifFalse:[
+ name := libName
+ ].
+ ].
+ nameString := typeName.
+ libName isNil ifTrue:[
+ nameString := nameString, 'module '
+ ] ifFalse:[
+ nameString := nameString, 'classLib '
+ ].
+ nameString := nameString , name.
+
+ libName isNil ifTrue:[
+ type := #classObject
+ ] ifFalse:[
+ type := #classLibrary
+ ].
+
+ infoRec := modules at:idArg ifAbsent:nil.
+ infoRec notNil ifTrue:[
+ infoRec classNames add:subModuleName.
+ ] ifFalse:[
+ infoRec := BinaryModuleDescriptor
+ name:nameString
+ type:type
+ id:idArg
+ dynamic:dynamic
+ classNames:( (OrderedSet ? Set) with:subModuleName)
+ handle:handle
+ pathName:pathName
+ libraryName:libName
+ timeStamp:nil.
+
+ modules at:idArg put:infoRec.
+ ].
+ ].
].
^ modules
@@ -5604,11 +5604,11 @@
!ObjectMemory class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.283 2014-07-09 15:05:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.284 2014-09-11 12:28:25 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.283 2014-07-09 15:05:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.284 2014-09-11 12:28:25 cg Exp $'
!
version_SVN