Merge pull request #20 from anboralabs/operators

Operators

Author: dalgarins

build.gradle

@@ -12,7 +12,7 @@ grammarKit {
 }
 
 group 'co.anbora.labs'
-version '1.1.3-SNAPSHOT'
+version '1.1.4-SNAPSHOT'
 
 repositories {
     mavenCentral()
@@ -51,7 +51,7 @@ sourceSets.main.java.srcDirs 'src/main/gen'
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = '2020.2.2'
+    version = 'IU-2020.2.2'
 }
 
 buildPlugin {
@@ -65,6 +65,12 @@ publishPlugin {
 patchPluginXml {
     changeNotes """
       <ul>
+          <li><b>1.1.4</b> <em>(2020-11-19)</em> - Added operators support</li>
+              <ul>
+                  <li>Added operation with numbers support: +, -, *, / </li>
+                  <li>Added operation with strings support: +, * </li>
+              </ul>
+          </li>
           <li><b>1.1.3</b> <em>(2020-11-19)</em> - comments issue</li>
               <ul>
                   <li>Fixed false positive with comments in match body statement</li>

src/main/grammar/FirebaseRules.bnf

@@ -93,7 +93,15 @@ Expression ::= BooleanStatement
 
 ArrayLiteralStatement ::= LB (ParameterStatement|ArrayLiteralStatement) RB
 
-LiteralStatement ::= (number|string)
+LiteralStatement ::= (NumberLiteralStatement|StringLiteralStatement)
+
+NumberLiteralStatement ::= number (NumberOperator number)*
+
+StringLiteralStatement ::= string (StringOperator string)*
+
+StringOperator ::= (PLUS_OP|MULT_OP)
+
+NumberOperator ::= (PLUS_OP|MINUS_OP|MULT_OP|SLASH)
 
 NullStatement ::= NULL_KEYWORD
 

src/main/grammar/FirebaseRules.flex

@@ -77,6 +77,10 @@ PATH_BUILT_IN=[$][(][a-zA-Z_\-0-9]+[a-zA-Z_\.\-0-9]*[)]
   ">"                { return GT; }
   ">="               { return GE; }
 
+  "+"                { return PLUS_OP; }
+  "-"                { return MINUS_OP; }
+  "*"                { return MULT_OP; }
+
   "("                { return LP; }
   ")"                { return RP; }
   "["                { return LB; }