finance rules WIP

Author: hdlj

src/dimension.rs

@@ -48,14 +48,14 @@ impl Default for Precision {
     }
 }
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Copy, Clone, Default)]
 pub struct AmountOfMoneyValue {
     pub value: f32,
     pub precision: Precision,
     pub unit: Option<&'static str>
 }
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Copy, Clone, Default)]
 pub struct MoneyUnitValue {
     pub unit: Option<&'static str>,
 }

src/en.rs

@@ -4,7 +4,7 @@ use dimension::Precision::*;
 use helpers;
 use examples::*;
 
-
+#[allow(dead_code)]
 pub fn rules_finance() -> DucklingResult<RuleSet<Dimension>> {
     Ok(RuleSet(vec![
         rule! {
@@ -13,11 +13,29 @@ pub fn rules_finance() -> DucklingResult<RuleSet<Dimension>> {
                 amount_of_money_check!(),
                 amount_of_money_check!(|money: &AmountOfMoneyValue| money.unit == Some("cent"))
             ),
-            |a, b| Ok(*a.value())
+            |a, b| helpers::compose_money(a.value(), b.value())
+        },
+        rule! {
+            "intersect (and X cents)",
+            (
+                amount_of_money_check!(),
+                regex!(r#"and"#),
+                amount_of_money_check!(|money: &AmountOfMoneyValue| money.unit == Some("cent"))
+            ),
+            |a, _, b| helpers::compose_money(&a.value(), &b.value())
+        },
+        rule! {
+            "intersect",
+            (
+                amount_of_money_check!(),
+                number_check!()
+            ),
+            |a, b|  helpers::compose_money_number(&a.value(), &b.value())
         }
     ]))
 }
 
+#[allow(dead_code)]
 pub fn rules_temperature() -> DucklingResult<RuleSet<Dimension>> {
     Ok(RuleSet(vec![
         rule! { 

src/fr.rs

@@ -2,6 +2,7 @@ use rustling::*;
 use dimension::*;
 use examples;
 
+#[allow(dead_code)]
 pub fn rules_temperature() -> DucklingResult<RuleSet<Dimension>> {
     Ok(RuleSet(vec![
         rule! { 

src/helpers.rs

@@ -14,3 +14,13 @@ pub fn compose_numbers(a: &NumberValue, b: &NumberValue) -> RuleResult<NumberVal
         Err(RuleErrorKind::Invalid.into())
     }
 }
+
+pub fn compose_money(a: &AmountOfMoneyValue, b: &AmountOfMoneyValue) -> RuleResult<AmountOfMoneyValue> {
+    let amount = a.value + b.value / 100.0;
+    Ok(AmountOfMoneyValue { value: amount, unit: a.unit, .. AmountOfMoneyValue::default() })
+}
+
+pub fn compose_money_number(a: &AmountOfMoneyValue, b: &NumberValue) -> RuleResult<AmountOfMoneyValue> {
+    let amount = a.value + b.value() / 100.0;
+    Ok(AmountOfMoneyValue { value: amount, unit: a.unit, .. AmountOfMoneyValue::default() })
+}