issue #90: @page inside @media

lib/gonzales.cssp.node.js

@@ -677,7 +677,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         if (l = checkSC(_i)) _i += l;
 
-        while (l = checkRuleset(_i)) {
+        while ((l = checkRuleset(_i)) || (l = checkAtrule(_i)) || (l = checkSC(_i))) {
             _i += l;
         }
 
@@ -693,7 +693,13 @@ function getCSSPAST(_tokens, rule, _needInfo) {
             x;
 
         while (!tokens[pos].atrulers_end) {
-            atrulers.push(getRuleset());
+            if (checkSC(pos)) {
+                atrulers = atrulers.concat(getSC());
+            } else if (checkRuleset(pos)) {
+                atrulers.push(getRuleset());
+            } else {
+                atrulers.push(getAtrule());
+            }
         }
 
         return atrulers.concat(getSC());

src/gonzales.cssp.web.js

@@ -677,7 +677,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         if (l = checkSC(_i)) _i += l;
 
-        while (l = checkRuleset(_i)) {
+        while ((l = checkRuleset(_i)) || (l = checkAtrule(_i)) || (l = checkSC(_i))) {
             _i += l;
         }
 
@@ -693,7 +693,13 @@ function getCSSPAST(_tokens, rule, _needInfo) {
             x;
 
         while (!tokens[pos].atrulers_end) {
-            atrulers.push(getRuleset());
+            if (checkSC(pos)) {
+                atrulers = atrulers.concat(getSC());
+            } else if (checkRuleset(pos)) {
+                atrulers.push(getRuleset());
+            } else {
+                atrulers.push(getAtrule());
+            }
         }
 
         return atrulers.concat(getSC());

test/data/test_stylesheet/issue90.test1.css

@@ -0,0 +1,5 @@
+@media test {
+    @page {
+        p: v;
+    }
+}

test/data/test_stylesheet/issue90.test1.l

@@ -0,0 +1,5 @@
+@media test {
+    @page {
+        p: v;
+    }
+}

test/data/test_stylesheet/issue90.test1.p

@@ -0,0 +1,29 @@
+['stylesheet', 
+  ['atruler', 
+    ['atkeyword', 
+      ['ident', 'media']], 
+    ['atrulerq', 
+      ['s', ' '], 
+      ['ident', 'test'], 
+      ['s', ' ']], 
+    ['atrulers', 
+      ['s', '
+    '], 
+      ['atruleb', 
+        ['atkeyword', 
+          ['ident', 'page']], 
+        ['s', ' '], 
+        ['block', 
+          ['s', '
+        '], 
+          ['declaration', 
+            ['property', 
+              ['ident', 'p']], 
+            ['value', 
+              ['s', ' '], 
+              ['ident', 'v']]], 
+          ['decldelim'], 
+          ['s', '
+    ']]], 
+      ['s', '
+']]]]

test/data/test_stylesheet/issue90.test2.css

@@ -0,0 +1,23 @@
+x {
+    p:v;
+}
+
+@media test {
+    a {
+        p:v;
+    }
+
+    /* comment */
+
+    @page {
+        p: v;
+    }
+
+    b {
+        p:v;
+    }
+}
+
+y {
+    p:v;
+}

test/data/test_stylesheet/issue90.test2.l

@@ -0,0 +1,23 @@
+x {
+    p:v;
+}
+
+@media test {
+    a {
+        p:v;
+    }
+
+    /* comment */
+
+    @page {
+        p: v;
+    }
+
+    b {
+        p:v;
+    }
+}
+
+y {
+    p:v;
+}

test/data/test_stylesheet/issue90.test2.p

@@ -0,0 +1,109 @@
+['stylesheet', 
+  ['ruleset', 
+    ['selector', 
+      ['simpleselector', 
+        ['ident', 'x'], 
+        ['s', ' ']]], 
+    ['block', 
+      ['s', '
+    '], 
+      ['declaration', 
+        ['property', 
+          ['ident', 'p']], 
+        ['value', 
+          ['ident', 'v']]], 
+      ['decldelim'], 
+      ['s', '
+']]], 
+  ['s', '
+
+'], 
+  ['atruler', 
+    ['atkeyword', 
+      ['ident', 'media']], 
+    ['atrulerq', 
+      ['s', ' '], 
+      ['ident', 'test'], 
+      ['s', ' ']], 
+    ['atrulers', 
+      ['s', '
+    '], 
+      ['ruleset', 
+        ['selector', 
+          ['simpleselector', 
+            ['ident', 'a'], 
+            ['s', ' ']]], 
+        ['block', 
+          ['s', '
+        '], 
+          ['declaration', 
+            ['property', 
+              ['ident', 'p']], 
+            ['value', 
+              ['ident', 'v']]], 
+          ['decldelim'], 
+          ['s', '
+    ']]], 
+      ['s', '
+
+    '], 
+      ['comment', ' comment '], 
+      ['s', '
+
+    '], 
+      ['atruleb', 
+        ['atkeyword', 
+          ['ident', 'page']], 
+        ['s', ' '], 
+        ['block', 
+          ['s', '
+        '], 
+          ['declaration', 
+            ['property', 
+              ['ident', 'p']], 
+            ['value', 
+              ['s', ' '], 
+              ['ident', 'v']]], 
+          ['decldelim'], 
+          ['s', '
+    ']]], 
+      ['s', '
+
+    '], 
+      ['ruleset', 
+        ['selector', 
+          ['simpleselector', 
+            ['ident', 'b'], 
+            ['s', ' ']]], 
+        ['block', 
+          ['s', '
+        '], 
+          ['declaration', 
+            ['property', 
+              ['ident', 'p']], 
+            ['value', 
+              ['ident', 'v']]], 
+          ['decldelim'], 
+          ['s', '
+    ']]], 
+      ['s', '
+']]], 
+  ['s', '
+
+'], 
+  ['ruleset', 
+    ['selector', 
+      ['simpleselector', 
+        ['ident', 'y'], 
+        ['s', ' ']]], 
+    ['block', 
+      ['s', '
+    '], 
+      ['declaration', 
+        ['property', 
+          ['ident', 'p']], 
+        ['value', 
+          ['ident', 'v']]], 
+      ['decldelim'], 
+      ['s', '
+']]]]

web/csso.web.js

@@ -709,7 +709,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         if (l = checkSC(_i)) _i += l;
 
-        while (l = checkRuleset(_i)) {
+        while ((l = checkRuleset(_i)) || (l = checkAtrule(_i)) || (l = checkSC(_i))) {
             _i += l;
         }
 
@@ -725,7 +725,13 @@ function getCSSPAST(_tokens, rule, _needInfo) {
             x;
 
         while (!tokens[pos].atrulers_end) {
-            atrulers.push(getRuleset());
+            if (checkSC(pos)) {
+                atrulers = atrulers.concat(getSC());
+            } else if (checkRuleset(pos)) {
+                atrulers.push(getRuleset());
+            } else {
+                atrulers.push(getAtrule());
+            }
         }
 
         return atrulers.concat(getSC());