Fixed operator precedence for logical not (#58)

src/antlr4/Navi.g4

@@ -61,10 +61,10 @@ ifExpression:
 
 fieldAccessExpression: primaryExpression ('.' Identifier)*;
 
-unaryExpression: (OpMinus | Not)? fieldAccessExpression;
+negateExpression: OpMinus? fieldAccessExpression;
 
 multiplicativeExpression:
-	unaryExpression ((OpMult | OpDiv) unaryExpression)*;
+	negateExpression ((OpMult | OpDiv) negateExpression)*;
 
 additiveExpression:
 	multiplicativeExpression (
@@ -82,8 +82,10 @@ comparisonExpression:
 		(OpEqual | OpNotEqual | OpGt | OpGte | OpLt | OpLte) unionExpression
 	)?;
 
+logicalNotExpression: Not* comparisonExpression;
+
 logicalAndExpression:
-	comparisonExpression (And comparisonExpression)*;
+	logicalNotExpression (And logicalNotExpression)*;
 
 logicalOrExpression:
 	logicalAndExpression (Or logicalAndExpression)*;

src/antlr4/NaviListener.js

@@ -176,12 +176,12 @@ export default class NaviListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
-	// Enter a parse tree produced by NaviParser#unaryExpression.
-	enterUnaryExpression(ctx) {
+	// Enter a parse tree produced by NaviParser#negateExpression.
+	enterNegateExpression(ctx) {
 	}
 
-	// Exit a parse tree produced by NaviParser#unaryExpression.
-	exitUnaryExpression(ctx) {
+	// Exit a parse tree produced by NaviParser#negateExpression.
+	exitNegateExpression(ctx) {
 	}
 
 
@@ -230,6 +230,15 @@ export default class NaviListener extends antlr4.tree.ParseTreeListener {
 	}
 
 
+	// Enter a parse tree produced by NaviParser#logicalNotExpression.
+	enterLogicalNotExpression(ctx) {
+	}
+
+	// Exit a parse tree produced by NaviParser#logicalNotExpression.
+	exitLogicalNotExpression(ctx) {
+	}
+
+
 	// Enter a parse tree produced by NaviParser#logicalAndExpression.
 	enterLogicalAndExpression(ctx) {
 	}