Changeset 6554 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

Timestamp:

2013-12-28T01:31:47+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 fix #9409 - extend MapCSS condition syntax to allow the comparison of two key values

The syntax is [key1 = *key2] where * is inspired by the C de-reference operator, and = stands for any of =/!=/~=/^=/$=/*=/=~/!~.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (3 diffs)

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

@@ -367 +367 @@
     int i;
     Condition.Op op;
+    boolean considerValAsKey = false;
 }
 {
     key=tag_key() s()
     (
-        LOOKAHEAD(2)
-            <EQUAL> <TILDE> { op=Condition.Op.REGEX; } s() val=regex()
-        |
-        LOOKAHEAD(2)
-            <EXCLAMATION> <TILDE> { op=Condition.Op.NREGEX; } s() val=regex()
+        LOOKAHEAD(3)
+            (
+                    <EQUAL> <TILDE> { op=Condition.Op.REGEX; }
+                |
+                    <EXCLAMATION> <TILDE> { op=Condition.Op.NREGEX; }
+            )
+            s()
+            ( <STAR> { considerValAsKey=true; } )?
+            val=regex()
         |
             (
@@ -391 +396 @@
             )
             s()
+            ( <STAR> { considerValAsKey=true; } )?
             ( 
                 LOOKAHEAD(2) 
@@ -412 +418 @@
             f=float_() { val=Float.toString(f); }
     )
-    { return Condition.create(key, val, op, context); }
+    { return Condition.create(key, val, op, context, considerValAsKey); }
 }