update third party libraries

2017-03-17 16:23:21 +01:00
parent ade8463e46
commit 513c256352
7 changed files with 15 additions and 16 deletions
--- a/pdb-keyword-db/build.gradle
+++ b/pdb-keyword-db/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'antlr'

 dependencies {
 	compile 'org.lucares:primitiveCollections:0.1.20170203201705'
-	runtime "org.antlr:antlr4:4.5.3"
-	antlr "org.antlr:antlr4:4.5.3"
+	runtime "org.antlr:antlr4:4.6"
+	antlr "org.antlr:antlr4:4.6"
 }

 sourceSets {
--- a/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4
+++ b/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4
@@ -10,8 +10,8 @@ expression
 	: prop=identifier eq=equal value=identifier       #propertyExpression
    | LPAREN expression RPAREN                       #parenExpression
 	| NOT expression                                 #notExpression
-    | left=expression op=and right=expression  #andExpression
-	| left=expression op=or right=expression #orExpression
+    | left=expression op_and=and right=expression  #andExpression
+	| left=expression op_or=or right=expression #orExpression
 ;
  
 identifier