--- a/Metaclass.st Mon Oct 28 17:09:22 1996 +0100
+++ b/Metaclass.st Mon Oct 28 19:22:33 1996 +0100
@@ -474,7 +474,7 @@
classVarChange instVarChange superClassChange newComment
changeSet1 changeSet2 addedNames
anyChange oldInstVars newInstVars oldClassVars newClassVars superFlags newFlags
- project currentProject t nClassInstVars superInstVars
+ project currentProject pkg idx spec nClassInstVars superInstVars
realNewName thisIsPrivate oldCIVNames newCIVNames msg nsName namespace|
"NOTICE:
@@ -528,11 +528,11 @@
realNewName := classSymbol.
"/ does the name imply a nameSpace ?
- ((t := realNewName indexOf:$:)) ~~ 0 ifTrue:[
+ ((idx := realNewName indexOf:$:)) ~~ 0 ifTrue:[
"/ check for this namespace to exist
- nsName := realNewName copyTo:(t - 1).
+ nsName := realNewName copyTo:(idx - 1).
nsName := nsName asSymbol.
- (realNewName indexOf:$: startingAt:(t+2)) ~~ 0 ifTrue:[
+ (realNewName indexOf:$: startingAt:(idx+2)) ~~ 0 ifTrue:[
self warn:('nested namespaces are not (yet) implemented.') withCRs.
^ nil
].
@@ -751,19 +751,19 @@
"/ but prefer the old package
oldClass notNil ifTrue:[
- t := oldClass package.
+ pkg := oldClass package.
newClass setBinaryRevision:(oldClass binaryRevision).
] ifFalse:[
project notNil ifTrue:[
currentProject := project current.
currentProject notNil ifTrue:[
- t := currentProject packageName.
+ pkg := currentProject packageName.
]
].
].
- t notNil ifTrue:[
- newMetaclass package:t.
- newClass package:t.
+ pkg notNil ifTrue:[
+ newMetaclass package:pkg.
+ newClass package:pkg.
].
"
@@ -808,8 +808,8 @@
setting first will make new class clear obsolete classvars
"
newClass setClassVariableString:(oldClass classVariableString).
- (t := oldClass primitiveSpec) notNil ifTrue:[
- newClass primitiveSpec:t.
+ (spec := oldClass primitiveSpec) notNil ifTrue:[
+ newClass primitiveSpec:spec.
newClass setClassFilename:(oldClass classFilename).
]
].
@@ -1263,7 +1263,7 @@
"Created: 26.5.1996 / 11:55:26 / cg"
"Modified: 18.6.1996 / 14:19:39 / stefan"
- "Modified: 28.10.1996 / 11:53:45 / cg"
+ "Modified: 28.10.1996 / 19:22:05 / cg"
!
name:newName inEnvironment:aSystemDictionary
@@ -1662,5 +1662,5 @@
!Metaclass class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.80 1996-10-28 10:57:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.81 1996-10-28 18:22:33 cg Exp $'
! !