Merge pull request #17 from RomanGotsiy/master

Allow for quoted empty strings with double-quotes (fixes #16)
andyjansson · Dec 20, 2016 · 580a076 · 580a076
2 parents 4f92906 + ad3b830
commit 580a076
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ var output = postcss()
   .css;
 ```
 
-Using this ```input.css```: 
+Using this ```input.css```:
 
 ```css
 .foo {
@@ -70,7 +70,7 @@ and with [postcss-for]:
 
 ```css
 @for $i from 1 to 3 {
-  .b-$i { 
+  .b-$i {
     width: $i px;
     @if $i == 2 {
       color: green;
@@ -79,4 +79,9 @@ and with [postcss-for]:
 }
 ```
 
-[postcss-for]: https://github.com/antyakushev/postcss-for
+[postcss-for]: https://github.com/antyakushev/postcss-for
+
+## Development
+1. Clone repository
+2. Install dependencies `npm install`
+3. If `parser.jison` file has been changed, regenerate `parser.js` by running `npm run gen-parser`
diff --git a/package.json b/package.json
@@ -25,10 +25,12 @@
     "postcss": "^5.0.4"
   },
   "devDependencies": {
+    "jison": "^0.4.17",
     "tap-dot": "^1.0.0",
     "tape": "^4.0.2"
   },
   "scripts": {
-    "test": "node test/test.js | tap-dot"
+    "test": "node test/test.js | tap-dot",
+    "gen-parser": "jison parser.jison"
   }
 }
diff --git a/parser.jison b/parser.jison
@@ -201,6 +201,7 @@ hsla\(\s*[0-9]+\s*\,\s*[0-9]+\%\s*\,\s*[0-9]+\%\s*\,\s*([0-1]|0?\.[0-9]+)\s*\)
 [0-9]+("."[0-9]+)?\b                                                                  return 'NUMBER';
 [a-zA-Z0-9-_.]+\b                                                                     return 'STRING';
 \'(\\[^\']|[^\'\\])*\'                                                                yytext = yytext.slice(1,-1); return 'STRING';
+\"(\\[^\"]|[^\"\\])*\"                                                                yytext = yytext.slice(1,-1); return 'STRING';
 "("                                                                                   return 'LPAREN';
 ")"                                                                                   return 'RPAREN';
 "=="                                                                                  return 'RELOP';

diff --git a/parser.js b/parser.js
diff --git a/test/test.js b/test/test.js
@@ -85,6 +85,9 @@ test('@if true { foo: bar } @else if false { bar: baz } @else { bat: quux }', 'f
 test('@if false { foo: bar } @else if true { bar: baz } @else { bat: quux }', 'bar: baz');
 test('@if false { foo: bar } @else if false { bar: baz } @else { bat: quux }', 'bat: quux');
 test('@if \'\' == \'\' { foo: bar }', 'foo: bar');
+test('@if "" == "" { foo: bar }', 'foo: bar');
+test('@if \'\' == "" { foo: bar }', 'foo: bar');
+test('@if "" == \'\' { foo: bar }', 'foo: bar');
 test('@if \'foo\\bar\' == \'foo\\bar\' { foo: bar }', 'foo: bar');
 test('@if .foo == .foo { foo: bar }', 'foo: bar');
 test('@if .foo == .bar { foo: bar }', '');