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/grammar.pest |  7 ++++---
 src/main.rs      | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/grammar.pest b/src/grammar.pest
index e930511..333a58e 100644
--- a/src/grammar.pest
+++ b/src/grammar.pest
@@ -1,9 +1,10 @@
 WHITESPACE = _{ " " | "\t" }
-COMMENT = _{ "/*" ~ (!"*/" ~ ANY)* ~ "*/" }
+COMMENT = _{ "/*" ~ (!"*/" ~ ANY)* ~ "*/" ~ NEWLINE* }
 program = { SOI ~ statement+ ~ EOI }
 statement = { (definition | expression) ~ NEWLINE* }
 definition = { symbol+ ~ "=" ~ expression }
-expression = { leaf+ }
-leaf = { integer_literal | symbol }
+expression = { expression_node+ }
+expression_node = { integer_literal | operator | symbol | ("(" ~ expression ~ ")") }
+operator = { "+" | "-" | "/" | "*" }
 integer_literal = @{ "-"? ~ ASCII_DIGIT+ }
 symbol = @{ ASCII_ALPHA ~ (ASCII_ALPHANUMERIC | "-" | ".")* }
\ No newline at end of file
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