Changeset 8822 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2015-10-04T17:53:14+02:00 (9 years ago)

Author:

simon04

Message:

see #11916 - Search: allow to use multiple MapCSS selectors and child/parent selectors

File:

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

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

@@ -604 +604 @@
 void rule():
 {
-    List<Selector> selectors = new ArrayList<Selector>();
-    Selector sel;
+    List<Selector> selectors;
     Declaration decl;
 }
 {
-    sel=child_selector() { selectors.add(sel); }
-    (
-        <COMMA> w()
-        sel=child_selector() { selectors.add(sel); }
-    )*
+    selectors=selectors()
     decl=declaration()
     { 
@@ -620 +615 @@
         }
     }
+}
+
+List<Selector> selectors():
+{
+    List<Selector> selectors = new ArrayList<Selector>();
+    Selector sel;
+}
+{
+    sel=child_selector() { selectors.add(sel); }
+    (
+        <COMMA> w()
+        sel=child_selector() { selectors.add(sel); }
+    )*
+    { return selectors; }
 }