--- a/ObjectMemory.st Fri Dec 01 16:36:05 2000 +0100
+++ b/ObjectMemory.st Fri Dec 01 16:44:08 2000 +0100
@@ -1712,37 +1712,37 @@
|names oClass|
referent == Smalltalk ifTrue:[
- referent keysAndValuesDo:[:key :val |
- |idx|
-
- (anObject == val) ifTrue:[
- "/ for our convenience - if its a nameSpace, cut off Smalltalk.
- idx := key string indexOf:$:.
- (idx ~~ 0
- and:[idx < key string size
- and:[(key string at:(idx+1)) == $:]]) ifTrue:[
- ^ (key copyFrom:(idx+2)) asText allBold
- ].
- ^ 'Smalltalk:' , (key asText allBold).
- ]
- ].
+ referent keysAndValuesDo:[:key :val |
+ |idx|
+
+ (anObject == val) ifTrue:[
+ "/ for our convenience - if its a nameSpace, cut off Smalltalk.
+ idx := key string indexOf:$:.
+ (idx ~~ 0
+ and:[idx < key string size
+ and:[(key string at:(idx+1)) == $:]]) ifTrue:[
+ ^ (key copyFrom:(idx+2)) allBold
+ ].
+ ^ 'Smalltalk:' , (key allBold).
+ ]
+ ].
] ifFalse:[
- names := referent class allInstVarNames.
- oClass := referent class.
- 1 to:oClass instSize do:[:i |
- ((referent instVarAt:i) == anObject) ifTrue:[
- ^ (referent classNameWithArticle , ' [' , (names at:i) asText allBold, ']').
- ].
- ].
- oClass isVariable ifTrue:[
- oClass isPointers ifTrue:[
- 1 to:referent basicSize do:[:i |
- ((referent basicAt:i) == anObject) ifTrue:[
- ^ (referent classNameWithArticle , ' [' , i printString asText allBold, ']').
- ]
- ]
- ]
- ].
+ names := referent class allInstVarNames.
+ oClass := referent class.
+ 1 to:oClass instSize do:[:i |
+ ((referent instVarAt:i) == anObject) ifTrue:[
+ ^ (referent classNameWithArticle , ' [' , (names at:i) allBold, ']').
+ ].
+ ].
+ oClass isVariable ifTrue:[
+ oClass isPointers ifTrue:[
+ 1 to:referent basicSize do:[:i |
+ ((referent basicAt:i) == anObject) ifTrue:[
+ ^ (referent classNameWithArticle , ' [' , i printString allBold, ']').
+ ]
+ ]
+ ]
+ ].
].
self halt:'no reference'.
@@ -5047,6 +5047,6 @@
!ObjectMemory class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.189 2000-09-03 14:44:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ObjectMemory.st,v 1.190 2000-12-01 15:43:03 cg Exp $'
! !
ObjectMemory initialize!
--- a/PositionableStream.st Fri Dec 01 16:36:05 2000 +0100
+++ b/PositionableStream.st Fri Dec 01 16:44:08 2000 +0100
@@ -615,7 +615,7 @@
oldPackage := param key package.
newPackage := param value package.
- msg := 'trying to redefine class: ' , param key name asText allBold , '\\in package '''
+ msg := 'trying to redefine class: ' , param key name allBold , '\\in package '''
, oldPackage , ''' with new definition from package ''' , newPackage , ''''.
canContinueForAll := true.
redef := true.
@@ -1026,6 +1026,6 @@
!PositionableStream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.95 2000-11-09 10:46:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.96 2000-12-01 15:43:49 cg Exp $'
! !
PositionableStream initialize!
--- a/Project.st Fri Dec 01 16:36:05 2000 +0100
+++ b/Project.st Fri Dec 01 16:44:08 2000 +0100
@@ -22,15 +22,15 @@
category:'System-Support'
!
-Object subclass:#MethodInfo
- instanceVariableNames:'conditionForInclusion methodName className fileName'
+Object subclass:#ClassInfo
+ instanceVariableNames:'conditionForInclusion className classFileName'
classVariableNames:''
poolDictionaries:''
privateIn:Project
!
-Object subclass:#ClassInfo
- instanceVariableNames:'conditionForInclusion className classFileName'
+Object subclass:#MethodInfo
+ instanceVariableNames:'conditionForInclusion methodName className fileName'
classVariableNames:''
poolDictionaries:''
privateIn:Project
@@ -1909,7 +1909,7 @@
].
numBad ~~ 0 ifTrue:[
msg := 'Cannot determine load/compile order when about to ' , whatMsg.
- msg := msg , '\Reason: Class ''' , firstBad asText allBold
+ msg := msg , '\Reason: Class ''' , firstBad allBold
, ''' is not loaded.'.
numBad ~~ 1 ifTrue:[
msg := msg , '\(' , (numBad-1) printString , ' more unloaded classes were found)'
@@ -3764,47 +3764,111 @@
"Modified: 14.2.1997 / 15:38:47 / cg"
! !
+!Project::ClassInfo methodsFor:'accessing'!
+
+classFileName
+ "return the value of the instance variable 'classFileName' (automatically generated)"
+
+ ^ classFileName
+!
+
+classFileName:something
+ "set the value of the instance variable 'classFileName' (automatically generated)"
+
+ classFileName := something.
+!
+
+className
+ "return the value of the instance variable 'className' (automatically generated)"
+
+ ^ className
+!
+
+className:something
+ "set the value of the instance variable 'className' (automatically generated)"
+
+ className := something.
+!
+
+conditionForInclusion
+ "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+ ^ conditionForInclusion
+!
+
+conditionForInclusion:something
+ "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+ conditionForInclusion := something.
+! !
+
+!Project::ClassInfo methodsFor:'printing & storing'!
+
+displayString
+ ^ 'ClassInfo: ' , className
+! !
+
+!Project::ClassInfo methodsFor:'queries'!
+
+theClass
+ |cls|
+
+ cls := Smalltalk classNamed:className.
+ cls isNil ifTrue:[ ^ nil].
+ ^ cls
+
+ "Created: / 26.9.1999 / 13:39:00 / cg"
+! !
+
!Project::MethodInfo methodsFor:'accessing'!
className
"return the value of the instance variable 'className' (automatically generated)"
- ^ className!
+ ^ className
+!
className:something
"set the value of the instance variable 'className' (automatically generated)"
- className := something.!
+ className := something.
+!
conditionForInclusion
"return the value of the instance variable 'conditionForInclusion' (automatically generated)"
- ^ conditionForInclusion!
+ ^ conditionForInclusion
+!
conditionForInclusion:something
"set the value of the instance variable 'conditionForInclusion' (automatically generated)"
- conditionForInclusion := something.!
+ conditionForInclusion := something.
+!
fileName
"return the value of the instance variable 'fileName' (automatically generated)"
- ^ fileName!
+ ^ fileName
+!
fileName:something
"set the value of the instance variable 'fileName' (automatically generated)"
- fileName := something.!
+ fileName := something.
+!
methodName
"return the value of the instance variable 'methodName' (automatically generated)"
- ^ methodName!
+ ^ methodName
+!
methodName:something
"set the value of the instance variable 'methodName' (automatically generated)"
- methodName := something.! !
+ methodName := something.
+! !
!Project::MethodInfo methodsFor:'printing & storing'!
@@ -3833,59 +3897,9 @@
"Created: / 26.9.1999 / 13:39:07 / cg"
! !
-!Project::ClassInfo methodsFor:'accessing'!
-
-classFileName
- "return the value of the instance variable 'classFileName' (automatically generated)"
-
- ^ classFileName!
-
-classFileName:something
- "set the value of the instance variable 'classFileName' (automatically generated)"
-
- classFileName := something.!
-
-className
- "return the value of the instance variable 'className' (automatically generated)"
-
- ^ className!
-
-className:something
- "set the value of the instance variable 'className' (automatically generated)"
-
- className := something.!
-
-conditionForInclusion
- "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
- ^ conditionForInclusion!
-
-conditionForInclusion:something
- "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
- conditionForInclusion := something.! !
-
-!Project::ClassInfo methodsFor:'printing & storing'!
-
-displayString
- ^ 'ClassInfo: ' , className
-! !
-
-!Project::ClassInfo methodsFor:'queries'!
-
-theClass
- |cls|
-
- cls := Smalltalk classNamed:className.
- cls isNil ifTrue:[ ^ nil].
- ^ cls
-
- "Created: / 26.9.1999 / 13:39:00 / cg"
-! !
-
!Project class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.166 2000-11-07 11:46:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.167 2000-12-01 15:44:08 cg Exp $'
! !
Project initialize!