hg/stx-libbasic: comparison Class.st

equal deleted inserted replaced

-:5558dc303721
+:ab5b38bd8f81
 "the comment is either a string, or an integer specifying the
 position within the classes sourcefile ...
 "
 comment isNumber ifTrue:[
-	classFilename notNil ifTrue:[
+classFilename notNil ifTrue:[
-	    stream := self sourceStream.
+stream := self sourceStream.
-	    stream notNil ifTrue:[
+stream notNil ifTrue:[
-		stream position1Based:comment.
+stream position:comment-1.
-		string := String readFrom:stream onError:''.
+string := String readFrom:stream onError:''.
-		stream close.
+stream close.
-		^ string
+^ string
-	    ].
+].
-	    ^ nil
+^ nil
-	]
+]
 ].
 ^ comment
 "
 Object comment
 "the attribute is either a string, or an integer specifying the
 position within the classes sourcefile ..."
 pos isNumber ifTrue:[
 "/        classFilename notNil ifTrue:[
-	    stream := self sourceStream.
+stream := self sourceStream.
-	    stream notNil ifTrue:[
+stream notNil ifTrue:[
-		stream position0Based:pos.
+stream position:pos.
-		string := stream nextChunk.
+string := stream nextChunk.
-		stream close.
+stream close.
-		^ string
+^ string
-	    ].
+].
 "/        ].
-	^ nil
+^ nil
 ].
 ^ pos
 !
 |cls meta cannotCheckReason versionMethod info
 versionFromCode versionFromSource oldPos pos src rev|
 ValidateSourceOnlyOnce == true ifTrue:[
-	ValidatedClasses notNil ifTrue:[
+ValidatedClasses notNil ifTrue:[
-	    (ValidatedClasses includes:self) ifTrue:[
+(ValidatedClasses includes:self) ifTrue:[
-		Transcript showCR:'trust validated'.
+Transcript showCR:'trust validated'.
-		^ true
+^ true
-	    ].
+].
-	] ifFalse:[
+] ifFalse:[
-	    ValidatedClasses := WeakIdentitySet new.
+ValidatedClasses := WeakIdentitySet new.
-	].
+].
 ].
 meta := self theMetaclass.
 cls := self theNonMetaclass.
 cannotCheckReason := nil.
 versionMethod := self findVersionMethod.
 versionMethod isNil ifTrue:[
-	cannotCheckReason := 'no valid version method'.
+cannotCheckReason := 'no valid version method'.
 ] ifFalse:[
-	"/
+"/
-	"/ if its a method returning the string,
+"/ if its a method returning the string,
-	"/ thats the returned value
+"/ thats the returned value
-	"/
+"/
-	versionFromCode := versionMethod valueWithReceiver:cls arguments:#().
+versionFromCode := versionMethod valueWithReceiver:cls arguments:#().
-	versionFromCode isString ifFalse:[
+versionFromCode isString ifFalse:[
-	    cannotCheckReason := 'version method does not return a string'
+cannotCheckReason := 'version method does not return a string'
-	].
+].
 ].
 versionMethod notNil ifTrue:[
-	pos := versionMethod sourcePosition.
+pos := versionMethod sourcePosition.
-	pos isInteger ifFalse:[
+pos isInteger ifFalse:[
-	    "/ mhmh - either no version method,
+"/ mhmh - either no version method,
-	    "/ or updated due to a checkin.
+"/ or updated due to a checkin.
-	    "/ in any case, this should be a good source.
+"/ in any case, this should be a good source.
-	    ^ true.
+^ true.
-	    "/ cannotCheckReason := 'no source position for version-method'
+"/ cannotCheckReason := 'no source position for version-method'
-	]
+]
 ].
 cannotCheckReason notNil ifTrue:[
-	('Class [warning]: ' , cannotCheckReason , ' in ' , self name) infoPrintCR.
+('Class [warning]: ' , cannotCheckReason , ' in ' , self name) infoPrintCR.
-	'Class [info]: cannot validate source; trusting source' infoPrintCR.
+'Class [info]: cannot validate source; trusting source' infoPrintCR.
-	^ true
+^ true
 ].
 oldPos := aStream position.
 Stream positionErrorSignal handle:[:ex |
-	'Class [info]: position error when accessing source' infoPrintCR.
+'Class [info]: position error when accessing source' infoPrintCR.
-	^ false
+^ false
 ] do:[
-	aStream position1Based:pos.
+aStream position:pos-1.
 ].
 src := aStream nextChunk.
 aStream position:oldPos.
 (src isEmptyOrNil) ifTrue:[
-	'Class [info]: empty source for version-method' infoPrintCR.
+'Class [info]: empty source for version-method' infoPrintCR.
-	^ false
+^ false
 ].
 (src startsWith:'version') ifFalse:[
-	'Class [info]: corrupted source (source does not correspond to binary)' infoPrintCR.
+'Class [info]: corrupted source (source does not correspond to binary)' infoPrintCR.
-	^ false
+^ false
 ].
 versionFromSource := Class revisionStringFromSource:src.
 versionFromSource = versionFromCode ifTrue:[
-	ValidatedClasses notNil ifTrue:[ ValidatedClasses add:self ].
+ValidatedClasses notNil ifTrue:[ ValidatedClasses add:self ].
-	^ true
+^ true
 ].
 versionFromSource isNil ifTrue:[
-	'Class [info]: version-from source is nil' infoPrintCR.
+'Class [info]: version-from source is nil' infoPrintCR.
-	^ false
+^ false
 ].
 "/ mhmh - check my binary version ...
 info := Class revisionInfoFromString:versionFromSource.
 info notNil ifTrue:[
-	rev := info at:#revision.
+rev := info at:#revision.
-	rev = self binaryRevision ifTrue:[
+rev = self binaryRevision ifTrue:[
-	    ValidatedClasses notNil ifTrue:[ ValidatedClasses add:self ].
+ValidatedClasses notNil ifTrue:[ ValidatedClasses add:self ].
-	    ^ true
+^ true
-	].
+].
 ].
 'Class [info]: source-version is different from binaryRevision' infoPrintCR.
 ^ false
 "Modified: / 29-09-2011 / 14:29:55 / cg"
 ! !
 !Class class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.628 2013-07-12 13:56:43 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.629 2013-08-10 11:14:10 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.628 2013-07-12 13:56:43 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.629 2013-08-10 11:14:10 stefan Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'

branch	jv
changeset 18084	ab5b38bd8f81
parent 18076	17106b5b6cee
parent 15610	cdec81bdc7a7
child 18092	4174aa84a870