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

Timestamp:

2011-03-30T22:25:20+02:00 (15 years ago)

Author:

bastiK

Message:

applied #6150 - mapcss - improve parent_tag (based on patch by Gubaer)

File:

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

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression.FunctionExpression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression.LiteralExpression;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.DescendentSelector;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
 import org.openstreetmap.josm.tools.Pair;
@@ -251 +251 @@
 Selector child_selector() :
 {
-    boolean child = false;
+    boolean parentSelector = false;
     Selector sel1, sel2 = null;
 }
@@ -257 +257 @@
     sel1=selector() w()
     (
-        ( <GREATER> { child = true; } | <LESS> { child = false; } ) w()
+        ( <GREATER> { parentSelector = false; } | <LESS> { parentSelector = true; } ) w()
         sel2=selector() w()
     )?
-    { return sel2 != null ? new DescendentSelector(sel1, sel2, child) : sel1; }
+    { return sel2 != null ? new ChildOrParentSelector(sel1, sel2, parentSelector) : sel1; }
 }