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

Timestamp:

13.02.2010 17:05:37 (2 years ago)

Author:

jttt

Message:

Fix #4519 JOSM doesn't show nor find token (negative) IDs

File:

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

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

@@ -15 +15 @@
     private Token currentToken;
     private String currentText;
+    private long currentNumber;
     private int c;
 
@@ -25 +26 @@
         NOT(marktr("<not>")), OR(marktr("<or>")), LEFT_PARENT(marktr("<left parent>")),
         RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
-        KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")), EOF(marktr("<end-of-file>"));
+        KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")), NUMBER(marktr("<number>")),
+        EOF(marktr("<end-of-file>"));
 
         private Token(String name) {
@@ -46 +48 @@
             throw new RuntimeException(e.getMessage(), e);
         }
+    }
+
+    private long getNumber() {
+        long result = 0;
+        while (Character.isDigit(c)) {
+            result = result * 10 + (c - '0');
+            getChar();
+        }
+        return result;
     }
 
@@ -78 +89 @@
         case '-':
             getChar();
-            return Token.NOT;
+            if (Character.isDigit(c)) {
+                currentNumber = -1 * getNumber();
+                return Token.NUMBER;
+            } else
+                return Token.NOT;
         case '(':
             getChar();
@@ -111 +126 @@
         default:
         {
+            if (Character.isDigit(c)) {
+                currentNumber = getNumber();
+                return Token.NUMBER;
+            }
+
             StringBuilder s = new StringBuilder();
             while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=' || c == '?')) {
@@ -149 +169 @@
     }
 
+    public long readNumber(String errorMessage) throws ParseError {
+        if (nextToken() == Token.NUMBER)
+            return currentNumber;
+        else
+            throw new ParseError(errorMessage);
+    }
+
     public String getText() {
         return currentText;