Merge pull request #191 from snipsco/task/fr-new-spec-dt-enhancement-…

…rebase

Task/fr new spec dt

grammar/en/src/lib.rs

@@ -23,7 +23,7 @@ pub fn rule_set() -> ::rustling::RustlingResult<::rustling::RuleSet<rustling_ont
     rules_datetime::rules_cycle(&mut b)?;
     rules_datetime::rules_datetime(&mut b)?;
     rules_datetime::rules_datetime_with_duration(&mut b)?;
-    rules_datetime::rules_datetime_with_nth_cycle(&mut b)?;
+    rules_datetime::rules_datetime_with_cycle(&mut b)?;
     rules_celebrations::rules_celebration(&mut b)?;
     rules_duration::rules_duration(&mut b)?;
     Ok(b.build())

grammar/en/src/rules_datetime.rs

@@ -1266,7 +1266,8 @@ pub fn rules_datetime_with_duration(b: &mut RuleSetBuilder<Dimension>) -> Rustli
 
 }
 
-pub fn rules_datetime_with_nth_cycle(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
+// FIXME: rename "rules_datetime_with_cycle"
+pub fn rules_datetime_with_cycle(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
 
     b.rule_2("this <cycle>",
              b.reg(r#"this|current|coming"#)?,

grammar/fr/src/lib.rs

@@ -3,7 +3,11 @@ extern crate rustling;
 extern crate rustling_ontology_values;
 extern crate rustling_ontology_moment;
 
-pub mod rules;
+mod rules_datetime;
+mod rules_celebrations;
+mod rules_duration;
+mod rules_number;
+mod rules_amount;
 pub mod training;
 
 use rustling_ontology_values::DimensionKind::*;
@@ -12,13 +16,16 @@ pub fn rule_set() -> ::rustling::RustlingResult<::rustling::RuleSet<rustling_ont
     let mut b = ::rustling::RuleSetBuilder::new(
                     ::rustling::BoundariesChecker::detailed(),
                     ::rustling::BoundariesChecker::separated_alphanumeric_word());
-    rules::rules_numbers(&mut b)?;
-    rules::rules_datetime(&mut b)?;
-    rules::rules_cycle(&mut b)?;
-    rules::rules_duration(&mut b)?;
-    rules::rules_temperature(&mut b)?;
-    rules::rules_finance(&mut b)?;
-    rules::rules_percentage(&mut b)?;
+    rules_number::rules_numbers(&mut b)?;
+    rules_amount::rules_temperature(&mut b)?;
+    rules_amount::rules_finance(&mut b)?;
+    rules_amount::rules_percentage(&mut b)?;
+    rules_datetime::rules_cycle(&mut b)?;
+    rules_datetime::rules_datetime(&mut b)?;
+    rules_datetime::rules_datetime_with_duration(&mut b)?;
+    rules_datetime::rules_datetime_with_cycle(&mut b)?;
+    rules_celebrations::rules_celebration(&mut b)?;
+    rules_duration::rules_duration(&mut b)?;
     Ok(b.build())
 }