hg/stx-libbasic: comparison Symbol.st

equal deleted inserted replaced

-:8baf5d75506e
+:752a9509eadf
 ^ true
 ! !
-!Symbol methodsFor:'*magritte-model-converting'!
-asAccessor
-^ Magritte::MASelectorAccessor selector: self
-! !
 !Symbol methodsFor:'Compatibility-Squeak'!
 isUnary
 ^ self isUnarySelector
 ! !
 VW compatibility."
 ^ UserMessage key:self catalogID:catalogID
 "
 (#theFooMessage << #myMessages)
 (#theFooMessage << #myMessages >> 'cannot read subclass of metaclass')
 (#theFooMessage >> 'cannot read subclass of metaclass')
 "
 !
 >> aString
 "create and return a new UserMessage, with the receiver as key,
 and the argument as defaultString.
 VW compatibility."
 ^ UserMessage key:self defaultString:aString
 "
 (#theFooMessage << #myMessages)
 (#theFooMessage << #myMessages >> 'cannot read subclass of metaclass')
 (#theFooMessage >> 'cannot read subclass of metaclass')
 "
 ! !
 !Symbol methodsFor:'accessing'!
 !Symbol methodsFor:'comparing'!
 = something
 "return true, if the receiver and argument consist of the same characters.
 Redefined here, for more efficient #= comparison of symbols
 (which ought to be compared using #==).
 If the argument is a symbol, we use a quick pointer compare, instead of
 the inherited value compare."
 %{   /* NOCONTEXT */
 if (! __isNonNilObject(something)) RETURN(false);
 if ((cls = __qClass(something)) == Symbol) {
 	RETURN (self == something ? true : false);
 }
 if (cls == String) {
 	RETURN (strcmp(__stringVal(self), __stringVal(something)) == 0 ? true : false);
 }
 %}.
 "fall back; could be a TwoByteString, or a collection of Characters"
 ^ super = something
 	 * after it got a hashKey assigned.
 	 */
 	if (val == 0) {
 	    cp = __stringVal(self);
 	    l = __stringSize(self);
 	    /*
 	     * this is the dragon-book algorithm
 	     * We have tested 5-bit shifts as well:
 	     *
 	     * ST/X Symbols:                 17807
 	     * Hashkey collisions (4bit):       14   0.07%
 	     * Hashkey collisions (5bit):      300   1.68%
 	     */
 	    if (l > 0) {
 	Symbol allInstancesDo:[:instance |
 	    hashColl add:instance identityHash
 	].
 	hashSet := hashColl asSet.
 	Transcript showCR:'Symbols: ', hashColl size printString,
 			  ' unique hash keys: ', hashSet size printString,
 			  ' collisions:', (hashColl size - hashSet size) printString.
 "
 !
 ~= something
 "return true, if the receiver and argument do not consist of the same characters.
 Redefined here, for more efficient #~= comparison of symbols
 (which ought to be compared using #~~).
 If the argument is a symbol, we use a quick pointer compare, instead of
 the inherited value compare."
 %{   /* NOCONTEXT */
 %{  /* NOCONTEXT */
 OBJ s;
 s = __MKSTRING_ST(self);
 if (s != nil) {
-RETURN (s);
+	RETURN (s);
 }
 %}.
 ^ (String new:(self size))
-replaceFrom:1 with:self startingAt:1
+	replaceFrom:1 with:self startingAt:1
 !
 asSymbol
 "Return a unique symbol with the name taken from the receivers characters.
 Since I am a symbol - just return myself"
 ^ self
 !
 asSymbolIfInterned
 "If a symbol with the receivers characters is already known, return it. Otherwise, return nil.
 Since I am a symbol - just return myself"
 ^ self
 ! !
 |storeString|
 storeString := self storeString.
 (self == #true or:[self == #false or:[self == #nil or:[(storeString at:2) == $']]]) ifTrue:[
-aStream nextPutAll:storeString.
+	aStream nextPutAll:storeString.
 ] ifFalse:[
-aStream nextPutAll:self.
+	aStream nextPutAll:self.
 ].
 !
 storeOn:aStream
 "store myself on a stream"
 !
 storeString
 "return a String for storing the receiver"
 |sz "{Class: SmallInteger }"
 c anyColon|
 sz := self size.
 (sz ~~ 0 and:[(self at:1) isLetter]) ifTrue:[
-anyColon := false.
+	anyColon := false.
-2 to:sz do:[:index |
+	2 to:sz do:[:index |
-c := self at:index.
+	    c := self at:index.
-c == $: ifTrue:[
+	    c == $: ifTrue:[
-(index == sz or:[(self at:(index+1)) isLetterOrDigit]) ifFalse:[
+		(index == sz or:[(self at:(index+1)) isLetterOrDigit]) ifFalse:[
-^ '#' , super storeString.
+		    ^ '#' , super storeString.
-].
+		].
-anyColon := true.
+		anyColon := true.
-] ifFalse:[
+	    ] ifFalse:[
-c isLetterOrDigit ifFalse:[
+		c isLetterOrDigit ifFalse:[
-^ '#' , super storeString
+		    ^ '#' , super storeString
-].
+		].
-].
+	    ].
-].
+	].
-"no colon in symbol or symbol ends with a colon"
+	"no colon in symbol or symbol ends with a colon"
-(anyColon and:[c ~~ $:]) ifFalse:[
+	(anyColon and:[c ~~ $:]) ifFalse:[
-^ '#' , self
+	    ^ '#' , self
-].
+	].
 ].
 ^ '#' , super storeString
 "
 #'abc'       storeString
 #'abc:'      storeString
 #'abc:def:'  storeString
 #'abc:def'   storeString
 #'abc::def'  storeString
 #'abc &^*'   storeString
 #'abcdef::'  storeString
 #'hello''world'  storeString
 #'' storeString
 #'''' storeString
 #'_hello' storeString
 #'123'  storeString
 "
 ! !
 !Symbol methodsFor:'queries'!
 "return true, if the receiver is a binary message selector"
 ^ self first isLetterOrDigit not
 "
 #at:put: isInfix
 #at: isInfix
 #+ isInfix
 #size isInfix
 "
 "Created: / 1.11.1997 / 12:34:55 / cg"
 "Modified: / 1.11.1997 / 12:36:37 / cg"
 !
 "return true, if the receiver is a keyword message selector"
 ^ self includes:$:
 "
 #at:put: isKeyword
 #at: isKeyword
 #+ isKeyword
 #size isKeyword
 "
 "Created: / 1.11.1997 / 12:34:55 / cg"
 "Modified: / 1.11.1997 / 12:36:37 / cg"
 !
 isSymbol
 "return true, if the receiver is some kind of symbol.
 Since I am a symbol, return always true"
 ^ true
 !
 	coll add:part
 ].
 ^ coll asArray
 "
 #at:put: keywords
 #at: keywords
 #+ keywords
 #size keywords
 "
 !
 species
 "when copying, or concatenating, return instances of this class"
 rid of the receiver. For symbols, this is not allowed, if the receiver
 is used as a key in some SystemDictionary.
 This can be a very dangerous operation - be warned.
 Notice: because of the danger here, this method may report an error
-in future versions"
+	     in future versions"
 (Smalltalk includesKey:self) ifTrue:[
-self primitiveFailed
+	self primitiveFailed
 ] ifFalse:[
-super becomeNil
+	super becomeNil
 ]
 ! !
 !Symbol methodsFor:'tracing'!
 ! !
 !Symbol class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Symbol.st,v 1.87 2009-07-30 08:03:40 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Symbol.st,v 1.88 2009-08-15 06:54:44 sr Exp $'
 ! !

changeset 11859	752a9509eadf
parent 11819	ad671b753451
child 12473	828e275ddf8b