Repository navigation
fix(relative): group month and year adjustments #360
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
anastygnome
wants to merge
1
commit into
uutils:main
Choose a base branch
from
anastygnome:split/month-year-grouping
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+167
−26
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| // For the full copyright and license information, please view the LICENSE | ||
| // file that was distributed with this source code. | ||
|
|
||
| use jiff::{civil, Span, ToSpan, ZonedDateTime}; | ||
| use jiff::{civil, SignedDuration, Span, ZonedDateTime}; | ||
|
|
||
| use super::{date, epoch, error, offset, relative, time, weekday, year, Item}; | ||
| use crate::extended::{DateParts, TimeParts}; | ||
|
|
@@ -359,25 +359,12 @@ impl DateTimeBuilder { | |
| dt = dt.datetime().to_zoned_datetime((&offset).try_into()?)?; | ||
| } | ||
|
|
||
| // 4e. Apply relative adjustments. | ||
| for rel in self.relative { | ||
| dt = match rel { | ||
| relative::Relative::Years(_) | relative::Relative::Months(_) => { | ||
| // GNU way of calculating relative months and years. | ||
| // GNU changes the month/year and then checks if the target month has | ||
| // this day. If this day does not exist in the target month it overflows | ||
| // the difference. | ||
| let original_day_of_month = dt.day(); | ||
| dt = dt.checked_add::<Span>(rel.try_into()?)?; | ||
| if original_day_of_month != dt.day() { | ||
| dt = dt.checked_add( | ||
| (original_day_of_month.checked_sub(dt.day()).unwrap_or(0)).days(), | ||
| )?; | ||
| } | ||
| dt | ||
| } | ||
| _ => dt.checked_add::<Span>(rel.try_into()?)?, | ||
| }; | ||
| let relative = relative_adjustment(&self.relative)?; | ||
| if relative.has_date_component() { | ||
| dt = apply_relative_date(dt, relative)?; | ||
| } | ||
| if relative.has_time_component() { | ||
| dt = apply_relative_time(dt, relative)?; | ||
| } | ||
|
|
||
| Ok(dt) | ||
|
|
@@ -552,6 +539,152 @@ fn weekday_monday0(day: weekday::Day) -> u8 { | |
| } | ||
| } | ||
|
|
||
| /// Relative values are accumulated by unit before they are applied. GNU | ||
| /// applies all year/month changes together, followed by days and then the | ||
| /// clock units, rather than applying the input items one at a time. | ||
| #[derive(Clone, Copy, Debug, Default)] | ||
| struct RelativeAdjustment { | ||
| years: i64, | ||
| months: i64, | ||
| days: i64, | ||
| hours: i64, | ||
| minutes: i64, | ||
| seconds: i64, | ||
| nanoseconds: i64, | ||
| } | ||
|
|
||
| impl RelativeAdjustment { | ||
| fn has_date_component(self) -> bool { | ||
| self.years != 0 || self.months != 0 || self.days != 0 | ||
| } | ||
|
|
||
| fn has_time_component(self) -> bool { | ||
| self.hours != 0 || self.minutes != 0 || self.seconds != 0 || self.nanoseconds != 0 | ||
| } | ||
| } | ||
|
|
||
| fn relative_adjustment( | ||
| relative: &[relative::Relative], | ||
| ) -> Result<RelativeAdjustment, error::Error> { | ||
| fn checked_add(field: &mut i64, value: i64, message: &'static str) -> Result<(), error::Error> { | ||
| *field = field.checked_add(value).ok_or(message)?; | ||
| Ok(()) | ||
| } | ||
|
|
||
| let mut result = RelativeAdjustment::default(); | ||
| for rel in relative { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. almost the same checked_add block 6 times, could be dedup, no? |
||
| match *rel { | ||
| relative::Relative::Years(value) => { | ||
| checked_add( | ||
| &mut result.years, | ||
| i64::from(value), | ||
| "relative year adjustment overflow", | ||
| )?; | ||
| } | ||
| relative::Relative::Months(value) => { | ||
| checked_add( | ||
| &mut result.months, | ||
| i64::from(value), | ||
| "relative month adjustment overflow", | ||
| )?; | ||
| } | ||
| relative::Relative::Days(value) => { | ||
| checked_add( | ||
| &mut result.days, | ||
| i64::from(value), | ||
| "relative day adjustment overflow", | ||
| )?; | ||
| } | ||
| relative::Relative::Hours(value) => { | ||
| checked_add( | ||
| &mut result.hours, | ||
| i64::from(value), | ||
| "relative hour adjustment overflow", | ||
| )?; | ||
| } | ||
| relative::Relative::Minutes(value) => { | ||
| checked_add( | ||
| &mut result.minutes, | ||
| i64::from(value), | ||
| "relative minute adjustment overflow", | ||
| )?; | ||
| } | ||
| relative::Relative::Seconds(seconds, nanoseconds) => { | ||
| checked_add( | ||
| &mut result.seconds, | ||
| seconds, | ||
| "relative second adjustment overflow", | ||
| )?; | ||
| checked_add( | ||
| &mut result.nanoseconds, | ||
| i64::from(nanoseconds), | ||
| "relative nanosecond adjustment overflow", | ||
| )?; | ||
| } | ||
| } | ||
| } | ||
| Ok(result) | ||
| } | ||
|
|
||
| fn apply_relative_date( | ||
| mut dt: ZonedDateTime, | ||
| relative: RelativeAdjustment, | ||
| ) -> Result<ZonedDateTime, error::Error> { | ||
| // Change the year and month as one calendar operation. This intentionally | ||
| // preserves the original day until the target month is known, so a date | ||
| // such as January 31 overflows into March rather than clamping to February. | ||
| if relative.years != 0 || relative.months != 0 { | ||
| let (year, month) = shifted_year_month(&dt, relative)?; | ||
| let first = civil::Date::new(year, month as i8, 1)?; | ||
| let target = first.checked_add(Span::new().try_days(i64::from(dt.day() - 1))?)?; | ||
| dt = dt.with().date(target).build()?; | ||
| } | ||
| if relative.days != 0 { | ||
| dt = dt.checked_add(Span::new().try_days(relative.days)?)?; | ||
| } | ||
| Ok(dt) | ||
| } | ||
|
|
||
| fn shifted_year_month( | ||
| dt: &ZonedDateTime, | ||
| relative: RelativeAdjustment, | ||
| ) -> Result<(i16, u8), error::Error> { | ||
| let month_index = i64::from(dt.year()) | ||
| .checked_mul(12) | ||
| .and_then(|value| value.checked_add(i64::from(dt.month()) - 1)) | ||
| .and_then(|value| value.checked_add(relative.years.checked_mul(12)?)) | ||
| .and_then(|value| value.checked_add(relative.months)) | ||
| .ok_or("relative month/year overflow")?; | ||
| let year = month_index.div_euclid(12); | ||
| let month = month_index.rem_euclid(12) + 1; | ||
| let year = i16::try_from(year).map_err(|_| "relative year overflow")?; | ||
| Ok((year, month as u8)) | ||
| } | ||
|
|
||
| fn apply_relative_time( | ||
| dt: ZonedDateTime, | ||
| relative: RelativeAdjustment, | ||
| ) -> Result<ZonedDateTime, error::Error> { | ||
| let seconds = relative | ||
| .hours | ||
| .checked_mul(3_600) | ||
| .and_then(|hours| { | ||
| relative | ||
| .minutes | ||
| .checked_mul(60) | ||
| .and_then(|minutes| hours.checked_add(minutes)) | ||
| }) | ||
| .and_then(|seconds| seconds.checked_add(relative.seconds)) | ||
| .ok_or("relative time overflow")?; | ||
| let extra_seconds = relative.nanoseconds.div_euclid(1_000_000_000); | ||
| let nanoseconds = relative.nanoseconds.rem_euclid(1_000_000_000); | ||
| let seconds = seconds | ||
| .checked_add(extra_seconds) | ||
| .ok_or("relative time overflow")?; | ||
| let nanoseconds = i32::try_from(nanoseconds).map_err(|_| "relative time overflow")?; | ||
| Ok(dt.checked_add(SignedDuration::new(seconds, nanoseconds))?) | ||
| } | ||
|
|
||
| impl TryFrom<Vec<Item>> for DateTimeBuilder { | ||
| type Error = &'static str; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the comment here and the one at the call site say the same thing, please keep only one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok