aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/oneroll
diff options
context:
space:
mode:
Diffstat (limited to 'src/oneroll')
-rw-r--r--src/oneroll/grammar.pest14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/oneroll/grammar.pest b/src/oneroll/grammar.pest
index e5ce667..ac017b7 100644
--- a/src/oneroll/grammar.pest
+++ b/src/oneroll/grammar.pest
@@ -29,6 +29,8 @@ modifier = {
| unique
| sort
| count
+ | merge
+ | group
}
explode = { "!" }
explode_alias = { "e" }
@@ -45,5 +47,15 @@ drop_low = { "dl" ~ number }
unique = { "u" }
sort = { "s" }
count = { "c" ~ number }
+merge = { "m" }
+group = { "g" ~ ("s")? ~ number }
+
op = { "+" | "-" | "*" | "/" | "^" }
-main = { SOI ~ dice_expr ~ EOI } \ No newline at end of file
+
+// Instruction sequences and variable references
+var_ref = { "$" ~ number ~ modifiers? }
+
+instruction = { dice_expr | var_ref }
+instruction_list = { instruction ~ (";" ~ instruction)* }
+
+main = { SOI ~ instruction_list ~ EOI } \ No newline at end of file