Changeset 6455 in josm for trunk/src

Timestamp:

2013-12-07T22:38:45+01:00 (11 years ago)

Author:

simon04

Message:

fix #7939 - MapCSS: add support for negated regular expressions

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• Condition.java (modified) (2 diffs)
• MapCSSParser.jj (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -64 +64 @@
     public static enum Op {
         EQ, NEQ, GREATER_OR_EQUAL, GREATER, LESS_OR_EQUAL, LESS,
-        REGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
+        REGEX, NREGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
 
         public boolean eval(String testString, String prototypeString) {
@@ -75 +75 @@
                 return !equal(testString, prototypeString);
             case REGEX:
+            case NREGEX:
                 Pattern p = Pattern.compile(prototypeString);
                 Matcher m = p.matcher(testString);
-                return m.find();
+                return REGEX.equals(this) ? m.find() : !m.find();
             case ONE_OF:
                 String[] parts = testString.split(";");

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -368 +368 @@
             <EQUAL> <TILDE> { op=Condition.Op.REGEX; } s() val=regex()
         |
+        LOOKAHEAD(2)
+            <EXCLAMATION> <TILDE> { op=Condition.Op.NREGEX; } s() val=regex()
+        |
             (
                     <EXCLAMATION> <EQUAL> { op=Condition.Op.NEQ; }