Don't assume relative_time_suffix_anchor is present. Fixes #128

joestelmach · May 13, 2015 · 57b7fec · 57b7fec
1 parent 84ac3a1
commit 57b7fec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g b/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g
@@ -616,11 +616,11 @@ relative_date_suffix
 relative_time_suffix
   // from now, after today, before noon, after 4pm
   : (FROM | AFTER) (WHITE_SPACE relative_time_suffix_anchor)?
-      -> DIRECTION[">"] SEEK_BY["by_day"] relative_time_suffix_anchor
+      -> DIRECTION[">"] SEEK_BY["by_day"] relative_time_suffix_anchor?
 
   // before noon, before 3pm
   | BEFORE (WHITE_SPACE relative_time_suffix_anchor)?
-      -> DIRECTION["<"] SEEK_BY["by_day"] relative_time_suffix_anchor
+      -> DIRECTION["<"] SEEK_BY["by_day"] relative_time_suffix_anchor?
 
   | AGO 
       -> DIRECTION["<"] SEEK_BY["by_day"]

diff --git a/src/test/java/com/joestelmach/natty/DateTest.java b/src/test/java/com/joestelmach/natty/DateTest.java
@@ -360,9 +360,7 @@ public void testRelativeDateDifferentTimezone() {
 
   public static void main(String[] args) {
 
-    String value="5.30pm";
-    value = "this friday.";
-    value = "I want to plan a get-together with my friends for this Friday.";
+    String value="...all the backstory I needed in the first two minutes. From there, I....";
 
     org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
 

diff --git a/src/test/java/com/joestelmach/natty/SearchTest.java b/src/test/java/com/joestelmach/natty/SearchTest.java
@@ -290,6 +290,12 @@ public void test() throws Exception {
     dates = groups.get(0).getDates();
     Assert.assertEquals(1, dates.size());
     validateDate(dates.get(0), 11, 21, 2014);
+
+    groups = parser.parse("...all the backstory I needed in the first two minutes. From there, I....");
+    Assert.assertEquals(1, groups.size());
+    dates = groups.get(0).getDates();
+    Assert.assertEquals(1, dates.size());
+    validateDateTime(dates.get(0), 2, 20, 2011, 0, 2, 0);
   }
 
   @Test