Changeset 16260 in josm for trunk

Timestamp:

2020-04-11T17:37:01+02:00 (4 years ago)

Author:

simon04

Message:

fix #19070 - SearchCompiler: regexp comparison using <tilde>

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/search/PushbackTokenizer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/search/PushbackTokenizer.java

@@ -108 +108 @@
         EQUALS(marktr("<equals>")),
         /**
+         * The tilde sign (~)
+         */
+        TILDE(marktr("<tilde>")),
+        /**
          * A text
          */
@@ -148 +152 @@
     }
 
-    private static final List<Character> SPECIAL_CHARS = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>');
+    private static final List<Character> SPECIAL_CHARS = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '~', '?', '<', '>');
     private static final List<Character> SPECIAL_CHARS_QUOTED = Arrays.asList('"');
 
@@ -200 +204 @@
             getChar();
             return Token.EQUALS;
+        case '~':
+            getChar();
+            return Token.TILDE;
         case '<':
             getChar();

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -2119 +2119 @@
             if (tokenizer.readIfEqual(Token.EQUALS)) {
                 return new ExactKeyValue(regexSearch, key, tokenizer.readTextOrNumber());
+            } else if (tokenizer.readIfEqual(Token.TILDE)) {
+                return new ExactKeyValue(true, key, tokenizer.readTextOrNumber());
             } else if (tokenizer.readIfEqual(Token.LESS_THAN)) {
                 return new ValueComparison(key, tokenizer.readTextOrNumber(), -1);

trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java

@@ -294 +294 @@
                 .addKeyword("<i>key</i>", null, tr("matches if ''key'' exists"))
                 .addKeyword("<i>key</i>=<i>value</i>", null, tr("''key'' with exactly ''value''"))
+                .addKeyword("<i>key</i>~<i>regexp</i>", null, tr("value of ''key'' matching the regular expression ''regexp''"))
                 .addKeyword("<i>key</i>=*", null, tr("''key'' with any value"))
                 .addKeyword("<i>key</i>=", null, tr("''key'' with empty value"))

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -142 +142 @@
 
     /**
+     * Search by regular expression: key~value.
+     * @throws SearchParseError if an error has been encountered while compiling
+     */
+    @Test
+    public void testRegexp() throws SearchParseError {
+        final SearchCompiler.Match c = SearchCompiler.compile("foo~[Bb]a[rz]");
+        assertFalse(c.match(newPrimitive("foobar", "true")));
+        assertFalse(c.match(newPrimitive("foo", "foo")));
+        assertTrue(c.match(newPrimitive("foo", "bar")));
+        assertTrue(c.match(newPrimitive("foo", "baz")));
+        assertTrue(c.match(newPrimitive("foo", "Baz")));
+        assertEquals("foo=[Bb]a[rz]", c.toString());
+    }
+
+    /**
      * Search by comparison.
      * @throws SearchParseError if an error has been encountered while compiling