implement hooks, fix docs

1 files changed, 5 insertions, 5 deletions

diff --git a/rprt-engine/src/expression.rs b/rprt-engine/src/expression.rs
index 3bad172..195da80 100644
--- a/rprt-engine/src/expression.rs
+++ b/rprt-engine/src/expression.rs
@@ -15,8 +15,8 @@ pub enum Composite {
 
     Hook {
         kind: HookKind,
-        left: Box<Composite>,
-        right: Box<Composite>,
+        f: Box<Composite>,
+        g: Box<Composite>,
     },
 
     Train2 {
@@ -55,7 +55,7 @@ impl Display for Composite {
             TextFunction { func, swapped } => {
                 write!(fmtr, "{}{func}", if *swapped { "@" } else { "" })
             }
-            Hook { kind, left, right } => write!(fmtr, "({left}{kind}{right})"),
+            Hook { kind, f, g } => write!(fmtr, "({f}{kind}{g})"),
             Train2 { f, g } => write!(fmtr, "({f} {g})"),
             Train3 { f, g, h } => write!(fmtr, "({f} {g} {h})"),
             Group { operations } => {
@@ -211,12 +211,12 @@ mod tests {
             }),
             h: Box::new(Composite::Hook {
                 kind: HookKind::Before,
-                left: Box::new(Composite::SelectionFunction {
+                f: Box::new(Composite::SelectionFunction {
                     func: BuiltinSelectionFn::Empty,
                     result_transform: None,
                     search_mod: None,
                 }),
-                right: Box::new(Composite::TextFunction {
+                g: Box::new(Composite::TextFunction {
                     func: BuiltinTextFn::Delete,
                     swapped: false,
                 }),