Squeak-dev January 2019

squeak-dev@lists.squeakfoundation.org

41 participants
152 discussions

The Inbox: TrueType-kfr.52.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

A new version of TrueType was added to project The Inbox: http://source.squeak.org/inbox/TrueType-kfr.52.mcz ==================== Summary ==================== Name: TrueType-kfr.52 Author: kfr Time: 3 January 2019, 10:34:19.705286 pm UUID: 248937ad-7e63-4c27-b659-6165fdda9ffe Ancestors: TrueType-pre.51 FontImporterTool would not open because 'Noto Color Emoji' error: 'File does not have a naming table'. Delete the font from FontPaths and continue =============== Diff against TrueType-pre.51 =============== Item was changed: ----- Method: TTFileDescription class>>openFontFile:do: (in category 'instance creation') ----- openFontFile: fontFileName do: aBlock "Open the font with the given font file name" | fontFilePath file | fontFilePath := FontPaths at: fontFileName ifAbsentPut:[self findFontFile: fontFileName]. fontFilePath ifNil:[^nil]. file := [FileStream readOnlyFileNamed: fontFilePath] on: Error do:[:ex| "We lost the font; someone might have moved it away" + FontPaths removeKey: fontFileName ifAbsent:[]. + ^nil]. + [^[aBlock value: file binary] on: Error do:[:ex| + "Error reading font. Skip it" + FontPaths removeKey: fontFileName ifAbsent:[]. + ^nil] ] ensure:[file close]. + ! - fontFilePath removeKey: fontFileName ifAbsent:[]. - ^nil - ]. - ^[aBlock value: file binary] ensure:[file close].!

3 4

The Trunk: Chronology-Core-dtl.20.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

