Added since X timeunit

Author: Bytekeeper

src/main/antlr/EnglishCommands.g4

@@ -47,11 +47,11 @@ agoFormat returns [DateTime result]
 @init {
 	$result = DateTime.now();
 }
-: amount=NUMBER (
+: SINCE? amount=NUMBER (
 	 	HOURS {$result = $result.minusHours($amount.int); }
 	| 	MINUTES {$result = $result.minusMinutes($amount.int); } 
 	| 	SECONDS {$result = $result.minusSeconds($amount.int); }
-	) AGO;
+	) AGO?;
 
 date: NUMBER (DOT|MINUS) NUMBER (DOT|MINUS) NUMBER;
 

src/test/java/org/stt/g4/EnglishCommandsTest.java

@@ -41,6 +41,17 @@ public void shouldParseHrsAgoCommand() {
 		System.out.println(command.newItem);
 	}
 
+	@Test
+	public void shouldParseSinceHrsAgoCommand() {
+		String commandToParse = "test 1 since 2 hrs ago";
+		CharStream input = new ANTLRInputStream(commandToParse);
+		EnglishCommandsLexer lexer = new EnglishCommandsLexer(input);
+		EnglishCommandsParser parser = new EnglishCommandsParser(
+				new CommonTokenStream(lexer));
+		CommandContext command = parser.command();
+		System.out.println(command.newItem);
+	}
+
 	@Test
 	public void shouldParseSinceCommand() {
 		String commandToParse = "test 1 since 10:00:00";