:not(X) support — css/csso#111

css · Nov 23, 2012 · b8e69dd · b8e69dd
1 parent 0e561e8
commit b8e69dd
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ Gomzales changelog
 -------------------------
 
 - Typo fix (global variable leak): https://github.com/css/csso/pull/110
+- Attribute selectors extended by `|`.
+- `not(..)` pseudo-class special support: https://github.com/css/csso/issues/111
 
 28.10.2012, Version 1.0.5 
 -------------------------

diff --git a/lib/gonzales.cssp.node.js b/lib/gonzales.cssp.node.js
@@ -554,6 +554,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 //attrselector = (seq('=') | seq('~=') | seq('^=') | seq('$=') | seq('*=') | seq('|=')):x -> [#attrselector, x]
     function checkAttrselector(_i) {
         if (tokens[_i].type === TokenType.EqualsSign) return 1;
+        if (tokens[_i].type === TokenType.VerticalLine && (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign)) return 1;
 
         if (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign) return fail(tokens[_i]);
 
@@ -1205,7 +1206,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         pos++;
 
-        var body = getFunctionBody();
+        var body = ident[needInfo? 2 : 1] !== 'not'?
+            getFunctionBody() :
+            getNotFunctionBody(); // ok, here we have CSS3 initial draft: http://dev.w3.org/csswg/selectors3/#negation
 
         return needInfo?
                 [{ ln: tokens[startPos].ln }, CSSPNodeType.FunktionType, ident, body] :
@@ -1220,11 +1223,33 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         while (tokens[pos].type !== TokenType.RightParenthesis) {
             if (checkTset(pos)) {
                 x = getTset();
-
                 if ((needInfo && typeof x[1] === 'string') || typeof x[0] === 'string') body.push(x);
                 else body = body.concat(x);
             } else if (checkClazz(pos)) {
                 body.push(getClazz());
+            } else {
+                throwError();
+            }
+        }
+
+        pos++;
+
+        return (needInfo?
+                    [{ ln: tokens[startPos].ln }, CSSPNodeType.FunctionBodyType] :
+                    [CSSPNodeType.FunctionBodyType]
+                ).concat(body);
+    }
+
+    function getNotFunctionBody() {
+        var startPos = pos,
+            body = [],
+            x;
+
+        while (tokens[pos].type !== TokenType.RightParenthesis) {
+            if (checkSimpleselector(pos)) {
+                body.push(getSimpleSelector());
+            } else {
+                throwError();
             }
         }
 

diff --git a/src/cssp.ast.shared.js b/src/cssp.ast.shared.js
@@ -282,6 +282,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 //attrselector = (seq('=') | seq('~=') | seq('^=') | seq('$=') | seq('*=') | seq('|=')):x -> [#attrselector, x]
     function checkAttrselector(_i) {
         if (tokens[_i].type === TokenType.EqualsSign) return 1;
+        if (tokens[_i].type === TokenType.VerticalLine && (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign)) return 1;
 
         if (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign) return fail(tokens[_i]);
 
@@ -933,7 +934,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         pos++;
 
-        var body = getFunctionBody();
+        var body = ident[needInfo? 2 : 1] !== 'not'?
+            getFunctionBody() :
+            getNotFunctionBody(); // ok, here we have CSS3 initial draft: http://dev.w3.org/csswg/selectors3/#negation
 
         return needInfo?
                 [{ ln: tokens[startPos].ln }, CSSPNodeType.FunktionType, ident, body] :
@@ -948,11 +951,33 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         while (tokens[pos].type !== TokenType.RightParenthesis) {
             if (checkTset(pos)) {
                 x = getTset();
-
                 if ((needInfo && typeof x[1] === 'string') || typeof x[0] === 'string') body.push(x);
                 else body = body.concat(x);
             } else if (checkClazz(pos)) {
                 body.push(getClazz());
+            } else {
+                throwError();
+            }
+        }
+
+        pos++;
+
+        return (needInfo?
+                    [{ ln: tokens[startPos].ln }, CSSPNodeType.FunctionBodyType] :
+                    [CSSPNodeType.FunctionBodyType]
+                ).concat(body);
+    }
+
+    function getNotFunctionBody() {
+        var startPos = pos,
+            body = [],
+            x;
+
+        while (tokens[pos].type !== TokenType.RightParenthesis) {
+            if (checkSimpleselector(pos)) {
+                body.push(getSimpleSelector());
+            } else {
+                throwError();
             }
         }
 

diff --git a/test/cssp/data/test_attrselector/attrselector.5.css b/test/cssp/data/test_attrselector/attrselector.5.css
@@ -0,0 +1 @@
+|
diff --git a/test/cssp/data/test_attrselector/attrselector.5.l b/test/cssp/data/test_attrselector/attrselector.5.l
@@ -0,0 +1 @@
+|
diff --git a/test/cssp/data/test_attrselector/attrselector.5.p b/test/cssp/data/test_attrselector/attrselector.5.p
@@ -0,0 +1 @@
+['attrselector', '|']
diff --git a/test/cssp/data/test_simpleselector/simpleselector.11.p b/test/cssp/data/test_simpleselector/simpleselector.11.p
@@ -6,4 +6,5 @@
     ['funktion', 
       ['ident', 'not'], 
       ['functionBody', 
-        ['ident', '*']]]]]
+        ['simpleselector', 
+          ['ident', '*']]]]]]
diff --git a/test/cssp/data/test_simpleselector/simpleselector.12.p b/test/cssp/data/test_simpleselector/simpleselector.12.p
@@ -4,5 +4,6 @@
     ['funktion', 
       ['ident', 'not'], 
       ['functionBody', 
-        ['braces', '[', ']', 
-          ['ident', 'ABC']]]]]]
+        ['simpleselector', 
+          ['attrib', 
+            ['ident', 'ABC']]]]]]]
diff --git a/test/cssp/data/test_simpleselector/simpleselector.13.p b/test/cssp/data/test_simpleselector/simpleselector.13.p
@@ -3,6 +3,7 @@
     ['funktion', 
       ['ident', 'not'], 
       ['functionBody', 
-        ['ident', 'el'], 
-        ['clazz', 
-          ['ident', 'class-postfix']]]]]]
+        ['simpleselector', 
+          ['ident', 'el'], 
+          ['clazz', 
+            ['ident', 'class-postfix']]]]]]]
diff --git a/test/cssp/data/test_stylesheet/issue111.test1.css b/test/cssp/data/test_stylesheet/issue111.test1.css
@@ -0,0 +1 @@
+body:not([x|x]) {}
diff --git a/test/cssp/data/test_stylesheet/issue111.test1.l b/test/cssp/data/test_stylesheet/issue111.test1.l
@@ -0,0 +1 @@
+body:not([x|x]) {}
diff --git a/test/cssp/data/test_stylesheet/issue111.test1.p b/test/cssp/data/test_stylesheet/issue111.test1.p
@@ -0,0 +1,16 @@
+['stylesheet', 
+  ['ruleset', 
+    ['selector', 
+      ['simpleselector', 
+        ['ident', 'body'], 
+        ['pseudoc', 
+          ['funktion', 
+            ['ident', 'not'], 
+            ['functionBody', 
+              ['simpleselector', 
+                ['attrib', 
+                  ['ident', 'x'], 
+                  ['attrselector', '|'], 
+                  ['ident', 'x']]]]]], 
+        ['s', ' ']]], 
+    ['block']]]
diff --git a/web/gonzales.cssp.web.js b/web/gonzales.cssp.web.js
@@ -554,6 +554,7 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 //attrselector = (seq('=') | seq('~=') | seq('^=') | seq('$=') | seq('*=') | seq('|=')):x -> [#attrselector, x]
     function checkAttrselector(_i) {
         if (tokens[_i].type === TokenType.EqualsSign) return 1;
+        if (tokens[_i].type === TokenType.VerticalLine && (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign)) return 1;
 
         if (!tokens[_i + 1] || tokens[_i + 1].type !== TokenType.EqualsSign) return fail(tokens[_i]);
 
@@ -1205,7 +1206,9 @@ function getCSSPAST(_tokens, rule, _needInfo) {
 
         pos++;
 
-        var body = getFunctionBody();
+        var body = ident[needInfo? 2 : 1] !== 'not'?
+            getFunctionBody() :
+            getNotFunctionBody(); // ok, here we have CSS3 initial draft: http://dev.w3.org/csswg/selectors3/#negation
 
         return needInfo?
                 [{ ln: tokens[startPos].ln }, CSSPNodeType.FunktionType, ident, body] :
@@ -1220,11 +1223,33 @@ function getCSSPAST(_tokens, rule, _needInfo) {
         while (tokens[pos].type !== TokenType.RightParenthesis) {
             if (checkTset(pos)) {
                 x = getTset();
-
                 if ((needInfo && typeof x[1] === 'string') || typeof x[0] === 'string') body.push(x);
                 else body = body.concat(x);
             } else if (checkClazz(pos)) {
                 body.push(getClazz());
+            } else {
+                throwError();
+            }
+        }
+
+        pos++;
+
+        return (needInfo?
+                    [{ ln: tokens[startPos].ln }, CSSPNodeType.FunctionBodyType] :
+                    [CSSPNodeType.FunctionBodyType]
+                ).concat(body);
+    }
+
+    function getNotFunctionBody() {
+        var startPos = pos,
+            body = [],
+            x;
+
+        while (tokens[pos].type !== TokenType.RightParenthesis) {
+            if (checkSimpleselector(pos)) {
+                body.push(getSimpleSelector());
+            } else {
+                throwError();
             }
         }