David T. Lewis uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-dtl.20.mcz ==================== Summary ==================== Name: Chronology-Core-dtl.20 Author: dtl Time: 1 January 2019, 8:13:58.107101 pm UUID: 2bffea2b-6a8e-4013-8e86-34347eef905e Ancestors: Chronology-Core-dtl.19 Bootstrap UTCDateAndTime, step 5 of 5 Update to latest level of Chronology-Core. See http://www.squeaksource.com/UTCDateAndTime for the original development history, which is a series of update versions beginning with Chronology-Core-cmm.2 and ending with this version. DateAndTime is now implemented wtih instance variables utcMicroseconds and localOffsetSeconds. This represents time magnitude as elapsed microseconds since the Posix epoch, with localOffsetSeconds representing local offset from UTC. The magnitude is used for comparison and duration calculations, and the local offset is used for displaying this magnitude in the context of a local time zone. The implementation ignores leap seconds, which are adjustments made to maintain earth rotational clock time in synchronization with elapsed seconds. DateAndTime class>>now uses #primitiveUtcWithOffset to obtain current time in UTC microseconds with current local offset in seconds. The primitive provides an atomic query for UTC time and local offset as measured by the OS platform. If primitiveUtcWithOffset is not available, the traditional implementation is used, which relies on a primitive for microseconds in the local time zone and derives UTC based on the TimeZone setting. =============== Diff against Chronology-Core-dtl.19 =============== Item was removed: - ----- Method: DateAndTime>>asLXDateAndTime (in category 'LX-Kernel-Chronology') ----- - asLXDateAndTime - - ^LXDateAndTime - year: self year - month: self month - day: self dayOfMonth - hour: self hour - minute: self minute - second: self second - nanoSecond: self nanoSecond - offset: self offset! Item was removed: - Magnitude subclass: #LXDateAndTime - instanceVariableNames: 'utcMicroseconds localOffsetSeconds' - classVariableNames: 'AutomaticTimezone ClockProvider InitializeFromPrimitive LocalTimeZone PosixEpochJulianDays' - poolDictionaries: 'ChronologyConstants' - category: 'Chronology-Core'! - - !LXDateAndTime commentStamp: 'dtl 3/12/2016 10:32' prior: 0! - I represent a point in UTC time as defined by ISO 8601. I have zero duration. - - My implementation uses variables utcMicroseconds and localOffsetSeconds. This represents time magnitude as elapsed microseconds since the Posix epoch, with localOffsetSeconds representing local offset from UTC. The magnitude is used for comparison and duration calculations, and the local offset is used for displaying this magnitude in the context of a local time zone. - - The implementation ignores leap seconds, which are adjustments made to maintain earth rotational clock time in synchronization with elapsed seconds. - - DateAndTime class>>now will use #primitiveUtcWithOffset to obtain current time in UTC microseconds with current local offset in seconds. The primitive provides an atomic query for UTC time and local offset as measured by the OS platform. If primitiveUtcWithOffset is not available, the traditional implementation is used, which relies on a primitive for microseconds in the local time zone and derives UTC based on the TimeZone setting. - ! Item was removed: - ----- Method: LXDateAndTime class>>automaticTimezone (in category 'preferences') ----- - automaticTimezone - "Accessor for the system-wide preference" - - <preference: 'Automatically set local timezone' - category: 'general' - description: 'If enabled, the timezone will automatically be kept in sync with the system''s time (daylight savings changes etc.)' - type: #Boolean> - ^AutomaticTimezone ifNil: [ true ]! Item was removed: - ----- Method: LXDateAndTime class>>automaticTimezone: (in category 'preferences') ----- - automaticTimezone: aBoolean - "Accessor for the system-wide preference. - Note this gets disabled in localTimeZone: to make that override stick" - - AutomaticTimezone := aBoolean. - aBoolean ifTrue: [self now]. "fetch timezone immediately"! Item was removed: - ----- Method: LXDateAndTime class>>canInitializeFromPrimitive (in category 'system startup') ----- - canInitializeFromPrimitive - "Some implementations of primitiveUtcWithOffset do not support passing the - DateAndTime instance as a parameter to the primitive." - - ^self basicNew initializeFromPrimitive utcMicroseconds notNil! Item was removed: - ----- Method: LXDateAndTime class>>clock (in category 'clock provider') ----- - clock - "the provider of real time seconds/milliseconds." - - ^ ClockProvider ! Item was removed: - ----- Method: LXDateAndTime class>>clockPrecision (in category 'ansi protocol') ----- - clockPrecision - "One nanosecond precision" - - ^ Duration seconds: 0 nanoSeconds: 1 - ! Item was removed: - ----- Method: LXDateAndTime class>>current (in category 'squeak protocol') ----- - current - - - ^ self now! Item was removed: - ----- Method: LXDateAndTime class>>date:time: (in category 'squeak protocol') ----- - date: aDate time: aTime - - ^ self - year: aDate year - month: aDate monthIndex - day: aDate dayOfMonth - hour: aTime hour - minute: aTime minute - second: aTime second - nanoSecond: aTime nanoSecond - offset: aDate start offset! Item was removed: - ----- Method: LXDateAndTime class>>daysFromSmalltalkEpochToPosixEpoch (in category 'private') ----- - daysFromSmalltalkEpochToPosixEpoch - - ^52 * 365 + (17 * 366)! Item was removed: - ----- Method: LXDateAndTime class>>epoch (in category 'squeak protocol') ----- - epoch - "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" - - ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 - ! Item was removed: - ----- Method: LXDateAndTime class>>epochOffset (in category 'private') ----- - epochOffset - "Elaspsed seconds from the Smalltalk epoch to the Posix epoch" - ^self daysFromSmalltalkEpochToPosixEpoch * SecondsInDay! Item was removed: - ----- Method: LXDateAndTime class>>epochOffsetMicros (in category 'private') ----- - epochOffsetMicros - "Elaspsed microseconds from the Smalltalk epoch to the Posix epoch" - ^self epochOffset * 1000000! Item was removed: - ----- Method: LXDateAndTime class>>fromSeconds: (in category 'smalltalk-80') ----- - fromSeconds: seconds - "Answer a DateAndTime since the Squeak epoch: 1 January 1901 - - Squeak traditionally used seconds since the Smalltalk epoch in local time, - which is undefinable. The error was probably caused by some early VM design - choices that have since been corrected. Assume now that the Smalltalk epoch - is defined relative to GMT, and that it may be treated similarly to the Posix - epoch except for a constant offset value. - - This implementation differs from earlier Squeak in that it uses seconds relative - to the Smalltalk epoch (not local time), and represents seconds as an arbitrary - precision number rather than an integer." - - | s uSec offset | - offset := self localOffsetSeconds. - s := seconds - self epochOffset. - uSec := s * 1000000. - ^ self utcMicroseconds: uSec offset: offset - ! Item was removed: - ----- Method: LXDateAndTime class>>fromString: (in category 'squeak protocol') ----- - fromString: aString - - - ^ self readFrom: (ReadStream on: aString)! Item was removed: - ----- Method: LXDateAndTime class>>fromUnixTime: (in category 'squeak protocol') ----- - fromUnixTime: utcSeconds - - ^self utcSeconds: utcSeconds offset: 0 - ! Item was removed: - ----- Method: LXDateAndTime class>>initialize (in category 'initialize-release') ----- - initialize - - super initialize. - - ClockProvider := Time. - PosixEpochJulianDays := 2440588. - InitializeFromPrimitive := self canInitializeFromPrimitive. - Smalltalk addToStartUpList: self. - self startUp: true - ! Item was removed: - ----- Method: LXDateAndTime class>>julianDayNumber: (in category 'squeak protocol') ----- - julianDayNumber: anInteger - ^ self - julianDayNumber: anInteger - offset: self localOffset! Item was removed: - ----- Method: LXDateAndTime class>>julianDayNumber:offset: (in category 'squeak protocol') ----- - julianDayNumber: anInteger offset: aDuration - - ^self basicNew - setJdn: anInteger - seconds: 0 - nano: 0 - offset: aDuration! Item was removed: - ----- Method: LXDateAndTime class>>localOffset (in category 'squeak protocol') ----- - localOffset - "Answer the duration we are offset from UTC" - - ^ Duration seconds: self localOffsetSeconds - ! Item was removed: - ----- Method: LXDateAndTime class>>localOffset: (in category 'squeak protocol') ----- - localOffset: aDuration - "Override the local time zone (for testing). This disables the #automaticTimezone: preference" - self localTimeZone: (TimeZone offset: aDuration name: 'Local Time (override)' abbreviation: 'LTO'). - ! Item was removed: - ----- Method: LXDateAndTime class>>localOffsetSeconds (in category 'private') ----- - localOffsetSeconds - - self automaticTimezone - ifTrue: [ ^Time posixMicrosecondClockWithOffset second ] - ifFalse: [ ^self localTimeZone offset asSeconds ]! Item was removed: - ----- Method: LXDateAndTime class>>localTimeZone (in category 'accessing') ----- - localTimeZone - "Answer the local time zone" - - ^ LocalTimeZone ifNil: [ LocalTimeZone := TimeZone default ] - - ! Item was removed: - ----- Method: LXDateAndTime class>>localTimeZone: (in category 'accessing') ----- - localTimeZone: aTimeZone - "Set the local time zone" - " - DateAndTime localTimeZone: (TimeZone offset: 0 hours name: 'Universal Time' abbreviation: 'UTC'). - DateAndTime localTimeZone: (TimeZone offset: -8 hours name: 'Pacific Standard Time' abbreviation: 'PST'). - " - LocalTimeZone := aTimeZone. - self automaticTimezone: (aTimeZone abbreviation = 'LT')! Item was removed: - ----- Method: LXDateAndTime class>>midnight (in category 'squeak protocol') ----- - midnight - - ^ self now midnight! Item was removed: - ----- Method: LXDateAndTime class>>milliSecondsSinceMidnight (in category 'squeak protocol') ----- - milliSecondsSinceMidnight - ^Time milliSecondsSinceMidnight! Item was removed: - ----- Method: LXDateAndTime class>>millisecondClockValue (in category 'smalltalk-80') ----- - millisecondClockValue - - ^ self clock millisecondClockValue! Item was removed: - ----- Method: LXDateAndTime class>>new (in category 'squeak protocol') ----- - new - "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" - - ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 - - ! Item was removed: - ----- Method: LXDateAndTime class>>noon (in category 'squeak protocol') ----- - noon - - ^ self now noon - ! Item was removed: - ----- Method: LXDateAndTime class>>now (in category 'ansi protocol') ----- - now - "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not - available, answer the Posix epoch GMT." - - self automaticTimezone - ifTrue: [ InitializeFromPrimitive - ifTrue: [ ^ self basicNew initializeFromPrimitive ] - ifFalse: [ | timeArray | - timeArray := Time posixMicrosecondClockWithOffset. - ^ self utcMicroseconds: timeArray first offset: timeArray second ] ] - ifFalse: [ | timeArray | - timeArray := Time posixMicrosecondClockWithOffset. - ^ self utcMicroseconds: timeArray first offset: self localOffsetSeconds ] - ! Item was removed: - ----- Method: LXDateAndTime class>>nowAtOffset: (in category 'squeak protocol') ----- - nowAtOffset: offsetDuration - "Answers the local time at places with the specified offsetDuration timezone." - "local time Chicago (CST)" - "DateAndTime nowAtOffset: -6 hours" - - ^ self utcMicroseconds: Time posixMicrosecondClockWithOffset first offset: offsetDuration asSeconds - ! Item was removed: - ----- Method: LXDateAndTime class>>nowWithOffset: (in category 'squeak protocol') ----- - nowWithOffset: aDuration - "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not - available, answer the Posix epoch with time zone offset aDuration." - - | timeArray | - timeArray := Time posixMicrosecondClockWithOffset. - ^ self utcMicroseconds: timeArray first offset: aDuration asSeconds - ! Item was removed: - ----- Method: LXDateAndTime class>>readFrom: (in category 'squeak protocol') ----- - readFrom: aStream - - | offsetSeconds ch yearMonthDay hourMinuteSecondNano offset | - - yearMonthDay := Date readYearMonthDayFrom: aStream. - [aStream peek isDigit] - whileFalse: [aStream next]. - hourMinuteSecondNano := Time readHourMinuteSecondNanoFrom: aStream. - (aStream atEnd or: [('+-Z' includes: aStream peek) not]) - ifTrue: [ self flag: #FIXME. - "Different unit tests have conflicting opinions as to whether the - current local offset should be used as a default. However, the current - local offset cannot be correct due to DST (offset is itself a function - of the point in time). Nevertheless, this is a reasonable default considering - that the offset would have been explicitly part of the date string if it - was a matter of concern. Unit tests will require updates to match this - assumption." - "offsetSeconds := 0" - offsetSeconds := self localOffsetSeconds] - ifFalse: [(aStream peekFor: $Z) - ifTrue: [offsetSeconds := 0] - ifFalse: [ - ch := aStream next. - ch = $+ ifTrue: [ch := Character space]. - offset := Duration fromString: ch asString, '0:', aStream upToEnd, ':0'. - offsetSeconds := offset asSeconds]]. - ^ self - year: yearMonthDay first - month: yearMonthDay second - day: yearMonthDay third - hour: hourMinuteSecondNano first - minute: hourMinuteSecondNano second - second: hourMinuteSecondNano third - nanoSecond: hourMinuteSecondNano fourth - offsetSeconds: offsetSeconds - - - " '-1199-01-05T20:33:14.321-05:00' asDateAndTime - ' 2002-05-16T17:20:45.1+01:01' asDateAndTime - - ' 2002-05-16T17:20:45.02+01:01' asDateAndTime - - ' 2002-05-16T17:20:45.003+01:01' asDateAndTime - - ' 2002-05-16T17:20:45.0004+01:01' asDateAndTime - ' 2002-05-16T17:20:45.00005' asDateAndTime - ' 2002-05-16T17:20:45.000006+01:01' asDateAndTime - - ' 2002-05-16T17:20:45.0000007+01:01' asDateAndTime - ' 2002-05-16T17:20:45.00000008-01:01' asDateAndTime - ' 2002-05-16T17:20:45.000000009+01:01' asDateAndTime - ' 2002-05-16T17:20:45.0000000001+01:01' asDateAndTime - - ' 2002-05-16T17:20' asDateAndTime - ' 2002-05-16T17:20:45' asDateAndTime - ' 2002-05-16T17:20:45+01:57' asDateAndTime - ' 2002-05-16T17:20:45-02:34' asDateAndTime - ' 2002-05-16T17:20:45+00:00' asDateAndTime - ' 1997-04-26T01:02:03+01:02:3' asDateAndTime - "! Item was removed: - ----- Method: LXDateAndTime class>>startUp: (in category 'system startup') ----- - startUp: startingAfresh - "Set local timezone" - startingAfresh - ifTrue: [InitializeFromPrimitive := self canInitializeFromPrimitive. - Time initialize. "set LastClockTick to 0". - self now. - self automaticTimezone]! Item was removed: - ----- Method: LXDateAndTime class>>today (in category 'squeak protocol') ----- - today - - ^ self midnight! Item was removed: - ----- Method: LXDateAndTime class>>tomorrow (in category 'squeak protocol') ----- - tomorrow - - ^ self today asDate next asLXDateAndTime - ! Item was removed: - ----- Method: LXDateAndTime class>>totalSeconds (in category 'smalltalk-80') ----- - totalSeconds - - ^ self clock totalSeconds! Item was removed: - ----- Method: LXDateAndTime class>>unixEpoch (in category 'squeak protocol') ----- - unixEpoch - "Answer a DateAndTime representing the Unix epoch (1 January 1970, midnight UTC)" - - ^ self basicNew - ticks: #(2440588 0 0) offset: Duration zero; - yourself. - ! Item was removed: - ----- Method: LXDateAndTime class>>utcMicroseconds:offset: (in category 'instance creation') ----- - utcMicroseconds: microsecondsSincePosixEpoch offset: secondsFromGMT - - ^super new - utcMicroseconds: microsecondsSincePosixEpoch - offset: secondsFromGMT! Item was removed: - ----- Method: LXDateAndTime class>>utcMicrosecondsForYear:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'private') ----- - utcMicrosecondsForYear: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds - - | monthIndex daysInMonth p q r s julianDayNumber posixDays seconds utcSeconds | - - monthIndex := month isInteger ifTrue: [month] ifFalse: [Month indexOfMonth: month]. - daysInMonth := Month - daysInMonth: monthIndex - forYear: year. - day < 1 ifTrue: [self error: 'day may not be zero or negative']. - day > daysInMonth ifTrue: [self error: 'day is after month ends']. - - p := (monthIndex - 14) quo: 12. - q := year + 4800 + p. - r := monthIndex - 2 - (12 * p). - s := (year + 4900 + p) quo: 100. - - julianDayNumber := - ( (1461 * q) quo: 4 ) + - ( (367 * r) quo: 12 ) - - ( (3 * s) quo: 4 ) + - ( day - 32075 ). - - posixDays := julianDayNumber - PosixEpochJulianDays. - seconds := hour * 60 + minute * 60 + second - offsetSeconds. - utcSeconds := seconds + (posixDays * 24 * 3600). - ^ utcSeconds * 1000000 + (nanoCount / 1000) - ! Item was removed: - ----- Method: LXDateAndTime class>>utcSeconds:offset: (in category 'instance creation') ----- - utcSeconds: secondsSincePosixEpoch offset: secondsFromGMT - - ^self - utcMicroseconds: secondsSincePosixEpoch * 1000000 - offset: secondsFromGMT! Item was removed: - ----- Method: LXDateAndTime class>>year:day: (in category 'squeak protocol') ----- - year: year day: dayOfYear - "Return a DateAndTime" - - ^ self - year: year - day: dayOfYear - hour: 0 - minute: 0 - second: 0 - ! Item was removed: - ----- Method: LXDateAndTime class>>year:day:hour:minute:second: (in category 'ansi protocol') ----- - year: year day: dayOfYear hour: hour minute: minute second: second - - ^ self - year: year - day: dayOfYear - hour: hour - minute: minute - second: second - offset: self localOffset - ! Item was removed: - ----- Method: LXDateAndTime class>>year:day:hour:minute:second:offset: (in category 'ansi protocol') ----- - year: year day: dayOfYear hour: hour minute: minute second: second offset: offset - "Return a DataAndTime" - - | y d | - y := self - year: year - month: 1 - day: 1 - hour: hour - minute: minute - second: second - nanoSecond: 0 - offset: offset. - - d := Duration days: (dayOfYear - 1). - - ^ y + d - ! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day: (in category 'squeak protocol') ----- - year: year month: month day: day - "Return a DateAndTime, midnight local time" - - ^self - year: year - month: month - day: day - hour: 0 - minute: 0 - ! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day:hour:minute: (in category 'squeak protocol') ----- - year: year month: month day: day hour: hour minute: minute - "Return a DateAndTime" - - ^self - year: year - month: month - day: day - hour: hour - minute: minute - second: 0 - ! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second: (in category 'ansi protocol') ----- - year: year month: month day: day hour: hour minute: minute second: second - "Return a DateAndTime" - - ^ self - year: year - month: month - day: day - hour: hour - minute: minute - second: second - offset: self localOffset! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offset: (in category 'squeak protocol') ----- - year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset - "Return a DateAndTime" - - | offsetSeconds utcMicros | - offsetSeconds := offset asSeconds. - utcMicros := self - utcMicrosecondsForYear: year - month: month - day: day - hour: hour - minute: minute - second: second - nanoSecond: nanoCount - offsetSeconds: offsetSeconds. - ^ self utcMicroseconds: utcMicros offset: offsetSeconds! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'squeak protocol') ----- - year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds - "Return a DateAndTime" - - | utcMicros | - utcMicros := self - utcMicrosecondsForYear: year - month: month - day: day - hour: hour - minute: minute - second: second - nanoSecond: nanoCount - offsetSeconds: offsetSeconds. - ^ self utcMicroseconds: utcMicros offset: offsetSeconds! Item was removed: - ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:offset: (in category 'ansi protocol') ----- - year: year month: month day: day hour: hour minute: minute second: second offset: offset - - ^ self - year: year - month: month - day: day - hour: hour - minute: minute - second: second - nanoSecond: 0 - offset: offset! Item was removed: - ----- Method: LXDateAndTime class>>yesterday (in category 'squeak protocol') ----- - yesterday - - ^ self today asDate previous asLXDateAndTime! Item was removed: - ----- Method: LXDateAndTime>>+ (in category 'ansi protocol') ----- - + operand - "operand conforms to protocol Duration" - - ^ self class - utcMicroseconds: operand asDuration asNanoSeconds / 1000 + utcMicroseconds - offset: localOffsetSeconds - ! Item was removed: - ----- Method: LXDateAndTime>>- (in category 'ansi protocol') ----- - - operand - "operand conforms to protocol DateAndTime or protocol Duration" - - ^ (operand respondsTo: #asLXDateAndTime) - ifTrue: - [ | micros | - micros := utcMicroseconds - operand asLXDateAndTime utcMicroseconds. - Duration seconds: micros // 1000000 nanoSeconds: micros \\ 1000000 * 1000] - ifFalse: - [ self + (operand negated) ] - ! Item was removed: - ----- Method: LXDateAndTime>>< (in category 'ansi protocol') ----- - < comparand - "comparand conforms to protocol DateAndTime, - or can be converted into something that conforms." - - ^utcMicroseconds < comparand asLXDateAndTime utcMicroseconds - ! Item was removed: - ----- Method: LXDateAndTime>>= (in category 'ansi protocol') ----- - = aDateAndTimeOrTimeStamp - "Equal if the absolute time values match, regardless of local time transform" - self == aDateAndTimeOrTimeStamp ifTrue: [ ^ true ]. - ^aDateAndTimeOrTimeStamp species == DateAndTime - and: [ utcMicroseconds = aDateAndTimeOrTimeStamp asLXDateAndTime utcMicroseconds ]! Item was removed: - ----- Method: LXDateAndTime>>asChronologySeconds (in category 'converting') ----- - asChronologySeconds - "What #asSeconds answers in prior Chronology-format images." - ^ self asSeconds + self offset asSeconds! Item was removed: - ----- Method: LXDateAndTime>>asDate (in category 'squeak protocol') ----- - asDate - - - ^ Date starting: self asLXDateAndTime! Item was removed: - ----- Method: LXDateAndTime>>asDateAndTime (in category 'squeak protocol') ----- - asDateAndTime - ^ DateAndTime - year: self year - month: self month - day: self dayOfMonth - hour: self hour - minute: self minute - second: self second - nanoSecond: self nanoSecond - offset: self offset! Item was removed: - ----- Method: LXDateAndTime>>asDuration (in category 'squeak protocol') ----- - asDuration - "Answer the duration since midnight." - - ^ Duration seconds: self getSeconds nanoSeconds: self nanoSecond - ! Item was removed: - ----- Method: LXDateAndTime>>asExactSeconds (in category 'smalltalk-80') ----- - asExactSeconds - "Return the duration in seconds since the Squeak epoch" - - "Squeak traditionally used seconds since the Smalltalk epoch in local time, - which is undefinable. The error was probably caused by some early VM design - choices that have since been corrected. Assume now that the Smalltalk epoch - is defined relative to GMT, and that it may be treated similarly to the Posix - epoch except for a constant offset value. - - This implementation differs from earlier Squeak in that it uses seconds relative - to the Smalltalk epoch (not local time), and represents seconds as an arbitrary - precision number rather than an integer." - - ^ utcMicroseconds / 1000000 + self class epochOffset - ! Item was removed: - ----- Method: LXDateAndTime>>asLXDateAndTime (in category 'squeak protocol') ----- - asLXDateAndTime - - ^ self! Item was removed: - ----- Method: LXDateAndTime>>asLXTimeStamp (in category 'transitional - temporary') ----- - asLXTimeStamp - - ^ self as: LXTimeStamp! Item was removed: - ----- Method: LXDateAndTime>>asLocal (in category 'ansi protocol') ----- - asLocal - - - ^ (self offset = self class localOffset) - - ifTrue: [self] - ifFalse: [self utcOffset: self class localOffset]! Item was removed: - ----- Method: LXDateAndTime>>asMonth (in category 'squeak protocol') ----- - asMonth - - ^ Month starting: self! Item was removed: - ----- Method: LXDateAndTime>>asNanoSeconds (in category 'squeak protocol') ----- - asNanoSeconds - "Answer the number of nanoseconds since midnight" - - ^ self asDuration asNanoSeconds! Item was removed: - ----- Method: LXDateAndTime>>asPosixSeconds (in category 'converting') ----- - asPosixSeconds - - ^utcMicroseconds / 1000000 - ! Item was removed: - ----- Method: LXDateAndTime>>asSeconds (in category 'smalltalk-80') ----- - asSeconds - "Return the number of seconds since the Squeak epoch. See asExactSeconds - to retain full precision of the duration in seconds." - - "Squeak traditionally used seconds since the Smalltalk epoch in local time, - which is undefinable. The error was probably caused by some early VM design - choices that have since been corrected. Assume now that the Smalltalk epoch - is defined relative to GMT, and that it may be treated similarly to the Posix - epoch except for a constant offset value. - - This implementation differs from earlier Squeak in that it uses seconds relative - to the Smalltalk epoch (not local time), and represents seconds as an arbitrary - precision number rather than an integer." - - ^ utcMicroseconds // 1000000 + self class epochOffset - ! Item was removed: - ----- Method: LXDateAndTime>>asTime (in category 'squeak protocol') ----- - asTime - - - ^ Time seconds: self getSeconds nanoSeconds: self nanoSecond - ! Item was removed: - ----- Method: LXDateAndTime>>asTimeStamp (in category 'squeak protocol') ----- - asTimeStamp - - ^ self asLXTimeStamp - ! Item was removed: - ----- Method: LXDateAndTime>>asUTC (in category 'ansi protocol') ----- - asUTC - - localOffsetSeconds = 0 ifTrue: [ ^self ]. - ^self copy - utcMicroseconds: utcMicroseconds - offset: 0 - ! Item was removed: - ----- Method: LXDateAndTime>>asUnixTime (in category 'squeak protocol') ----- - asUnixTime - "answer number of seconds since unix epoch (midnight Jan 1, 1970, UTC)" - - ^(self - self class unixEpoch) asSeconds! Item was removed: - ----- Method: LXDateAndTime>>asWeek (in category 'squeak protocol') ----- - asWeek - - ^ Week starting: self! Item was removed: - ----- Method: LXDateAndTime>>asYear (in category 'squeak protocol') ----- - asYear - - ^ Year starting: self! Item was removed: - ----- Method: LXDateAndTime>>day (in category 'smalltalk-80') ----- - day - - ^ self dayOfYear - ! Item was removed: - ----- Method: LXDateAndTime>>dayMonthYearDo: (in category 'squeak protocol') ----- - dayMonthYearDo: aBlock - "Evaluation the block with three arguments: day month, year." - - | l n i j dd mm yyyy | - l := self julianDayNumber + 68569. - n := 4 * l // 146097. - l := l - (146097 * n + 3 // 4). - i := 4000 * (l + 1) // 1461001. - l := l - (1461 * i // 4) + 31. - j := 80 * l // 2447. - dd := l - (2447 * j // 80). - l := j // 11. - mm := j + 2 - (12 * l). - yyyy := 100 * (n - 49) + i + l. - - ^ aBlock - value: dd - value: mm - value: yyyy! Item was removed: - ----- Method: LXDateAndTime>>dayOfMonth (in category 'ansi protocol') ----- - dayOfMonth - "Answer which day of the month is represented by the receiver." - - ^ self - dayMonthYearDo: [ :d :m :y | d ] - ! Item was removed: - ----- Method: LXDateAndTime>>dayOfWeek (in category 'ansi protocol') ----- - dayOfWeek - - "Sunday=1, ... , Saturday=7" - - ^ (self julianDayNumber + 1 rem: 7) + 1 - ! Item was removed: - ----- Method: LXDateAndTime>>dayOfWeekAbbreviation (in category 'ansi protocol') ----- - dayOfWeekAbbreviation - - ^ self dayOfWeekName copyFrom: 1 to: 3 - ! Item was removed: - ----- Method: LXDateAndTime>>dayOfWeekName (in category 'ansi protocol') ----- - dayOfWeekName - - ^ Week nameOfDay: self dayOfWeek! Item was removed: - ----- Method: LXDateAndTime>>dayOfYear (in category 'ansi protocol') ----- - dayOfYear - "This code was contributed by Dan Ingalls. It is equivalent to the terser - ^ jdn - (Year year: self year) start julianDayNumber + 1 but much quicker." - - ^ self dayMonthYearDo: - [ :d :m :y | - | monthStart | - monthStart := #(1 32 60 91 121 152 182 213 244 274 305 335) at: m. - (m > 2 and: [ Year isLeapYear: y ]) - ifTrue: [ monthStart + d ] - ifFalse: [ monthStart + d - 1 ]]! Item was removed: - ----- Method: LXDateAndTime>>daysInMonth (in category 'smalltalk-80') ----- - daysInMonth - "Answer the number of days in the month represented by the receiver." - - - ^ self asMonth daysInMonth! Item was removed: - ----- Method: LXDateAndTime>>daysInYear (in category 'smalltalk-80') ----- - daysInYear - - "Answer the number of days in the year represented by the receiver." - - ^ self asYear daysInYear! Item was removed: - ----- Method: LXDateAndTime>>daysLeftInYear (in category 'smalltalk-80') ----- - daysLeftInYear - "Answer the number of days in the year after the date of the receiver." - - ^ self daysInYear - self dayOfYear! Item was removed: - ----- Method: LXDateAndTime>>duration (in category 'squeak protocol') ----- - duration - - ^ Duration zero! Item was removed: - ----- Method: LXDateAndTime>>firstDayOfMonth (in category 'smalltalk-80') ----- - firstDayOfMonth - - ^ self asMonth start day - ! Item was removed: - ----- Method: LXDateAndTime>>floor (in category 'squeak protocol') ----- - floor - "Answer a copy with magnitude rounded down to the nearest whole second" - ^self class - utcMicroseconds: utcMicroseconds - (utcMicroseconds \\ 1000000) - offset: localOffsetSeconds! Item was removed: - ----- Method: LXDateAndTime>>getSeconds (in category 'accessing') ----- - getSeconds - - | posixDays posixSeconds localSeconds | - posixSeconds := utcMicroseconds // 1000000. - localSeconds := posixSeconds + localOffsetSeconds. - localSeconds < 0 ifTrue: [localSeconds := localSeconds \\ SecondsInDay]. "normalize" - posixDays := localSeconds // SecondsInDay. - ^localSeconds - (posixDays * SecondsInDay). - ! Item was removed: - ----- Method: LXDateAndTime>>hasEqualTicks: (in category 'private') ----- - hasEqualTicks: aDateAndTime - - ^ (self julianDayNumber = aDateAndTime julianDayNumber) - and: [ (self secondsSinceMidnight = aDateAndTime secondsSinceMidnight) - and: [ self nanoSecond = aDateAndTime nanoSecond ] ] - ! Item was removed: - ----- Method: LXDateAndTime>>hash (in category 'ansi protocol') ----- - hash - ^utcMicroseconds hash! Item was removed: - ----- Method: LXDateAndTime>>hour (in category 'ansi protocol') ----- - hour - - ^ self hour24! Item was removed: - ----- Method: LXDateAndTime>>hour12 (in category 'ansi protocol') ----- - hour12 - "Answer an <integer> between 1 and 12, inclusive, representing the hour - of the day in the 12-hour clock of the local time of the receiver." - ^ self hour24 - 1 \\ 12 + 1 - ! Item was removed: - ----- Method: LXDateAndTime>>hour24 (in category 'ansi protocol') ----- - hour24 - - ^self getSeconds // 3600! Item was removed: - ----- Method: LXDateAndTime>>hours (in category 'smalltalk-80') ----- - hours - - ^ self hour - ! Item was removed: - ----- Method: LXDateAndTime>>initializeFromPrimitive (in category 'initialize-release') ----- - initializeFromPrimitive - - Time posixMicrosecondClockWithOffset: self! Item was removed: - ----- Method: LXDateAndTime>>isLeapYear (in category 'ansi protocol') ----- - isLeapYear - - - ^ Year isLeapYear: self year - ! Item was removed: - ----- Method: LXDateAndTime>>julianDayNumber (in category 'squeak protocol') ----- - julianDayNumber - - | posixDays posixSeconds localSeconds negativeDays | - posixSeconds := utcMicroseconds // 1000000. - localSeconds := posixSeconds + localOffsetSeconds. - negativeDays := 0. - localSeconds < 0 ifTrue: [ "normalize" - negativeDays := localSeconds // SecondsInDay. - localSeconds := negativeDays * SecondsInDay + localSeconds]. - posixDays := localSeconds // SecondsInDay. - ^posixDays + PosixEpochJulianDays - negativeDays. - ! Item was removed: - ----- Method: LXDateAndTime>>localOffsetSeconds: (in category 'initialize-release') ----- - localOffsetSeconds: seconds - "Private. Allow value to be modified during initialization in order to support local - timezone preference." - - localOffsetSeconds := seconds - ! Item was removed: - ----- Method: LXDateAndTime>>makeUTC (in category 'squeak protocol') ----- - makeUTC - "Make the receiver's timezone UTC." - localOffsetSeconds := 0! Item was removed: - ----- Method: LXDateAndTime>>meridianAbbreviation (in category 'ansi protocol') ----- - meridianAbbreviation - - ^ self asTime meridianAbbreviation - ! Item was removed: - ----- Method: LXDateAndTime>>microsecondsFromDay:seconds:nanos:offset: (in category 'private') ----- - microsecondsFromDay: jdn seconds: s nanos: n offset: localOffsetSeconds - - | days totalSeconds micros | - days := jdn - PosixEpochJulianDays. - totalSeconds := days * 86400 + s - localOffsetSeconds. "n.g. const 86400 is faster than SecondsInDay" - micros := totalSeconds * 1000000. - ^micros + (n / 1000) - ! Item was removed: - ----- Method: LXDateAndTime>>middleOf: (in category 'squeak protocol') ----- - middleOf: aDuration - "Return a Timespan where the receiver is the middle of the Duration" - - | duration | - duration := aDuration asDuration. - - ^ Timespan starting: (self - (duration / 2)) duration: duration - ! Item was removed: - ----- Method: LXDateAndTime>>midnight (in category 'squeak protocol') ----- - midnight - "Answer a DateAndTime starting at midnight of the same timezone offset as the receiver." - ^ self class basicNew - setJdn: self julianDayNumber - seconds: localOffsetSeconds - nano: 0 - localOffsetSeconds: localOffsetSeconds.! Item was removed: - ----- Method: LXDateAndTime>>minute (in category 'ansi protocol') ----- - minute - - ^self getSeconds // 60 \\ 60! Item was removed: - ----- Method: LXDateAndTime>>minutes (in category 'smalltalk-80') ----- - minutes - - ^ self minute - ! Item was removed: - ----- Method: LXDateAndTime>>month (in category 'ansi protocol') ----- - month - - ^ self - dayMonthYearDo: [ :d :m :y | m ] - ! Item was removed: - ----- Method: LXDateAndTime>>monthAbbreviation (in category 'ansi protocol') ----- - monthAbbreviation - - - ^ self monthName copyFrom: 1 to: 3! Item was removed: - ----- Method: LXDateAndTime>>monthIndex (in category 'smalltalk-80') ----- - monthIndex - - - ^ self month! Item was removed: - ----- Method: LXDateAndTime>>monthName (in category 'ansi protocol') ----- - monthName - - - ^ Month nameOfMonth: self month! Item was removed: - ----- Method: LXDateAndTime>>nanoSecond (in category 'squeak protocol') ----- - nanoSecond - - ^utcMicroseconds \\ 1000000 * 1000 - ! Item was removed: - ----- Method: LXDateAndTime>>noTimezone (in category 'private') ----- - noTimezone - ^ false! Item was removed: - ----- Method: LXDateAndTime>>noon (in category 'squeak protocol') ----- - noon - "Answer a DateAndTime starting at noon" - - ^ self dayMonthYearDo: - [ :d :m :y | self class year: y month: m day: d hour: 12 minute: 0 second: 0 ] - ! Item was removed: - ----- Method: LXDateAndTime>>normalize:ticks:base: (in category 'private') ----- - normalize: i ticks: ticks base: base - - | tick div quo rem | - tick := ticks at: i. - div := tick asInteger digitDiv: base neg: tick negative. - quo := (div at: 1) normalize. - rem := (div at: 2) normalize. - rem < 0 ifTrue: [ quo := quo - 1. rem := base + rem ]. - ticks at: (i-1) put: ((ticks at: i-1) + quo). - ticks at: i put: rem - ! Item was removed: - ----- Method: LXDateAndTime>>offset (in category 'ansi protocol') ----- - offset - - ^ Duration seconds: localOffsetSeconds! Item was removed: - ----- Method: LXDateAndTime>>offset: (in category 'ansi protocol') ----- - offset: anOffset - - "Answer a <DateAndTime> equivalent to the receiver but with its local time - being offset from UTC by offset." - - | newOffset newMicros | - self flag: #FIXME. "check the definition of this and of #utcOffset:" - newOffset := anOffset asDuration asSeconds. - newMicros := localOffsetSeconds - newOffset * 1000000 + utcMicroseconds. - ^ self class utcMicroseconds: newMicros offset: newOffset - ! Item was removed: - ----- Method: LXDateAndTime>>offsetSeconds (in category 'accessing') ----- - offsetSeconds - - ^localOffsetSeconds! Item was removed: - ----- Method: LXDateAndTime>>posixEpochJulianDays (in category 'initialize-release') ----- - posixEpochJulianDays - - ^self class daysFromSmalltalkEpochToPosixEpoch + SqueakEpoch! Item was removed: - ----- Method: LXDateAndTime>>printHMSOn: (in category 'squeak protocol') ----- - printHMSOn: aStream - "Print just hh:mm:ss" - - | seconds | - seconds := self getSeconds. - seconds // 3600 printOn: aStream base: 10 length: 2 padded: true. - aStream nextPut: $:. - seconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. - aStream nextPut: $:. - seconds \\ 60 printOn: aStream base: 10 length: 2 padded: true! Item was removed: - ----- Method: LXDateAndTime>>printOn: (in category 'squeak protocol') ----- - printOn: aStream - "Print as per ISO 8601 sections 5.3.3 and 5.4.1. - Prints either: - 'YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years)" - - ^self printOn: aStream withLeadingSpace: false - ! Item was removed: - ----- Method: LXDateAndTime>>printOn:withLeadingSpace: (in category 'squeak protocol') ----- - printOn: aStream withLeadingSpace: printLeadingSpaceToo - "Print as per ISO 8601 sections 5.3.3 and 5.4.1. - If printLeadingSpaceToo is false, prints either: - 'YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) - If printLeadingSpaceToo is true, prints either: - ' YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) - " - - | nanos offsetSeconds | - self printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo. - aStream nextPut: $T. - self printHMSOn: aStream. - (nanos := utcMicroseconds \\ 1000000 * 1000) = 0 ifFalse: [ - | length | - aStream nextPut: $.. - length := 9. - [ nanos \\ 10 = 0 ] whileTrue: [ - nanos := nanos // 10. - length := length - 1 ]. - nanos printOn: aStream base: 10 length: length padded: true ]. - "Print offset" - aStream nextPut: (localOffsetSeconds >= 0 ifTrue: [ $+ ] ifFalse: [ $- ]). - offsetSeconds := localOffsetSeconds abs. - offsetSeconds // 3600 printOn: aStream base: 10 length: 2 padded: true. - aStream nextPut: $:. - offsetSeconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. - (offsetSeconds := offsetSeconds \\ 60) = 0 ifFalse: [ - aStream - nextPut: $:; - print: offsetSeconds ]! Item was removed: - ----- Method: LXDateAndTime>>printYMDOn: (in category 'squeak protocol') ----- - printYMDOn: aStream - "Print just YYYY-MM-DD part. - If the year is negative, prints out '-YYYY-MM-DD'." - - ^self printYMDOn: aStream withLeadingSpace: false. - ! Item was removed: - ----- Method: LXDateAndTime>>printYMDOn:withLeadingSpace: (in category 'squeak protocol') ----- - printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo - "Print just the year, month, and day on aStream. - - If printLeadingSpaceToo is true, then print as: - ' YYYY-MM-DD' (if the year is positive) or '-YYYY-MM-DD' (if the year is negative) - otherwise print as: - 'YYYY-MM-DD' or '-YYYY-MM-DD' " - - self dayMonthYearDo: [ :day :month :year | - year negative - ifTrue: [ aStream nextPut: $- ] - ifFalse: [ printLeadingSpaceToo ifTrue: [ aStream space ] ]. - year abs printOn: aStream base: 10 length: 4 padded: true. - aStream nextPut: $-. - month printOn: aStream base: 10 length: 2 padded: true. - aStream nextPut: $-. - day printOn: aStream base: 10 length: 2 padded: true ]! Item was removed: - ----- Method: LXDateAndTime>>readDataFrom:size: (in category 'objects from disk') ----- - readDataFrom: aDataStream size: varsOnDisk - "Fill in the fields of self based on the contents of aDataStream. The serialized - data will have four instance variables, because all instances are serialized in a - cononical format as if having originating from an instance with the traditional - seconds/offset/jdn/nanos instance variables." - - | seconds offset jdn nanos | - seconds := aDataStream next. - offset := aDataStream next. - jdn := aDataStream next. - nanos := aDataStream next. - localOffsetSeconds := offset ifNil: [ 0 ] ifNotNil: [ :off | off asSeconds ]. - utcMicroseconds := self - microsecondsFromDay: jdn - seconds: seconds - nanos: nanos - offset: localOffsetSeconds.! Item was removed: - ----- Method: LXDateAndTime>>second (in category 'ansi protocol') ----- - second - - ^self getSeconds \\ 60! Item was removed: - ----- Method: LXDateAndTime>>seconds (in category 'smalltalk-80') ----- - seconds - - ^ self second - ! Item was removed: - ----- Method: LXDateAndTime>>secondsSinceMidnight (in category 'private') ----- - secondsSinceMidnight - - ^ self getSeconds! Item was removed: - ----- Method: LXDateAndTime>>setJdn:seconds:nano:localOffsetSeconds: (in category 'private') ----- - setJdn: jdn seconds: s nano: n localOffsetSeconds: offset - - localOffsetSeconds := offset. - utcMicroseconds := self - microsecondsFromDay: jdn - seconds: s - offset - nanos: n - offset: offset! Item was removed: - ----- Method: LXDateAndTime>>setJdn:seconds:nano:offset: (in category 'squeak protocol') ----- - setJdn: jdn seconds: s nano: n offset: o - - self setJdn: jdn seconds: s nano: n localOffsetSeconds: o asSeconds. - ! Item was removed: - ----- Method: LXDateAndTime>>species (in category 'accessing') ----- - species - ^DateAndTime! Item was removed: - ----- Method: LXDateAndTime>>storeDataOn: (in category 'objects from disk') ----- - storeDataOn: aDataStream - "Store myself on a DataStream. Answer self. - Store 4 variables worth of data, corresponding to the 4 instance variables of the old - DateAndTime implementation, which is to be used as common format for externally - stored instances." - - " | dt dt2 | - dt := DateAndTime now. - dt2 := DataStream testWith: dt. - { dt . dt2 }." - - | cntInstVars cntIndexedVars ticks jdn offset seconds nanos | - "Set the instance variable count to 4 to match that of a cononical instance." - cntInstVars := 4. - cntIndexedVars := self basicSize. - aDataStream - beginInstance: self xxxClass - size: cntInstVars + cntIndexedVars. - - "Create the 4 values of the old format DateAndTime" - ticks := self ticks. "{days. seconds. nanoSeconds}." - offset := self offset. - jdn := ticks at: 1. - seconds := ticks at: 2. - nanos := ticks at: 3. - aDataStream - nextPut: seconds; - nextPut: offset; - nextPut: jdn; - nextPut: nanos. - ! Item was removed: - ----- Method: LXDateAndTime>>ticks (in category 'private') ----- - ticks - "Private - answer an array with our instance variables. Assumed to be UTC " - - ^ Array with: self julianDayNumber with: self getSeconds with: self nanoSecond - ! Item was removed: - ----- Method: LXDateAndTime>>ticks:offset: (in category 'private') ----- - ticks: ticks offset: utcOffset - "ticks is {julianDayNumber. secondCount. nanoSeconds}" - - | jdn s nanos | - self normalize: 3 ticks: ticks base: NanosInSecond. - self normalize: 2 ticks: ticks base: SecondsInDay. - - jdn := ticks at: 1. - s := ticks at: 2. - nanos := ticks at: 3. - localOffsetSeconds := utcOffset ifNil: [0] ifNotNil: [utcOffset asSeconds]. - utcMicroseconds := self microsecondsFromDay: jdn seconds: s nanos: nanos offset: localOffsetSeconds. - ! Item was removed: - ----- Method: LXDateAndTime>>timeZoneAbbreviation (in category 'ansi protocol') ----- - timeZoneAbbreviation - - ^ self class localTimeZone abbreviation! Item was removed: - ----- Method: LXDateAndTime>>timeZoneName (in category 'ansi protocol') ----- - timeZoneName - - ^ self class localTimeZone name! Item was removed: - ----- Method: LXDateAndTime>>to: (in category 'squeak protocol') ----- - to: anEnd - "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" - - ^ Timespan starting: self ending: (anEnd asLXDateAndTime) - ! Item was removed: - ----- Method: LXDateAndTime>>to:by: (in category 'squeak protocol') ----- - to: anEnd by: aDuration - "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" - - ^ (Schedule starting: self ending: (anEnd asLXDateAndTime)) - schedule: (Array with: aDuration asDuration); - yourself - ! Item was removed: - ----- Method: LXDateAndTime>>to:by:do: (in category 'squeak protocol') ----- - to: anEnd by: aDuration do: aBlock - "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" - - ^ (self to: anEnd by: aDuration) scheduleDo: aBlock! Item was removed: - ----- Method: LXDateAndTime>>utcMicroseconds (in category 'accessing') ----- - utcMicroseconds - ^utcMicroseconds! Item was removed: - ----- Method: LXDateAndTime>>utcMicroseconds: (in category 'initialize-release') ----- - utcMicroseconds: utcValue - "Allow value to be modified during initialization from a primitive in order to support - monotonically increasing clock behavior." - utcMicroseconds := utcValue! Item was removed: - ----- Method: LXDateAndTime>>utcMicroseconds:offset: (in category 'initialize-release') ----- - utcMicroseconds: microsecondsSincePosixEpoch offset: tzOffset - - utcMicroseconds := microsecondsSincePosixEpoch. - localOffsetSeconds := tzOffset. - ! Item was removed: - ----- Method: LXDateAndTime>>utcOffset: (in category 'squeak protocol') ----- - utcOffset: anOffset - - "Answer a <DateAndTime> equivalent to the receiver but offset from UTC by anOffset" - - self flag: #FIXME. "check the definition of this and of #offset:" - ^self utcMicroseconds: utcMicroseconds offset: anOffset asDuration asSeconds - ! Item was removed: - ----- Method: LXDateAndTime>>year (in category 'ansi protocol') ----- - year - ^ self - dayMonthYearDo: [ :d :m :y | y ] - ! Item was removed: - LXDateAndTime subclass: #LXTimeStamp - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Chronology-Core'! - - !LXTimeStamp commentStamp: '<historical>' prior: 0! - This represents a duration of 0 length that marks a particular point in time.! Item was removed: - ----- Method: LXTimeStamp class>>current (in category 'squeak protocol') ----- - current - - ^self now! Item was removed: - ----- Method: LXTimeStamp>>asDateAndTime (in category 'squeak protocol') ----- - asDateAndTime - "Answer the receiver as an instance of DateAndTime." - - ^ (LXDateAndTime utcMicroseconds: utcMicroseconds offset: localOffsetSeconds) - asDateAndTime! Item was removed: - ----- Method: LXTimeStamp>>asTimeStamp (in category 'squeak protocol') ----- - asTimeStamp - "Answer the receiver as an instance of TimeStamp." - - ^ self asDateAndTime asTimeStamp.! Item was removed: - ----- Method: LXTimeStamp>>date (in category 'squeak protocol') ----- - date - "Answer the date of the receiver." - - ^ self asDate! Item was removed: - ----- Method: LXTimeStamp>>dateAndTime (in category 'squeak protocol') ----- - dateAndTime - "Answer a two element Array containing the receiver's date and time." - - ^ Array with: self date with: self time! Item was removed: - ----- Method: LXTimeStamp>>minusDays: (in category 'squeak protocol') ----- - minusDays: anInteger - "Answer a TimeStamp which is anInteger days before the receiver." - - ^ self - (anInteger days)! Item was removed: - ----- Method: LXTimeStamp>>minusSeconds: (in category 'squeak protocol') ----- - minusSeconds: anInteger - "Answer a TimeStamp which is anInteger number of seconds before the receiver." - - ^ self - (anInteger seconds)! Item was removed: - ----- Method: LXTimeStamp>>plusDays: (in category 'squeak protocol') ----- - plusDays: anInteger - "Answer a TimeStamp which is anInteger days after the receiver." - - ^ self + (anInteger days)! Item was removed: - ----- Method: LXTimeStamp>>plusSeconds: (in category 'squeak protocol') ----- - plusSeconds: anInteger - "Answer a TimeStamp which is anInteger number of seconds after the receiver." - - ^ self + (anInteger seconds)! Item was removed: - ----- Method: LXTimeStamp>>printOn: (in category 'squeak protocol') ----- - printOn: aStream - "Print receiver's date and time on aStream." - - aStream - nextPutAll: self date printString; - space; - nextPutAll: self time printString.! Item was removed: - ----- Method: LXTimeStamp>>storeOn: (in category 'squeak protocol') ----- - storeOn: aStream - - aStream - print: self printString; - nextPutAll: ' asLXTimeStamp'! Item was removed: - ----- Method: LXTimeStamp>>time (in category 'squeak protocol') ----- - time - "Answer the time of the receiver." - - ^ self asTime! Item was removed: - ----- Method: String>>asLXDateAndTime (in category '*Chronology-Core') ----- - asLXDateAndTime - - "Convert from UTC format" ^ LXDateAndTime fromString: self! Item was removed: - ----- Method: TimeStamp>>asLXTimeStamp (in category 'LX-Kernel-Chronology') ----- - asLXTimeStamp - - ^self asLXDateAndTime asLXTimeStamp! Item was removed: - ----- Method: Timespan>>asLXDateAndTime (in category '*Chronology-Core') ----- - asLXDateAndTime - - ^ start asLXDateAndTime! Item was changed: + (PackageInfo named: 'Chronology-Core') postscript: 'DateAndTime startUp: true. + HashedCollection rehashAll. - (PackageInfo named: 'Chronology-Core') postscript: '"Convert all instances of LXDateAndTime and LXTimeStamp to the equivalent DateAndTime and TimeStamp." - - | oldInstances newInstances | - Smalltalk garbageCollect. - oldInstances := LXDateAndTime allInstances, LXTimeStamp allInstances. - newInstances := oldInstances collect: [ :each | - each class == LXDateAndTime - ifTrue: [ each asDateAndTime ] - ifFalse: [ each asTimeStamp ] ]. - oldInstances elementsForwardIdentityTo: newInstances. - Smalltalk garbageCollect. '!

2 1

The Trunk: Chronology-Core-ul.21.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

