Merge branch 'master' of github.com:Rolisteam/DiceParser

2 files changed, 32 insertions, 21 deletions

diff --git a/HelpMe.md b/HelpMe.md
index d2a12a0..b7a7db8 100644
--- a/HelpMe.md
+++ b/HelpMe.md
@@ -170,20 +170,20 @@ There is also 2 optional parameters
 
 > i*[]{}{}
 
-\* : the compare method
-[] : the validator
-{} : the true instruction
-{} : the false instruction
+* \* : the compare method
+* [] : the validator
+* {} : the true instruction
+* {} : the false instruction
 
 ## Compare method
 
 There are 3 different methods.
-* On Each : the condition is tested on each die from the previous part of the command. \[Default method\]
-* All Of Them : All dice must fit the condition to trigger the true instruction. If all dice do not fit the condition the false instruction is run.
-* One Of Them : at least one die must fit the condition to trigger the true instruction. If no dices fit the condition the false instruction is run.
+* **On Each** : the condition is tested on each die from the previous part of the command. \[Default method\]
+* **All Of Them** : All dice must fit the condition to trigger the true instruction. If all dice do not fit the condition the false instruction is run.
+* **One Of Them** : at least one die must fit the condition to trigger the true instruction. If no dices fit the condition the false instruction is run.
 
-To switch the operator to act in '''All Of Them''' method you must add '*' character as compare method position.
-To switch the operator to act in '''One Of Them''' method you must add '.' character as compare method position.
+To switch the operator to act in **All Of Them** method you must add **\*** character as compare method position.
+To switch the operator to act in **One Of Them** method you must add **.** character as compare method position.
 
 
 ## example:
diff --git a/README.md b/README.md
index a0031a6..0746586 100644
--- a/README.md
+++ b/README.md
@@ -3,26 +3,37 @@
 
 # DiceParser
 
-
-
 Rolisteam Dice Parser
 
 ## Grammar
 The grammar is something like this:
 
+```
 Command =: Expression
-
-Expression =: number | number Dice | ScalarOperator Expression
-
-Dice =: DiceOperator Number(faces)
-
-DiceOperator =: D
-
+Expression =: number | number Dice DiceOperation | ScalarOperator Expression | string
+Dice =: DiceOperator Number(faces) | DiceOperator ListOfValues
+DiceOperator =: D | L
+DiceOperation =: Keep | KeepAndExplose | sort | if | explose | jumpbackward | merge | filter | parenthese | count
 ScalarOperator =: [x,-,*,x,/]
-
 number =: [0-9]+
-
-Validator =: number | [operator number] | [ number - number ]
+Validator =: BooleanValidator | RangeValidator | CompositeValidator
+CompositeValidator =: Validator LogicOpetator Validator
+LogicOpetator =: = | > | => | < | =<
+RangeValidator =: [ number - number ]
+BooleanValidator =: number | [operator number] |
+ListOfValue=: String[Range],ListOfValue | String[Range]
+String =: [A-z0-9]+
+Keep =: k Number
+KeepAndExplose =: K number
+sort =: s
+if =: i compareMethod [Validator] {Expression}
+explose =: e Validator
+jumpbackward =: @DiceOperation
+merge =: m | m Expression
+filter =: f Validator
+parenthese =: (expression)
+count =: c Validator
+```
 
 
 ## Example: