hg/stx-libbasic: comparison AbstractTime.st

equal deleted inserted replaced

-:e8519ba62840
+:f2ebb76a952d
 |t1 t2|
 t1 := AbsoluteTime now.
 (Delay forSeconds:5) wait.
 t2 := AbsoluteTime now.
-'seconds passed: ' print. (t2 - t1) printNL.
+Transcript showCR:('seconds passed: ' , (t2 - t1) printString).
 "
 !
 addHours:numberOfHours
 "return a new instance of myself, numberOfHours afterwards."
 "
 |t|
 t := AbsoluteTime now.
-t printNL.
+Transcript showCR:t.
-(t addHours:50) printNL
+t printNL.
-"
+Transcript showCR:(t addHours:12).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t addHours:12).
+"
 !
 addMinutes:numberOfMinutes
 "return a new instance of myself, numberOfMinutes afterwards."
 ^ self addSeconds:(numberOfMinutes * 60)
 "
 |t|
-t := AbsoluteTime now. t printNL. (t addMinutes:50) printNL
+t := AbsoluteTime now.
+Transcript showCR:t.
-t := Time now. t printNL. (t addMinutes:50) printNL
+t printNL.
+Transcript showCR:(t addMinutes:60).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t addMinutes:60).
 "
 !
 addSeconds:numberOfSeconds
 "return a new instance of myself, numberOfSeconds afterwards."
-^ self species basicNew setSeconds:(self getSeconds + numberOfSeconds)
+^ self species basicNew
+setMilliseconds:(self getMilliseconds + (numberOfSeconds * 1000))
-"
-|t|
+"
+|t|
-t := AbsoluteTime now. t printNL. (t addSeconds:50) printNL.
+t := AbsoluteTime now.
-t := Time now. t printNL. (t addSeconds:50) printNL
+Transcript showCR:t.
-"
+t printNL.
+Transcript showCR:(t addSeconds:60).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t addSeconds:60).
+"
 !
 addTime:timeAmount
 "return a new instance of myself, timeAmount seconds afterwards.
-AddTime is a bad name - it does not add a time, but expects
+Provided for ST-80 compatibility.
-a number. Use any of addSeconds/addHours etc."
+WARNING:
+AddTime is a bad name - it does not add a time, but expects
-^ self species basicNew setSeconds:(self getSeconds + timeAmount)
+a numberOfSeconds as argument.
+Use any of addSeconds/addHours etc. to make things clear"
+^ self addSeconds:timeAmount
 !
 subtractHours:numberOfHours
 "return a new instance of myself, numberOfHours before."
 "
 |t|
 t := AbsoluteTime now.
-t printNL.
+Transcript showCR:t.
-(t subtractHours:50) printNL
+t printNL.
+Transcript showCR:(t subtractHours:12).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t subtractHours:12).
 "
 !
 subtractMinutes:numberOfMinutes
 "return a new instance of myself, numberOfMinutes before."
 "
 |t|
 t := AbsoluteTime now.
-t printNL.
+Transcript showCR:t.
-(t subtractMinutes:50) printNL
+t printNL.
+Transcript showCR:(t subtractMinutes:60).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t subtractMinutes:60).
 "
 !
 subtractSeconds:numberOfSeconds
 "return a new instance of myself, numberOfSeconds before."
-^ self species basicNew setSeconds:(self getSeconds - numberOfSeconds)
+^ self species basicNew
+setMilliseconds:(self getMilliseconds - (numberOfSeconds * 1000))
-"
-|t|
+"
+|t|
-t := AbsoluteTime now.
-t printNL.
+t := AbsoluteTime now.
-(t subtractSeconds:50) printNL
+Transcript showCR:t.
-"
+t printNL.
+Transcript showCR:(t subtractSeconds:60).
+"
+"
+|t|
+t := Time now.
+Transcript showCR:t.
+t printNL.
+Transcript showCR:(t subtractSeconds:60).
+"
 !
 subtractTime:timeAmount
-"return a new instance opf myself, timeAmount seconds before myself.
+"return a new instance of myself, timeAmount seconds before myself.
-SubtractTime is a bad name - it does not subtract a time, but expects
+Provided for ST-80 compatibility.
-a number. Use any of subtractSeconds/subtractHours etc."
+WARNING:
+SubtractTime is a bad name - it does not add a time, but expects
-^ self species basicNew setSeconds:(self getSeconds - timeAmount)
+a numberOfSeconds as argument.
+Use any of addSeconds/addHours etc. to make things clear"
+^ self subtractSeconds:timeAmount
 ! !
 !AbstractTime methodsFor:'private'!
 fromOSTime:osTime
 ! !
 !AbstractTime class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.14 1997-01-29 18:01:17 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.15 1998-05-22 10:47:19 cg Exp $'
 ! !

changeset 3476	f2ebb76a952d
parent 2310	2cb1366e0eb3
child 4649	3eaf75dd8973