From 08c930867859889045fda0b45029a37c789dff10 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Wed, 17 Nov 2021 10:06:04 +0200
Subject: Implement four function calc operators

---
 src/main.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index e540192..6874762 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,14 +43,25 @@ mod ast {
     #[derive(Debug, FromPest)]
     #[pest_ast(rule(Rule::expression))]
     pub struct Expression {
-        pub leaves: Vec<Leaf>,
+        pub nodes: Vec<ExpressionNode>,
     }
 
     #[derive(Debug, FromPest)]
-    #[pest_ast(rule(Rule::leaf))]
-    pub enum Leaf {
+    #[pest_ast(rule(Rule::expression_node))]
+    pub enum ExpressionNode {
         Symbol(Symbol),
+        Operator(Operator),
         IntegerLiteral(IntegerLiteral),
+        Expression(Expression),
+    }
+
+    #[derive(Debug, FromPest)]
+    #[pest_ast(rule(Rule::operator))]
+    pub enum Operator {
+        SumOp,
+        SubtractOp,
+        DivideOp,
+        MultiplyOp,
     }
 
     #[derive(Debug, FromPest)]
-- 
cgit v1.3