raymon/mblf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup grammar file

Browse Source 
- Formatting
- Remove generic `operator` and `operand`
  - used for testing
This commit is contained in:
raymon
2022-01-01 18:31:06 +01:00
committed by Raymon Zutekouw
parent c0b052cf5c
commit 4c78808d90
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/grammars/mblf.pest
+18 -23
View File
@@ -1,6 +1,3 @@
operator = @{ "operator" } // TODO
operand = @{ "operand" } // TODO
wordSeperator =_{ " " | "-" | "_" } wordSeperator =_{ " " | "-" | "_" }
variable =@{ ASCII_ALPHA variable =@{ ASCII_ALPHA
~ (ASCII_ALPHANUMERIC | wordSeperator)* ~ (ASCII_ALPHANUMERIC | wordSeperator)*
@@ -16,21 +13,21 @@ path = { "\"" ~ (!"\"" ~ ANY)+ ~ "\"" }
include =@{ "#include" ~ spacing+ ~ path } include =@{ "#include" ~ spacing+ ~ path }
var =@{ "var" ~ spacing+ ~ variable } var =@{ "var" ~ spacing+ ~ variable }
delvar =@{ "delvar" ~ spacing+ ~ variable } delvar =@{ "delvar" ~ spacing+ ~ variable }
point =@{ "point" ~ spacing+ ~ variable } point =@{ "point" ~ spacing+ ~ variable }
pointm =@{ "pointm" ~ spacing+ ~ variable } pointm =@{ "pointm" ~ spacing+ ~ variable }
add =@{ "add" ~ spacing+ ~ constant } add =@{ "add" ~ spacing+ ~ constant }
addb =@{ "addb" ~ spacing+ ~ constant } addb =@{ "addb" ~ spacing+ ~ constant }
addv =@{ "addv" ~ spacing+ ~ variable } addv =@{ "addv" ~ spacing+ ~ variable }
sub =@{ "sub" ~ spacing+ ~ constant } sub =@{ "sub" ~ spacing+ ~ constant }
subb =@{ "subb" ~ spacing+ ~ constant } subb =@{ "subb" ~ spacing+ ~ constant }
subv =@{ "subv" ~ spacing+ ~ variable } subv =@{ "subv" ~ spacing+ ~ variable }
copy =@{ "copy" ~ spacing+ ~ variable } copy =@{ "copy" ~ spacing+ ~ variable }
setz =@{ "setz" } setz =@{ "setz" }
getchr =@{ "getchr" } getchr =@{ "getchr" }
@@ -58,8 +55,6 @@ instruction =_{ macaroo
| getchr | getchr
| print | print
| operator ~ (spacing+ ~ operand)?
} }
loopBlockStart = { "[" ~ NEWLINE } loopBlockStart = { "[" ~ NEWLINE }
@@ -69,13 +64,13 @@ loopBlock = { loopBlockStart
~ spacing* ~ loopBlockEnd ~ spacing* ~ loopBlockEnd
} }
statement = _{ spacing* statement =_{ spacing*
~ (instruction | loopBlock) ~ (instruction | loopBlock)
} }
statements = _{ (statement | NEWLINE)* } statements =_{ (statement | NEWLINE)* }
spacing = _{ " " | "\t" } spacing =_{ " " | "\t" }
COMMENT = _{ ";;" ~ (!NEWLINE ~ ANY)* ~ NEWLINE} COMMENT =_{ ";;" ~ (!NEWLINE ~ ANY)* ~ NEWLINE }
file = {SOI ~ (statement ~ NEWLINE+)* ~ EOI} file = { SOI ~ (statement ~ NEWLINE+)* ~ EOI }
src/main.rs
-7
View File
@@ -141,13 +141,6 @@ fn instruct(statement: Pair<Rule>, out: &mut Builder) {
Rule::instruction => { Rule::instruction => {
out.append("\n"); out.append("\n");
} }
Rule::operator => {
out.append("operator ");
}
Rule::operand => {
out.append("operand ");
}
Rule::loopBlock => { Rule::loopBlock => {
for nested_statement in statement.into_inner() { for nested_statement in statement.into_inner() {
instruct(nested_statement, out); instruct(nested_statement, out);