Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

refactor(core): introduce SequenceExpr::number() constructor (#3732)

Andrew Dunbar8ef2c447054e
diff --git a/harper-core/src/expr/duration_expr.rs b/harper-core/src/expr/duration_expr.rs
index 85b24c674..05610ac92 100644
--- a/harper-core/src/expr/duration_expr.rs
+++ b/harper-core/src/expr/duration_expr.rs
@@ -31,7 +31,7 @@ impl Expr for DurationExpr {
let expr = SequenceExpr::longest_of([
Box::new(SpelledNumberExpr) as Box<dyn Expr>,
- Box::new(SequenceExpr::default().then_number()),
+ Box::new(SequenceExpr::number()),
Box::new(IndefiniteArticle::default()),
Box::new(a_couple_of),
Box::new(a_few),
diff --git a/harper-core/src/expr/sequence_expr.rs b/harper-core/src/expr/sequence_expr.rs
index b4307a3c6..22b79ea26 100644
--- a/harper-core/src/expr/sequence_expr.rs
+++ b/harper-core/src/expr/sequence_expr.rs
@@ -120,6 +120,11 @@ impl SequenceExpr {
Self::default().then_any_word()
}
+ /// Match any number.
+ pub fn number() -> Self {
+ Self::default().then_number()
+ }
+
// Expressions of more than one token
/// Optionally match an expression.
diff --git a/harper-core/src/linting/hyphenate_number_day.rs b/harper-core/src/linting/hyphenate_number_day.rs
index 8e4013b32..b2bb32246 100644
--- a/harper-core/src/linting/hyphenate_number_day.rs
+++ b/harper-core/src/linting/hyphenate_number_day.rs
@@ -11,8 +11,7 @@ pub struct HyphenateNumberDay {
impl Default for HyphenateNumberDay {
fn default() -> Self {
- let pattern = SequenceExpr::default()
- .then_number()
+ let pattern = SequenceExpr::number()
.then_whitespace()
.t_aco("day")
.then_longest_of(vec![
diff --git a/harper-core/src/linting/numeric_range_en_dash.rs b/harper-core/src/linting/numeric_range_en_dash.rs
index 547e1a1c1..b2bfbb68e 100644
--- a/harper-core/src/linting/numeric_range_en_dash.rs
+++ b/harper-core/src/linting/numeric_range_en_dash.rs
@@ -60,10 +60,7 @@ impl Default for NumericRangeEnDash {
// Match isolated numeric ranges like `12-14` or `3—5`.
// The context check below skips dates, version chains, and similar
// multipart numeric forms that should keep their existing separators.
- let pattern = SequenceExpr::default()
- .then_number()
- .then(is_target_dash)
- .then_number();
+ let pattern = SequenceExpr::number().then(is_target_dash).then_number();
Self { expr: pattern }
}
diff --git a/harper-core/src/linting/soon_to_be.rs b/harper-core/src/linting/soon_to_be.rs
index 42cfbc753..fae30c231 100644
--- a/harper-core/src/linting/soon_to_be.rs
+++ b/harper-core/src/linting/soon_to_be.rs
@@ -31,8 +31,7 @@ impl Default for SoonToBe {
};
let hyphenated_number_modifier = || {
- SequenceExpr::default()
- .then_number()
+ SequenceExpr::number()
.then_hyphen()
.then_nominal()
.then_optional(SequenceExpr::default().then_hyphen().then_adjective())