diff -r 9c579009a14b -r dee0c393db4e SnapShotImageMemory.st --- a/SnapShotImageMemory.st Tue Sep 13 18:32:05 2016 +0200 +++ b/SnapShotImageMemory.st Wed Sep 14 10:34:43 2016 +0200 @@ -324,7 +324,7 @@ |val| val := eachGlobal value. - (val notNil + (val notNil and:[(val isKindOf:ImageHeader) and:[val isImageBehavior]]) ifTrue:[ aBlock value:val @@ -874,17 +874,17 @@ ^ flags bitTest:Behavior flagSymbol ! -isJavaMethod +isJavaMethod |nm| nm := classRef name. ^ (nm = 'JavaMethod' - or:[ nm = 'JavaMethodWithException' - or:[ nm = 'JavaMethodWithHandler' + or:[ nm = 'JavaMethodWithException' + or:[ nm = 'JavaMethodWithHandler' or:[ nm = 'JavaNativeMethod' ]]]) ! -isLazyMethod +isLazyMethod ^ classRef name = 'LazyMethod' ! @@ -892,7 +892,7 @@ ^ false ! -isMethod +isMethod |cls| cls := classRef. @@ -907,7 +907,7 @@ ^ classRef name = 'MethodDictionary' ! -isMethodOrLazyMethod +isMethodOrLazyMethod classRef name = 'LazyMethod' ifTrue:[^ true]. ^ self isMethod ! @@ -1214,7 +1214,7 @@ ! sourceStream - |sourcePosition source aStream fileName junk who + |sourcePosition source aStream fileName junk who myClass mgr className sep dir mod package| self isMethod ifTrue:[ @@ -1283,7 +1283,7 @@ ]. "/ - "/ nope - look in standard places + "/ nope - look in standard places "/ (if there is a source-code manager - otherwise, we already did that) "/ mgr notNil ifTrue:[ @@ -1321,7 +1321,7 @@ ]. ] ] - ]. + ]. ^ nil ]. @@ -3433,7 +3433,7 @@ ^ self getPrimitiveSpecsAt:1 " - Object primitiveDefinitionsString + Object primitiveDefinitionsString String primitiveDefinitionsString " ! @@ -3777,19 +3777,19 @@ name := self name. "/ - "/ if there is no SourceCodeManager, + "/ if there is no SourceCodeManager, "/ or TryLocalSourceFirst is true, "/ look in standard places first "/ - ((mgr := self sourceCodeManager) isNil + ((mgr := self sourceCodeManager) isNil or:[Class tryLocalSourceFirst == true]) ifTrue:[ aStream := self localSourceStreamFor:source. ]. aStream isNil ifTrue:[ "/ mhmh - still no source file. - "/ If there is a SourceCodeManager, ask it to aquire the - "/ the source for my class, and return an open stream on it. + "/ If there is a SourceCodeManager, ask it to acquire the + "/ the source for my class, and return an open stream on it. "/ if that one does not know about the source, look in "/ standard places @@ -3812,7 +3812,7 @@ ]. aStream notNil ifTrue:[ (self validateSourceStream:aStream) ifFalse:[ - ('Class [info]: repositories source for `' + ('Class [info]: repositories source for `' , (self isMeta ifTrue:[self soleInstance name] ifFalse:[name]) , ''' is invalid.') infoPrintCR. @@ -3826,16 +3826,16 @@ ]. aStream isNil ifTrue:[ - "/ + "/ "/ hard case - there is no source file for this class "/ (in the source-dir-path). - "/ - - "/ + "/ + + "/ "/ look if my binary is from a dynamically loaded module, "/ and, if so, look in the modules directory for the "/ source file. - "/ + "/ ObjectFileLoader notNil ifTrue:[ ObjectFileLoader loadedObjectHandlesDo:[:h | |f classes| @@ -4161,7 +4161,7 @@ ! isPrivate - ^ classRef isPrivateMeta + ^ classRef isPrivateMeta ! isPrivateMeta @@ -4257,7 +4257,7 @@ ! wasAutoloaded - ^ false + ^ false ! ! !SnapShotImageMemory::SpaceInfo methodsFor:'accessing'!