From ee10dddb811d7e28ad29a5a5838e2b88236e462e Mon Sep 17 00:00:00 2001 From: Gideon le Grange Date: Tue, 7 Oct 2014 15:38:16 +0200 Subject: [PATCH] Cleanups --- src/main/java/me/legrange/mikrotik/grammar.txt | 3 ++- src/main/java/me/legrange/mikrotik/impl/Response.java | 2 +- src/main/java/me/legrange/mikrotik/impl/ScanException.java | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/legrange/mikrotik/grammar.txt b/src/main/java/me/legrange/mikrotik/grammar.txt index 9868188..fe68add 100644 --- a/src/main/java/me/legrange/mikrotik/grammar.txt +++ b/src/main/java/me/legrange/mikrotik/grammar.txt @@ -1,11 +1,12 @@ command = action [ query ] [ return ] action = ("/" word)+ query = "where" expr -expr = expr "and" expr | expr "or" expr | "not" expr | hasExpr | eqExpr | lessExpr | moreExpr +expr = expr "and" expr | expr "or" expr | "not" expr | hasExpr | eqExpr | lessExpr | moreExpr | notExpr hasExpr = name eqExpr = name "=" value lessExpr = name "<" value moreExpr = name ">" value +notExpr = name "!=" value return = "return" (name)+ diff --git a/src/main/java/me/legrange/mikrotik/impl/Response.java b/src/main/java/me/legrange/mikrotik/impl/Response.java index 6e9b592..ca59fbe 100644 --- a/src/main/java/me/legrange/mikrotik/impl/Response.java +++ b/src/main/java/me/legrange/mikrotik/impl/Response.java @@ -24,5 +24,5 @@ abstract class Response { this.tag = tag; } - private String tag; + private String tag; } diff --git a/src/main/java/me/legrange/mikrotik/impl/ScanException.java b/src/main/java/me/legrange/mikrotik/impl/ScanException.java index 01b6cb0..57aea6b 100644 --- a/src/main/java/me/legrange/mikrotik/impl/ScanException.java +++ b/src/main/java/me/legrange/mikrotik/impl/ScanException.java @@ -14,6 +14,4 @@ public class ScanException extends ParseException { super(msg, err); } - - }