# HG changeset patch # User claus # Date 808512940 -7200 # Node ID 66bb97f4e41f7144bbfe1af04231b84a60d8486a # Parent 32585822527b3515af37a450b8191ebd305b4b9d . diff -r 32585822527b -r 66bb97f4e41f AbsTime.st --- a/AbsTime.st Sun Aug 13 22:48:41 1995 +0200 +++ b/AbsTime.st Tue Aug 15 20:55:40 1995 +0200 @@ -23,7 +23,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Attic/AbsTime.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Attic/AbsTime.st,v 1.13 1995-08-15 18:53:41 claus Exp $ '! !AbsoluteTime class methodsFor:'documentation'! @@ -44,7 +44,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Attic/AbsTime.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Attic/AbsTime.st,v 1.13 1995-08-15 18:53:41 claus Exp $ " ! @@ -90,15 +90,13 @@ " ! -readFromString:aString onError:exceptionBlock +readFrom:aStream onError:exceptionBlock "return a new AbsoluteTime, reading a printed representation from aStream. The string is interpreted as 24 hour format, as printed. Notice, that this is not the storeString format and is different from the format expected by readFrom:." - |day month year hour min sec aStream ex| - - aStream := ReadStream on:aString. + |day month year hour min sec ex| ex := [^ exceptionBlock value]. day := Integer readFrom:aStream onError:ex. diff -r 32585822527b -r 66bb97f4e41f AbsoluteTime.st --- a/AbsoluteTime.st Sun Aug 13 22:48:41 1995 +0200 +++ b/AbsoluteTime.st Tue Aug 15 20:55:40 1995 +0200 @@ -23,7 +23,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Attic/AbsoluteTime.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Attic/AbsoluteTime.st,v 1.13 1995-08-15 18:53:41 claus Exp $ '! !AbsoluteTime class methodsFor:'documentation'! @@ -44,7 +44,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Attic/AbsoluteTime.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Attic/AbsoluteTime.st,v 1.13 1995-08-15 18:53:41 claus Exp $ " ! @@ -90,15 +90,13 @@ " ! -readFromString:aString onError:exceptionBlock +readFrom:aStream onError:exceptionBlock "return a new AbsoluteTime, reading a printed representation from aStream. The string is interpreted as 24 hour format, as printed. Notice, that this is not the storeString format and is different from the format expected by readFrom:." - |day month year hour min sec aStream ex| - - aStream := ReadStream on:aString. + |day month year hour min sec ex| ex := [^ exceptionBlock value]. day := Integer readFrom:aStream onError:ex. diff -r 32585822527b -r 66bb97f4e41f Class.st --- a/Class.st Sun Aug 13 22:48:41 1995 +0200 +++ b/Class.st Tue Aug 15 20:55:40 1995 +0200 @@ -22,7 +22,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Class.st,v 1.51 1995-08-11 03:11:55 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Class.st,v 1.52 1995-08-15 18:54:02 claus Exp $ '! !Class class methodsFor:'documentation'! @@ -43,7 +43,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Class.st,v 1.51 1995-08-11 03:11:55 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Class.st,v 1.52 1995-08-15 18:54:02 claus Exp $ " ! @@ -75,7 +75,7 @@ package the package, in which the class was defined (inserted by compilers) - revision revision string - inserted by stc + revision revision string - inserted by stc history a place for a history string (not currently used) @@ -834,14 +834,14 @@ Smalltalk removeKey:(self name , ':' , aName) asSymbol. ]. any ifTrue:[ - Smalltalk changed:#classVariables - ] + Smalltalk changed:#classVariables with:self + ]. ] ! addClassVarName:aString "add a class variable if not already there and initialize it with nil. - Also write a change record and notify dependents. + Also writes a change record and notifies dependents. BUG: Currently, no recompilation is done - this will change." (self classVarNames includes:aString) ifFalse:[ @@ -853,7 +853,7 @@ removeClassVarName:aString "remove a class variable if not already there. - Also write a change record and notify dependents. + Also writes a change record and notifies dependents. BUG: Currently, no recompilation is done - this will change." |names newNames| @@ -870,7 +870,7 @@ renameCategory:oldCategory to:newCategory "rename a category (changes category of those methods). - Append a change record and notifies dependents." + Appends a change record and notifies dependents." |any| diff -r 32585822527b -r 66bb97f4e41f Make.proto --- a/Make.proto Sun Aug 13 22:48:41 1995 +0200 +++ b/Make.proto Tue Aug 15 20:55:40 1995 +0200 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.34 1995-08-08 00:49:43 claus Exp $ +# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.35 1995-08-15 18:55:40 claus Exp $ # # -------------- no need to change anything below ---------- @@ -116,6 +116,12 @@ SeqColl.$(O): @$(MAKE) $(LONGNAME_RULE) LONGNAME_FILE=$* +AIX: + $(MAKE) Object.o + $(MAKE) OPT=-O2 Behavior.o + $(MAKE) Class.o + $(MAKE) OPT=-O2 + # # special rule, to define the config-string while compiling # this places the current config setting into the Smalltalk class binary diff -r 32585822527b -r 66bb97f4e41f Method.st --- a/Method.st Sun Aug 13 22:48:41 1995 +0200 +++ b/Method.st Tue Aug 15 20:55:40 1995 +0200 @@ -23,7 +23,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Method.st,v 1.42 1995-08-11 03:01:55 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Method.st,v 1.43 1995-08-15 18:54:38 claus Exp $ '! !Method class methodsFor:'documentation'! @@ -44,7 +44,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Method.st,v 1.42 1995-08-11 03:01:55 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Method.st,v 1.43 1995-08-15 18:54:38 claus Exp $ " ! @@ -874,18 +874,22 @@ |m| m := Method compiledMethodAt:#invalidCodeObject. - (self code notNil and:[self code = m code]) ifTrue:[^ true]. - (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. + self ~~ m ifTrue:[ + (self code notNil and:[self code = m code]) ifTrue:[^ true]. + (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. + ]. m := Method compiledMethodAt:#uncompiledCodeObject. - (self code notNil and:[self code = m code]) ifTrue:[^ true]. - (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. - + self ~~ m ifTrue:[ + (self code notNil and:[self code = m code]) ifTrue:[^ true]. + (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. + ]. m := Metaclass compiledMethodAt:#invalidCodeObject. - (self code notNil and:[self code = m code]) ifTrue:[^ true]. - (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. + self ~~ m ifTrue:[ + (self code notNil and:[self code = m code]) ifTrue:[^ true]. + (byteCode notNil and:[byteCode == m byteCode]) ifTrue:[^ true]. + ]. ^ false - ! ! !Method methodsFor:'error handling'! diff -r 32585822527b -r 66bb97f4e41f Time.st --- a/Time.st Sun Aug 13 22:48:41 1995 +0200 +++ b/Time.st Tue Aug 15 20:55:40 1995 +0200 @@ -23,7 +23,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Time.st,v 1.17 1995-08-11 03:04:25 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Time.st,v 1.18 1995-08-15 18:55:28 claus Exp $ '! !Time class methodsFor:'documentation'! @@ -44,7 +44,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Time.st,v 1.17 1995-08-11 03:04:25 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Time.st,v 1.18 1995-08-15 18:55:28 claus Exp $ " ! @@ -87,16 +87,15 @@ " ! -readFromString:aString onError:exceptionBlock +readFrom:aStream onError:exceptionBlock "return a new Time, reading a printed representation from aStream. If no pm follows the time, the string is interpreted as either 24 hour format or being am. Notice, that this is not the storeString format and is different from the format expected by readFrom:." - |hour min sec aStream ex| + |hour min sec ex| - aStream := ReadStream on:aString. ex := [^ exceptionBlock value]. hour := Integer readFrom:aStream onError:ex. (hour between:0 and:24) ifFalse:[ex value]. diff -r 32585822527b -r 66bb97f4e41f Timestamp.st --- a/Timestamp.st Sun Aug 13 22:48:41 1995 +0200 +++ b/Timestamp.st Tue Aug 15 20:55:40 1995 +0200 @@ -23,7 +23,7 @@ COPYRIGHT (c) 1989 by Claus Gittinger All Rights Reserved -$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.13 1995-08-15 18:53:41 claus Exp $ '! !AbsoluteTime class methodsFor:'documentation'! @@ -44,7 +44,7 @@ version " -$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.12 1995-08-11 02:58:09 claus Exp $ +$Header: /cvs/stx/stx/libbasic/Timestamp.st,v 1.13 1995-08-15 18:53:41 claus Exp $ " ! @@ -90,15 +90,13 @@ " ! -readFromString:aString onError:exceptionBlock +readFrom:aStream onError:exceptionBlock "return a new AbsoluteTime, reading a printed representation from aStream. The string is interpreted as 24 hour format, as printed. Notice, that this is not the storeString format and is different from the format expected by readFrom:." - |day month year hour min sec aStream ex| - - aStream := ReadStream on:aString. + |day month year hour min sec ex| ex := [^ exceptionBlock value]. day := Integer readFrom:aStream onError:ex.