Added support for open ended ranges

nielsbasjes · Nov 20, 2018 · cccde5f · cccde5f
1 parent d2f5ead
commit cccde5f
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 0 deletions.
diff --git a/analyzer/src/main/antlr4/nl/basjes/parse/useragent/parser/UserAgentTreeWalker.g4 b/analyzer/src/main/antlr4/nl/basjes/parse/useragent/parser/UserAgentTreeWalker.g4
@@ -107,6 +107,8 @@ path            : DOT numberRange name=VALUENAME  (nextStep=path)?  #stepDown
                 ;
 
 numberRange     : ( BRACEOPEN rangeStart=NUMBER MINUS rangeEnd=NUMBER BRACECLOSE ) #numberRangeStartToEnd
+                | ( BRACEOPEN                   MINUS rangeEnd=NUMBER BRACECLOSE ) #numberRangeOpenStartToEnd
+                | ( BRACEOPEN rangeStart=NUMBER MINUS                 BRACECLOSE ) #numberRangeStartToOpenEnd
                 | ( BRACEOPEN count=NUMBER BRACECLOSE )                            #numberRangeSingleValue
                 | ( BRACEOPEN STAR BRACECLOSE )                                    #numberRangeAll
                 | (  )                                                             #numberRangeEmpty

diff --git a/analyzer/src/main/java/nl/basjes/parse/useragent/analyze/NumberRangeVisitor.java b/analyzer/src/main/java/nl/basjes/parse/useragent/analyze/NumberRangeVisitor.java
@@ -26,8 +26,10 @@
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeAllContext;
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeContext;
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeEmptyContext;
+import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeOpenStartToEndContext;
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeSingleValueContext;
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeStartToEndContext;
+import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.NumberRangeStartToOpenEndContext;
 import static nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser.StepDownContext;
 
 public final class NumberRangeVisitor extends UserAgentTreeWalkerBaseVisitor<NumberRangeList> {
@@ -84,6 +86,20 @@ public NumberRangeList visitNumberRangeStartToEnd(NumberRangeStartToEndContext c
                 Integer.parseInt(ctx.rangeEnd.getText()));
     }
 
+    @Override
+    public NumberRangeList visitNumberRangeOpenStartToEnd(NumberRangeOpenStartToEndContext ctx) {
+        return new NumberRangeList(
+            1,
+            Integer.parseInt(ctx.rangeEnd.getText()));
+    }
+
+    @Override
+    public NumberRangeList visitNumberRangeStartToOpenEnd(NumberRangeStartToOpenEndContext ctx) {
+        return new NumberRangeList(
+            Integer.parseInt(ctx.rangeStart.getText()),
+            getMaxRange(ctx));
+    }
+
     @Override
     public NumberRangeList visitNumberRangeSingleValue(NumberRangeSingleValueContext ctx) {
         int value = Integer.parseInt(ctx.count.getText());

diff --git a/analyzer/src/test/java/nl/basjes/parse/useragent/analyze/TestTreewalkerExtract.java b/analyzer/src/test/java/nl/basjes/parse/useragent/analyze/TestTreewalkerExtract.java
@@ -52,6 +52,41 @@ public void validateWalkPathSimpleName() {
         checkPath(path, expectedHashEntries, expectedWalkList);
     }
 
+    @Test
+    public void validateWalkPathSimpleNameOpenStartRange() {
+        String path = "agent.(-3)product.(1)name";
+
+        String[] expectedHashEntries = {
+            "agent.(1)product.(1)name",
+            "agent.(2)product.(1)name",
+            "agent.(3)product.(1)name",
+        };
+
+        String[] expectedWalkList = {
+        };
+
+        checkPath(path, expectedHashEntries, expectedWalkList);
+    }
+
+    @Test
+    public void validateWalkPathSimpleNameOpenEndRange() {
+        String path = "agent.(5-)product.(1)name";
+
+        String[] expectedHashEntries = {
+            "agent.(5)product.(1)name",
+            "agent.(6)product.(1)name",
+            "agent.(7)product.(1)name",
+            "agent.(8)product.(1)name",
+            "agent.(9)product.(1)name",
+            "agent.(10)product.(1)name",
+        };
+
+        String[] expectedWalkList = {
+        };
+
+        checkPath(path, expectedHashEntries, expectedWalkList);
+    }
+
     @Test
     public void validateWalkPathSimpleNameEquals() {
         String path = "agent.(1)product.(1)name=\"Foo\"^.(1-3)version";

diff --git a/src/main/docs/Internals-MakingNewRules.md b/src/main/docs/Internals-MakingNewRules.md
@@ -227,6 +227,8 @@ Previous Sibling | < | agent.(2)product< | agent.(1)product
 Down to child | .name | agent.(1)product.version |
 Down to specific child | .(2)version | agent.(1)product.(2)version |
 Down to specific child range | .(2-3)version | agent.(1)product.(2-3)version |
+Down to specific child range | .(2-)version | agent.(1)product.(2-)version |
+Down to specific child range | .(-5)version | agent.(1)product.(-5)version |
 
 Comparing values in the tree