David T. Lewis uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-ul.21.mcz ==================== Summary ==================== Name: Chronology-Core-ul.21 Author: dtl Time: 4 January 2019, 1:17:39.848442 pm UUID: 5d9b02fa-8e37-4678-adda-f302163732a1 Ancestors: Chronology-Core-dtl.20 >From Chronology-Core-ul.21 from inbox, and resaved to ensure that version history exactly matches that of trunk. Updated by dtl and saved with original author initials. Name: Chronology-Core-ul.21 Author: ul Time: 26 December 2018, 1:48:40.220196 am UUID: 2e6f6ce2-d0ec-41a0-b27c-88c642e5afc9 Ancestors: Chronology-Core-dtl.20 - fix: do not subtract the offset twice while evaluating DateAndTime >> #setJdn:seconds:nano:localOffsetSeconds: - use 0 for seconds in DateAndTime >> #midnight, because the offset will not be subtracted from the passed value =============== Diff against Chronology-Core-dtl.20 =============== Item was changed: ----- Method: DateAndTime>>midnight (in category 'squeak protocol') ----- midnight "Answer a DateAndTime starting at midnight of the same timezone offset as the receiver." ^ self class basicNew setJdn: self julianDayNumber + seconds: 0 - seconds: localOffsetSeconds nano: 0 localOffsetSeconds: localOffsetSeconds.! Item was changed: ----- Method: DateAndTime>>setJdn:seconds:nano:localOffsetSeconds: (in category 'private') ----- setJdn: jdn seconds: s nano: n localOffsetSeconds: offset localOffsetSeconds := offset. utcMicroseconds := self microsecondsFromDay: jdn + seconds: s - seconds: s - offset nanos: n offset: offset!

1 0

The Trunk: Chronology-Core-dtl.18.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

David T. Lewis uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-dtl.18.mcz ==================== Summary ==================== Name: Chronology-Core-dtl.18 Author: dtl Time: 1 January 2019, 2:40:33.441753 am UUID: 0cdf2ac5-c63b-40df-9942-80916d4c7648 Ancestors: Chronology-Core-dtl.17 Bootstrap UTCDateAndTime, step 3 of 5 DateAndTime and TimeStamp are now inactive, having been replaced by LXDateAndTime and LXTimeStamp. Load copies of the reimplemented LXDateAndTime and LXTimeStamp, renamed as DateAndTime and TimeStamp, to replace the original implementations of DateAndTime now. At this point, DateAndTime is an inactive copy of LXDateAndTime. The next update will activate the new DateAndTime implementation. =============== Diff against Chronology-Core-dtl.17 =============== Item was changed: Magnitude subclass: #DateAndTime + instanceVariableNames: 'utcMicroseconds localOffsetSeconds' + classVariableNames: 'AutomaticTimezone ClockProvider InitializeFromPrimitive LocalTimeZone PosixEpochJulianDays' - instanceVariableNames: 'seconds offset jdn nanos' - classVariableNames: 'AutomaticTimezone ClockProvider LastClockValue LocalTimeZone NanoOffset' poolDictionaries: 'ChronologyConstants' category: 'Chronology-Core'! + !DateAndTime commentStamp: 'dtl 3/12/2016 10:32' prior: 0! - !DateAndTime commentStamp: 'bf 2/18/2016 16:20' prior: 0! I represent a point in UTC time as defined by ISO 8601. I have zero duration. + My implementation uses variables utcMicroseconds and localOffsetSeconds. This represents time magnitude as elapsed microseconds since the Posix epoch, with localOffsetSeconds representing local offset from UTC. The magnitude is used for comparison and duration calculations, and the local offset is used for displaying this magnitude in the context of a local time zone. + The implementation ignores leap seconds, which are adjustments made to maintain earth rotational clock time in synchronization with elapsed seconds. - My implementation uses three SmallIntegers - and a Duration: - jdn - julian day number. - seconds - number of seconds since midnight. - nanos - the number of nanoseconds since the second. + DateAndTime class>>now will use #primitiveUtcWithOffset to obtain current time in UTC microseconds with current local offset in seconds. The primitive provides an atomic query for UTC time and local offset as measured by the OS platform. If primitiveUtcWithOffset is not available, the traditional implementation is used, which relies on a primitive for microseconds in the local time zone and derives UTC based on the TimeZone setting. - offset - duration from UTC (possibly nil if no timezone information) - - The nanosecond attribute is almost always zero but it defined for full ISO compliance and is suitable for timestamping. ! Item was added: + ----- Method: DateAndTime class>>canInitializeFromPrimitive (in category 'system startup') ----- + canInitializeFromPrimitive + "Some implementations of primitiveUtcWithOffset do not support passing the + DateAndTime instance as a parameter to the primitive." + + ^self basicNew initializeFromPrimitive utcMicroseconds notNil! Item was changed: ----- Method: DateAndTime class>>date:time: (in category 'squeak protocol') ----- date: aDate time: aTime ^ self + year: aDate year + month: aDate monthIndex + day: aDate dayOfMonth - year: aDate year - day: aDate dayOfYear hour: aTime hour + minute: aTime minute - minute: aTime minute second: aTime second + nanoSecond: aTime nanoSecond offset: aDate start offset! Item was added: + ----- Method: DateAndTime class>>daysFromSmalltalkEpochToPosixEpoch (in category 'private') ----- + daysFromSmalltalkEpochToPosixEpoch + + ^52 * 365 + (17 * 366)! Item was changed: ----- Method: DateAndTime class>>epoch (in category 'squeak protocol') ----- epoch "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" + ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 + ! - ^ self julianDayNumber: SqueakEpoch! Item was added: + ----- Method: DateAndTime class>>epochOffset (in category 'private') ----- + epochOffset + "Elaspsed seconds from the Smalltalk epoch to the Posix epoch" + ^self daysFromSmalltalkEpochToPosixEpoch * SecondsInDay! Item was added: + ----- Method: DateAndTime class>>epochOffsetMicros (in category 'private') ----- + epochOffsetMicros + "Elaspsed microseconds from the Smalltalk epoch to the Posix epoch" + ^self epochOffset * 1000000! Item was changed: ----- Method: DateAndTime class>>fromSeconds: (in category 'smalltalk-80') ----- fromSeconds: seconds + "Answer a DateAndTime since the Squeak epoch: 1 January 1901 - "Answer a DateAndTime since the Squeak epoch: 1 January 1901" + Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + ^ LXDateAndTime fromSeconds: seconds + "| s uSec offset | + offset := self localOffsetSeconds. + s := seconds - self epochOffset. + uSec := s * 1000000. + ^ self utcMicroseconds: uSec offset: offset" + ! - "| integerSeconds nanos | - integerSeconds := seconds truncated. - integerSeconds = seconds - ifTrue: [nanos := 0] - ifFalse: [nanos := (seconds - integerSeconds * NanosInSecond) asInteger]. - ^ self basicNew - ticks: (Array - with: SqueakEpoch - with: integerSeconds - with: nanos) - offset: self localOffset"! Item was changed: ----- Method: DateAndTime class>>fromUnixTime: (in category 'squeak protocol') ----- + fromUnixTime: utcSeconds - fromUnixTime: aNumber + ^self utcSeconds: utcSeconds offset: 0 + ! - - ^ self fromSeconds: aNumber + self unixEpoch asSeconds! Item was changed: ----- Method: DateAndTime class>>initialize (in category 'initialize-release') ----- initialize + + super initialize. + + ClockProvider := Time. + PosixEpochJulianDays := 2440588. + InitializeFromPrimitive := self canInitializeFromPrimitive. + Smalltalk addToStartUpList: self. + self startUp: true - ClockProvider ifNil: [ClockProvider := Time]. - Smalltalk addToStartUpList: self after: Delay. - self startUp: true. ! Item was changed: ----- Method: DateAndTime class>>julianDayNumber:offset: (in category 'squeak protocol') ----- julianDayNumber: anInteger offset: aDuration ^ LXDateAndTime julianDayNumber: anInteger offset: aDuration "^self basicNew setJdn: anInteger seconds: 0 nano: 0 offset: aDuration"! Item was changed: ----- Method: DateAndTime class>>localOffset (in category 'squeak protocol') ----- localOffset "Answer the duration we are offset from UTC" + ^ Duration seconds: self localOffsetSeconds - ^ self localTimeZone offset ! Item was added: + ----- Method: DateAndTime class>>localOffsetSeconds (in category 'private') ----- + localOffsetSeconds + + self automaticTimezone + ifTrue: [ ^Time posixMicrosecondClockWithOffset second ] + ifFalse: [ ^self localTimeZone offset asSeconds ]! Item was changed: ----- Method: DateAndTime class>>new (in category 'squeak protocol') ----- new "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" + ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 + + ! - ^ self epoch! Item was changed: ----- Method: DateAndTime class>>now (in category 'ansi protocol') ----- now + "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not + available, answer the Posix epoch GMT." ^LXDateAndTime now. + "self automaticTimezone + ifTrue: [ InitializeFromPrimitive + ifTrue: [ ^ self basicNew initializeFromPrimitive ] + ifFalse: [ | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: timeArray second ] ] + ifFalse: [ | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: self localOffsetSeconds ]" + ! - "| clockAndOffset localSeconds | - clockAndOffset := self clock utcMicrosecondClockWithOffset. - localSeconds := self localOffset asSeconds. - (self automaticTimezone and: [localSeconds ~= clockAndOffset second]) - ifTrue: [self setLocalOffsetAutomatically: (Duration seconds: (localSeconds := clockAndOffset second))]. - ^self now: clockAndOffset first + (localSeconds * 1000000) offset: self localOffset"! Item was changed: ----- Method: DateAndTime class>>nowAtOffset: (in category 'squeak protocol') ----- nowAtOffset: offsetDuration "Answers the local time at places with the specified offsetDuration timezone." "local time Chicago (CST)" "DateAndTime nowAtOffset: -6 hours" + + ^ self utcMicroseconds: Time posixMicrosecondClockWithOffset first offset: offsetDuration asSeconds + ! - ^ self now + (offsetDuration - self localOffset) offset: offsetDuration! Item was added: + ----- Method: DateAndTime class>>nowWithOffset: (in category 'squeak protocol') ----- + nowWithOffset: aDuration + "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not + available, answer the Posix epoch with time zone offset aDuration." + + | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: aDuration asSeconds + ! Item was changed: ----- Method: DateAndTime class>>readFrom: (in category 'squeak protocol') ----- readFrom: aStream + | offsetSeconds ch yearMonthDay hourMinuteSecondNano offset | - | offset date time ch | + yearMonthDay := Date readYearMonthDayFrom: aStream. - date := Date readFrom: aStream. [aStream peek isDigit] whileFalse: [aStream next]. + hourMinuteSecondNano := Time readHourMinuteSecondNanoFrom: aStream. - time := Time readFrom: aStream. (aStream atEnd or: [('+-Z' includes: aStream peek) not]) + ifTrue: [ self flag: #FIXME. + "Different unit tests have conflicting opinions as to whether the + current local offset should be used as a default. However, the current + local offset cannot be correct due to DST (offset is itself a function + of the point in time). Nevertheless, this is a reasonable default considering + that the offset would have been explicitly part of the date string if it + was a matter of concern. Unit tests will require updates to match this + assumption." + "offsetSeconds := 0" + offsetSeconds := self localOffsetSeconds] - ifTrue: [offset := self localOffset] ifFalse: [(aStream peekFor: $Z) + ifTrue: [offsetSeconds := 0] - ifTrue: [offset := Duration zero] ifFalse: [ ch := aStream next. ch = $+ ifTrue: [ch := Character space]. + offset := Duration fromString: ch asString, '0:', aStream upToEnd, ':0'. + offsetSeconds := offset asSeconds]]. - offset := Duration fromString: ch asString, '0:', aStream upToEnd, ':0']]. ^ self + year: yearMonthDay first + month: yearMonthDay second + day: yearMonthDay third + hour: hourMinuteSecondNano first + minute: hourMinuteSecondNano second + second: hourMinuteSecondNano third + nanoSecond: hourMinuteSecondNano fourth + offsetSeconds: offsetSeconds - year: date year - month: date monthIndex - day: date dayOfMonth - hour: time hour - minute: time minute - second: time second - nanoSecond: time nanoSecond - offset: offset " '-1199-01-05T20:33:14.321-05:00' asDateAndTime ' 2002-05-16T17:20:45.1+01:01' asDateAndTime ' 2002-05-16T17:20:45.02+01:01' asDateAndTime ' 2002-05-16T17:20:45.003+01:01' asDateAndTime ' 2002-05-16T17:20:45.0004+01:01' asDateAndTime ' 2002-05-16T17:20:45.00005' asDateAndTime ' 2002-05-16T17:20:45.000006+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000007+01:01' asDateAndTime ' 2002-05-16T17:20:45.00000008-01:01' asDateAndTime ' 2002-05-16T17:20:45.000000009+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000000001+01:01' asDateAndTime ' 2002-05-16T17:20' asDateAndTime ' 2002-05-16T17:20:45' asDateAndTime ' 2002-05-16T17:20:45+01:57' asDateAndTime ' 2002-05-16T17:20:45-02:34' asDateAndTime ' 2002-05-16T17:20:45+00:00' asDateAndTime ' 1997-04-26T01:02:03+01:02:3' asDateAndTime "! Item was changed: ----- Method: DateAndTime class>>startUp: (in category 'system startup') ----- startUp: startingAfresh "Set local timezone" + startingAfresh + ifTrue: [InitializeFromPrimitive := self canInitializeFromPrimitive. + Time initialize. "set LastClockTick to 0". + self now. + self automaticTimezone]! - startingAfresh & self automaticTimezone ifTrue: [self now]. - ! Item was added: + ----- Method: DateAndTime class>>utcMicroseconds:offset: (in category 'instance creation') ----- + utcMicroseconds: microsecondsSincePosixEpoch offset: secondsFromGMT + + ^super new + utcMicroseconds: microsecondsSincePosixEpoch + offset: secondsFromGMT! Item was added: + ----- Method: DateAndTime class>>utcMicrosecondsForYear:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'private') ----- + utcMicrosecondsForYear: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds + + | monthIndex daysInMonth p q r s julianDayNumber posixDays seconds utcSeconds | + + monthIndex := month isInteger ifTrue: [month] ifFalse: [Month indexOfMonth: month]. + daysInMonth := Month + daysInMonth: monthIndex + forYear: year. + day < 1 ifTrue: [self error: 'day may not be zero or negative']. + day > daysInMonth ifTrue: [self error: 'day is after month ends']. + + p := (monthIndex - 14) quo: 12. + q := year + 4800 + p. + r := monthIndex - 2 - (12 * p). + s := (year + 4900 + p) quo: 100. + + julianDayNumber := + ( (1461 * q) quo: 4 ) + + ( (367 * r) quo: 12 ) - + ( (3 * s) quo: 4 ) + + ( day - 32075 ). + + posixDays := julianDayNumber - PosixEpochJulianDays. + seconds := hour * 60 + minute * 60 + second - offsetSeconds. + utcSeconds := seconds + (posixDays * 24 * 3600). + ^ utcSeconds * 1000000 + (nanoCount / 1000) + ! Item was added: + ----- Method: DateAndTime class>>utcSeconds:offset: (in category 'instance creation') ----- + utcSeconds: secondsSincePosixEpoch offset: secondsFromGMT + + ^self + utcMicroseconds: secondsSincePosixEpoch * 1000000 + offset: secondsFromGMT! Item was changed: ----- Method: DateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offset: (in category 'squeak protocol') ----- year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset "Return a DateAndTime" + ^ LXDateAndTime year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset - | monthIndex daysInMonth p q r s julianDayNumber | + "| offsetSeconds utcMicros | + offsetSeconds := offset asSeconds. + utcMicros := self + utcMicrosecondsForYear: year + month: month + day: day + hour: hour + minute: minute + second: second + nanoSecond: nanoCount + offsetSeconds: offsetSeconds. + ^ self utcMicroseconds: utcMicros offset: offsetSeconds"! - monthIndex := month isInteger ifTrue: [month] ifFalse: [Month indexOfMonth: month]. - daysInMonth := Month - daysInMonth: monthIndex - forYear: year. - day < 1 ifTrue: [self error: 'day may not be zero or negative']. - day > daysInMonth ifTrue: [self error: 'day is after month ends']. - - p := (monthIndex - 14) quo: 12. - q := year + 4800 + p. - r := monthIndex - 2 - (12 * p). - s := (year + 4900 + p) quo: 100. - - julianDayNumber := - ( (1461 * q) quo: 4 ) + - ( (367 * r) quo: 12 ) - - ( (3 * s) quo: 4 ) + - ( day - 32075 ). - - ^self basicNew - setJdn: julianDayNumber - seconds: hour * 60 + minute * 60 + second - nano: nanoCount - offset: offset; - yourself! Item was added: + ----- Method: DateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'squeak protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds + "Return a DateAndTime" + + | utcMicros | + utcMicros := self + utcMicrosecondsForYear: year + month: month + day: day + hour: hour + minute: minute + second: second + nanoSecond: nanoCount + offsetSeconds: offsetSeconds. + ^ self utcMicroseconds: utcMicros offset: offsetSeconds! Item was changed: ----- Method: DateAndTime>>+ (in category 'ansi protocol') ----- + operand "operand conforms to protocol Duration" + ^ self class + utcMicroseconds: operand asDuration asNanoSeconds / 1000 + utcMicroseconds + offset: localOffsetSeconds - | ticks | - ticks := self ticks + (operand asDuration ticks) . - - ^ self class basicNew - ticks: ticks - offset: self offset; - yourself ! Item was changed: ----- Method: DateAndTime>>- (in category 'ansi protocol') ----- - operand "operand conforms to protocol DateAndTime or protocol Duration" ^ (operand respondsTo: #asDateAndTime) ifTrue: + [ | micros | + micros := utcMicroseconds - operand asDateAndTime utcMicroseconds. + Duration seconds: micros // 1000000 nanoSeconds: micros \\ 1000000 * 1000] + ifFalse: + [ self + (operand negated) ] - [ | lticks rticks | - lticks := self asLocal ticks. - - rticks := operand asDateAndTime asLocal ticks. - Duration - seconds: (SecondsInDay *(lticks first - rticks first)) + - (lticks second - rticks second) - nanoSeconds: (lticks third - rticks third) ] - - ifFalse: - - [ self + (operand negated) ] ! Item was changed: ----- Method: DateAndTime>>< (in category 'ansi protocol') ----- + < comparand - < comparand "comparand conforms to protocol DateAndTime, or can be converted into something that conforms." + + ^utcMicroseconds < comparand asDateAndTime utcMicroseconds + ! - | lvalue rvalue comparandAsDateAndTime | - comparandAsDateAndTime := comparand asDateAndTime. - self offset = comparandAsDateAndTime offset - ifTrue: - [ lvalue := self. - rvalue := comparandAsDateAndTime ] - ifFalse: - [ lvalue := self asUTC. - rvalue := comparandAsDateAndTime asUTC ]. - ^ lvalue julianDayNumber < rvalue julianDayNumber or: - [ lvalue julianDayNumber > rvalue julianDayNumber - ifTrue: [ false ] - ifFalse: - [ lvalue secondsSinceMidnight < rvalue secondsSinceMidnight or: - [ lvalue secondsSinceMidnight > rvalue secondsSinceMidnight - ifTrue: [ false ] - ifFalse: [ lvalue nanoSecond < rvalue nanoSecond ] ] ] ]! Item was changed: ----- Method: DateAndTime>>= (in category 'ansi protocol') ----- + = aDateAndTimeOrTimeStamp + "Equal if the absolute time values match, regardless of local time transform" - = aDateAndTimeOrTimeStamp self == aDateAndTimeOrTimeStamp ifTrue: [ ^ true ]. + ^aDateAndTimeOrTimeStamp species == DateAndTime + and: [ utcMicroseconds = aDateAndTimeOrTimeStamp utcMicroseconds ]! - ((aDateAndTimeOrTimeStamp isKindOf: self class) - or: [aDateAndTimeOrTimeStamp isKindOf: DateAndTime orOf: TimeStamp]) - ifFalse: [ ^ false ]. - ^ self offset = aDateAndTimeOrTimeStamp offset - ifTrue: [ self hasEqualTicks: aDateAndTimeOrTimeStamp ] - ifFalse: [ self asUTC hasEqualTicks: aDateAndTimeOrTimeStamp asUTC ]! Item was added: + ----- Method: DateAndTime>>asChronologySeconds (in category 'converting') ----- + asChronologySeconds + "What #asSeconds answers in prior Chronology-format images." + ^ self asSeconds + self offset asSeconds! Item was changed: ----- Method: DateAndTime>>asDuration (in category 'squeak protocol') ----- asDuration "Answer the duration since midnight." + ^ Duration seconds: self getSeconds nanoSeconds: self nanoSecond - ^ Duration seconds: seconds nanoSeconds: nanos ! Item was added: + ----- Method: DateAndTime>>asExactSeconds (in category 'smalltalk-80') ----- + asExactSeconds + "Return the duration in seconds since the Squeak epoch" + + "Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + + ^ utcMicroseconds / 1000000 + self class epochOffset + ! Item was added: + ----- Method: DateAndTime>>asPosixSeconds (in category 'converting') ----- + asPosixSeconds + + ^utcMicroseconds / 1000000 + ! Item was changed: ----- Method: DateAndTime>>asSeconds (in category 'smalltalk-80') ----- asSeconds + "Return the number of seconds since the Squeak epoch. See asExactSeconds + to retain full precision of the duration in seconds." + + "Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + + ^ utcMicroseconds // 1000000 + self class epochOffset + ! - "Return the number of seconds since the Squeak epoch" - ^ (self - (self class epoch offset: offset)) asSeconds! Item was changed: ----- Method: DateAndTime>>asTime (in category 'squeak protocol') ----- asTime + ^ Time seconds: self getSeconds nanoSeconds: self nanoSecond - ^ Time seconds: seconds nanoSeconds: nanos ! Item was changed: ----- Method: DateAndTime>>asTimeStamp (in category 'squeak protocol') ----- asTimeStamp + ^ self + asDateAndTime "FIXME LX hack for test support" + as: TimeStamp! - ^ self as: TimeStamp! Item was changed: ----- Method: DateAndTime>>asUTC (in category 'ansi protocol') ----- asUTC + localOffsetSeconds = 0 ifTrue: [ ^self ]. + ^self copy + utcMicroseconds: utcMicroseconds + offset: 0 - ^ self offset isZero - ifTrue: [self] - ifFalse: [self utcOffset: 0] ! Item was changed: ----- Method: DateAndTime>>dayMonthYearDo: (in category 'squeak protocol') ----- dayMonthYearDo: aBlock "Evaluation the block with three arguments: day month, year." | l n i j dd mm yyyy | + l := self julianDayNumber + 68569. - l := jdn + 68569. n := 4 * l // 146097. l := l - (146097 * n + 3 // 4). i := 4000 * (l + 1) // 1461001. l := l - (1461 * i // 4) + 31. j := 80 * l // 2447. dd := l - (2447 * j // 80). l := j // 11. mm := j + 2 - (12 * l). yyyy := 100 * (n - 49) + i + l. ^ aBlock value: dd value: mm value: yyyy! Item was changed: ----- Method: DateAndTime>>dayOfWeek (in category 'ansi protocol') ----- dayOfWeek "Sunday=1, ... , Saturday=7" + ^ (self julianDayNumber + 1 rem: 7) + 1 - ^ (jdn + 1 rem: 7) + 1 ! Item was changed: ----- Method: DateAndTime>>floor (in category 'squeak protocol') ----- floor "Answer a copy with magnitude rounded down to the nearest whole second" + ^self class + utcMicroseconds: utcMicroseconds - (utcMicroseconds \\ 1000000) + offset: localOffsetSeconds! - ^self class basicNew - ticks: (self ticks at: 3 put: 0; yourself) - offset: offset. - ! Item was added: + ----- Method: DateAndTime>>getSeconds (in category 'accessing') ----- + getSeconds + + | posixDays posixSeconds localSeconds | + posixSeconds := utcMicroseconds // 1000000. + localSeconds := posixSeconds + localOffsetSeconds. + localSeconds < 0 ifTrue: [localSeconds := localSeconds \\ SecondsInDay]. "normalize" + posixDays := localSeconds // SecondsInDay. + ^localSeconds - (posixDays * SecondsInDay). + ! Item was changed: ----- Method: DateAndTime>>hash (in category 'ansi protocol') ----- hash + ^utcMicroseconds hash! - | totalSeconds | - totalSeconds := seconds - self offset asSeconds. - ^ ((totalSeconds // 86400 + jdn) hashMultiply bitXor: totalSeconds \\ - 86400) bitXor: nanos! Item was changed: ----- Method: DateAndTime>>hour24 (in category 'ansi protocol') ----- hour24 + ^self getSeconds // 3600! - - ^ (Duration seconds: seconds) hours! Item was added: + ----- Method: DateAndTime>>initializeFromPrimitive (in category 'initialize-release') ----- + initializeFromPrimitive + + Time posixMicrosecondClockWithOffset: self! Item was changed: ----- Method: DateAndTime>>julianDayNumber (in category 'squeak protocol') ----- julianDayNumber + | posixDays posixSeconds localSeconds negativeDays | + posixSeconds := utcMicroseconds // 1000000. + localSeconds := posixSeconds + localOffsetSeconds. + negativeDays := 0. + localSeconds < 0 ifTrue: [ "normalize" + negativeDays := localSeconds // SecondsInDay. + localSeconds := negativeDays * SecondsInDay + localSeconds]. + posixDays := localSeconds // SecondsInDay. + ^posixDays + PosixEpochJulianDays - negativeDays. + ! - - ^ jdn! Item was added: + ----- Method: DateAndTime>>localOffsetSeconds: (in category 'initialize-release') ----- + localOffsetSeconds: seconds + "Private. Allow value to be modified during initialization in order to support local + timezone preference." + + localOffsetSeconds := seconds + ! Item was changed: ----- Method: DateAndTime>>makeUTC (in category 'squeak protocol') ----- makeUTC "Make the receiver's timezone UTC." + localOffsetSeconds := 0! - self primOffset: Duration zero! Item was added: + ----- Method: DateAndTime>>microsecondsFromDay:seconds:nanos:offset: (in category 'private') ----- + microsecondsFromDay: jdn seconds: s nanos: n offset: localOffsetSeconds + + | days totalSeconds micros | + days := jdn - PosixEpochJulianDays. + totalSeconds := days * 86400 + s - localOffsetSeconds. "n.g. const 86400 is faster than SecondsInDay" + micros := totalSeconds * 1000000. + ^micros + (n / 1000) + ! Item was changed: ----- Method: DateAndTime>>midnight (in category 'squeak protocol') ----- midnight "Answer a DateAndTime starting at midnight of the same timezone offset as the receiver." ^ self class basicNew + setJdn: self julianDayNumber + seconds: localOffsetSeconds - setJdn: jdn - seconds: 0 nano: 0 + localOffsetSeconds: localOffsetSeconds.! - offset: offset! Item was changed: ----- Method: DateAndTime>>minute (in category 'ansi protocol') ----- minute + ^self getSeconds // 60 \\ 60! - - ^ (Duration seconds: seconds) minutes! Item was changed: ----- Method: DateAndTime>>nanoSecond (in category 'squeak protocol') ----- nanoSecond + ^utcMicroseconds \\ 1000000 * 1000 + ! - - ^ nanos! Item was changed: ----- Method: DateAndTime>>normalize:ticks:base: (in category 'private') ----- normalize: i ticks: ticks base: base | tick div quo rem | tick := ticks at: i. + div := tick asInteger digitDiv: base neg: tick negative. - div := tick digitDiv: base neg: tick negative. quo := (div at: 1) normalize. rem := (div at: 2) normalize. rem < 0 ifTrue: [ quo := quo - 1. rem := base + rem ]. ticks at: (i-1) put: ((ticks at: i-1) + quo). ticks at: i put: rem ! Item was changed: ----- Method: DateAndTime>>offset (in category 'ansi protocol') ----- offset + ^ Duration seconds: localOffsetSeconds! - ^ offset ifNil: [Duration zero]! Item was changed: ----- Method: DateAndTime>>offset: (in category 'ansi protocol') ----- offset: anOffset "Answer a <DateAndTime> equivalent to the receiver but with its local time being offset from UTC by offset." + | newOffset newMicros | + self flag: #FIXME. "check the definition of this and of #utcOffset:" + newOffset := anOffset asDuration asSeconds. + newMicros := localOffsetSeconds - newOffset * 1000000 + utcMicroseconds. + ^ self class utcMicroseconds: newMicros offset: newOffset + ! - ^ self class basicNew - ticks: self ticks offset: (anOffset ifNotNil: [anOffset asDuration]); - yourself! Item was added: + ----- Method: DateAndTime>>offsetSeconds (in category 'accessing') ----- + offsetSeconds + + ^localOffsetSeconds! Item was added: + ----- Method: DateAndTime>>posixEpochJulianDays (in category 'initialize-release') ----- + posixEpochJulianDays + + ^self class daysFromSmalltalkEpochToPosixEpoch + SqueakEpoch! Item was changed: ----- Method: DateAndTime>>printHMSOn: (in category 'squeak protocol') ----- printHMSOn: aStream "Print just hh:mm:ss" + + | seconds | + seconds := self getSeconds. + seconds // 3600 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + seconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + seconds \\ 60 printOn: aStream base: 10 length: 2 padded: true! - aStream - nextPutAll: (self hour asString padded: #left to: 2 with: $0); - nextPut: $:; - nextPutAll: (self minute asString padded: #left to: 2 with: $0); - nextPut: $:; - nextPutAll: (self second asString padded: #left to: 2 with: $0). - ! Item was changed: ----- Method: DateAndTime>>printOn:withLeadingSpace: (in category 'squeak protocol') ----- printOn: aStream withLeadingSpace: printLeadingSpaceToo "Print as per ISO 8601 sections 5.3.3 and 5.4.1. If printLeadingSpaceToo is false, prints either: 'YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) If printLeadingSpaceToo is true, prints either: ' YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) " + | nanos offsetSeconds | self printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo. aStream nextPut: $T. self printHMSOn: aStream. + (nanos := utcMicroseconds \\ 1000000 * 1000) = 0 ifFalse: [ + | length | + aStream nextPut: $.. + length := 9. + [ nanos \\ 10 = 0 ] whileTrue: [ + nanos := nanos // 10. + length := length - 1 ]. + nanos printOn: aStream base: 10 length: length padded: true ]. + "Print offset" + aStream nextPut: (localOffsetSeconds >= 0 ifTrue: [ $+ ] ifFalse: [ $- ]). + offsetSeconds := localOffsetSeconds abs. + offsetSeconds // 3600 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + offsetSeconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. + (offsetSeconds := offsetSeconds \\ 60) = 0 ifFalse: [ + aStream - self nanoSecond ~= 0 ifTrue: - [ | z ps | - ps := self nanoSecond printString padded: #left to: 9 with: $0. - z := ps findLast: [ :c | c asciiValue > $0 asciiValue ]. - (z > 0) ifTrue: [aStream nextPut: $.]. - ps from: 1 to: z do: [ :c | aStream nextPut: c ] ]. - aStream - nextPut: (self offset positive ifTrue: [$+] ifFalse: [$-]); - nextPutAll: (self offset hours abs asString padded: #left to: 2 with: $0); - nextPut: $:; - nextPutAll: (self offset minutes abs asString padded: #left to: 2 with: $0). - self offset seconds = 0 ifFalse: - [ aStream nextPut: $:; + print: offsetSeconds ]! - nextPutAll: (self offset seconds abs truncated asString) ]. - ! Item was changed: ----- Method: DateAndTime>>printYMDOn:withLeadingSpace: (in category 'squeak protocol') ----- printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo "Print just the year, month, and day on aStream. If printLeadingSpaceToo is true, then print as: ' YYYY-MM-DD' (if the year is positive) or '-YYYY-MM-DD' (if the year is negative) otherwise print as: 'YYYY-MM-DD' or '-YYYY-MM-DD' " + self dayMonthYearDo: [ :day :month :year | + year negative + ifTrue: [ aStream nextPut: $- ] + ifFalse: [ printLeadingSpaceToo ifTrue: [ aStream space ] ]. + year abs printOn: aStream base: 10 length: 4 padded: true. + aStream nextPut: $-. + month printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $-. + day printOn: aStream base: 10 length: 2 padded: true ]! - | year month day | - self dayMonthYearDo: [ :d :m :y | year := y. month := m. day := d ]. - year negative - ifTrue: [ aStream nextPut: $- ] - ifFalse: [ printLeadingSpaceToo ifTrue: [ aStream space ]]. - aStream - nextPutAll: (year abs asString padded: #left to: 4 with: $0); - nextPut: $-; - nextPutAll: (month asString padded: #left to: 2 with: $0); - nextPut: $-; - nextPutAll: (day asString padded: #left to: 2 with: $0) - ! Item was added: + ----- Method: DateAndTime>>readDataFrom:size: (in category 'objects from disk') ----- + readDataFrom: aDataStream size: varsOnDisk + "Fill in the fields of self based on the contents of aDataStream. The serialized + data will have four instance variables, because all instances are serialized in a + cononical format as if having originating from an instance with the traditional + seconds/offset/jdn/nanos instance variables." + + | seconds offset jdn nanos | + seconds := aDataStream next. + offset := aDataStream next. + jdn := aDataStream next. + nanos := aDataStream next. + localOffsetSeconds := offset ifNil: [ 0 ] ifNotNil: [ :off | off asSeconds ]. + utcMicroseconds := self + microsecondsFromDay: jdn + seconds: seconds + nanos: nanos + offset: localOffsetSeconds.! Item was changed: ----- Method: DateAndTime>>second (in category 'ansi protocol') ----- second + ^self getSeconds \\ 60! - - ^ (Duration seconds: seconds) seconds! Item was changed: ----- Method: DateAndTime>>secondsSinceMidnight (in category 'private') ----- secondsSinceMidnight + ^ self getSeconds! - ^ seconds! Item was added: + ----- Method: DateAndTime>>setJdn:seconds:nano:localOffsetSeconds: (in category 'private') ----- + setJdn: jdn seconds: s nano: n localOffsetSeconds: offset + + localOffsetSeconds := offset. + utcMicroseconds := self + microsecondsFromDay: jdn + seconds: s - offset + nanos: n + offset: offset! Item was changed: ----- Method: DateAndTime>>setJdn:seconds:nano:offset: (in category 'squeak protocol') ----- + setJdn: jdn seconds: s nano: n offset: o - setJdn: j seconds: s nano: n offset: o + self setJdn: jdn seconds: s nano: n localOffsetSeconds: o asSeconds. - jdn := j. - seconds := s. - nanos := n. - offset := o ! Item was added: + ----- Method: DateAndTime>>species (in category 'accessing') ----- + species + ^DateAndTime! Item was added: + ----- Method: DateAndTime>>storeDataOn: (in category 'objects from disk') ----- + storeDataOn: aDataStream + "Store myself on a DataStream. Answer self. + Store 4 variables worth of data, corresponding to the 4 instance variables of the old + DateAndTime implementation, which is to be used as common format for externally + stored instances." + + " | dt dt2 | + dt := DateAndTime now. + dt2 := DataStream testWith: dt. + { dt . dt2 }." + + | cntInstVars cntIndexedVars ticks jdn offset seconds nanos | + "Set the instance variable count to 4 to match that of a cononical instance." + cntInstVars := 4. + cntIndexedVars := self basicSize. + aDataStream + beginInstance: self xxxClass + size: cntInstVars + cntIndexedVars. + + "Create the 4 values of the old format DateAndTime" + ticks := self ticks. "{days. seconds. nanoSeconds}." + offset := self offset. + jdn := ticks at: 1. + seconds := ticks at: 2. + nanos := ticks at: 3. + aDataStream + nextPut: seconds; + nextPut: offset; + nextPut: jdn; + nextPut: nanos. + ! Item was changed: ----- Method: DateAndTime>>ticks (in category 'private') ----- ticks "Private - answer an array with our instance variables. Assumed to be UTC " + ^ Array with: self julianDayNumber with: self getSeconds with: self nanoSecond - ^ Array with: jdn with: seconds with: nanos ! Item was changed: ----- Method: DateAndTime>>ticks:offset: (in category 'private') ----- ticks: ticks offset: utcOffset "ticks is {julianDayNumber. secondCount. nanoSeconds}" + | jdn s nanos | self normalize: 3 ticks: ticks base: NanosInSecond. self normalize: 2 ticks: ticks base: SecondsInDay. jdn := ticks at: 1. + s := ticks at: 2. - seconds := ticks at: 2. nanos := ticks at: 3. + localOffsetSeconds := utcOffset ifNil: [0] ifNotNil: [utcOffset asSeconds]. + utcMicroseconds := self microsecondsFromDay: jdn seconds: s nanos: nanos offset: localOffsetSeconds. - offset := utcOffset ! Item was added: + ----- Method: DateAndTime>>utcMicroseconds (in category 'accessing') ----- + utcMicroseconds + ^utcMicroseconds! Item was added: + ----- Method: DateAndTime>>utcMicroseconds: (in category 'initialize-release') ----- + utcMicroseconds: utcValue + "Allow value to be modified during initialization from a primitive in order to support + monotonically increasing clock behavior." + utcMicroseconds := utcValue! Item was added: + ----- Method: DateAndTime>>utcMicroseconds:offset: (in category 'initialize-release') ----- + utcMicroseconds: microsecondsSincePosixEpoch offset: tzOffset + + utcMicroseconds := microsecondsSincePosixEpoch. + localOffsetSeconds := tzOffset. + ! Item was changed: ----- Method: DateAndTime>>utcOffset: (in category 'squeak protocol') ----- utcOffset: anOffset "Answer a <DateAndTime> equivalent to the receiver but offset from UTC by anOffset" + self flag: #FIXME. "check the definition of this and of #offset:" + ^self utcMicroseconds: utcMicroseconds offset: anOffset asDuration asSeconds + ! - | equiv | - equiv := self + (anOffset asDuration - self offset). - ^ equiv ticks: (equiv ticks) offset: anOffset asDuration; yourself! Item was changed: ----- Method: LXDateAndTime>>asTimeStamp (in category 'squeak protocol') ----- asTimeStamp + ^ self asLXTimeStamp - ^ self asDateAndTime asTimeStamp !

