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

Timestamp:

2012-01-18T20:19:02+01:00 (12 years ago)

Author:

bastiK

Message:

applied #7178 - Allow plugins to register search operators (patch by joshdoe)

File:

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

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

@@ -48 +48 @@
 
     public enum Token {
-        NOT(marktr("<not>")), OR(marktr("<or>")), LEFT_PARENT(marktr("<left parent>")),
+        NOT(marktr("<not>")), OR(marktr("<or>")), XOR(marktr("<xor>")), LEFT_PARENT(marktr("<left parent>")),
         RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
         KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")),
@@ -74 +74 @@
     }
 
-    private static final List<Character> specialChars = Arrays.asList(new Character[] {'"', ':', '(', ')', '|', '=', '?'});
+    private static final List<Character> specialChars = Arrays.asList(new Character[] {'"', ':', '(', ')', '|', '^', '=', '?'});
     private static final List<Character> specialCharsQuoted = Arrays.asList(new Character[] {'"'});
 
@@ -102 +102 @@
      * : for an key. The value is the next token
      * | for "OR"
+     * ^ for "XOR"
      * ' ' for anything else.
      * @return The next token in the stream.
@@ -134 +135 @@
             getChar();
             return Token.OR;
+        case '^':
+            getChar();
+            return Token.XOR;
         case '&':
             getChar();
@@ -156 +160 @@
             if ("or".equalsIgnoreCase(currentText))
                 return Token.OR;
-            if ("and".equalsIgnoreCase(currentText))
+            else if ("xor".equalsIgnoreCase(currentText))
+                return Token.XOR;
+            else if ("and".equalsIgnoreCase(currentText))
                 return nextToken();
             // try parsing number