Changeset 6429 in josm for trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

Timestamp:

2013-11-30T23:37:57+01:00 (11 years ago)

Author:

simon04

Message:

fix #8850 - search: support less/greater-than, e.g., start_date>1950

File:

• trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

@@ -59 +59 @@
         RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
         KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")),
-        EOF(marktr("<end-of-file>"));
+        EOF(marktr("<end-of-file>")), LESS_THAN("<less-than>"), GREATER_THAN("<greater-than>");
 
         private Token(String name) {
@@ -82 +82 @@
     }
 
-    private static final List<Character> specialChars = Arrays.asList(new Character[] {'"', ':', '(', ')', '|', '^', '=', '?'});
-    private static final List<Character> specialCharsQuoted = Arrays.asList(new Character[] {'"'});
+    private static final List<Character> specialChars = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>');
+    private static final List<Character> specialCharsQuoted = Arrays.asList('"');
 
     private String getString(boolean quoted) {
@@ -134 +134 @@
             getChar();
             return Token.EQUALS;
+        case '<':
+            getChar();
+            return Token.LESS_THAN;
+        case '>':
+            getChar();
+            return Token.GREATER_THAN;
         case '(':
             getChar();