1 0

The Trunk: Chronology-Core-dtl.17.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

David T. Lewis uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-dtl.17.mcz ==================== Summary ==================== Name: Chronology-Core-dtl.17 Author: dtl Time: 31 December 2018, 4:49:57.271035 am UUID: ae57904f-33ef-4614-9702-d2d148821f4f Ancestors: Chronology-Core-dtl.16 Bootstrap UTCDateAndTime, step 2 of 5 Start using LXDateAndTime instead of DateAndTime. Change instance creation in DateAndTime to create LXDateAndTime instances instead. In the postscript, have all DateAndTime instances become LXDateAndTime. =============== Diff against Chronology-Core-dtl.16 =============== Item was added: + ServiceProvider subclass: #ChronologyCoreServiceProvider + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! Item was added: + ----- Method: ChronologyCoreServiceProvider class>>initialize (in category 'initialization') ----- + initialize + ServiceRegistry current buildProvider: self new! Item was changed: ----- Method: DateAndTime class>>fromSeconds: (in category 'smalltalk-80') ----- fromSeconds: seconds "Answer a DateAndTime since the Squeak epoch: 1 January 1901" + ^ LXDateAndTime fromSeconds: seconds + + "| integerSeconds nanos | - | integerSeconds nanos | integerSeconds := seconds truncated. integerSeconds = seconds ifTrue: [nanos := 0] ifFalse: [nanos := (seconds - integerSeconds * NanosInSecond) asInteger]. ^ self basicNew ticks: (Array with: SqueakEpoch with: integerSeconds with: nanos) + offset: self localOffset"! - offset: self localOffset! Item was changed: ----- Method: DateAndTime class>>julianDayNumber:offset: (in category 'squeak protocol') ----- julianDayNumber: anInteger offset: aDuration + ^ LXDateAndTime julianDayNumber: anInteger offset: aDuration + + "^self basicNew - ^self basicNew setJdn: anInteger seconds: 0 nano: 0 + offset: aDuration"! - offset: aDuration! Item was changed: ----- Method: DateAndTime class>>now (in category 'ansi protocol') ----- now + + ^LXDateAndTime now. + + "| clockAndOffset localSeconds | - | clockAndOffset localSeconds | clockAndOffset := self clock utcMicrosecondClockWithOffset. localSeconds := self localOffset asSeconds. (self automaticTimezone and: [localSeconds ~= clockAndOffset second]) ifTrue: [self setLocalOffsetAutomatically: (Duration seconds: (localSeconds := clockAndOffset second))]. + ^self now: clockAndOffset first + (localSeconds * 1000000) offset: self localOffset"! - ^self now: clockAndOffset first + (localSeconds * 1000000) offset: self localOffset! Item was changed: ----- Method: LXDateAndTime>>= (in category 'ansi protocol') ----- = aDateAndTimeOrTimeStamp "Equal if the absolute time values match, regardless of local time transform" self == aDateAndTimeOrTimeStamp ifTrue: [ ^ true ]. ^aDateAndTimeOrTimeStamp species == DateAndTime + and: [ utcMicroseconds = aDateAndTimeOrTimeStamp asLXDateAndTime utcMicroseconds ]! - and: [ utcMicroseconds = aDateAndTimeOrTimeStamp utcMicroseconds ]! Item was added: + ----- Method: LXDateAndTime>>asLXTimeStamp (in category 'transitional - temporary') ----- + asLXTimeStamp + + ^ self as: LXTimeStamp! Item was changed: ----- Method: LXDateAndTime>>asTimeStamp (in category 'squeak protocol') ----- asTimeStamp + ^ self asDateAndTime asTimeStamp + ! - ^ self - asDateAndTime "FIXME LX hack for test support" - as: TimeStamp! Item was added: + ----- Method: LXDateAndTime>>hasEqualTicks: (in category 'private') ----- + hasEqualTicks: aDateAndTime + + ^ (self julianDayNumber = aDateAndTime julianDayNumber) + and: [ (self secondsSinceMidnight = aDateAndTime secondsSinceMidnight) + and: [ self nanoSecond = aDateAndTime nanoSecond ] ] + ! Item was added: + ----- Method: LXDateAndTime>>noTimezone (in category 'private') ----- + noTimezone + ^ false! Item was changed: ----- Method: TimeStamp class>>current (in category 'squeak protocol') ----- current + ^LXTimeStamp current + + "| ts ticks | - | ts ticks | ts := super now asTimeStamp. ticks := ts ticks. ticks at: 3 put: 0. ts ticks: ticks offset: ts offset. + ^ ts" - ^ ts ! Item was added: + ----- Method: TimeStamp class>>year:month:day:hour:minute:second:nanoSecond:offset: (in category 'squeak protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset + "Return a DateAndTime" + + ^ LXTimeStamp year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset + + ! Item was added: + ----- Method: TimeStamp>>asLXTimeStamp (in category 'LX-Kernel-Chronology') ----- + asLXTimeStamp + + ^self asLXDateAndTime asLXTimeStamp! Item was added: + (PackageInfo named: 'Chronology-Core') postscript: '"Convert all instances of DateAndTime and TimeStamp to the equivalent LXDateAndTime and LXTimeStamp." + + | oldInstances newInstances | + Smalltalk garbageCollect. + oldInstances := DateAndTime allInstances, TimeStamp allInstances. + newInstances := oldInstances collect: [ :each | + each class == DateAndTime + ifTrue: [ each asLXDateAndTime ] + ifFalse: [ each asLXTimeStamp ] ]. + oldInstances elementsForwardIdentityTo: newInstances. + Smalltalk garbageCollect. + '!

1 0

The Trunk: Chronology-Core-dtl.16.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

