Changeset 7277 in josm

Timestamp:

2014-06-30T11:59:11+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10210 - Bug combining multiple media queries

File:

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

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

@@ -140 +140 @@
 |   < LPAR: "(" >
 |   < RPAR: ")" >
+|   < COMMA: "," >
 |   < COLON: ":" >
 }
@@ -169 +170 @@
 |   < DCOLON: "::" >
 |   < SEMICOLON: ";" >
-|   < COMMA: "," >
 |   < PIPE: "|" >
 |   < PIPE_Z: "|z" >
@@ -243 +243 @@
 {
     (
-        (t=<PP_AND> | t=<PP_NOT> | t=<UINT> | t=<STRING> | t=<REGEX> | t=<LPAR> | t=<RPAR> | t=<COLON> | t=<IDENT> | t=<PP_SOMETHING_ELSE>) { if (write) sb.append(t.image); }
+        (t=<PP_AND> | t=<PP_NOT> | t=<UINT> | t=<STRING> | t=<REGEX> | t=<LPAR> | t=<RPAR> | t=<COMMA> | t=<COLON> | t=<IDENT> | t=<PP_SOMETHING_ELSE>) { if (write) sb.append(t.image); }
         |
             pp_w1()
         |
-            pp_media()
+            pp_media(!write)
         |
             t=<LBRACE> { if (write) sb.append(t.image); } pp_black_box(write) t=<RBRACE> { if (write) sb.append(t.image); }
@@ -253 +253 @@
 }
 
-void pp_media():
+void pp_media(boolean ignore):
 {
     boolean pass = false;
@@ -265 +265 @@
     )?
     <LBRACE>
-    pp_black_box(empty || pass)
+    pp_black_box((empty || pass) && !ignore)
     <RBRACE>
 }