Mercurial Mercurial > hg > stx-libcomp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
info message changed
authorClaus Gittinger <cg@exept.de>
Thu, 24 Oct 1996 12:15:28 +0200
changeset 399 2ac0a04afbdc
parent 398 d37a627f82ab
child 400 e5cfc008be47
info message changed
ObjFLoader.st file | annotate | diff | comparison | revisions
ObjectFileLoader.st file | annotate | diff | comparison | revisions 
--- a/ObjFLoader.st	Thu Oct 24 11:19:54 1996 +0200
+++ b/ObjFLoader.st	Thu Oct 24 12:15:28 1996 +0200
@@ -2197,20 +2197,24 @@
                     |newClass|
 
                     newClass := Smalltalk classNamed:(oldClass name).
-                    (newClass isNil or:[newClass == oldClass]) ifTrue:[
-                        ('OBJFLOADER: reload of ' , oldClass name , ' seemed to fail.') errorPrintCR.
+                    newClass == oldClass ifTrue:[
+"/                        ('OBJFLOADER: class ' , oldClass name , ' reloaded.') errorPrintCR.
                     ] ifFalse:[
+                        (newClass isNil or:[newClass == oldClass]) ifTrue:[
+                            ('OBJFLOADER: reload of ' , oldClass name , ' seemed to fail.') errorPrintCR.
+                        ] ifFalse:[
 "/'oldSize: ' print. oldClass instSize print. ' (' print. oldClass instSize class name print. ') ' print.
 "/'newSize: ' print. newClass instSize print. ' (' print. oldClass instSize class name print. ') ' printCR.
 
-                        oldClass instSize ~~ newClass instSize ifTrue:[
-                            ('OBJFLOADER: ' , oldClass name , ' has changed its size.') errorPrintCR.
-                        ] ifFalse:[
-                            oldClass class instSize ~~ newClass class instSize ifTrue:[
-                                ('OBJFLOADER: ' , oldClass name , ' class has changed its size.') errorPrintCR.
+                            oldClass instSize ~~ newClass instSize ifTrue:[
+                                ('OBJFLOADER: ' , oldClass name , ' has changed its size.') errorPrintCR.
                             ] ifFalse:[
-                                ('OBJFLOADER: migrating ' , oldClass name) errorPrintCR.
-                                oldClass becomeSameAs:newClass
+                                oldClass class instSize ~~ newClass class instSize ifTrue:[
+                                    ('OBJFLOADER: ' , oldClass name , ' class has changed its size.') errorPrintCR.
+                                ] ifFalse:[
+                                    ('OBJFLOADER: migrating ' , oldClass name) errorPrintCR.
+                                    oldClass becomeSameAs:newClass
+                                ]
                             ]
                         ]
                     ]
@@ -2279,7 +2283,7 @@
         PreviouslyLoadedObjects := nil
     ]
 
-    "Modified: 12.7.1996 / 17:37:48 / cg"
+    "Modified: 24.10.1996 / 12:14:58 / cg"
 !
 
 rememberAllObjectFiles
@@ -2912,6 +2916,6 @@
 !ObjectFileLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.115 1996-10-24 09:19:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.116 1996-10-24 10:15:28 cg Exp $'
 ! !
 ObjectFileLoader initialize!
--- a/ObjectFileLoader.st	Thu Oct 24 11:19:54 1996 +0200
+++ b/ObjectFileLoader.st	Thu Oct 24 12:15:28 1996 +0200
@@ -2197,20 +2197,24 @@
                     |newClass|
 
                     newClass := Smalltalk classNamed:(oldClass name).
-                    (newClass isNil or:[newClass == oldClass]) ifTrue:[
-                        ('OBJFLOADER: reload of ' , oldClass name , ' seemed to fail.') errorPrintCR.
+                    newClass == oldClass ifTrue:[
+"/                        ('OBJFLOADER: class ' , oldClass name , ' reloaded.') errorPrintCR.
                     ] ifFalse:[
+                        (newClass isNil or:[newClass == oldClass]) ifTrue:[
+                            ('OBJFLOADER: reload of ' , oldClass name , ' seemed to fail.') errorPrintCR.
+                        ] ifFalse:[
 "/'oldSize: ' print. oldClass instSize print. ' (' print. oldClass instSize class name print. ') ' print.
 "/'newSize: ' print. newClass instSize print. ' (' print. oldClass instSize class name print. ') ' printCR.
 
-                        oldClass instSize ~~ newClass instSize ifTrue:[
-                            ('OBJFLOADER: ' , oldClass name , ' has changed its size.') errorPrintCR.
-                        ] ifFalse:[
-                            oldClass class instSize ~~ newClass class instSize ifTrue:[
-                                ('OBJFLOADER: ' , oldClass name , ' class has changed its size.') errorPrintCR.
+                            oldClass instSize ~~ newClass instSize ifTrue:[
+                                ('OBJFLOADER: ' , oldClass name , ' has changed its size.') errorPrintCR.
                             ] ifFalse:[
-                                ('OBJFLOADER: migrating ' , oldClass name) errorPrintCR.
-                                oldClass becomeSameAs:newClass
+                                oldClass class instSize ~~ newClass class instSize ifTrue:[
+                                    ('OBJFLOADER: ' , oldClass name , ' class has changed its size.') errorPrintCR.
+                                ] ifFalse:[
+                                    ('OBJFLOADER: migrating ' , oldClass name) errorPrintCR.
+                                    oldClass becomeSameAs:newClass
+                                ]
                             ]
                         ]
                     ]
@@ -2279,7 +2283,7 @@
         PreviouslyLoadedObjects := nil
     ]
 
-    "Modified: 12.7.1996 / 17:37:48 / cg"
+    "Modified: 24.10.1996 / 12:14:58 / cg"
 !
 
 rememberAllObjectFiles
@@ -2912,6 +2916,6 @@
 !ObjectFileLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.115 1996-10-24 09:19:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.116 1996-10-24 10:15:28 cg Exp $'
 ! !
 ObjectFileLoader initialize!
hg/stx-libcomp