David T. Lewis uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-dtl.16.mcz ==================== Summary ==================== Name: Chronology-Core-dtl.16 Author: dtl Time: 30 December 2018, 4:35:23.83548 pm UUID: 0dcd076c-b568-4d2a-bbec-2c747ce32f23 Ancestors: Chronology-Core-cmm.15 Bootstrap UTCDateAndTime, step 1 of 5 Add LXDateAndTime and LXTimeStamp as alternative implementations of DateAndTime an TimeStamp. DateAndTime uses instance variables 'seconds offset jdn nanos' and calculates its magnitude based on those varables in conjunction with the local TimeZone, The LXDateAndTime variation uses instance variables 'utcMicroseconds localOffsetSeconds'. It represents time magnitude as elapsed microseconds since the Posix epoch, with localOffsetSeconds representing local offset from UTC. The magnitude is used for comparison and duration calculations, and the local offset is used for displaying this magnitude in the context of a local time zone. The implementation ignores leap seconds, which are adjustments made to maintain earth rotational clock time in synchronization with elapsed seconds. LXDateAndTime class>>now uses #primitiveUtcWithOffset to obtain current time in UTC microseconds with current local offset in seconds. The primitive provides an atomic query for UTC time and local offset as measured by the OS platform. If primitiveUtcWithOffset is not available, the traditional implementation is used, which relies on a primitive for microseconds in the local time zone and derives UTC based on the TimeZone setting. Tests are provided to verify equivalence of the LXDateAndTime and DateAndTime hierarchies. LXDateAndTimeConversionTest tests conversion to and from LXDateAndTime. LXDateAndTimeTest, LXDateAndTimeEpochTest, and LXDateAndTimeLeapTest are variations on their corresponding DateAndTime tests. These tests are placed in the Kernel package because they are temporary tests that will be removed when LXDateAndTime replaces DateAndTime in a later update. =============== Diff against Chronology-Core-cmm.15 =============== Item was added: + ----- Method: Date class>>readYearMonthDayFrom: (in category 'squeak protocol') ----- + readYearMonthDayFrom: aStream + "Read Date information from the stream in any of the forms: + <day> <month> <year> (15 April 1982; 15-APR-82; 15.4.82; 15APR82) + <month> <day> <year> (April 15, 1982; 4/15/82) + <year>-<month>-<day> (1982-04-15) (ISO8601)" + | day month year parsedNumber prefix monthIndex | + aStream peek = $- + ifTrue: [prefix := -1] + ifFalse: [prefix := 1]. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. + aStream peek isDigit + ifTrue: [ + parsedNumber := (Integer readFrom: aStream) * prefix. + (parsedNumber < 0 or: [parsedNumber > 31]) + ifTrue: [year := parsedNumber]]. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. + aStream peek isLetter + ifTrue: ["MM-DD-YY or DD-MM-YY or YY-MM-DD" + month := WriteStream on: (String new: 10). + [aStream peek isLetter] + whileTrue: [month nextPut: aStream next]. + month := month contents. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. + parsedNumber isNil + ifTrue: ["MM DD YY" + day := Integer readFrom: aStream] + ifFalse: [ + year isNil + ifTrue: ["DD MM YY" + day := parsedNumber]]] + ifFalse: ["MM-DD-YY or DD-MM-YY or YY-MM-DD" + year isNil + ifTrue: ["MM-DD-YY or DD-MM-YY" + parsedNumber > 12 + ifTrue: ["DD-MM-YY" + day := parsedNumber. + monthIndex := Integer readFrom: aStream. + "month := Month nameOfMonth: (Integer readFrom: aStream)"] + ifFalse: ["MM-DD-YY" + monthIndex := parsedNumber. + "month := Month nameOfMonth: parsedNumber." + day := Integer readFrom: aStream]] + ifFalse: ["YY-MM-DD" + monthIndex := Integer readFrom: aStream. + "month := Month nameOfMonth: (Integer readFrom: aStream)"]]. + [aStream peek isAlphaNumeric] + whileFalse: [aStream skip: 1]. + year isNil + ifTrue: [year := Integer readFrom: aStream] + ifFalse: [day := Integer readFrom: aStream]. + (year < 100 and: [year >= 0]) + ifTrue: [ + year < 69 + ifTrue: [ year := 2000 + year] + ifFalse: [year := 1900 + year]]. + + monthIndex ifNil: [monthIndex := Month indexOfMonth: month]. + ^ { year . monthIndex . day } + ! Item was added: + ----- Method: DateAndTime>>asLXDateAndTime (in category 'LX-Kernel-Chronology') ----- + asLXDateAndTime + + ^LXDateAndTime + year: self year + month: self month + day: self dayOfMonth + hour: self hour + minute: self minute + second: self second + nanoSecond: self nanoSecond + offset: self offset! Item was added: + Magnitude subclass: #LXDateAndTime + instanceVariableNames: 'utcMicroseconds localOffsetSeconds' + classVariableNames: 'AutomaticTimezone ClockProvider InitializeFromPrimitive LocalTimeZone PosixEpochJulianDays' + poolDictionaries: 'ChronologyConstants' + category: 'Chronology-Core'! + + !LXDateAndTime commentStamp: 'dtl 3/12/2016 10:32' prior: 0! + I represent a point in UTC time as defined by ISO 8601. I have zero duration. + + My implementation uses variables utcMicroseconds and localOffsetSeconds. This represents time magnitude as elapsed microseconds since the Posix epoch, with localOffsetSeconds representing local offset from UTC. The magnitude is used for comparison and duration calculations, and the local offset is used for displaying this magnitude in the context of a local time zone. + + The implementation ignores leap seconds, which are adjustments made to maintain earth rotational clock time in synchronization with elapsed seconds. + + DateAndTime class>>now will use #primitiveUtcWithOffset to obtain current time in UTC microseconds with current local offset in seconds. The primitive provides an atomic query for UTC time and local offset as measured by the OS platform. If primitiveUtcWithOffset is not available, the traditional implementation is used, which relies on a primitive for microseconds in the local time zone and derives UTC based on the TimeZone setting. + ! Item was added: + ----- Method: LXDateAndTime class>>automaticTimezone (in category 'preferences') ----- + automaticTimezone + "Accessor for the system-wide preference" + + <preference: 'Automatically set local timezone' + category: 'general' + description: 'If enabled, the timezone will automatically be kept in sync with the system''s time (daylight savings changes etc.)' + type: #Boolean> + ^AutomaticTimezone ifNil: [ true ]! Item was added: + ----- Method: LXDateAndTime class>>automaticTimezone: (in category 'preferences') ----- + automaticTimezone: aBoolean + "Accessor for the system-wide preference. + Note this gets disabled in localTimeZone: to make that override stick" + + AutomaticTimezone := aBoolean. + aBoolean ifTrue: [self now]. "fetch timezone immediately"! Item was added: + ----- Method: LXDateAndTime class>>canInitializeFromPrimitive (in category 'system startup') ----- + canInitializeFromPrimitive + "Some implementations of primitiveUtcWithOffset do not support passing the + DateAndTime instance as a parameter to the primitive." + + ^self basicNew initializeFromPrimitive utcMicroseconds notNil! Item was added: + ----- Method: LXDateAndTime class>>clock (in category 'clock provider') ----- + clock + "the provider of real time seconds/milliseconds." + + ^ ClockProvider ! Item was added: + ----- Method: LXDateAndTime class>>clockPrecision (in category 'ansi protocol') ----- + clockPrecision + "One nanosecond precision" + + ^ Duration seconds: 0 nanoSeconds: 1 + ! Item was added: + ----- Method: LXDateAndTime class>>current (in category 'squeak protocol') ----- + current + + + ^ self now! Item was added: + ----- Method: LXDateAndTime class>>date:time: (in category 'squeak protocol') ----- + date: aDate time: aTime + + ^ self + year: aDate year + month: aDate monthIndex + day: aDate dayOfMonth + hour: aTime hour + minute: aTime minute + second: aTime second + nanoSecond: aTime nanoSecond + offset: aDate start offset! Item was added: + ----- Method: LXDateAndTime class>>daysFromSmalltalkEpochToPosixEpoch (in category 'private') ----- + daysFromSmalltalkEpochToPosixEpoch + + ^52 * 365 + (17 * 366)! Item was added: + ----- Method: LXDateAndTime class>>epoch (in category 'squeak protocol') ----- + epoch + "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" + + ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 + ! Item was added: + ----- Method: LXDateAndTime class>>epochOffset (in category 'private') ----- + epochOffset + "Elaspsed seconds from the Smalltalk epoch to the Posix epoch" + ^self daysFromSmalltalkEpochToPosixEpoch * SecondsInDay! Item was added: + ----- Method: LXDateAndTime class>>epochOffsetMicros (in category 'private') ----- + epochOffsetMicros + "Elaspsed microseconds from the Smalltalk epoch to the Posix epoch" + ^self epochOffset * 1000000! Item was added: + ----- Method: LXDateAndTime class>>fromSeconds: (in category 'smalltalk-80') ----- + fromSeconds: seconds + "Answer a DateAndTime since the Squeak epoch: 1 January 1901 + + Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + + | s uSec offset | + offset := self localOffsetSeconds. + s := seconds - self epochOffset. + uSec := s * 1000000. + ^ self utcMicroseconds: uSec offset: offset + ! Item was added: + ----- Method: LXDateAndTime class>>fromString: (in category 'squeak protocol') ----- + fromString: aString + + + ^ self readFrom: (ReadStream on: aString)! Item was added: + ----- Method: LXDateAndTime class>>fromUnixTime: (in category 'squeak protocol') ----- + fromUnixTime: utcSeconds + + ^self utcSeconds: utcSeconds offset: 0 + ! Item was added: + ----- Method: LXDateAndTime class>>initialize (in category 'initialize-release') ----- + initialize + + super initialize. + + ClockProvider := Time. + PosixEpochJulianDays := 2440588. + InitializeFromPrimitive := self canInitializeFromPrimitive. + Smalltalk addToStartUpList: self. + self startUp: true + ! Item was added: + ----- Method: LXDateAndTime class>>julianDayNumber: (in category 'squeak protocol') ----- + julianDayNumber: anInteger + ^ self + julianDayNumber: anInteger + offset: self localOffset! Item was added: + ----- Method: LXDateAndTime class>>julianDayNumber:offset: (in category 'squeak protocol') ----- + julianDayNumber: anInteger offset: aDuration + + ^self basicNew + setJdn: anInteger + seconds: 0 + nano: 0 + offset: aDuration! Item was added: + ----- Method: LXDateAndTime class>>localOffset (in category 'squeak protocol') ----- + localOffset + "Answer the duration we are offset from UTC" + + ^ Duration seconds: self localOffsetSeconds + ! Item was added: + ----- Method: LXDateAndTime class>>localOffset: (in category 'squeak protocol') ----- + localOffset: aDuration + "Override the local time zone (for testing). This disables the #automaticTimezone: preference" + self localTimeZone: (TimeZone offset: aDuration name: 'Local Time (override)' abbreviation: 'LTO'). + ! Item was added: + ----- Method: LXDateAndTime class>>localOffsetSeconds (in category 'private') ----- + localOffsetSeconds + + self automaticTimezone + ifTrue: [ ^Time posixMicrosecondClockWithOffset second ] + ifFalse: [ ^self localTimeZone offset asSeconds ]! Item was added: + ----- Method: LXDateAndTime class>>localTimeZone (in category 'accessing') ----- + localTimeZone + "Answer the local time zone" + + ^ LocalTimeZone ifNil: [ LocalTimeZone := TimeZone default ] + + ! Item was added: + ----- Method: LXDateAndTime class>>localTimeZone: (in category 'accessing') ----- + localTimeZone: aTimeZone + "Set the local time zone" + " + DateAndTime localTimeZone: (TimeZone offset: 0 hours name: 'Universal Time' abbreviation: 'UTC'). + DateAndTime localTimeZone: (TimeZone offset: -8 hours name: 'Pacific Standard Time' abbreviation: 'PST'). + " + LocalTimeZone := aTimeZone. + self automaticTimezone: (aTimeZone abbreviation = 'LT')! Item was added: + ----- Method: LXDateAndTime class>>midnight (in category 'squeak protocol') ----- + midnight + + ^ self now midnight! Item was added: + ----- Method: LXDateAndTime class>>milliSecondsSinceMidnight (in category 'squeak protocol') ----- + milliSecondsSinceMidnight + ^Time milliSecondsSinceMidnight! Item was added: + ----- Method: LXDateAndTime class>>millisecondClockValue (in category 'smalltalk-80') ----- + millisecondClockValue + + ^ self clock millisecondClockValue! Item was added: + ----- Method: LXDateAndTime class>>new (in category 'squeak protocol') ----- + new + "Answer a DateAndTime representing the Squeak epoch: 1 January 1901" + + ^ self utcMicroseconds: self epochOffsetMicros negated offset: 0 + + ! Item was added: + ----- Method: LXDateAndTime class>>noon (in category 'squeak protocol') ----- + noon + + ^ self now noon + ! Item was added: + ----- Method: LXDateAndTime class>>now (in category 'ansi protocol') ----- + now + "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not + available, answer the Posix epoch GMT." + + self automaticTimezone + ifTrue: [ InitializeFromPrimitive + ifTrue: [ ^ self basicNew initializeFromPrimitive ] + ifFalse: [ | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: timeArray second ] ] + ifFalse: [ | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: self localOffsetSeconds ] + ! Item was added: + ----- Method: LXDateAndTime class>>nowAtOffset: (in category 'squeak protocol') ----- + nowAtOffset: offsetDuration + "Answers the local time at places with the specified offsetDuration timezone." + "local time Chicago (CST)" + "DateAndTime nowAtOffset: -6 hours" + + ^ self utcMicroseconds: Time posixMicrosecondClockWithOffset first offset: offsetDuration asSeconds + ! Item was added: + ----- Method: LXDateAndTime class>>nowWithOffset: (in category 'squeak protocol') ----- + nowWithOffset: aDuration + "Answer time now as reported by #primitiveUtcWithOffset. If the primitive is not + available, answer the Posix epoch with time zone offset aDuration." + + | timeArray | + timeArray := Time posixMicrosecondClockWithOffset. + ^ self utcMicroseconds: timeArray first offset: aDuration asSeconds + ! Item was added: + ----- Method: LXDateAndTime class>>readFrom: (in category 'squeak protocol') ----- + readFrom: aStream + + | offsetSeconds ch yearMonthDay hourMinuteSecondNano offset | + + yearMonthDay := Date readYearMonthDayFrom: aStream. + [aStream peek isDigit] + whileFalse: [aStream next]. + hourMinuteSecondNano := Time readHourMinuteSecondNanoFrom: aStream. + (aStream atEnd or: [('+-Z' includes: aStream peek) not]) + ifTrue: [ self flag: #FIXME. + "Different unit tests have conflicting opinions as to whether the + current local offset should be used as a default. However, the current + local offset cannot be correct due to DST (offset is itself a function + of the point in time). Nevertheless, this is a reasonable default considering + that the offset would have been explicitly part of the date string if it + was a matter of concern. Unit tests will require updates to match this + assumption." + "offsetSeconds := 0" + offsetSeconds := self localOffsetSeconds] + ifFalse: [(aStream peekFor: $Z) + ifTrue: [offsetSeconds := 0] + ifFalse: [ + ch := aStream next. + ch = $+ ifTrue: [ch := Character space]. + offset := Duration fromString: ch asString, '0:', aStream upToEnd, ':0'. + offsetSeconds := offset asSeconds]]. + ^ self + year: yearMonthDay first + month: yearMonthDay second + day: yearMonthDay third + hour: hourMinuteSecondNano first + minute: hourMinuteSecondNano second + second: hourMinuteSecondNano third + nanoSecond: hourMinuteSecondNano fourth + offsetSeconds: offsetSeconds + + + " '-1199-01-05T20:33:14.321-05:00' asDateAndTime + ' 2002-05-16T17:20:45.1+01:01' asDateAndTime + + ' 2002-05-16T17:20:45.02+01:01' asDateAndTime + + ' 2002-05-16T17:20:45.003+01:01' asDateAndTime + + ' 2002-05-16T17:20:45.0004+01:01' asDateAndTime + ' 2002-05-16T17:20:45.00005' asDateAndTime + ' 2002-05-16T17:20:45.000006+01:01' asDateAndTime + + ' 2002-05-16T17:20:45.0000007+01:01' asDateAndTime + ' 2002-05-16T17:20:45.00000008-01:01' asDateAndTime + ' 2002-05-16T17:20:45.000000009+01:01' asDateAndTime + ' 2002-05-16T17:20:45.0000000001+01:01' asDateAndTime + + ' 2002-05-16T17:20' asDateAndTime + ' 2002-05-16T17:20:45' asDateAndTime + ' 2002-05-16T17:20:45+01:57' asDateAndTime + ' 2002-05-16T17:20:45-02:34' asDateAndTime + ' 2002-05-16T17:20:45+00:00' asDateAndTime + ' 1997-04-26T01:02:03+01:02:3' asDateAndTime + "! Item was added: + ----- Method: LXDateAndTime class>>startUp: (in category 'system startup') ----- + startUp: startingAfresh + "Set local timezone" + startingAfresh + ifTrue: [InitializeFromPrimitive := self canInitializeFromPrimitive. + Time initialize. "set LastClockTick to 0". + self now. + self automaticTimezone]! Item was added: + ----- Method: LXDateAndTime class>>today (in category 'squeak protocol') ----- + today + + ^ self midnight! Item was added: + ----- Method: LXDateAndTime class>>tomorrow (in category 'squeak protocol') ----- + tomorrow + + ^ self today asDate next asLXDateAndTime + ! Item was added: + ----- Method: LXDateAndTime class>>totalSeconds (in category 'smalltalk-80') ----- + totalSeconds + + ^ self clock totalSeconds! Item was added: + ----- Method: LXDateAndTime class>>unixEpoch (in category 'squeak protocol') ----- + unixEpoch + "Answer a DateAndTime representing the Unix epoch (1 January 1970, midnight UTC)" + + ^ self basicNew + ticks: #(2440588 0 0) offset: Duration zero; + yourself. + ! Item was added: + ----- Method: LXDateAndTime class>>utcMicroseconds:offset: (in category 'instance creation') ----- + utcMicroseconds: microsecondsSincePosixEpoch offset: secondsFromGMT + + ^super new + utcMicroseconds: microsecondsSincePosixEpoch + offset: secondsFromGMT! Item was added: + ----- Method: LXDateAndTime class>>utcMicrosecondsForYear:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'private') ----- + utcMicrosecondsForYear: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds + + | monthIndex daysInMonth p q r s julianDayNumber posixDays seconds utcSeconds | + + monthIndex := month isInteger ifTrue: [month] ifFalse: [Month indexOfMonth: month]. + daysInMonth := Month + daysInMonth: monthIndex + forYear: year. + day < 1 ifTrue: [self error: 'day may not be zero or negative']. + day > daysInMonth ifTrue: [self error: 'day is after month ends']. + + p := (monthIndex - 14) quo: 12. + q := year + 4800 + p. + r := monthIndex - 2 - (12 * p). + s := (year + 4900 + p) quo: 100. + + julianDayNumber := + ( (1461 * q) quo: 4 ) + + ( (367 * r) quo: 12 ) - + ( (3 * s) quo: 4 ) + + ( day - 32075 ). + + posixDays := julianDayNumber - PosixEpochJulianDays. + seconds := hour * 60 + minute * 60 + second - offsetSeconds. + utcSeconds := seconds + (posixDays * 24 * 3600). + ^ utcSeconds * 1000000 + (nanoCount / 1000) + ! Item was added: + ----- Method: LXDateAndTime class>>utcSeconds:offset: (in category 'instance creation') ----- + utcSeconds: secondsSincePosixEpoch offset: secondsFromGMT + + ^self + utcMicroseconds: secondsSincePosixEpoch * 1000000 + offset: secondsFromGMT! Item was added: + ----- Method: LXDateAndTime class>>year:day: (in category 'squeak protocol') ----- + year: year day: dayOfYear + "Return a DateAndTime" + + ^ self + year: year + day: dayOfYear + hour: 0 + minute: 0 + second: 0 + ! Item was added: + ----- Method: LXDateAndTime class>>year:day:hour:minute:second: (in category 'ansi protocol') ----- + year: year day: dayOfYear hour: hour minute: minute second: second + + ^ self + year: year + day: dayOfYear + hour: hour + minute: minute + second: second + offset: self localOffset + ! Item was added: + ----- Method: LXDateAndTime class>>year:day:hour:minute:second:offset: (in category 'ansi protocol') ----- + year: year day: dayOfYear hour: hour minute: minute second: second offset: offset + "Return a DataAndTime" + + | y d | + y := self + year: year + month: 1 + day: 1 + hour: hour + minute: minute + second: second + nanoSecond: 0 + offset: offset. + + d := Duration days: (dayOfYear - 1). + + ^ y + d + ! Item was added: + ----- Method: LXDateAndTime class>>year:month:day: (in category 'squeak protocol') ----- + year: year month: month day: day + "Return a DateAndTime, midnight local time" + + ^self + year: year + month: month + day: day + hour: 0 + minute: 0 + ! Item was added: + ----- Method: LXDateAndTime class>>year:month:day:hour:minute: (in category 'squeak protocol') ----- + year: year month: month day: day hour: hour minute: minute + "Return a DateAndTime" + + ^self + year: year + month: month + day: day + hour: hour + minute: minute + second: 0 + ! Item was added: + ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second: (in category 'ansi protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second + "Return a DateAndTime" + + ^ self + year: year + month: month + day: day + hour: hour + minute: minute + second: second + offset: self localOffset! Item was added: + ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offset: (in category 'squeak protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offset: offset + "Return a DateAndTime" + + | offsetSeconds utcMicros | + offsetSeconds := offset asSeconds. + utcMicros := self + utcMicrosecondsForYear: year + month: month + day: day + hour: hour + minute: minute + second: second + nanoSecond: nanoCount + offsetSeconds: offsetSeconds. + ^ self utcMicroseconds: utcMicros offset: offsetSeconds! Item was added: + ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:nanoSecond:offsetSeconds: (in category 'squeak protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second nanoSecond: nanoCount offsetSeconds: offsetSeconds + "Return a DateAndTime" + + | utcMicros | + utcMicros := self + utcMicrosecondsForYear: year + month: month + day: day + hour: hour + minute: minute + second: second + nanoSecond: nanoCount + offsetSeconds: offsetSeconds. + ^ self utcMicroseconds: utcMicros offset: offsetSeconds! Item was added: + ----- Method: LXDateAndTime class>>year:month:day:hour:minute:second:offset: (in category 'ansi protocol') ----- + year: year month: month day: day hour: hour minute: minute second: second offset: offset + + ^ self + year: year + month: month + day: day + hour: hour + minute: minute + second: second + nanoSecond: 0 + offset: offset! Item was added: + ----- Method: LXDateAndTime class>>yesterday (in category 'squeak protocol') ----- + yesterday + + ^ self today asDate previous asLXDateAndTime! Item was added: + ----- Method: LXDateAndTime>>+ (in category 'ansi protocol') ----- + + operand + "operand conforms to protocol Duration" + + ^ self class + utcMicroseconds: operand asDuration asNanoSeconds / 1000 + utcMicroseconds + offset: localOffsetSeconds + ! Item was added: + ----- Method: LXDateAndTime>>- (in category 'ansi protocol') ----- + - operand + "operand conforms to protocol DateAndTime or protocol Duration" + + ^ (operand respondsTo: #asLXDateAndTime) + ifTrue: + [ | micros | + micros := utcMicroseconds - operand asLXDateAndTime utcMicroseconds. + Duration seconds: micros // 1000000 nanoSeconds: micros \\ 1000000 * 1000] + ifFalse: + [ self + (operand negated) ] + ! Item was added: + ----- Method: LXDateAndTime>>< (in category 'ansi protocol') ----- + < comparand + "comparand conforms to protocol DateAndTime, + or can be converted into something that conforms." + + ^utcMicroseconds < comparand asLXDateAndTime utcMicroseconds + ! Item was added: + ----- Method: LXDateAndTime>>= (in category 'ansi protocol') ----- + = aDateAndTimeOrTimeStamp + "Equal if the absolute time values match, regardless of local time transform" + self == aDateAndTimeOrTimeStamp ifTrue: [ ^ true ]. + ^aDateAndTimeOrTimeStamp species == DateAndTime + and: [ utcMicroseconds = aDateAndTimeOrTimeStamp utcMicroseconds ]! Item was added: + ----- Method: LXDateAndTime>>asChronologySeconds (in category 'converting') ----- + asChronologySeconds + "What #asSeconds answers in prior Chronology-format images." + ^ self asSeconds + self offset asSeconds! Item was added: + ----- Method: LXDateAndTime>>asDate (in category 'squeak protocol') ----- + asDate + + + ^ Date starting: self asLXDateAndTime! Item was added: + ----- Method: LXDateAndTime>>asDateAndTime (in category 'squeak protocol') ----- + asDateAndTime + ^ DateAndTime + year: self year + month: self month + day: self dayOfMonth + hour: self hour + minute: self minute + second: self second + nanoSecond: self nanoSecond + offset: self offset! Item was added: + ----- Method: LXDateAndTime>>asDuration (in category 'squeak protocol') ----- + asDuration + "Answer the duration since midnight." + + ^ Duration seconds: self getSeconds nanoSeconds: self nanoSecond + ! Item was added: + ----- Method: LXDateAndTime>>asExactSeconds (in category 'smalltalk-80') ----- + asExactSeconds + "Return the duration in seconds since the Squeak epoch" + + "Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + + ^ utcMicroseconds / 1000000 + self class epochOffset + ! Item was added: + ----- Method: LXDateAndTime>>asLXDateAndTime (in category 'squeak protocol') ----- + asLXDateAndTime + + ^ self! Item was added: + ----- Method: LXDateAndTime>>asLocal (in category 'ansi protocol') ----- + asLocal + + + ^ (self offset = self class localOffset) + + ifTrue: [self] + ifFalse: [self utcOffset: self class localOffset]! Item was added: + ----- Method: LXDateAndTime>>asMonth (in category 'squeak protocol') ----- + asMonth + + ^ Month starting: self! Item was added: + ----- Method: LXDateAndTime>>asNanoSeconds (in category 'squeak protocol') ----- + asNanoSeconds + "Answer the number of nanoseconds since midnight" + + ^ self asDuration asNanoSeconds! Item was added: + ----- Method: LXDateAndTime>>asPosixSeconds (in category 'converting') ----- + asPosixSeconds + + ^utcMicroseconds / 1000000 + ! Item was added: + ----- Method: LXDateAndTime>>asSeconds (in category 'smalltalk-80') ----- + asSeconds + "Return the number of seconds since the Squeak epoch. See asExactSeconds + to retain full precision of the duration in seconds." + + "Squeak traditionally used seconds since the Smalltalk epoch in local time, + which is undefinable. The error was probably caused by some early VM design + choices that have since been corrected. Assume now that the Smalltalk epoch + is defined relative to GMT, and that it may be treated similarly to the Posix + epoch except for a constant offset value. + + This implementation differs from earlier Squeak in that it uses seconds relative + to the Smalltalk epoch (not local time), and represents seconds as an arbitrary + precision number rather than an integer." + + ^ utcMicroseconds // 1000000 + self class epochOffset + ! Item was added: + ----- Method: LXDateAndTime>>asTime (in category 'squeak protocol') ----- + asTime + + + ^ Time seconds: self getSeconds nanoSeconds: self nanoSecond + ! Item was added: + ----- Method: LXDateAndTime>>asTimeStamp (in category 'squeak protocol') ----- + asTimeStamp + + ^ self + asDateAndTime "FIXME LX hack for test support" + as: TimeStamp! Item was added: + ----- Method: LXDateAndTime>>asUTC (in category 'ansi protocol') ----- + asUTC + + localOffsetSeconds = 0 ifTrue: [ ^self ]. + ^self copy + utcMicroseconds: utcMicroseconds + offset: 0 + ! Item was added: + ----- Method: LXDateAndTime>>asUnixTime (in category 'squeak protocol') ----- + asUnixTime + "answer number of seconds since unix epoch (midnight Jan 1, 1970, UTC)" + + ^(self - self class unixEpoch) asSeconds! Item was added: + ----- Method: LXDateAndTime>>asWeek (in category 'squeak protocol') ----- + asWeek + + ^ Week starting: self! Item was added: + ----- Method: LXDateAndTime>>asYear (in category 'squeak protocol') ----- + asYear + + ^ Year starting: self! Item was added: + ----- Method: LXDateAndTime>>day (in category 'smalltalk-80') ----- + day + + ^ self dayOfYear + ! Item was added: + ----- Method: LXDateAndTime>>dayMonthYearDo: (in category 'squeak protocol') ----- + dayMonthYearDo: aBlock + "Evaluation the block with three arguments: day month, year." + + | l n i j dd mm yyyy | + l := self julianDayNumber + 68569. + n := 4 * l // 146097. + l := l - (146097 * n + 3 // 4). + i := 4000 * (l + 1) // 1461001. + l := l - (1461 * i // 4) + 31. + j := 80 * l // 2447. + dd := l - (2447 * j // 80). + l := j // 11. + mm := j + 2 - (12 * l). + yyyy := 100 * (n - 49) + i + l. + + ^ aBlock + value: dd + value: mm + value: yyyy! Item was added: + ----- Method: LXDateAndTime>>dayOfMonth (in category 'ansi protocol') ----- + dayOfMonth + "Answer which day of the month is represented by the receiver." + + ^ self + dayMonthYearDo: [ :d :m :y | d ] + ! Item was added: + ----- Method: LXDateAndTime>>dayOfWeek (in category 'ansi protocol') ----- + dayOfWeek + + "Sunday=1, ... , Saturday=7" + + ^ (self julianDayNumber + 1 rem: 7) + 1 + ! Item was added: + ----- Method: LXDateAndTime>>dayOfWeekAbbreviation (in category 'ansi protocol') ----- + dayOfWeekAbbreviation + + ^ self dayOfWeekName copyFrom: 1 to: 3 + ! Item was added: + ----- Method: LXDateAndTime>>dayOfWeekName (in category 'ansi protocol') ----- + dayOfWeekName + + ^ Week nameOfDay: self dayOfWeek! Item was added: + ----- Method: LXDateAndTime>>dayOfYear (in category 'ansi protocol') ----- + dayOfYear + "This code was contributed by Dan Ingalls. It is equivalent to the terser + ^ jdn - (Year year: self year) start julianDayNumber + 1 but much quicker." + + ^ self dayMonthYearDo: + [ :d :m :y | + | monthStart | + monthStart := #(1 32 60 91 121 152 182 213 244 274 305 335) at: m. + (m > 2 and: [ Year isLeapYear: y ]) + ifTrue: [ monthStart + d ] + ifFalse: [ monthStart + d - 1 ]]! Item was added: + ----- Method: LXDateAndTime>>daysInMonth (in category 'smalltalk-80') ----- + daysInMonth + "Answer the number of days in the month represented by the receiver." + + + ^ self asMonth daysInMonth! Item was added: + ----- Method: LXDateAndTime>>daysInYear (in category 'smalltalk-80') ----- + daysInYear + + "Answer the number of days in the year represented by the receiver." + + ^ self asYear daysInYear! Item was added: + ----- Method: LXDateAndTime>>daysLeftInYear (in category 'smalltalk-80') ----- + daysLeftInYear + "Answer the number of days in the year after the date of the receiver." + + ^ self daysInYear - self dayOfYear! Item was added: + ----- Method: LXDateAndTime>>duration (in category 'squeak protocol') ----- + duration + + ^ Duration zero! Item was added: + ----- Method: LXDateAndTime>>firstDayOfMonth (in category 'smalltalk-80') ----- + firstDayOfMonth + + ^ self asMonth start day + ! Item was added: + ----- Method: LXDateAndTime>>floor (in category 'squeak protocol') ----- + floor + "Answer a copy with magnitude rounded down to the nearest whole second" + ^self class + utcMicroseconds: utcMicroseconds - (utcMicroseconds \\ 1000000) + offset: localOffsetSeconds! Item was added: + ----- Method: LXDateAndTime>>getSeconds (in category 'accessing') ----- + getSeconds + + | posixDays posixSeconds localSeconds | + posixSeconds := utcMicroseconds // 1000000. + localSeconds := posixSeconds + localOffsetSeconds. + localSeconds < 0 ifTrue: [localSeconds := localSeconds \\ SecondsInDay]. "normalize" + posixDays := localSeconds // SecondsInDay. + ^localSeconds - (posixDays * SecondsInDay). + ! Item was added: + ----- Method: LXDateAndTime>>hash (in category 'ansi protocol') ----- + hash + ^utcMicroseconds hash! Item was added: + ----- Method: LXDateAndTime>>hour (in category 'ansi protocol') ----- + hour + + ^ self hour24! Item was added: + ----- Method: LXDateAndTime>>hour12 (in category 'ansi protocol') ----- + hour12 + "Answer an <integer> between 1 and 12, inclusive, representing the hour + of the day in the 12-hour clock of the local time of the receiver." + ^ self hour24 - 1 \\ 12 + 1 + ! Item was added: + ----- Method: LXDateAndTime>>hour24 (in category 'ansi protocol') ----- + hour24 + + ^self getSeconds // 3600! Item was added: + ----- Method: LXDateAndTime>>hours (in category 'smalltalk-80') ----- + hours + + ^ self hour + ! Item was added: + ----- Method: LXDateAndTime>>initializeFromPrimitive (in category 'initialize-release') ----- + initializeFromPrimitive + + Time posixMicrosecondClockWithOffset: self! Item was added: + ----- Method: LXDateAndTime>>isLeapYear (in category 'ansi protocol') ----- + isLeapYear + + + ^ Year isLeapYear: self year + ! Item was added: + ----- Method: LXDateAndTime>>julianDayNumber (in category 'squeak protocol') ----- + julianDayNumber + + | posixDays posixSeconds localSeconds negativeDays | + posixSeconds := utcMicroseconds // 1000000. + localSeconds := posixSeconds + localOffsetSeconds. + negativeDays := 0. + localSeconds < 0 ifTrue: [ "normalize" + negativeDays := localSeconds // SecondsInDay. + localSeconds := negativeDays * SecondsInDay + localSeconds]. + posixDays := localSeconds // SecondsInDay. + ^posixDays + PosixEpochJulianDays - negativeDays. + ! Item was added: + ----- Method: LXDateAndTime>>localOffsetSeconds: (in category 'initialize-release') ----- + localOffsetSeconds: seconds + "Private. Allow value to be modified during initialization in order to support local + timezone preference." + + localOffsetSeconds := seconds + ! Item was added: + ----- Method: LXDateAndTime>>makeUTC (in category 'squeak protocol') ----- + makeUTC + "Make the receiver's timezone UTC." + localOffsetSeconds := 0! Item was added: + ----- Method: LXDateAndTime>>meridianAbbreviation (in category 'ansi protocol') ----- + meridianAbbreviation + + ^ self asTime meridianAbbreviation + ! Item was added: + ----- Method: LXDateAndTime>>microsecondsFromDay:seconds:nanos:offset: (in category 'private') ----- + microsecondsFromDay: jdn seconds: s nanos: n offset: localOffsetSeconds + + | days totalSeconds micros | + days := jdn - PosixEpochJulianDays. + totalSeconds := days * 86400 + s - localOffsetSeconds. "n.g. const 86400 is faster than SecondsInDay" + micros := totalSeconds * 1000000. + ^micros + (n / 1000) + ! Item was added: + ----- Method: LXDateAndTime>>middleOf: (in category 'squeak protocol') ----- + middleOf: aDuration + "Return a Timespan where the receiver is the middle of the Duration" + + | duration | + duration := aDuration asDuration. + + ^ Timespan starting: (self - (duration / 2)) duration: duration + ! Item was added: + ----- Method: LXDateAndTime>>midnight (in category 'squeak protocol') ----- + midnight + "Answer a DateAndTime starting at midnight of the same timezone offset as the receiver." + ^ self class basicNew + setJdn: self julianDayNumber + seconds: localOffsetSeconds + nano: 0 + localOffsetSeconds: localOffsetSeconds.! Item was added: + ----- Method: LXDateAndTime>>minute (in category 'ansi protocol') ----- + minute + + ^self getSeconds // 60 \\ 60! Item was added: + ----- Method: LXDateAndTime>>minutes (in category 'smalltalk-80') ----- + minutes + + ^ self minute + ! Item was added: + ----- Method: LXDateAndTime>>month (in category 'ansi protocol') ----- + month + + ^ self + dayMonthYearDo: [ :d :m :y | m ] + ! Item was added: + ----- Method: LXDateAndTime>>monthAbbreviation (in category 'ansi protocol') ----- + monthAbbreviation + + + ^ self monthName copyFrom: 1 to: 3! Item was added: + ----- Method: LXDateAndTime>>monthIndex (in category 'smalltalk-80') ----- + monthIndex + + + ^ self month! Item was added: + ----- Method: LXDateAndTime>>monthName (in category 'ansi protocol') ----- + monthName + + + ^ Month nameOfMonth: self month! Item was added: + ----- Method: LXDateAndTime>>nanoSecond (in category 'squeak protocol') ----- + nanoSecond + + ^utcMicroseconds \\ 1000000 * 1000 + ! Item was added: + ----- Method: LXDateAndTime>>noon (in category 'squeak protocol') ----- + noon + "Answer a DateAndTime starting at noon" + + ^ self dayMonthYearDo: + [ :d :m :y | self class year: y month: m day: d hour: 12 minute: 0 second: 0 ] + ! Item was added: + ----- Method: LXDateAndTime>>normalize:ticks:base: (in category 'private') ----- + normalize: i ticks: ticks base: base + + | tick div quo rem | + tick := ticks at: i. + div := tick asInteger digitDiv: base neg: tick negative. + quo := (div at: 1) normalize. + rem := (div at: 2) normalize. + rem < 0 ifTrue: [ quo := quo - 1. rem := base + rem ]. + ticks at: (i-1) put: ((ticks at: i-1) + quo). + ticks at: i put: rem + ! Item was added: + ----- Method: LXDateAndTime>>offset (in category 'ansi protocol') ----- + offset + + ^ Duration seconds: localOffsetSeconds! Item was added: + ----- Method: LXDateAndTime>>offset: (in category 'ansi protocol') ----- + offset: anOffset + + "Answer a <DateAndTime> equivalent to the receiver but with its local time + being offset from UTC by offset." + + | newOffset newMicros | + self flag: #FIXME. "check the definition of this and of #utcOffset:" + newOffset := anOffset asDuration asSeconds. + newMicros := localOffsetSeconds - newOffset * 1000000 + utcMicroseconds. + ^ self class utcMicroseconds: newMicros offset: newOffset + ! Item was added: + ----- Method: LXDateAndTime>>offsetSeconds (in category 'accessing') ----- + offsetSeconds + + ^localOffsetSeconds! Item was added: + ----- Method: LXDateAndTime>>posixEpochJulianDays (in category 'initialize-release') ----- + posixEpochJulianDays + + ^self class daysFromSmalltalkEpochToPosixEpoch + SqueakEpoch! Item was added: + ----- Method: LXDateAndTime>>printHMSOn: (in category 'squeak protocol') ----- + printHMSOn: aStream + "Print just hh:mm:ss" + + | seconds | + seconds := self getSeconds. + seconds // 3600 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + seconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + seconds \\ 60 printOn: aStream base: 10 length: 2 padded: true! Item was added: + ----- Method: LXDateAndTime>>printOn: (in category 'squeak protocol') ----- + printOn: aStream + "Print as per ISO 8601 sections 5.3.3 and 5.4.1. + Prints either: + 'YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years)" + + ^self printOn: aStream withLeadingSpace: false + ! Item was added: + ----- Method: LXDateAndTime>>printOn:withLeadingSpace: (in category 'squeak protocol') ----- + printOn: aStream withLeadingSpace: printLeadingSpaceToo + "Print as per ISO 8601 sections 5.3.3 and 5.4.1. + If printLeadingSpaceToo is false, prints either: + 'YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) + If printLeadingSpaceToo is true, prints either: + ' YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for positive years) or '-YYYY-MM-DDThh:mm:ss.s+ZZ:zz:z' (for negative years) + " + + | nanos offsetSeconds | + self printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo. + aStream nextPut: $T. + self printHMSOn: aStream. + (nanos := utcMicroseconds \\ 1000000 * 1000) = 0 ifFalse: [ + | length | + aStream nextPut: $.. + length := 9. + [ nanos \\ 10 = 0 ] whileTrue: [ + nanos := nanos // 10. + length := length - 1 ]. + nanos printOn: aStream base: 10 length: length padded: true ]. + "Print offset" + aStream nextPut: (localOffsetSeconds >= 0 ifTrue: [ $+ ] ifFalse: [ $- ]). + offsetSeconds := localOffsetSeconds abs. + offsetSeconds // 3600 printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $:. + offsetSeconds \\ 3600 // 60 printOn: aStream base: 10 length: 2 padded: true. + (offsetSeconds := offsetSeconds \\ 60) = 0 ifFalse: [ + aStream + nextPut: $:; + print: offsetSeconds ]! Item was added: + ----- Method: LXDateAndTime>>printYMDOn: (in category 'squeak protocol') ----- + printYMDOn: aStream + "Print just YYYY-MM-DD part. + If the year is negative, prints out '-YYYY-MM-DD'." + + ^self printYMDOn: aStream withLeadingSpace: false. + ! Item was added: + ----- Method: LXDateAndTime>>printYMDOn:withLeadingSpace: (in category 'squeak protocol') ----- + printYMDOn: aStream withLeadingSpace: printLeadingSpaceToo + "Print just the year, month, and day on aStream. + + If printLeadingSpaceToo is true, then print as: + ' YYYY-MM-DD' (if the year is positive) or '-YYYY-MM-DD' (if the year is negative) + otherwise print as: + 'YYYY-MM-DD' or '-YYYY-MM-DD' " + + self dayMonthYearDo: [ :day :month :year | + year negative + ifTrue: [ aStream nextPut: $- ] + ifFalse: [ printLeadingSpaceToo ifTrue: [ aStream space ] ]. + year abs printOn: aStream base: 10 length: 4 padded: true. + aStream nextPut: $-. + month printOn: aStream base: 10 length: 2 padded: true. + aStream nextPut: $-. + day printOn: aStream base: 10 length: 2 padded: true ]! Item was added: + ----- Method: LXDateAndTime>>readDataFrom:size: (in category 'objects from disk') ----- + readDataFrom: aDataStream size: varsOnDisk + "Fill in the fields of self based on the contents of aDataStream. The serialized + data will have four instance variables, because all instances are serialized in a + cononical format as if having originating from an instance with the traditional + seconds/offset/jdn/nanos instance variables." + + | seconds offset jdn nanos | + seconds := aDataStream next. + offset := aDataStream next. + jdn := aDataStream next. + nanos := aDataStream next. + localOffsetSeconds := offset ifNil: [ 0 ] ifNotNil: [ :off | off asSeconds ]. + utcMicroseconds := self + microsecondsFromDay: jdn + seconds: seconds + nanos: nanos + offset: localOffsetSeconds.! Item was added: + ----- Method: LXDateAndTime>>second (in category 'ansi protocol') ----- + second + + ^self getSeconds \\ 60! Item was added: + ----- Method: LXDateAndTime>>seconds (in category 'smalltalk-80') ----- + seconds + + ^ self second + ! Item was added: + ----- Method: LXDateAndTime>>secondsSinceMidnight (in category 'private') ----- + secondsSinceMidnight + + ^ self getSeconds! Item was added: + ----- Method: LXDateAndTime>>setJdn:seconds:nano:localOffsetSeconds: (in category 'private') ----- + setJdn: jdn seconds: s nano: n localOffsetSeconds: offset + + localOffsetSeconds := offset. + utcMicroseconds := self + microsecondsFromDay: jdn + seconds: s - offset + nanos: n + offset: offset! Item was added: + ----- Method: LXDateAndTime>>setJdn:seconds:nano:offset: (in category 'squeak protocol') ----- + setJdn: jdn seconds: s nano: n offset: o + + self setJdn: jdn seconds: s nano: n localOffsetSeconds: o asSeconds. + ! Item was added: + ----- Method: LXDateAndTime>>species (in category 'accessing') ----- + species + ^DateAndTime! Item was added: + ----- Method: LXDateAndTime>>storeDataOn: (in category 'objects from disk') ----- + storeDataOn: aDataStream + "Store myself on a DataStream. Answer self. + Store 4 variables worth of data, corresponding to the 4 instance variables of the old + DateAndTime implementation, which is to be used as common format for externally + stored instances." + + " | dt dt2 | + dt := DateAndTime now. + dt2 := DataStream testWith: dt. + { dt . dt2 }." + + | cntInstVars cntIndexedVars ticks jdn offset seconds nanos | + "Set the instance variable count to 4 to match that of a cononical instance." + cntInstVars := 4. + cntIndexedVars := self basicSize. + aDataStream + beginInstance: self xxxClass + size: cntInstVars + cntIndexedVars. + + "Create the 4 values of the old format DateAndTime" + ticks := self ticks. "{days. seconds. nanoSeconds}." + offset := self offset. + jdn := ticks at: 1. + seconds := ticks at: 2. + nanos := ticks at: 3. + aDataStream + nextPut: seconds; + nextPut: offset; + nextPut: jdn; + nextPut: nanos. + ! Item was added: + ----- Method: LXDateAndTime>>ticks (in category 'private') ----- + ticks + "Private - answer an array with our instance variables. Assumed to be UTC " + + ^ Array with: self julianDayNumber with: self getSeconds with: self nanoSecond + ! Item was added: + ----- Method: LXDateAndTime>>ticks:offset: (in category 'private') ----- + ticks: ticks offset: utcOffset + "ticks is {julianDayNumber. secondCount. nanoSeconds}" + + | jdn s nanos | + self normalize: 3 ticks: ticks base: NanosInSecond. + self normalize: 2 ticks: ticks base: SecondsInDay. + + jdn := ticks at: 1. + s := ticks at: 2. + nanos := ticks at: 3. + localOffsetSeconds := utcOffset ifNil: [0] ifNotNil: [utcOffset asSeconds]. + utcMicroseconds := self microsecondsFromDay: jdn seconds: s nanos: nanos offset: localOffsetSeconds. + ! Item was added: + ----- Method: LXDateAndTime>>timeZoneAbbreviation (in category 'ansi protocol') ----- + timeZoneAbbreviation + + ^ self class localTimeZone abbreviation! Item was added: + ----- Method: LXDateAndTime>>timeZoneName (in category 'ansi protocol') ----- + timeZoneName + + ^ self class localTimeZone name! Item was added: + ----- Method: LXDateAndTime>>to: (in category 'squeak protocol') ----- + to: anEnd + "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" + + ^ Timespan starting: self ending: (anEnd asLXDateAndTime) + ! Item was added: + ----- Method: LXDateAndTime>>to:by: (in category 'squeak protocol') ----- + to: anEnd by: aDuration + "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" + + ^ (Schedule starting: self ending: (anEnd asLXDateAndTime)) + schedule: (Array with: aDuration asDuration); + yourself + ! Item was added: + ----- Method: LXDateAndTime>>to:by:do: (in category 'squeak protocol') ----- + to: anEnd by: aDuration do: aBlock + "Answer a Timespan. anEnd conforms to protocol DateAndTime or protocol Timespan" + + ^ (self to: anEnd by: aDuration) scheduleDo: aBlock! Item was added: + ----- Method: LXDateAndTime>>utcMicroseconds (in category 'accessing') ----- + utcMicroseconds + ^utcMicroseconds! Item was added: + ----- Method: LXDateAndTime>>utcMicroseconds: (in category 'initialize-release') ----- + utcMicroseconds: utcValue + "Allow value to be modified during initialization from a primitive in order to support + monotonically increasing clock behavior." + utcMicroseconds := utcValue! Item was added: + ----- Method: LXDateAndTime>>utcMicroseconds:offset: (in category 'initialize-release') ----- + utcMicroseconds: microsecondsSincePosixEpoch offset: tzOffset + + utcMicroseconds := microsecondsSincePosixEpoch. + localOffsetSeconds := tzOffset. + ! Item was added: + ----- Method: LXDateAndTime>>utcOffset: (in category 'squeak protocol') ----- + utcOffset: anOffset + + "Answer a <DateAndTime> equivalent to the receiver but offset from UTC by anOffset" + + self flag: #FIXME. "check the definition of this and of #offset:" + ^self utcMicroseconds: utcMicroseconds offset: anOffset asDuration asSeconds + ! Item was added: + ----- Method: LXDateAndTime>>year (in category 'ansi protocol') ----- + year + ^ self + dayMonthYearDo: [ :d :m :y | y ] + ! Item was added: + TestCase subclass: #LXDateAndTimeConversionTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testAsSeconds (in category 'testing') ----- + testAsSeconds + + | day dt hour lxdt min mo nano offset sec yr expectedSeconds | + yr := 1970. + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: 2206404184 equals: dt asSeconds. + self assert: 2206404184 equals: lxdt asSeconds. + + yr := 1969. + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + expectedSeconds := 2206404184 - (365 * 24 * 60 * 60). + self assert: expectedSeconds equals: dt asSeconds. + self assert: expectedSeconds equals: lxdt asSeconds. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testAsSeconds2 (in category 'testing') ----- + testAsSeconds2 + "(self selector: #testAsSeconds2) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + " -2000 to: 5000 do: [:yr |" + 1970 to: 5000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt asSeconds equals: lxdt asSeconds]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testDayOfMonth (in category 'testing') ----- + testDayOfMonth + "(self selector: #testDayOfMonth) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -1200 to: 3000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt dayOfMonth equals: lxdt dayOfMonth]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testDayOfWeek (in category 'testing') ----- + testDayOfWeek + "(self selector: #testDayOfWeek) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -1200 to: 3000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt dayOfWeek equals: lxdt dayOfWeek]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testDayOfYear (in category 'testing') ----- + testDayOfYear + "(self selector: #testDayOfYear) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -1200 to: 3000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt dayOfYear equals: lxdt dayOfYear]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testFromString (in category 'testing') ----- + testFromString + "Convert to string then back, verify same date and time. Skip years in the + range 0 to 99 because they are interpreted relative to 2000." + + "(LXDateAndTimeConversionTest selector: #testFromString) debug" + + | day hour lxdt min mo nano offset sec newLxdt s | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + (-2000 to: -1) , (100 to: 5000) do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + s := lxdt asString. + newLxdt := LXDateAndTime fromString: s. + self assert: lxdt equals: newLxdt]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testJulianDayNumber (in category 'testing') ----- + testJulianDayNumber + "(self selector: #testJulianDayNumber) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -2000 to: 5000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt julianDayNumber equals: lxdt julianDayNumber]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testMinute (in category 'testing') ----- + testMinute + "(self selector: #testMinute) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -2000 to: 5000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt minute equals: lxdt minute]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testMonth (in category 'testing') ----- + testMonth + + | day dt hour lxdt min mo nano offset sec yr | + yr := 1969. + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: 12 equals: dt month. + self assert: 12 equals: lxdt month. + + (2105 to: -1105 by: 20) + do: [:year | + 1 to: 12 do: [:m | + lxdt := LXDateAndTime + year: year month: m day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: year month: m day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: m equals: dt month. + self assert: m equals: lxdt month]] + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testNanoSecond (in category 'testing') ----- + testNanoSecond + + | day dt hour lxdt min mo nano offset sec yr | + yr := 1969. + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: 5 equals: dt nanoSecond. + self assert: 5 equals: lxdt nanoSecond. + + (2105 to: -1105 by: 20) + do: [:year | + lxdt := LXDateAndTime + year: year month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: year month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: 5 equals: dt nanoSecond. + self assert: 5 equals: lxdt nanoSecond] + + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testSecond (in category 'testing') ----- + testSecond + "(self selector: #testSecond) debug" + + | day dt hour lxdt min mo nano offset sec | + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + -2000 to: 5000 do: [:yr | + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: dt second equals: lxdt second]. + ! Item was added: + ----- Method: LXDateAndTimeConversionTest>>testYear (in category 'testing') ----- + testYear + + | day dt hour lxdt min mo nano offset sec yr | + yr := 1969. + mo := 12. + day := 2. + hour := 2. + min := 3. + sec := 4. + nano := 5. + offset := 6 hours. + lxdt := LXDateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: yr month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: 1969 equals: dt year. + self assert: 1969 equals: lxdt year. + + (2105 to: -1105 by: 20) + do: [:year | + lxdt := LXDateAndTime + year: year month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + dt := DateAndTime + year: year month: mo day: day + hour: hour minute: min second: sec nanoSecond: nano + offset: offset. + self assert: year equals: dt year. + self assert: year equals: lxdt year] + + ! Item was added: + TestCase subclass: #LXDateAndTimeEpochTest + instanceVariableNames: 'aDateAndTime aDuration aTimeZone localTimeZoneToRestore' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! + + !LXDateAndTimeEpochTest commentStamp: 'tlk 1/6/2004 18:27' prior: 0! + I represent one of several Sunit test Cases intentended to provide complete coverage for the Chronology set of classes as part of the external testing. The other Chronology sunit test cases are: + DateTestCase + DateAndTimeLeapTestCase, + DurationTestCase, + ScheduleTestCase + TimeStampTestCase + TimespanDoTestCase, + TimespanDoSpanAYearTestCase, + TimespanTestCase, + YearMonthWeekTestCase. + These tests attempt to exercise all public and private methods. Except, they do not explicitly depreciated methods. tlk + My fixtures are: + aDateAndTime = January 01, 1901 midnight (the start of the Squeak epoch) with localTimeZone = Grenwhich Meridian (local offset = 0 hours) + aDuration = 1 day, 2 hours, 3, minutes, 4 seconds and 5 nano seconds. + aTimeZone = 'Epoch Test Time Zone', 'ETZ' , offset: 12 hours, 15 minutes. ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>setUp (in category 'running') ----- + setUp + localTimeZoneToRestore := LXDateAndTime localTimeZone. + aDateAndTime := LXDateAndTime localTimeZone: TimeZone default; epoch. + aTimeZone := TimeZone offset: (Duration minutes: 135) name: 'Epoch Test Time Zone' abbreviation: 'ETZ'. + aDuration := Duration days: 1 hours: 2 minutes: 3 seconds: 4 nanoSeconds: 5 ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>tearDown (in category 'running') ----- + tearDown + LXDateAndTime localTimeZone: localTimeZoneToRestore. + "wish I could remove the time zones I added earlier, tut there is no method for that" + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsDate (in category 'testing') ----- + testAsDate + self assert: aDateAndTime asDate = 'January 1, 1901' asDate. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsDateAndTime (in category 'testing') ----- + testAsDateAndTime + self assert: aDateAndTime asLXDateAndTime = aDateAndTime + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsDuration (in category 'testing') ----- + testAsDuration + self assert: aDateAndTime asDuration = 0 asDuration + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsLocal (in category 'testing') ----- + testAsLocal + self assert: aDateAndTime asLocal = aDateAndTime. + self assert: aDateAndTime asLocal = (aDateAndTime utcOffset: aDateAndTime class localOffset) + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsMonth (in category 'testing') ----- + testAsMonth + self assert: aDateAndTime asMonth = (Month month: 'January' year: 1901). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsNanoSeconds (in category 'testing') ----- + testAsNanoSeconds + self assert: aDateAndTime asNanoSeconds = 0 asDuration asNanoSeconds + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsSeconds (in category 'testing') ----- + testAsSeconds + self assert: aDateAndTime asSeconds = 0 asDuration asSeconds + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsTime (in category 'testing') ----- + testAsTime + self assert: aDateAndTime asTime = Time midnight. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsTimeStamp (in category 'testing') ----- + testAsTimeStamp + self assert: aDateAndTime asTimeStamp = TimeStamp new. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsUTC (in category 'testing') ----- + testAsUTC + self assert: aDateAndTime asUTC = aDateAndTime + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsWeek (in category 'testing') ----- + testAsWeek + self assert: aDateAndTime asWeek = (Week starting: '12-31-1900' asDate). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testAsYear (in category 'testing') ----- + testAsYear + self assert: aDateAndTime asYear = (Year starting: '01-01-1901' asDate). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testCurrent (in category 'testing') ----- + testCurrent + self deny: aDateAndTime = (LXDateAndTime current). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDateTime (in category 'testing') ----- + testDateTime + self assert: aDateAndTime = (LXDateAndTime date: '01-01-1901' asDate time: '00:00:00' asTime) + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDay (in category 'testing') ----- + testDay + self assert: aDateAndTime day = LXDateAndTime new day + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDayMonthYearDo (in category 'testing') ----- + testDayMonthYearDo + |iterations| + iterations := 0. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | iterations := iterations + 1]) = 1. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachYear]) = 1901. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachMonth]) = 1. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachDay]) = 1. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDayOfMonth (in category 'testing') ----- + testDayOfMonth + self assert: aDateAndTime dayOfMonth = 1. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDayOfWeek (in category 'testing') ----- + testDayOfWeek + self assert: aDateAndTime dayOfWeek = 3. + self assert: aDateAndTime dayOfWeekAbbreviation = 'Tue'. + self assert: aDateAndTime dayOfWeekName = 'Tuesday'. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDayOfYear (in category 'testing') ----- + testDayOfYear + self assert: aDateAndTime dayOfYear = 1. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDaysInMonth (in category 'testing') ----- + testDaysInMonth + self assert: aDateAndTime daysInMonth = 31. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDaysInYear (in category 'testing') ----- + testDaysInYear + self assert: aDateAndTime daysInYear = 365. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDaysLeftInYear (in category 'testing') ----- + testDaysLeftInYear + self assert: aDateAndTime daysLeftInYear = 364. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testDuration (in category 'testing') ----- + testDuration + self assert: aDateAndTime duration = 0 asDuration. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testEpoch (in category 'testing') ----- + testEpoch + self assert: aDateAndTime = '1901-01-01T00:00:00+00:00' asLXDateAndTime + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testFirstDayOfMonth (in category 'testing') ----- + testFirstDayOfMonth + self assert: aDateAndTime firstDayOfMonth = 1 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testFromSeconds (in category 'testing') ----- + testFromSeconds + self assert: aDateAndTime = (LXDateAndTime fromSeconds: 0). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testFromString (in category 'testing') ----- + testFromString + self assert: aDateAndTime = (LXDateAndTime fromString: ' 1901-01-01T00:00:00+00:00'). + self assert: aDateAndTime = (LXDateAndTime fromString: ' 1901-01-01T00:00:00'). + self assert: aDateAndTime = (LXDateAndTime fromString: ' 1901-01-01T00:00'). + self assert: aDateAndTime = (LXDateAndTime fromString: ' 1901-01-01T00:00:00+00:00'). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testHash (in category 'testing') ----- + testHash + self assert: aDateAndTime hash = LXDateAndTime new hash. + self assert: aDateAndTime hash = 112557138 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testHour (in category 'testing') ----- + testHour + self assert: aDateAndTime hour = aDateAndTime hour24. + self assert: aDateAndTime hour = 0. + self assert: aDateAndTime hour = aDateAndTime hours + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testHour12 (in category 'testing') ----- + testHour12 + self assert: aDateAndTime hour12 = LXDateAndTime new hour12. + self assert: aDateAndTime hour12 = 12 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testIsLeapYear (in category 'testing') ----- + testIsLeapYear + self deny: aDateAndTime isLeapYear + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testJulianDayNumber (in category 'testing') ----- + testJulianDayNumber + self assert: aDateAndTime = (LXDateAndTime julianDayNumber: 2415386). + self assert: aDateAndTime julianDayNumber = 2415386.! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testLessThan (in category 'testing') ----- + testLessThan + self assert: aDateAndTime < (aDateAndTime + '1:00:00:00'). + self assert: aDateAndTime + -1 < aDateAndTime. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMeridianAbbreviation (in category 'testing') ----- + testMeridianAbbreviation + self assert: aDateAndTime meridianAbbreviation = 'AM'. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMiddleOf (in category 'testing') ----- + testMiddleOf + self assert: (aDateAndTime middleOf: '2:00:00:00' asDuration) = + (Timespan starting: '12-31-1900' asDate duration: 2 days). + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMidnight (in category 'testing') ----- + testMidnight + self assert: aDateAndTime midnight = aDateAndTime + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMinus (in category 'testing') ----- + testMinus + self assert: aDateAndTime - aDateAndTime = '0:00:00:00' asDuration. + self assert: aDateAndTime - '0:00:00:00' asDuration = aDateAndTime. + self assert: aDateAndTime - aDuration = (LXDateAndTime year: 1900 month: 12 day: 30 hour: 21 minute: 56 second: 55 nanoSecond: 999999995 offset: 0 hours ). + " I believe this Failure is a bug in the nanosecond part of (LXDateAndTime >> year:month:day:hour:minute:second:nanoSecond:offset:)" ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMinute (in category 'testing') ----- + testMinute + self assert: aDateAndTime minute = 0 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMinutes (in category 'testing') ----- + testMinutes + self assert: aDateAndTime minutes = 0 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testMonth (in category 'testing') ----- + testMonth + self assert: aDateAndTime month = 1. + self assert: aDateAndTime monthAbbreviation = 'Jan'. + self assert: aDateAndTime monthName = 'January'. + self assert: aDateAndTime monthIndex = 1.! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testNanoSecond (in category 'testing') ----- + testNanoSecond + self assert: aDateAndTime nanoSecond = 0 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testNew (in category 'testing') ----- + testNew + self assert: aDateAndTime = (LXDateAndTime new). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testNoon (in category 'testing') ----- + testNoon + self assert: aDateAndTime noon = '1901-01-01T12:00:00+00:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testNow (in category 'testing') ----- + testNow + self deny: aDateAndTime = (LXDateAndTime now). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testOffset (in category 'testing') ----- + testOffset + self assert: aDateAndTime offset = '0:00:00:00' asDuration. + self assert: (aDateAndTime offset: '0:12:00:00') = '1901-01-01T00:00:00+12:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testPlus (in category 'testing') ----- + testPlus + self assert: aDateAndTime + '0:00:00:00' = aDateAndTime. + self assert: aDateAndTime + 0 = aDateAndTime. + self assert: aDateAndTime + aDuration = (LXDateAndTime year: 1901 month: 1 day: 2 hour: 2 minute: 3 second: 4 nanoSecond: 5 offset: 0 hours ) + " I believe this is a bug in the nanosecond part of (DateAndTime >> year:month:day:hour:minute:second:nanoSecond:offset:)" + + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testPrintOn (in category 'testing') ----- + testPrintOn + | ref ws | + ref := '1901-01-01T00:00:00+00:00'. + ws := '' writeStream. + aDateAndTime printOn: ws. + self assert: ws contents = ref. + ref := 'a TimeZone(ETZ)'. + ws := '' writeStream. + aTimeZone printOn: ws. + self assert: ws contents = ref! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testSecond (in category 'testing') ----- + testSecond + self assert: aDateAndTime second = 0 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testSeconds (in category 'testing') ----- + testSeconds + self assert: aDateAndTime seconds = 0 + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testTicks (in category 'testing') ----- + testTicks + self assert: aDateAndTime ticks = (LXDateAndTime julianDayNumber: 2415386) ticks. + self assert: aDateAndTime ticks = #(2415386 0 0)! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testTicksOffset (in category 'testing') ----- + testTicksOffset + self assert: aDateAndTime = (aDateAndTime ticks: #(2415386 0 0) offset: LXDateAndTime localOffset). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testTo (in category 'testing') ----- + testTo + self assert: (aDateAndTime to: aDateAndTime) = (LXDateAndTime new to: LXDateAndTime new) + "MessageNotUnderstood: UndefinedObject>>starting:ending: where UndefinedObject is Timespan "! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testToBy (in category 'testing') ----- + testToBy + self assert: (aDateAndTime to: aDateAndTime + 10 days by: 5 days) = + (LXDateAndTime new to: LXDateAndTime new + 10 days by: 5 days ) + "MessageNotUnderstood: UndefinedObject>>starting:ending: where UndefinedObject is Timespan "! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testToByDo (in category 'testing') ----- + testToByDo + "self assert: (aDateAndTime to: aDateAndTime + 10 days by: 5 days do: []) = " + "MessageNotUnderstood: UndefinedObject>>starting:ending: where UndefinedObject is Timespan "! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testToday (in category 'testing') ----- + testToday + self deny: aDateAndTime = (LXDateAndTime today). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testTommorrow (in category 'testing') ----- + testTommorrow + self assert: (LXDateAndTime today + 24 hours) = (LXDateAndTime tomorrow). + self deny: aDateAndTime = (LXDateAndTime tomorrow). + "MessageNotUnderstood: Date class>>starting:"! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testUtcOffset (in category 'testing') ----- + testUtcOffset + self assert: (aDateAndTime utcOffset: '0:12:00:00') = '1901-01-01T12:00:00+12:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYear (in category 'testing') ----- + testYear + self assert: aDateAndTime year = 1901. + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYearDay (in category 'testing') ----- + testYearDay + self assert: aDateAndTime = (LXDateAndTime year: 1901 day: 1). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYearDayHourMinuteSecond (in category 'testing') ----- + testYearDayHourMinuteSecond + self assert: aDateAndTime = (LXDateAndTime year: 1901 day: 1 hour: 0 minute: 0 second: 0). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYearMonthDay (in category 'testing') ----- + testYearMonthDay + self assert: aDateAndTime = (LXDateAndTime year: 1901 month: 1 day: 1). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYearMonthDayHourMinuteSecond (in category 'testing') ----- + testYearMonthDayHourMinuteSecond + self assert: aDateAndTime = (LXDateAndTime year: 1901 month: 1 day: 1 hour: 0 minute: 0 second: 0). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYearMonthDayHourMinuteSecondNanosSecondOffset (in category 'testing') ----- + testYearMonthDayHourMinuteSecondNanosSecondOffset + self assert: aDateAndTime = (LXDateAndTime year: 1901 month: 1 day: 1 hour: 0 minute: 0 second: 0 nanoSecond: 0 offset:0 hours ). + self assert: ((LXDateAndTime year: 1 month: 1 day: 1 hour: 0 minute: 0 second: 0 nanoSecond: 0 offset: 0 hours ) + + (Duration days: 1 hours: 2 minutes: 3 seconds: 4 nanoSeconds: 5) ) = + (LXDateAndTime year: 1 month: 1 day: 2 hour: 2 minute: 3 second: 4 nanoSecond: 5 offset: 0 hours ) + " I believe this is a bug in the nanosecond part of (DateAndTime >> year:month:day:hour:minute:second:nanoSecond:offset:)"" I believe this is a bug in the nanosecond part of (DateAndTime >> year:month:day:hour:minute:second:nanoSecond:offset:)" + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testYesterday (in category 'testing') ----- + testYesterday + self deny: aDateAndTime = (LXDateAndTime yesterday). + ! Item was added: + ----- Method: LXDateAndTimeEpochTest>>testtimeZone (in category 'testing') ----- + testtimeZone + self assert: aDateAndTime timeZoneName = 'Universal Time'. + self assert: aDateAndTime timeZoneAbbreviation = 'UTC' + ! Item was added: + TestCase subclass: #LXDateAndTimeLeapTest + instanceVariableNames: 'aDateAndTime aDuration aTimeZone localTimeZoneToRestore' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! + + !LXDateAndTimeLeapTest commentStamp: 'tlk 1/6/2004 17:54' prior: 0! + I represent one of several Sunit test Cases intentended to provide complete coverage for the Chronology set of classes as part of the external testing. tlk. + My fixtures are: + aDateAndTime = February 29, 2004 1:33 PM with offset: 2 hours + aDuration = 15 days, 14 hours, 13 minutes, 12 seconds and 11 nano seconds. + aTimeZone = Grenwhich Meridian (local offset = 0 hours) ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>setUp (in category 'running') ----- + setUp + localTimeZoneToRestore := LXDateAndTime localTimeZone. + LXDateAndTime localTimeZone: TimeZone default. + aDateAndTime := (LXDateAndTime year: 2004 month: 2 day: 29 hour: 13 minute: 33 second: 0 offset: 2 hours). + aTimeZone := TimeZone default. + aDuration := Duration days: 0 hours: 13 minutes: 33 seconds: 0 nanoSeconds: 0 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>tearDown (in category 'running') ----- + tearDown + LXDateAndTime localTimeZone: localTimeZoneToRestore. + "wish I could remove the time zones I added earlier, tut there is no method for that" + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsDate (in category 'testing') ----- + testAsDate + self assert: (aDateAndTime offset: LXDateAndTime localTimeZone offset) asDate = 'February 29, 2004' asDate! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsDuration (in category 'testing') ----- + testAsDuration + self assert: aDateAndTime asDuration = aDuration + + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsLocal (in category 'testing') ----- + testAsLocal + self assert: aDateAndTime asLocal = aDateAndTime. + self assert: aDateAndTime asLocal = (aDateAndTime utcOffset: aDateAndTime class localOffset) + + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsMonth (in category 'testing') ----- + testAsMonth + self assert: + (aDateAndTime offset: Month defaultOffset) asMonth = + (Month + month: 'February' + year: 2004)! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsNanoSeconds (in category 'testing') ----- + testAsNanoSeconds + self assert: aDateAndTime asNanoSeconds = aDuration asNanoSeconds. + self assert: aDateAndTime asNanoSeconds = 48780000000000 + + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsSeconds (in category 'testing') ----- + testAsSeconds + self assert: aDuration asSeconds = 48780. + self assert: aDateAndTime asSeconds = 3255514380! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsTime (in category 'testing') ----- + testAsTime + self assert: aDateAndTime asTime = (Time hour: 13 minute: 33 second: 0) + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsTimeStamp (in category 'testing') ----- + testAsTimeStamp + self assert: aDateAndTime asTimeStamp = ((TimeStamp readFrom: '2-29-2004 1:33 pm' readStream) offset: 2 hours). + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsUTC (in category 'testing') ----- + testAsUTC + self assert: aDateAndTime asUTC = aDateAndTime + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsWeek (in category 'testing') ----- + testAsWeek + self assert: (aDateAndTime offset: LXDateAndTime localTimeZone offset) asWeek = (Week starting: '02-29-2004' asDate)! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testAsYear (in category 'testing') ----- + testAsYear + | year | + year := (aDateAndTime offset: LXDateAndTime localTimeZone offset) asYear. + self assert: year = (Year starting: '02-29-2004' asDate). + self deny: year = (Year starting: '01-01-2004' asDate)! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDay (in category 'testing') ----- + testDay + self assert: aDateAndTime day = 60. + self deny: aDateAndTime day = 29 ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDayMonthYearDo (in category 'testing') ----- + testDayMonthYearDo + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachYear]) = 2004. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachMonth]) = 2. + self assert: (aDateAndTime dayMonthYearDo: [:eachDay :eachMonth :eachYear | eachDay]) = 29. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDayOfMonth (in category 'testing') ----- + testDayOfMonth + self assert: aDateAndTime dayOfMonth = 29. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDayOfWeek (in category 'testing') ----- + testDayOfWeek + self assert: aDateAndTime dayOfWeek = 1. + self assert: aDateAndTime dayOfWeekAbbreviation = 'Sun'. + self assert: aDateAndTime dayOfWeekName = 'Sunday'. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDayOfYear (in category 'testing') ----- + testDayOfYear + self assert: aDateAndTime dayOfYear = 60. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDaysInMonth (in category 'testing') ----- + testDaysInMonth + self assert: aDateAndTime daysInMonth = 29. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDaysInYear (in category 'testing') ----- + testDaysInYear + self assert: aDateAndTime daysInYear = 366. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testDaysLeftInYear (in category 'testing') ----- + testDaysLeftInYear + self assert: aDateAndTime daysLeftInYear = 306. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testFirstDayOfMonth (in category 'testing') ----- + testFirstDayOfMonth + self deny: aDateAndTime firstDayOfMonth = 1. + self assert: aDateAndTime firstDayOfMonth = 32 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testFromString (in category 'testing') ----- + testFromString + self assert: aDateAndTime = (LXDateAndTime fromString: ' 2004-02-29T13:33:00+02:00'). + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testHash (in category 'testing') ----- + testHash + self assert: aDateAndTime hash = 16256473 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testHour (in category 'testing') ----- + testHour + self assert: aDateAndTime hour = aDateAndTime hour24. + self assert: aDateAndTime hour = 13. + self assert: aDateAndTime hour = aDateAndTime hours + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testHour12 (in category 'testing') ----- + testHour12 + self assert: aDateAndTime hour12 = 1. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testIsLeapYear (in category 'testing') ----- + testIsLeapYear + self assert: aDateAndTime isLeapYear + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testLessThan (in category 'testing') ----- + testLessThan + self assert: aDateAndTime < (aDateAndTime + '1:00:00:00'). + self assert: aDateAndTime + -1 < aDateAndTime. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMeridianAbbreviation (in category 'testing') ----- + testMeridianAbbreviation + self assert: aDateAndTime meridianAbbreviation = 'PM'. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMiddleOf (in category 'testing') ----- + testMiddleOf + self assert: (aDateAndTime middleOf: aDuration) = + (Timespan starting: (LXDateAndTime year: 2004 month: 2 day: 29 hour: 6 minute: 46 second: 30 offset: 2 hours) + duration: (Duration days: 0 hours: 13 minutes: 33 seconds: 0 nanoSeconds: 0 )) + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMidnight (in category 'testing') ----- + testMidnight + | midnight | + midnight := (aDateAndTime offset: LXDateAndTime localTimeZone offset) midnight. + self assert: midnight = '2004-02-29T00:00:00+00:00' asLXDateAndTime. + self deny: midnight = '2004-02-29T00:00:00+02:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMinute (in category 'testing') ----- + testMinute + self assert: aDateAndTime minute = 33 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMinutes (in category 'testing') ----- + testMinutes + self assert: aDateAndTime minutes = 33 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMonth (in category 'testing') ----- + testMonth + self assert: aDateAndTime month = 2. + self assert: aDateAndTime monthAbbreviation = 'Feb'. + self assert: aDateAndTime monthName = 'February'. + self assert: aDateAndTime monthIndex = 2.! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testMonthParsing (in category 'testing') ----- + testMonthParsing + self assert: + (Month readFrom: 'Feb 2011' readStream) = + (Month + month: 2 + year: 2011)! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testNanoSecond (in category 'testing') ----- + testNanoSecond + self assert: aDateAndTime nanoSecond = 0 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testNoon (in category 'testing') ----- + testNoon + self assert: aDateAndTime noon = '2004-02-29T12:00:00+00:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testOffset (in category 'testing') ----- + testOffset + self assert: aDateAndTime offset = '0:02:00:00' asDuration. + self assert: (aDateAndTime offset: '0:12:00:00') = '2004-02-29T13:33:00+12:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testPrintOn (in category 'testing') ----- + testPrintOn + | ref ws | + ref := '2004-02-29T13:33:00+02:00'. + ws := '' writeStream. + aDateAndTime printOn: ws. + self assert: ws contents = ref. + ref := 'a TimeZone(UTC)'. + ws := '' writeStream. + aTimeZone printOn: ws. + self assert: ws contents = ref ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testSecond (in category 'testing') ----- + testSecond + self assert: aDateAndTime second = 0 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testSeconds (in category 'testing') ----- + testSeconds + self assert: aDateAndTime seconds = 0 + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testTicks (in category 'testing') ----- + testTicks + self assert: aDateAndTime ticks = ((LXDateAndTime julianDayNumber: 2453065) + 48780 seconds) ticks. + self assert: aDateAndTime ticks = #(2453065 48780 0)! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testTicksOffset (in category 'testing') ----- + testTicksOffset + self assert: aDateAndTime = (aDateAndTime ticks: #(2453065 48780 0) offset: LXDateAndTime localOffset). + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testUtcOffset (in category 'testing') ----- + testUtcOffset + self assert: (aDateAndTime utcOffset: '0:02:00:00') = '2004-02-29T13:33:00+02:00' asLXDateAndTime! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testYear (in category 'testing') ----- + testYear + self assert: aDateAndTime year = 2004. + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testYearDayHourMinuteSecond (in category 'testing') ----- + testYearDayHourMinuteSecond + self assert: aDateAndTime = ((LXDateAndTime year: 2004 day: 60 hour: 13 minute: 33 second: 0) offset: 2 hours). + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testYearMonthDayHourMinuteSecond (in category 'testing') ----- + testYearMonthDayHourMinuteSecond + self assert: aDateAndTime = ((LXDateAndTime year: 2004 month: 2 day: 29 hour: 13 minute: 33 second: 0) offset: 2 hours). + ! Item was added: + ----- Method: LXDateAndTimeLeapTest>>testtimeZone (in category 'testing') ----- + testtimeZone + self assert: aDateAndTime timeZoneName = 'Universal Time'. + self assert: aDateAndTime timeZoneAbbreviation = 'UTC' + ! Item was added: + ClassTestCase subclass: #LXDateAndTimeTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! Item was added: + ----- Method: LXDateAndTimeTest>>classToBeTested (in category 'Coverage') ----- + classToBeTested + ^ LXDateAndTime + ! Item was added: + ----- Method: LXDateAndTimeTest>>selectorsToBeIgnored (in category 'Coverage') ----- + selectorsToBeIgnored + | private | + private := #( #printOn: ). + ^ super selectorsToBeIgnored, private + ! Item was added: + ----- Method: LXDateAndTimeTest>>testArithmeticAcrossDateBoundary (in category 'Tests') ----- + testArithmeticAcrossDateBoundary + | t1 t2 | + t1 := '2004-01-07T11:55:00+00:00' asLXDateAndTime. + t2 := t1 - ( (42900+1) seconds). + self + assert: t2 = ('2004-01-06T23:59:59+00:00' asLXDateAndTime) + + ! Item was added: + ----- Method: LXDateAndTimeTest>>testDateTimeDenotation1 (in category 'Tests') ----- + testDateTimeDenotation1 + "LXDateAndTimeTest new testDateTimeDenotation1" + + " Detroit is 5 hours behind UTC, this offset to UTC is therefore written with a minus sign. This example tests the correct interpretation of the DateAndTime denotation. " + | twoPmInLondon twoPmUTCInLocalTimeOfDetroit nineAmInDetroit | + twoPmInLondon := LXDateAndTime + year: 2004 + month: 11 + day: 2 + hour: 14 + minute: 0 + second: 0 + offset: 0 hours. + twoPmUTCInLocalTimeOfDetroit := twoPmInLondon utcOffset: -5 hours. + nineAmInDetroit := '2004-11-02T09:00:00-05:00' asLXDateAndTime. + self assert: twoPmUTCInLocalTimeOfDetroit = nineAmInDetroit. + + ! Item was added: + ----- Method: LXDateAndTimeTest>>testDateTimeDenotation2 (in category 'Tests') ----- + testDateTimeDenotation2 + "LXDateAndTimeTest new testDateTimeDenotation2" + + " Moscow is 3 hours ahead UTC, this offset to UTC is therefore positive. This example tests the correct interpretation of the DateAndTime denotation. " + | lateEveningInLondon lateEveningInLocalTimeOfMoscow + localMoscowTimeFromDenotation | + lateEveningInLondon := LXDateAndTime + year: 2004 + month: 11 + day: 30 + hour: 23 + minute: 30 + second: 0 + offset: 0 hours. + lateEveningInLocalTimeOfMoscow := lateEveningInLondon utcOffset: 3 hours. + localMoscowTimeFromDenotation := '2004-12-01T02:30:00+03:00' asLXDateAndTime. + self assert: lateEveningInLocalTimeOfMoscow = localMoscowTimeFromDenotation. + + ! Item was added: + ----- Method: LXDateAndTimeTest>>testErrorWhenDayIsAfterMonthEnd (in category 'Tests') ----- + testErrorWhenDayIsAfterMonthEnd + self + should: + [LXDateAndTime + year: 2004 + month: 2 + day: 30] + raise: Error.! Item was added: + ----- Method: LXDateAndTimeTest>>testErrorWhenDayIsBeforeMonthStart (in category 'Tests') ----- + testErrorWhenDayIsBeforeMonthStart + self + should: + [LXDateAndTime + year: 2004 + month: 2 + day: -1] + raise: Error. + self + should: + [LXDateAndTime + year: 2004 + month: 2 + day: 0] + raise: Error.! Item was added: + ----- Method: LXDateAndTimeTest>>testFromString (in category 'Tests') ----- + testFromString + | fromString fromStringNoOffset fromStringUTC | + fromString := LXDateAndTime fromString: '-1199-01-05T20:33:14.321-05:00'. + self assert: (fromString printString = '-1199-01-05T20:33:14.321-05:00'). + + "if no offset is provided, the local offset should be used" + fromStringNoOffset := LXDateAndTime fromString: '-1199-01-05T20:33:14.321'. + self assert: (fromStringNoOffset offset = LXDateAndTime localOffset). + + "if a string contains the UTC designator Z, the local offset should not be used" + fromStringUTC := LXDateAndTime fromString: '2011-08-26T18:00:03Z'. + self assert: (fromStringUTC printString = '2011-08-26T18:00:03+00:00').! Item was added: + ----- Method: LXDateAndTimeTest>>testHash (in category 'Tests') ----- + testHash + | date0 date1 date2 | + date0 := LXDateAndTime unixEpoch. + date1 := LXDateAndTime new ticks: (date0 + 1 hours) ticks offset: 0 hours. + date2 := LXDateAndTime new ticks: (date0 - 2 hours) ticks offset: -3 hours. + self assert: (date1 = date2) ==> [date1 hash = date2 hash]! Item was added: + ----- Method: LXDateAndTimeTest>>testInstanceCreation (in category 'Tests') ----- + testInstanceCreation + | t | + t := LXDateAndTime + year: 1 month: 1 day: 2 + hour: 2 minute: 3 second: 4 nanoSecond: 5 + offset: 6 hours. + self + assert: (t julianDayNumber = 1721427); + assert: (t offset = 6 hours); + assert: (t hour = 2); + assert: (t minute = 3); + assert: (t second = 4); + assert: (t nanoSecond = 5). + + ! Item was added: + ----- Method: LXDateAndTimeTest>>testMonotonicity (in category 'Tests') ----- + testMonotonicity + | t1 t2 t3 t4 | + t1 := LXDateAndTime now. + t2 := LXDateAndTime now. + (Delay forMilliseconds: 1000) wait. + t3 := LXDateAndTime now. + t4 := LXDateAndTime now. + self + assert: ( t1 <= t2); + assert: ( t2 < t3); + assert: ( t3 <= t4). + ! Item was added: + ----- Method: LXDateAndTimeTest>>testPrecision (in category 'Tests') ----- + testPrecision + "Verify that the clock is returning a value with accuracy of better than 1 second. For now it seems sufficient to get two values and verify they are not the same." + self + assert: (LXDateAndTime now ~= LXDateAndTime now) + ! Item was added: + ----- Method: LXDateAndTimeTest>>testPrintString (in category 'Tests') ----- + testPrintString + "(self new setTestSelector: #testPrintString) debug" + | dt dtNoOffset | + dt :=LXDateAndTime + year: 2004 + month: 11 + day: 2 + hour: 14 + minute: 3 + second: 5 + nanoSecond: 12345 + offset: (Duration seconds: (5 * 3600)). + self assert: dt printString = '2004-11-02T14:03:05.000012345+05:00'. + + self assert: ('2002-05-16T17:20:45.1+01:01' asLXDateAndTime printString = '2002-05-16T17:20:45.1+01:01'). + self assert: (' 2002-05-16T17:20:45.02+01:01' asLXDateAndTime printString = '2002-05-16T17:20:45.02+01:01'). + self assert: ('2002-05-16T17:20:45.000000009+01:01' asLXDateAndTime printString = '2002-05-16T17:20:45.000000009+01:01'). + self assert: ('2002-05-16T17:20:45+00:00' asLXDateAndTime printString = '2002-05-16T17:20:45+00:00' ). + self assert: (' 2002-05-16T17:20:45+01:57' asLXDateAndTime printString = '2002-05-16T17:20:45+01:57'). + self assert: (' 2002-05-16T17:20:45-02:34' asLXDateAndTime printString = '2002-05-16T17:20:45-02:34'). + self assert: ('2002-05-16T17:20:45+00:00' asLXDateAndTime printString = '2002-05-16T17:20:45+00:00'). + self assert: ('1997-04-26T01:02:03+01:02:3' asLXDateAndTime printString = '1997-04-26T01:02:03+01:02:3'). + "When no offset is provided, the local one is used" + dtNoOffset := '2002-05-16T17:20' asLXDateAndTime. + self assert: (('2002-05-16T17:20:00*' match: dtNoOffset printString) and: [dtNoOffset offset = LXDateAndTime localOffset]). + ! Item was added: + ----- Method: LXDateAndTimeTest>>testReadFrom (in category 'Tests') ----- + testReadFrom + self assert: ((LXDateAndTime readFrom: '-1199-01-05T20:33:14.321-05:00' readStream) printString = '-1199-01-05T20:33:14.321-05:00'). + ! Item was added: + ----- Method: LXDateAndTimeTest>>testSmalltalk80Accessors (in category 'Tests') ----- + testSmalltalk80Accessors + | t | + t := LXDateAndTime + year: 1 month: 1 day: 2 + hour: 2 minute: 3 second: 4 nanoSecond: 5 + offset: 6 hours. + self + assert: (t hours = t hours); + assert: (t minutes = t minute); + assert: (t seconds = t second). + ! Item was added: + ----- Method: LXDateAndTimeTest>>testTimeZoneEquivalence (in category 'Tests') ----- + testTimeZoneEquivalence + "LXDateAndTimeTest new testTimeZoneEquivalence" + "When the clock on the wall in Detroit says 9:00am, the clock on the wall + in London says 2:00pm. The Duration difference between the corresponding + DateAndTime values should be zero." + + " Detroit is 5 hours behind UTC, this offset to UTC is therefore written with a minus sign. This example tests both the correct interpretation of the DateAndTime denotation and correct DateAndTime arithmetics. " + | twoPmInLondon nineAmInDetroit durationDifference | + twoPmInLondon := '2004-11-02T14:00:00+00:00' asLXDateAndTime. + nineAmInDetroit := '2004-11-02T09:00:00-05:00' asLXDateAndTime. + durationDifference := twoPmInLondon - nineAmInDetroit. + self assert: durationDifference asSeconds = 0. + self assert: twoPmInLondon = nineAmInDetroit + ! Item was added: + ----- Method: LXDateAndTimeTest>>testTimeZoneEquivalence2 (in category 'Tests') ----- + testTimeZoneEquivalence2 + "LXDateAndTimeTest new testTimeZoneEquivalence2" + "This example demonstates the fact that + 2004-05-24T22:40:00 UTC is + 2004-05-25T01:40:00 in Moscow + (Moscow is 3 hours ahead of UTC) " + | thisMoment thisMomentInMoscow | + thisMoment := LXDateAndTime year: 2004 month: 5 day: 24 hour: 22 minute: 40. + thisMomentInMoscow := thisMoment utcOffset: 3 hours. + self assert: (thisMoment - thisMomentInMoscow) asSeconds = 0. + self assert: thisMoment = thisMomentInMoscow + ! Item was added: + LXDateAndTime subclass: #LXTimeStamp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Chronology-Core'! + + !LXTimeStamp commentStamp: '<historical>' prior: 0! + This represents a duration of 0 length that marks a particular point in time.! Item was added: + ----- Method: LXTimeStamp class>>current (in category 'squeak protocol') ----- + current + + ^self now! Item was added: + ----- Method: LXTimeStamp>>asDateAndTime (in category 'squeak protocol') ----- + asDateAndTime + "Answer the receiver as an instance of DateAndTime." + + ^ (LXDateAndTime utcMicroseconds: utcMicroseconds offset: localOffsetSeconds) + asDateAndTime! Item was added: + ----- Method: LXTimeStamp>>asTimeStamp (in category 'squeak protocol') ----- + asTimeStamp + "Answer the receiver as an instance of TimeStamp." + + ^ self! Item was added: + ----- Method: LXTimeStamp>>date (in category 'squeak protocol') ----- + date + "Answer the date of the receiver." + + ^ self asDate! Item was added: + ----- Method: LXTimeStamp>>dateAndTime (in category 'squeak protocol') ----- + dateAndTime + "Answer a two element Array containing the receiver's date and time." + + ^ Array with: self date with: self time! Item was added: + ----- Method: LXTimeStamp>>minusDays: (in category 'squeak protocol') ----- + minusDays: anInteger + "Answer a TimeStamp which is anInteger days before the receiver." + + ^ self - (anInteger days)! Item was added: + ----- Method: LXTimeStamp>>minusSeconds: (in category 'squeak protocol') ----- + minusSeconds: anInteger + "Answer a TimeStamp which is anInteger number of seconds before the receiver." + + ^ self - (anInteger seconds)! Item was added: + ----- Method: LXTimeStamp>>plusDays: (in category 'squeak protocol') ----- + plusDays: anInteger + "Answer a TimeStamp which is anInteger days after the receiver." + + ^ self + (anInteger days)! Item was added: + ----- Method: LXTimeStamp>>plusSeconds: (in category 'squeak protocol') ----- + plusSeconds: anInteger + "Answer a TimeStamp which is anInteger number of seconds after the receiver." + + ^ self + (anInteger seconds)! Item was added: + ----- Method: LXTimeStamp>>printOn: (in category 'squeak protocol') ----- + printOn: aStream + "Print receiver's date and time on aStream." + + aStream + nextPutAll: self date printString; + space; + nextPutAll: self time printString.! Item was added: + ----- Method: LXTimeStamp>>storeOn: (in category 'squeak protocol') ----- + storeOn: aStream + + aStream + print: self printString; + nextPutAll: ' asLXTimeStamp'! Item was added: + ----- Method: LXTimeStamp>>time (in category 'squeak protocol') ----- + time + "Answer the time of the receiver." + + ^ self asTime! Item was added: + ----- Method: String>>asLXDateAndTime (in category '*Chronology-Core') ----- + asLXDateAndTime + + "Convert from UTC format" ^ LXDateAndTime fromString: self! Item was changed: Magnitude subclass: #Time instanceVariableNames: 'seconds nanos' + classVariableNames: 'ClockPolicy LastClockTick' - classVariableNames: '' poolDictionaries: 'ChronologyConstants' category: 'Chronology-Core'! !Time commentStamp: 'dew 10/23/2004 17:58' prior: 0! This represents a particular point in time during any given day. For example, '5:19:45 pm'. If you need a point in time on a particular day, use DateAndTime. If you need a duration of time, use Duration. ! Item was added: + ----- Method: Time class>>clockPolicy: (in category 'class initialization') ----- + clockPolicy: aSymbol + "When sequencial calls are made to DateAndTime now, it may be desirable to + force the system clock to be monotonic, and it may be desirable for the clock + to appear to be strictly increasing with no repeat values. The ClockPolicy + identifies which of several possible strategies to use. + + Allowable values are + #acceptPlatformTime + #monotonicAllowDuplicates + #monotonicForceMicrosecondIncrement + #monotonicForceNanosecondIncrement " + + ClockPolicy := aSymbol! Item was added: + ----- Method: Time class>>initialize (in category 'class initialization') ----- + initialize + "Time initialize" + + "Initialize at startup time to protect for the case of an image saved with bad LastClockTick" + LastClockTick := 0. + + "self clockPolicy: #acceptPlatformTime." + self clockPolicy: #monotonicAllowDuplicates. + "self clockPolicy: #monotonicForceMicrosecondIncrement." + "self clockPolicy: #monotonicForceNanosecondIncrement." + ! Item was added: + ----- Method: Time class>>posixMicrosecondClockWithOffset (in category 'clock') ----- + posixMicrosecondClockWithOffset + "Answer an array with local microseconds since the Posix epoch and the + current seconds offset from GMT in the local time zone." + + | array utcValue | + array := self primPosixMicrosecondClockWithOffset. + ClockPolicy caseOf: { + [#acceptPlatformTime] -> [^ array] . + [#monotonicAllowDuplicates] -> [ + utcValue := array at: 1. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [array at: 1 put: LastClockTick]] . + [#monotonicForceMicrosecondIncrement] -> [ + utcValue := array at: 1. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [LastClockTick := LastClockTick + 1. "add one microsecond" + array at: 1 put: LastClockTick]] . + [#monotonicForceNanosecondIncrement] -> [ + utcValue := array at: 1. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [LastClockTick := LastClockTick + (1 / 1000). "add one nanosecond" + array at: 1 put: LastClockTick]] + } otherwise: []. + ^array + + ! Item was added: + ----- Method: Time class>>posixMicrosecondClockWithOffset: (in category 'clock') ----- + posixMicrosecondClockWithOffset: aDateAndTime + "Initialize aDateAndTime initialized with local microseconds since the Posix + epoch and the current seconds offset from GMT in the local time zone." + + + | utcValue | + self primPosixMicrosecondClockWithOffset: aDateAndTime. + aDateAndTime utcMicroseconds ifNil: [ ^aDateAndTime]. "primitive failed" + ClockPolicy caseOf: { + [#acceptPlatformTime] -> [^ aDateAndTime] . + [#monotonicAllowDuplicates] -> [ + utcValue := aDateAndTime utcMicroseconds. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [aDateAndTime utcMicroseconds: LastClockTick]] . + [#monotonicForceMicrosecondIncrement] -> [ + utcValue := aDateAndTime utcMicroseconds. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [LastClockTick := LastClockTick + 1. "add one microsecond" + aDateAndTime utcMicroseconds: LastClockTick]] . + [#monotonicForceNanosecondIncrement] -> [ + utcValue := aDateAndTime utcMicroseconds. + utcValue > LastClockTick + ifTrue: [LastClockTick := utcValue] + ifFalse: [LastClockTick := LastClockTick + (1 / 1000). "add one nanosecond" + aDateAndTime utcMicroseconds: LastClockTick]] + } otherwise: []. + ^aDateAndTime + ! Item was added: + ----- Method: Time class>>primPosixMicrosecondClockWithOffset: (in category 'private') ----- + primPosixMicrosecondClockWithOffset: arrayOrObjectWithTwoSlots + "Answer an array with UTC microseconds since the Posix epoch and the + current seconds offset from GMT in the local time zone. If the primitive is + not available, then answer the time and offset of Posix epoch GMT. This enables + the image to continue running in the absence of #primitiveUtcWithOffset, thus + avoiding the need to fallback code based on the earlier local microsecond clock + mechanism. + + The parameter may be a two element array, or an object whose first two instance + variables are expected to be UTC microseconds and seconds offset from GMT." + + <primitive: 'primitiveUtcWithOffset'> + ^{0. 0}! Item was added: + ----- Method: Time class>>readHourMinuteSecondNanoFrom: (in category 'smalltalk-80') ----- + readHourMinuteSecondNanoFrom: aStream + "Read a Time from the stream in the form: + <hour>:<minute>:<second> <am/pm> + + <minute>, <second> or <am/pm> may be omitted. e.g. 1:59:30 pm; 8AM; 15:30" + + | hour minute second ampm nanos nanosBuffer | + hour := Integer readFrom: aStream. + minute := 0. + second := 0. + nanosBuffer := '000000000' copy. + nanos := WriteStream on: nanosBuffer. + (aStream peekFor: $:) + ifTrue: [ + minute := Integer readFrom: aStream. + (aStream peekFor: $:) + ifTrue: [ + second := Integer readFrom: aStream. + (aStream peekFor: $.) + ifTrue: [ + [aStream atEnd not and: [aStream peek isDigit]] + whileTrue: [nanos nextPut: aStream next]]]]. + aStream skipSeparators. + (aStream atEnd not and: ['PApa' includes: aStream peek]) ifTrue: + [ampm := aStream next asLowercase. + (ampm = $p and: [hour < 12]) ifTrue: [hour := hour + 12]. + (ampm = $a and: [hour = 12]) ifTrue: [hour := 0]. + (aStream peekFor: $m) ifFalse: [aStream peekFor: $M ]]. + ^ { hour . minute . second . nanosBuffer asInteger } + + "Time readFrom: (ReadStream on: '2:23:09 pm')"! Item was changed: ----- Method: Timespan class>>defaultOffset (in category 'configuring') ----- defaultOffset + "Timespans created in the context of an offset will start in that offset. When no context is available, the defaultOffset for Timespans must be zero. For example, two ways to make a Date for today: + Date today. 'start is midnight at offset zero. Will compare successfully to other Date today results.' + DateAndTime now asDate. 'In this case, the start is midnight of the local time-zone. It can only compare equally to Dates of its time-zone.'" + ^ Duration zero! - "Timespans created in the context of an offset will start in that offset. When no context is available, the defaultOffset for Timespans must be nil. For example, two ways to make a Date for today: - Date today. 'start is midnight without offset. Will compare successfully to other Date today results.' - DateAndTime now asDate. 'In this case, the start is midnight of the local time-zone. It can only compare equally to Dates of its time-zone or Dates without timezone.'" - ^ nil! Item was added: + ----- Method: Timespan>>asLXDateAndTime (in category '*Chronology-Core') ----- + asLXDateAndTime + + ^ start asLXDateAndTime!

