Skip to content
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.

Sign up for GitHub

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

Include prefix + in numbers (all lang) #186

Merged
merged 4 commits into from
Jul 10, 2019
Merged

Include prefix + in numbers (all lang) #186

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74a9d1a
Include prefix + in numbers (all lang)
JohannaSimoens Jul 4, 2019
89a0c1c
Merge branch 'develop' into fix/number-include-plus-prefix
adrienball Jul 10, 2019
6c075e4
Add training examples (all lang)
JohannaSimoens Jul 10, 2019
ba6f791
merge
JohannaSimoens Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions grammar/de/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,6 +2339,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("numbers suffixes (K, M, G)",
number_check!(|number: &NumberValue| !number.suffixed()),
b.reg_neg_lh(r#"([kmg])"#, r#"^[^\W\$€]"#)?,
Expand Down
23 changes: 23 additions & 0 deletions grammar/en/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,6 +2091,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("numbers suffixes (K, M, G)",
number_check!(|number: &NumberValue| !number.suffixed()),
b.reg_neg_lh(r#"([kmg])"#, r#"^[^\W\$€]"#)?,
Expand Down
23 changes: 23 additions & 0 deletions grammar/es/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("numbers suffixes (K, M, G)",
number_check!(|number: &NumberValue| !number.suffixed()),
b.reg_neg_lh(r#"([kmg])"#, r#"^[\W\$€]"#)?,
Expand Down
23 changes: 23 additions & 0 deletions grammar/fr/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("numbers suffixes (K, M, G)",
number_check!(|number: &NumberValue| !number.suffixed()),
b.reg_neg_lh(r#"([kmg])"#, r#"^[\W\$€]"#)?,
Expand Down
24 changes: 23 additions & 1 deletion grammar/it/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});

b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("numbers suffixes (K, M, G)",
number_check!(|number: &NumberValue| !number.suffixed()),
b.reg_neg_lh(r#"([kmg])"#, r#"^[\W\$€]"#)?,
Expand Down
23 changes: 23 additions & 0 deletions grammar/ja/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
Ok(())
}

Expand Down
23 changes: 23 additions & 0 deletions grammar/ko/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,6 +1537,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
})
}
);
b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_2("ordinals (첫번째)",
integer_check!(),
b.reg(r#"번째|째|째번"#)?,
Expand Down
25 changes: 23 additions & 2 deletions grammar/pt/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,8 +2153,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});


b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_1_terminal("ordinals (primeiro..9)",
b.reg(r#"(primeir|segund|terceir|quart|quint|sext|s[eéè]tim|oitav|non)(?:[oa]s?)?"#)?,
|text_match| {
Expand Down
24 changes: 23 additions & 1 deletion grammar/zh/src/rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,29 @@ pub fn rules_numbers(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
}
})
});

b.rule_2("numbers prefix with +, positive",
b.reg(r#"\+"#)?,
number_check!(|number: &NumberValue| !number.prefixed()),
|_, a| -> RuleResult<NumberValue> {
Ok(match a.value().clone() {
// checked
NumberValue::Integer(integer) => {
IntegerValue {
prefixed: true,
..integer
}
.into()
}
NumberValue::Float(float) => {
FloatValue {
prefixed: true,
..float
}
.into()
}
})
}
);
b.rule_1_terminal("decimal with thousands separator",
b.reg(r#"(\d+(,\d\d\d)+\.\d+)"#)?,
|text_match| {
Expand Down