Changeset 7166 in josm for trunk

Timestamp:

2014-05-22T13:08:33+02:00 (10 years ago)

Author:

simon04

Message:

fix #10059 - MapCSS, child selector: make greater-than-sign optional

The following selectors are equivalent:
relation[type=route] way[highway]
relation[type=route] > way[highway]

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

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

@@ -524 +524 @@
         (
             (
-                <GREATER> { type = Selector.ChildOrParentSelectorType.CHILD; }
+                (
+                    <GREATER> { type = Selector.ChildOrParentSelectorType.CHILD; }
+                |
+                    <LESS> { type = Selector.ChildOrParentSelectorType.PARENT; }
+                |
+                    <PLUS> { type = Selector.ChildOrParentSelectorType.SIBLING; }
+                )
+                ( ( c=condition(Context.LINK) | c=class_or_pseudoclass(Context.LINK) ) { conditions.add(c); } )*
             |
-                <LESS> { type = Selector.ChildOrParentSelectorType.PARENT; }
+                <ELEMENT_OF> { type = Selector.ChildOrParentSelectorType.ELEMENT_OF; }
             |
-                <PLUS> { type = Selector.ChildOrParentSelectorType.SIBLING; }
+                <CROSSING> { type = Selector.ChildOrParentSelectorType.CROSSING; }
             )
-            ( ( c=condition(Context.LINK) | c=class_or_pseudoclass(Context.LINK) ) { conditions.add(c); } )*
-        |
-            <ELEMENT_OF> { type = Selector.ChildOrParentSelectorType.ELEMENT_OF; }
-        |
-            <CROSSING> { type = Selector.ChildOrParentSelectorType.CROSSING; }
+            w()
+        |
+            { /* <GREATER> is optional for child selector */ type = Selector.ChildOrParentSelectorType.CHILD; }
         )
         { selLink = new LinkSelector(conditions); }
-        w()
         selRight=selector() w()
     )?

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

@@ -97 +97 @@
          */
         public ChildOrParentSelector(Selector a, LinkSelector link, Selector b, ChildOrParentSelectorType type) {
+            CheckParameterUtil.ensureParameterNotNull(a, "a");
+            CheckParameterUtil.ensureParameterNotNull(b, "b");
+            CheckParameterUtil.ensureParameterNotNull(link, "link");
+            CheckParameterUtil.ensureParameterNotNull(type, "type");
             this.left = a;
             this.link = link;

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -257 +257 @@
 
     @Test
+    public void testChildSelectorGreaterThanSignIsOptional() throws Exception {
+        assert getParser("relation[type=route] way[highway]").child_selector().toString() ==
+                getParser("relation[type=route] > way[highway]").child_selector().toString()
+    }
+
+    @Test
     public void testSiblingSelector() throws Exception {
         def s1 = (Selector.ChildOrParentSelector) getParser("*[a?][parent_tag(\"highway\")=\"unclassified\"] + *[b?]").child_selector()