re: #377 instead of filtering null entries, avoid adding them, or clear them as needed during parsing time

Author: ylafon

org/w3c/css/atrules/css/AtRuleMedia.java

@@ -31,10 +31,18 @@ public abstract AtRuleMedia addMedia(String restrictor, String medium,
      * Adds a media
      */
     public AtRuleMedia addMedia(Media m) {
-        allMedia.add(m);
+        if (m != null) {
+            allMedia.add(m);
+        }
         return this;
     }
 
+    public void removeLastMedia() {
+        if (!allMedia.isEmpty()) {
+            allMedia.remove(allMedia.size() - 1);
+        }
+    }
+
     /**
      * Add a media feature to the current media, like (color:1)
      *
@@ -62,7 +70,7 @@ public ArrayList<Media> getMediaList() {
 
     public String getCurrentMedia() {
         if (!allMedia.isEmpty()) {
-            return allMedia.get(allMedia.size()-1).getMedia();
+            return allMedia.get(allMedia.size() - 1).getMedia();
         }
         return null;
     }
@@ -85,6 +93,7 @@ public String lookupPrefix() {
         return "";
 
     }
+
     /**
      * Use to display the value part of the @media rule
      * used where the value is used, like as an option in @import

org/w3c/css/parser/analyzer/CssParser.java

@@ -73,6 +73,8 @@
 import org.w3c.css.values.CssVariable;
 import org.w3c.css.values.CssVolume;
 
+import static org.w3c.css.util.StringUtils.convertIdent;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
@@ -1764,6 +1766,10 @@ final public void mediaquerylist(AtRuleMedia mediaRule) throws ParseException {
             mediaRule.addMediaFeature(mf, ac);
             mf.setCombinator(comb);
             // mf.setParens();
+        } else {
+            if (defaultMedia) {
+                mediaRule.removeLastMedia();
+            }
         }
   }
 
@@ -9080,19 +9086,6 @@ private boolean jj_2_32(int xla)
     finally { jj_save(31, xla); }
   }
 
-  private boolean jj_3R_429()
- {
-    if (jj_3R_230()) return true;
-    return false;
-  }
-
-  private boolean jj_3_22()
- {
-    if (jj_3R_238()) return true;
-    if (jj_3R_239()) return true;
-    return false;
-  }
-
   private boolean jj_3R_260()
  {
     if (jj_3R_233()) return true;
@@ -9609,12 +9602,6 @@ private boolean jj_3R_423()
     return false;
   }
 
-  private boolean jj_3_3()
- {
-    if (jj_3R_223()) return true;
-    return false;
-  }
-
   private boolean jj_3R_277()
  {
     if (jj_scan_token(S)) return true;
@@ -9641,6 +9628,12 @@ private boolean jj_3R_296()
     return false;
   }
 
+  private boolean jj_3_3()
+ {
+    if (jj_3R_223()) return true;
+    return false;
+  }
+
   private boolean jj_3R_245()
  {
     Token xsp;
@@ -10150,12 +10143,6 @@ private boolean jj_3R_244()
     return false;
   }
 
-  private boolean jj_3R_404()
- {
-    if (jj_scan_token(COLON)) return true;
-    return false;
-  }
-
   private boolean jj_3R_243()
  {
     if (jj_scan_token(ANY)) return true;
@@ -10189,6 +10176,12 @@ private boolean jj_3_8()
     return false;
   }
 
+  private boolean jj_3R_404()
+ {
+    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
   private boolean jj_3_29()
  {
     Token xsp;
@@ -10210,25 +10203,6 @@ private boolean jj_3R_273()
     return false;
   }
 
-  private boolean jj_3R_393()
- {
-    if (jj_scan_token(LPAREN)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(IDENT)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_404()) jj_scanpos = xsp;
-    if (jj_scan_token(RPAREN)) return true;
-    return false;
-  }
-
   private boolean jj_3R_434()
  {
     if (jj_3R_237()) return true;
@@ -10263,6 +10237,25 @@ private boolean jj_3R_242()
     return false;
   }
 
+  private boolean jj_3R_393()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(IDENT)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_404()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_412()
  {
     if (jj_3R_274()) return true;
@@ -10329,12 +10322,6 @@ private boolean jj_3R_261()
     return false;
   }
 
-  private boolean jj_3R_249()
- {
-    if (jj_3R_280()) return true;
-    return false;
-  }
-
   private boolean jj_3R_262()
  {
     if (jj_scan_token(FUNCTIONSLOTTED)) return true;
@@ -10363,32 +10350,15 @@ private boolean jj_3R_366()
     return false;
   }
 
-  private boolean jj_3R_365()
- {
-    if (jj_scan_token(TILDE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_222()
+  private boolean jj_3R_249()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_248()) {
-    jj_scanpos = xsp;
-    if (jj_3R_249()) return true;
-    }
+    if (jj_3R_280()) return true;
     return false;
   }
 
-  private boolean jj_3R_248()
+  private boolean jj_3R_365()
  {
-    if (jj_scan_token(NOT)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_280()) return true;
+    if (jj_scan_token(TILDE)) return true;
     return false;
   }
 
@@ -10415,6 +10385,29 @@ private boolean jj_3R_363()
     return false;
   }
 
+  private boolean jj_3R_222()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_248()) {
+    jj_scanpos = xsp;
+    if (jj_3R_249()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_248()
+ {
+    if (jj_scan_token(NOT)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_280()) return true;
+    return false;
+  }
+
   private boolean jj_3R_285()
  {
     Token xsp;
@@ -11792,6 +11785,19 @@ private boolean jj_3R_223()
     return false;
   }
 
+  private boolean jj_3R_429()
+ {
+    if (jj_3R_230()) return true;
+    return false;
+  }
+
+  private boolean jj_3_22()
+ {
+    if (jj_3R_238()) return true;
+    if (jj_3R_239()) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public CssParserTokenManager token_source;
   SimpleCharStream jj_input_stream;

org/w3c/css/parser/analyzer/CssParser.jj

@@ -1193,6 +1193,10 @@ void mediaexpression(AtRuleMedia mediaRule, boolean defaultMedia, String comb) :
             mediaRule.addMediaFeature(mf, ac);
 	    mf.setCombinator(comb);
 	    // mf.setParens();
+        } else {
+            if (defaultMedia) {
+                mediaRule.removeLastMedia();
+            }
         }
     }
 }