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

Timestamp:

2011-05-02T23:47:19+02:00 (15 years ago)

Author:

bastiK

Message:

mapcss: add role based selection (collaborative work by Gubaer and me)

File:

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

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

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
@@ -20 +21 @@
 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.MapCSSException;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -224 +227 @@
     (
         try {
-            r=rule() { if (r != null) { sheet.rules.add(r); } } w()
+                r=rule() { if (r != null) { sheet.rules.add(r); } } w()
+        } catch (MapCSSException mex) {
+            error_skipto(RBRACE, mex);
+            w();
         } catch (ParseException ex) {
-            error_skipto(RBRACE);
+            error_skipto(RBRACE, null);
             w();
         }
@@ -252 +258 @@
 {
     boolean parentSelector = false;
-    Selector sel1, sel2 = null;
-}
-{
-    sel1=selector() w()
-    (
-        ( <GREATER> { parentSelector = false; } | <LESS> { parentSelector = true; } ) w()
-        sel2=selector() w()
+    Condition c;
+    List<Condition> conditions = new ArrayList<Condition>();
+    Selector selLeft;
+    LinkSelector selLink = null;
+    Selector selRight = null;
+}
+{
+    selLeft=selector() w()
+    (
+        ( <GREATER> { parentSelector = false; } | <LESS> { parentSelector = true; } ) 
+        ( ( c=condition(Context.LINK) | c=pseudoclass(Context.LINK) ) { conditions.add(c); } )*
+        { selLink = new LinkSelector(conditions); }
+        w()
+        selRight=selector() w()
     )?
-    { return sel2 != null ? new ChildOrParentSelector(sel1, sel2, parentSelector) : sel1; }
+    { return selRight != null ? new ChildOrParentSelector(selLeft, selLink, selRight, parentSelector) : selLeft; }
 }
 
@@ -274 +287 @@
     ( base=<IDENT> | base=<STAR> )
     ( r=zoom() )?
-    ( ( c=condition() | c=pseudoclass() ) { conditions.add(c); } )*
+    ( ( c=condition(Context.PRIMITIVE) | c=pseudoclass(Context.PRIMITIVE) ) { conditions.add(c); } )*
     ( sub=subpart() )?
     { return new GeneralSelector(base.image, r, conditions, sub); }
@@ -294 +307 @@
 }
 
-Condition condition() :
+Condition condition(Context context) :
 {
     Condition c;
@@ -302 +315 @@
     <LSQUARE> s()
     (
-        LOOKAHEAD( simple_key_condition() s() <RSQUARE> )
-            c=simple_key_condition() s() <RSQUARE> { return c; }
+        LOOKAHEAD( simple_key_condition(context) s() <RSQUARE> )
+            c=simple_key_condition(context) s() <RSQUARE> { return c; }
         |
-        LOOKAHEAD( simple_key_value_condition() s() <RSQUARE> )
-            c=simple_key_value_condition() s() <RSQUARE> { return c; }
+        LOOKAHEAD( simple_key_value_condition(context) s() <RSQUARE> )
+            c=simple_key_value_condition(context) s() <RSQUARE> { return c; }
         |
-            e=expression() <RSQUARE> { return new Condition.ExpressionCondition(e); }
+            e=expression() <RSQUARE> { return Condition.create(e, context); }
     )
 }
@@ -323 +336 @@
 }
 
-Condition simple_key_condition() :
+Condition simple_key_condition(Context context) :
 {
     boolean not = false;
@@ -333 +346 @@
     key=tag_key()
     ( <QUESTION> { yes = true; } )?
-    { return new Condition.KeyCondition(key, not, yes); }
-}
-
-Condition simple_key_value_condition() :
+    { return Condition.create(key, not, yes, context); }
+}
+
+Condition simple_key_value_condition(Context context) :
 {
     String key;
@@ -385 +398 @@
             f=float_() { val=Float.toString(f); }
     )
-    { return new Condition.KeyValueCondition(key, val, op); }
-}
-
-Condition pseudoclass() :
+    { return Condition.create(key, val, op, context); }
+}
+
+Condition pseudoclass(Context context) :
 {
     Token t;
@@ -397 +410 @@
     <COLON>
     t=<IDENT>
-    { return new Condition.PseudoClassCondition(t.image, not); }
+    { return Condition.create(t.image, not, context); }
 }
 
@@ -550 +563 @@
 
 JAVACODE
-void error_skipto(int kind) {
+void error_skipto(int kind, MapCSSException me) {
     if (token.kind == EOF)
         throw new ParseException("Reached end of file while parsing");
-    ParseException e = generateParseException();
+        
+    Exception e = null;        
+    ParseException pe = generateParseException();
+
+    if (me != null) {
+        me.setLine(pe.currentToken.next.beginLine);
+        me.setColumn(pe.currentToken.next.beginColumn);
+        e = me;
+    } else {
+        e = new ParseException(pe.getMessage()); // prevent memory leak
+    }
+    
     System.err.println("Skipping to the next rule, because of an error:");
     System.err.println(e);
     if (sheet != null) {
-        sheet.logError(new ParseException(e.getMessage()));
+        sheet.logError(e);
     }
     Token t;