--- a/CharacterArray.st Thu Sep 05 14:33:04 2002 +0200
+++ b/CharacterArray.st Fri Sep 06 21:22:24 2002 +0200
@@ -5118,11 +5118,16 @@
idx := idx2 - 1.
v := argArrayOrDictionary at:key asSymbol ifAbsent:nil
] ifFalse:[
- v := next asString.
-"/ v := argArrayOrDictionary at:next ifAbsent:nil.
-"/ v isNil ifTrue:[
-"/ v := argArrayOrDictionary at:next asString asSymbol ifAbsent:nil.
-"/ ].
+ (argArrayOrDictionary includesKey:next) ifTrue:[
+ v := argArrayOrDictionary at:next ifAbsent:nil.
+ ].
+ v isNil ifTrue:[
+ (argArrayOrDictionary includesKey:next asString) ifTrue:[
+ v := argArrayOrDictionary at:next asString asSymbol ifAbsent:nil.
+ ] ifFalse:[
+ v := next asString.
+ ]
+ ].
]
].
v isNil ifTrue:[v := ''].
@@ -6160,6 +6165,6 @@
!CharacterArray class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.226 2002-09-05 12:33:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/CharacterArray.st,v 1.227 2002-09-06 19:22:24 cg Exp $'
! !
CharacterArray initialize!