# HG changeset patch # User Stefan Vogel # Date 859338790 -3600 # Node ID c217e646447e59414eefc82480f697ca6176f92e # Parent 95392696facc0d928ddbdbf874ff39570426eba0 'revision' instvar may now be both a number ('1.12') and a RCS ' ....'. diff -r 95392696facc -r c217e646447e Class.st --- a/Class.st Tue Mar 25 13:50:51 1997 +0100 +++ b/Class.st Wed Mar 26 02:13:10 1997 +0100 @@ -4233,12 +4233,23 @@ If a classes binary is up-to-date w.r.t. the source repository, the returned string is the same as the one returned by #revision." - |owner| + |owner info c| (owner := self owningClass) notNil ifTrue:[^ owner binaryRevision]. self isMeta ifTrue:[ ^ self soleInstance binaryRevision ]. + revision notNil ifTrue:[ + c := revision first. + c == $$ ifTrue:[ + info := Class revisionInfoFromString:revision. + ^ info at:#revision ifAbsent:0. + ]. + c isDigit ifFalse:[ + ^ 0 + ]. + ]. + ^ revision " @@ -4258,6 +4269,7 @@ "Created: 7.12.1995 / 10:58:47 / cg" "Modified: 15.10.1996 / 18:55:28 / cg" + "Modified: 26.3.1997 / 00:24:51 / stefan" ! packageSourceCodeInfo @@ -4416,9 +4428,9 @@ info := self revisionInfo. info notNil ifTrue:[ - ^ info at:#revision ifAbsent:nil + ^ info at:#revision ifAbsent:nil ]. - ^ revision + ^ self binaryRevision " Object revision @@ -4426,6 +4438,7 @@ "Created: 11.11.1995 / 14:27:20 / cg" "Modified: 12.12.1995 / 20:30:20 / cg" + "Modified: 26.3.1997 / 00:14:00 / stefan" ! revisionInfo @@ -4453,7 +4466,7 @@ info := Class revisionInfoFromString:vsnString. ]. info notNil ifTrue:[ - info at:#binaryRevision put:revision. + info at:#binaryRevision put:self binaryRevision. ] ]. ^ info @@ -4466,6 +4479,7 @@ "Created: 11.11.1995 / 14:27:20 / cg" "Modified: 29.1.1997 / 18:59:12 / cg" + "Modified: 26.3.1997 / 00:13:17 / stefan" ! revisionString @@ -4866,6 +4880,6 @@ !Class class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.270 1997-03-24 10:13:02 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.271 1997-03-26 01:13:10 stefan Exp $' ! ! Class initialize!