1 0

The Trunk: Compiler-eem.398.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.398.mcz ==================== Summary ==================== Name: Compiler-eem.398 Author: eem Time: 3 January 2019, 3:47:34.750814 pm UUID: 641c8172-6e85-49c8-aa42-0e2cd184e05a Ancestors: Compiler-eem.397 Fix a spelling error =============== Diff against Compiler-eem.397 =============== Item was changed: ----- Method: MethodNode>>preenableNodes (in category 'converting-private') ----- preenableNodes "Answer a Dictionary from node or sequence of nodes to preen method selector for nodes in the tree that require post-processing after either a format or a decompile. Such issues are the variable for an ifNotNil: which is local to the ifNotNil: block but, due to the inlining of ifNotNil: appears to be declared at the outer level, and, similarly, a temporary variable that conflicts with one of the same name in a block when, were the variable declared local to some inlined block it would no longer conflict. The resulting dictionary is used to perform the value with the key (node or array) as argument to preen the tree." | preenableNodes priorBlocks priorVariables | preenableNodes := Dictionary new. priorBlocks := OrderedCollection new. priorVariables := Set new. + self nodesWithPrecedingStatementsDo: - self nodesWithPreceedingStatementsDo: [:node :preceedingStatementOrNil| | variable temps | (node isMessageNode and: [node macroPrinter == #printIfNilNotNil:indent: and: [node receiver isMessageNode and: [node receiver selector key == #== and: [node receiver receiver isAssignmentNode and: [(variable := node receiver receiver variable) isTemp and: [variable isRemote not and: [variable isOnlySubnodeOf: node in: self]]]]]]]) ifTrue: [preenableNodes at: node put: #preenIfNotNilNode:. priorVariables add: variable]. node isBlockNode ifTrue: [temps := OrderedCollection new. node temporaries do: [:temp| priorBlocks do: [:aBlock| aBlock temporaries do: [:priorTemp| (priorVariables includes: priorTemp) ifFalse: [priorTemp key = temp key ifTrue: [temps addLast: priorTemp]]]]]. temps isEmpty ifFalse: [preenableNodes at: temps put: #preenTempsConflictingWithBlockNode:]. priorBlocks addLast: node]. (node == NodeNil and: [preceedingStatementOrNil notNil and: [preceedingStatementOrNil isMessageNode and: [preceedingStatementOrNil isNilIf]]]) ifTrue: [preenableNodes at: preceedingStatementOrNil put: #preenNilNodeFollowingNilIfNode:]]. ^preenableNodes! Item was added: + ----- Method: ParseNode>>nodesWithPrecedingStatementsDo: (in category 'visiting') ----- + nodesWithPrecedingStatementsDo: aBinaryBlock + self accept: (ParseNodeWithPrecedingStatementEnumerator ofBlock: aBinaryBlock)! Item was removed: - ----- Method: ParseNode>>nodesWithPreceedingStatementsDo: (in category 'visiting') ----- - nodesWithPreceedingStatementsDo: aBinaryBlock - self accept: (ParseNodeWithPreceedingStatementEnumerator ofBlock: aBinaryBlock)! Item was added: + ParseNodeEnumerator subclass: #ParseNodeWithPrecedingStatementEnumerator + instanceVariableNames: 'precedingStatement' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-Support'! Item was added: + ----- Method: ParseNodeWithPrecedingStatementEnumerator>>ofBlock: (in category 'initialize-release') ----- + ofBlock: aBlock + "N.B. This enumerator visits a node before any of the node's children. + Hence, when enumewrating statements in a block, we can ensure that + the second argument to the block, the preceeding statement, is non-nil + only for top-level statements in the block by nilling out preceedingStatement + once the block is evaluated. Perhaps stronger would be to capture its value + in a temporary and nil it before evaluating, but this is good enough." + theBlock := [:node| + aBlock value: node value: precedingStatement. + preceedingStatement := nil]! Item was added: + ----- Method: ParseNodeWithPrecedingStatementEnumerator>>ofBlock:select: (in category 'initialize-release') ----- + ofBlock: aBlock select: aSelectBlock + self ofBlock: aBlock. + theSelectBlock := aSelectBlock! Item was added: + ----- Method: ParseNodeWithPrecedingStatementEnumerator>>visitBlockNode: (in category 'visiting') ----- + visitBlockNode: aBlockNode + | savedPrecedingStatement | + (theSelectBlock isNil or: [theSelectBlock value: aBlockNode]) ifFalse: + [^nil]. + theBlock value: aBlockNode. + savedPrecedingStatement := precedingStatement. + precedingStatement := nil. + [aBlockNode statements do: + [:statement| + statement accept: self. + precedingStatement := statement]] ensure: + [precedingStatement := savedPrecedingStatement]! Item was removed: - ParseNodeEnumerator subclass: #ParseNodeWithPreceedingStatementEnumerator - instanceVariableNames: 'preceedingStatement' - classVariableNames: '' - poolDictionaries: '' - category: 'Compiler-Support'! Item was removed: - ----- Method: ParseNodeWithPreceedingStatementEnumerator>>ofBlock: (in category 'initialize-release') ----- - ofBlock: aBlock - "N.B. This enumerator visits a node before any of the node's children. - Hence, when enumewrating statements in a block, we can ensure that - the second argument to the block, the preceeding statement, is non-nil - only for top-level statements in the block by nilling out preceedingStatement - once the block is evaluated. Perhaps stronger would be to capture its value - in a temporary and nil it before evaluating, but this is good enough." - theBlock := [:node| - aBlock value: node value: preceedingStatement. - preceedingStatement := nil]! Item was removed: - ----- Method: ParseNodeWithPreceedingStatementEnumerator>>ofBlock:select: (in category 'initialize-release') ----- - ofBlock: aBlock select: aSelectBlock - self ofBlock: aBlock. - theSelectBlock := aSelectBlock! Item was removed: - ----- Method: ParseNodeWithPreceedingStatementEnumerator>>visitBlockNode: (in category 'visiting') ----- - visitBlockNode: aBlockNode - | savedPreceedingStatement | - (theSelectBlock isNil or: [theSelectBlock value: aBlockNode]) ifFalse: - [^nil]. - theBlock value: aBlockNode. - savedPreceedingStatement := preceedingStatement. - preceedingStatement := nil. - [aBlockNode statements do: - [:statement| - statement accept: self. - preceedingStatement := statement]] ensure: - [preceedingStatement := savedPreceedingStatement]!

1 0

The Trunk: Compiler-eem.397.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.397.mcz ==================== Summary ==================== Name: Compiler-eem.397 Author: eem Time: 3 January 2019, 3:15:09.938414 pm UUID: 0561e11a-8d91-4ed1-b806-535264b98ef8 Ancestors: Compiler-eem.396 Fix the recorded pcs for inlined blocks. The old code assumed one-byte branches and so generated off-by-one pcs for all multiple byte branches. In addition the code for case guards was simply wrong, always off-by-one. The fix is to use emncoder nextPC in teh right place, not encoder pc after branch/send generation when a multibyte send will compute the wrong pc. Tests exist in Tests-eem.405 and later. Play via debugging e.g.: 5 caseOf: { [4] -> [#nope]. [3] -> [#nope]. [2] -> [#nope]. [1] -> [#nope]. [0] -> [#nope] } otherwise: [#dope] =============== Diff against Compiler-eem.396 =============== Item was changed: ----- Method: MessageNode>>emitCodeForCase:encoder:value: (in category 'code generation') ----- emitCodeForCase: stack encoder: encoder value: forValue | braceNode sizeStream allReturn | forValue ifFalse: [^super emitCodeForEffect: stack encoder: encoder]. braceNode := arguments first. sizeStream := ReadStream on: sizes. receiver emitCodeForValue: stack encoder: encoder. "There must be at least one branch around the otherwise/caseError so the decompiler can identify the end of the otherwise/caseError." allReturn := true. "assume every case ends with a return" braceNode casesForwardDo: [:keyNode :valueNode :last | | thenSize elseSize | thenSize := sizeStream next. elseSize := sizeStream next. last ifFalse: [encoder genDup. stack push: 1]. keyNode emitCodeForEvaluatedValue: stack encoder: encoder. + keyNode pc: encoder nextPC. - keyNode pc: encoder pc. equalNode emitCode: stack args: 1 encoder: encoder. self emitCodeForBranchOn: false dist: thenSize pop: stack encoder: encoder. last ifFalse: [encoder genPop. stack pop: 1]. valueNode emitCodeForEvaluatedValue: stack encoder: encoder. last ifTrue: [stack pop: 1]. valueNode returns ifFalse: [self emitCodeForJump: elseSize encoder: encoder. allReturn := false]. (last and: [allReturn]) ifTrue: [self emitCodeForJump: elseSize encoder: encoder]]. arguments size = 2 ifTrue: [arguments last emitCodeForEvaluatedValue: stack encoder: encoder] "otherwise: [...]" ifFalse: [NodeSelf emitCodeForValue: stack encoder: encoder. caseErrorNode emitCode: stack args: 0 encoder: encoder]! Item was changed: ----- Method: MessageNode>>emitCodeForIf:encoder:value: (in category 'code generation') ----- emitCodeForIf: stack encoder: encoder value: forValue | thenExpr thenSize elseExpr elseSize | thenSize := sizes at: 1. elseSize := sizes at: 2. thenExpr := arguments at: 1. elseExpr := arguments at: 2. receiver emitCodeForValue: stack encoder: encoder. + pc := encoder nextPC. elseSize * thenSize > 0 ifTrue: "Code for two-armed" [self emitCodeForBranchOn: false dist: thenSize pop: stack encoder: encoder. - pc := encoder pc. thenExpr emitCodeForEvaluatedValue: stack encoder: encoder. stack pop: 1. "then and else alternate; they don't accumulate" + thenExpr returns ifFalse: "Elide jump over else after a return" - thenExpr returns ifFalse: - "Elide jump over else after a return" [self emitCodeForJump: elseSize encoder: encoder]. elseExpr emitCodeForEvaluatedValue: stack encoder: encoder. + forValue ifFalse: "Two-armed IFs forEffect share a single pop - except if both return" + [(arguments allSatisfy: #returns) ifFalse: [encoder genPop]. + stack pop: 1]] - forValue - ifFalse: - ["Two-armed IFs forEffect share a single pop - except if both return" - (arguments allSatisfy: #returns) ifFalse: [encoder genPop]. - stack pop: 1]] ifFalse: "One arm is empty here (this can only ever be for effect)" [thenSize > 0 ifTrue: [self emitCodeForBranchOn: false dist: thenSize pop: stack encoder: encoder. - pc := encoder pc. thenExpr emitCodeForEvaluatedEffect: stack encoder: encoder] ifFalse: [self emitCodeForBranchOn: true dist: elseSize pop: stack encoder: encoder. - pc := encoder pc. elseExpr emitCodeForEvaluatedEffect: stack encoder: encoder]]! Item was changed: ----- Method: MessageNode>>emitCodeForIfNil:encoder:value: (in category 'code generation') ----- emitCodeForIfNil: stack encoder: encoder value: forValue | theNode theSize ifNotNilSelector | theNode := arguments first. theSize := sizes at: 1. ifNotNilSelector := #ifNotNil:. receiver emitCodeForValue: stack encoder: encoder. forValue ifTrue: [encoder genDup. stack push: 1]. encoder genPushSpecialLiteral: nil. stack push: 1. equalNode emitCode: stack args: 1 encoder: encoder. + pc := encoder nextPC. - pc := encoder pc. self emitCodeForBranchOn: (selector key == ifNotNilSelector) dist: theSize pop: stack encoder: encoder. forValue ifTrue: [encoder genPop. stack pop: 1. theNode emitCodeForEvaluatedValue: stack encoder: encoder] ifFalse: [theNode emitCodeForEvaluatedEffect: stack encoder: encoder]! Item was changed: ----- Method: MessageNode>>emitCodeForToDo:encoder:value: (in category 'code generation') ----- emitCodeForToDo: stack encoder: encoder value: forValue " var := rcvr. L1: [var <= arg1] Bfp(L2) [block body. var := var + inc] Jmp(L1) L2: " | loopSize initStmt limitInit test block incStmt blockSize | initStmt := arguments at: 4. limitInit := arguments at: 7. test := arguments at: 5. block := arguments at: 3. incStmt := arguments at: 6. blockSize := sizes at: 1. loopSize := sizes at: 2. "This will return the receiver of to:do: which is the initial value of the loop" forValue ifTrue: [initStmt emitCodeForValue: stack encoder: encoder] ifFalse: [initStmt emitCodeForEffect: stack encoder: encoder]. limitInit ifNotNil: [limitInit emitCodeForEffect: stack encoder: encoder]. test emitCodeForValue: stack encoder: encoder. + pc := encoder nextPC. self emitCodeForBranchOn: false dist: blockSize pop: stack encoder: encoder. - pc := encoder pc. block emitCodeForEvaluatedEffect: stack encoder: encoder. incStmt emitCodeForEffect: stack encoder: encoder. self emitCodeForJump: 0 - loopSize encoder: encoder! Item was changed: ----- Method: MessageNode>>emitCodeForWhile:encoder:value: (in category 'code generation') ----- emitCodeForWhile: stack encoder: encoder value: forValue "L1: ... Bfp(L2)|Btp(L2) ... Jmp(L1) L2: " | cond stmt stmtSize loopSize | cond := receiver. stmt := arguments at: 1. stmtSize := sizes at: 1. loopSize := sizes at: 2. cond emitCodeForEvaluatedValue: stack encoder: encoder. + pc := encoder nextPC. self emitCodeForBranchOn: (selector key == #whileFalse:) "Bfp for whileTrue" dist: stmtSize pop: stack encoder: encoder. "Btp for whileFalse" - pc := encoder pc. stmt emitCodeForEvaluatedEffect: stack encoder: encoder. self emitCodeForJump: 0 - loopSize encoder: encoder. forValue ifTrue: [encoder genPushSpecialLiteral: nil. stack push: 1]!

1 0

The Trunk: Tests-eem.405.mcz
by commits＠source.squeak.org 04 Jan '19

04 Jan '19

Eliot Miranda uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-eem.405.mcz ==================== Summary ==================== Name: Tests-eem.405 Author: eem Time: 3 January 2019, 3:07:27.378757 pm UUID: 17c87dc5-be34-42cc-b043-82315ab82527 Ancestors: Tests-pre.404 Add tests that check that for all methods in a package all pcs in nodes in that method map to valid pcs. =============== Diff against Tests-pre.404 =============== Item was added: + ----- Method: CompiledMethod class>>noCheckSetPreferredBytecodeSetTo:while: (in category '*Tests-Compiler-support') ----- + noCheckSetPreferredBytecodeSetTo: encoderClass while: aBlock + | savedEncoderClass | + encoderClass == PreferredBytecodeSetEncoderClass ifTrue: + [^aBlock value]. + savedEncoderClass := PreferredBytecodeSetEncoderClass. + PreferredBytecodeSetEncoderClass := encoderClass. + ^aBlock ensure: [PreferredBytecodeSetEncoderClass := savedEncoderClass]! Item was added: + ----- Method: CompilerTest>>runTestAllNodePCsAreForBytecodesInMethod: (in category 'private') ----- + runTestAllNodePCsAreForBytecodesInMethod: aMethod + "Before 1/3/2019 14:10 the bytecode compiler would ascribe the wrong pcs for long conditional branches + at the head of ifTrue:ifFalse: et al. This test checks that all nodes with a pc map to a real bytecode." + | class methodAndNode bytecodes | + class := aMethod methodClass. + methodAndNode := CompiledMethod + noCheckSetPreferredBytecodeSetTo: aMethod encoderClass + while: + [class + compile:(class sourceCodeAt: aMethod selector) + environment: class environment + notifying: nil + trailer: aMethod trailer + ifFail: [^nil]]. + bytecodes := self validPCsForMethod: methodAndNode method. + bytecodes add: methodAndNode node pc. + methodAndNode node nodesDo: + [:node| + node pc ifNotNil: + [:pc| + self assert: (bytecodes includes: pc)]]! Item was added: + ----- Method: CompilerTest>>runTestAllNodePCsAreForBytecodesInPackage: (in category 'private') ----- + runTestAllNodePCsAreForBytecodesInPackage: packageName + "Before 1/3/2019 14:10 the bytecode compiler would ascribe the wrong pcs for long conditional branches + at the head of ifTrue:ifFalse: et al. This slow test checks that all nodes with a pc in any method map to a + real bytecode." + (PackageInfo named: packageName) actualMethodsDo: + [:method| self runTestAllNodePCsAreForBytecodesInMethod: method]! Item was added: + ----- Method: CompilerTest>>testAllNodePCsAreForBytecodesInCollections (in category 'debugging') ----- + testAllNodePCsAreForBytecodesInCollections + <timeout: 30> "Approximately 2 seconds on 2018 2.9GHz Core i9 MacBook Pro running 64-bit Squeak Cog VM" + self runTestAllNodePCsAreForBytecodesInPackage: #Collections! Item was added: + ----- Method: CompilerTest>>testAllNodePCsAreForBytecodesInKernel (in category 'debugging') ----- + testAllNodePCsAreForBytecodesInKernel + <timeout: 30> "Approximately 3 seconds on 2018 2.9GHz Core i9 MacBook Pro running 64-bit Squeak Cog VM" + self runTestAllNodePCsAreForBytecodesInPackage: #Kernel! Item was added: + ----- Method: CompilerTest>>testAllNodePCsAreForBytecodesInMorphic (in category 'debugging') ----- + testAllNodePCsAreForBytecodesInMorphic + <timeout: 30> "Approximately 6 seconds on 2018 2.9GHz Core i9 MacBook Pro running 64-bit Squeak Cog VM" + self runTestAllNodePCsAreForBytecodesInPackage: #Morphic! Item was added: + ----- Method: CompilerTest>>validPCsForMethod: (in category 'private') ----- + validPCsForMethod: aMethod + "Answer a set of pcs (either integer pc for the method and embedded blocks, + or CompiledBlock -> integer pc for nested full blocks." + | validPCs is | + validPCs := Set new: aMethod size - aMethod initialPC. + (is := InstructionStream on: aMethod) scanFor: + [:b| validPCs add: is pc. false]. + aMethod nestedBlockMethods do: + [:bm| + (is := InstructionStream on: bm) scanFor: + [:b| validPCs add: bm -> is pc. false]]. + ^validPCs!

1 0

Rendering a text along an arc
by Eliot Miranda 03 Jan '19

03 Jan '19

Hi, anyone have any code to display text in a nice font along an arc or a spiral? _,,,^..^,,,_ best, Eliot

5 15

Jump to page: