equal
deleted
inserted
replaced
101 thisNamespace isNil ifTrue:[ |
101 thisNamespace isNil ifTrue:[ |
102 (Smalltalk includesKey:key) ifTrue:[ |
102 (Smalltalk includesKey:key) ifTrue:[ |
103 thisNamespace := Smalltalk at:key. |
103 thisNamespace := Smalltalk at:key. |
104 (thisNamespace notNil |
104 (thisNamespace notNil |
105 and:[thisNamespace isBehavior not]) ifTrue:[ |
105 and:[thisNamespace isBehavior not]) ifTrue:[ |
106 ^ self error:'name conflict: namespace ' , aName , ' vs. global'. |
106 self error:'name conflict: namespace ' , aName , ' vs. global'. |
107 ] |
107 ] |
108 ]. |
108 ]. |
109 thisNamespace isNil ifTrue:[ |
109 thisNamespace isNil ifTrue:[ |
110 thisNamespace := self name:key |
110 thisNamespace := self name:key |
111 ] |
111 ] |
156 "/ ] |
156 "/ ] |
157 "/ ] |
157 "/ ] |
158 ]. |
158 ]. |
159 ok ifFalse:[ |
159 ok ifFalse:[ |
160 self error:'invalid namespace name:''' , aStringOrSymbol printString , ''' (must be a valid identifier)'. |
160 self error:'invalid namespace name:''' , aStringOrSymbol printString , ''' (must be a valid identifier)'. |
161 ^ nil. |
|
162 ]. |
161 ]. |
163 |
162 |
164 currentNameSpace := Class nameSpaceQuerySignal query. |
163 currentNameSpace := Class nameSpaceQuerySignal query. |
165 currentNameSpace isNil ifTrue:[currentNameSpace := Smalltalk]. |
164 currentNameSpace isNil ifTrue:[currentNameSpace := Smalltalk]. |
166 |
165 |
399 ! ! |
398 ! ! |
400 |
399 |
401 !Namespace class methodsFor:'documentation'! |
400 !Namespace class methodsFor:'documentation'! |
402 |
401 |
403 version |
402 version |
404 ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.31 1999-07-26 14:01:44 cg Exp $' |
403 ^ '$Header: /cvs/stx/stx/libbasic/NameSpace.st,v 1.32 1999-08-04 14:08:36 cg Exp $' |
405 ! ! |
404 ! ! |