Changeset 6607 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
- Timestamp:
- 2014-01-03T11:12:16+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
r6561 r6607 80 80 | < CARET: "^" > 81 81 | < FULLSTOP: "." > 82 | < CONTAINS: "∋" > 82 83 | < COMMENT_START: "/*" > : COMMENT 83 84 | < UNEXPECTED_CHAR : ~[] > // avoid TokenMgrErrors because they are hard to recover from … … 262 263 Selector child_selector() : 263 264 { 264 boolean parentSelector = false;265 Selector.ChildOrParentSelectorType type = null; 265 266 Condition c; 266 267 List<Condition> conditions = new ArrayList<Condition>(); … … 272 273 selLeft=selector() w() 273 274 ( 274 ( <GREATER> { parentSelector = false; } | <LESS> { parentSelector = true; } ) 275 ( ( c=condition(Context.LINK) | c=class_or_pseudoclass(Context.LINK) ) { conditions.add(c); } )* 275 ( 276 ( <GREATER> { type = Selector.ChildOrParentSelectorType.CHILD; } | <LESS> { type = Selector.ChildOrParentSelectorType.PARENT; } ) 277 ( ( c=condition(Context.LINK) | c=class_or_pseudoclass(Context.LINK) ) { conditions.add(c); } )* 278 | 279 <CONTAINS> { type = Selector.ChildOrParentSelectorType.CONTAINS; } 280 ) 276 281 { selLink = new LinkSelector(conditions); } 277 282 w() 278 283 selRight=selector() w() 279 284 )? 280 { return selRight != null ? new ChildOrParentSelector(selLeft, selLink, selRight, parentSelector) : selLeft; }285 { return selRight != null ? new ChildOrParentSelector(selLeft, selLink, selRight, type) : selLeft; } 281 286 } 282 287
Note:
See TracChangeset
for help on using the changeset viewer.