From 877bb44c3e0a892fb520cc802894e3c70265809a Mon Sep 17 00:00:00 2001
From: Raymon Zutekouw <40148684+Raymonzut@users.noreply.github.com>
Date: Sat, 1 Jan 2022 18:31:06 +0100
Subject: [PATCH] Cleanup grammar file

- Formatting
- Remove generic `operator` and `operand`
  - used for testing
---
 src/grammars/mblf.pest | 41 ++++++++++++++++++-----------------------
 src/main.rs            |  7 -------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/grammars/mblf.pest b/src/grammars/mblf.pest
index b58494b..24d4788 100644
--- a/src/grammars/mblf.pest
+++ b/src/grammars/mblf.pest
@@ -1,6 +1,3 @@
-operator       = @{ "operator" } // TODO
-operand        = @{ "operand" }  // TODO
-
 wordSeperator  =_{ " " | "-" | "_" }
 variable       =@{ ASCII_ALPHA
                  ~ (ASCII_ALPHANUMERIC | wordSeperator)*
@@ -16,21 +13,21 @@ path           = { "\"" ~ (!"\"" ~ ANY)+ ~ "\"" }
 
 include        =@{ "#include" ~ spacing+ ~ path }
 
-var            =@{ "var"    ~ spacing+ ~ variable }
-delvar         =@{ "delvar" ~ spacing+ ~ variable }
+var            =@{ "var"      ~ spacing+ ~ variable }
+delvar         =@{ "delvar"   ~ spacing+ ~ variable }
 
-point          =@{ "point"  ~ spacing+ ~ variable }
-pointm         =@{ "pointm" ~ spacing+ ~ variable }
+point          =@{ "point"    ~ spacing+ ~ variable }
+pointm         =@{ "pointm"   ~ spacing+ ~ variable }
 
-add            =@{ "add"    ~ spacing+ ~ constant }
-addb           =@{ "addb"   ~ spacing+ ~ constant }
-addv           =@{ "addv"   ~ spacing+ ~ variable }
+add            =@{ "add"      ~ spacing+ ~ constant }
+addb           =@{ "addb"     ~ spacing+ ~ constant }
+addv           =@{ "addv"     ~ spacing+ ~ variable }
 
-sub            =@{ "sub"    ~ spacing+ ~ constant }
-subb           =@{ "subb"   ~ spacing+ ~ constant }
-subv           =@{ "subv"   ~ spacing+ ~ variable }
+sub            =@{ "sub"      ~ spacing+ ~ constant }
+subb           =@{ "subb"     ~ spacing+ ~ constant }
+subv           =@{ "subv"     ~ spacing+ ~ variable }
 
-copy           =@{ "copy"   ~ spacing+ ~ variable }
+copy           =@{ "copy"     ~ spacing+ ~ variable }
 setz           =@{ "setz" }
 
 getchr         =@{ "getchr" }
@@ -58,8 +55,6 @@ instruction    =_{ macaroo
 
                  | getchr
                  | print
-
-                 | operator ~ (spacing+ ~ operand)?
                  }
 
 loopBlockStart = { "[" ~ NEWLINE }
@@ -69,13 +64,13 @@ loopBlock      = { loopBlockStart
                  ~ spacing* ~ loopBlockEnd
                  }
 
-statement      = _{ spacing*
-                  ~ (instruction | loopBlock)
-                  }
+statement      =_{ spacing*
+                 ~ (instruction | loopBlock)
+                 }
 
-statements     = _{ (statement | NEWLINE)* }
+statements     =_{ (statement | NEWLINE)* }
 
-spacing        = _{ " "  | "\t" }
-COMMENT        = _{ ";;" ~ (!NEWLINE ~ ANY)* ~ NEWLINE}
+spacing        =_{ " "  | "\t" }
+COMMENT        =_{ ";;" ~ (!NEWLINE ~ ANY)* ~ NEWLINE }
 
-file = {SOI ~ (statement ~ NEWLINE+)* ~ EOI}
+file           = { SOI ~ (statement ~ NEWLINE+)* ~ EOI }
diff --git a/src/main.rs b/src/main.rs
index 97528ff..1f244d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -141,13 +141,6 @@ fn instruct(statement: Pair<Rule>, out: &mut Builder) {
         Rule::instruction => {
             out.append("\n");
         }
-        Rule::operator => {
-            out.append("operator ");
-        }
-        Rule::operand => {
-            out.append("operand ");
-        }
-
         Rule::loopBlock => {
             for nested_statement in statement.into_inner() {
                 instruct(nested_statement, out);