From b563e4620e8ecb451c6516a9540957863f4848a7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Gerardy <py@py.gy>
Date: Wed, 24 Feb 2016 02:52:37 +0100
Subject: [PATCH] Improve argument order of once private, now public tree
 walking functions. Improve inner nomencalture.

---
 dist/j2c.amd.js           | 152 +++++++++++++++++++++-----------------
 dist/j2c.amd.min.js       |   2 +-
 dist/j2c.commonjs.js      | 152 +++++++++++++++++++++-----------------
 dist/j2c.commonjs.min.js  |   2 +-
 dist/j2c.es6.js           | 152 +++++++++++++++++++++-----------------
 dist/j2c.global.js        | 152 +++++++++++++++++++++-----------------
 dist/j2c.global.min.js    |   2 +-
 dist/j2c.global.min.js.gz | Bin 1901 -> 1926 bytes
 src/at-rules.js           |  41 +++++-----
 src/declarations.js       |  18 ++---
 src/main.js               |  47 ++++++------
 src/sheet.js              |  46 ++++++------
 test/test.js              |  29 ++++----
 13 files changed, 434 insertions(+), 361 deletions(-)

diff --git a/dist/j2c.amd.js b/dist/j2c.amd.js
index 2475b314..20c15622 100644
--- a/dist/j2c.amd.js
+++ b/dist/j2c.amd.js
@@ -87,15 +87,15 @@ define(function () { 'use strict';
   /**
    * Handles the property:value; pairs.
    *
-   * @param {array|object|string} o - the declarations.
-   * @param {string[]} emit - the contextual emitters to the final buffer
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
    * @param {string} prefix - the current property or a prefix in case of nested
    *                          sub-properties.
+   * @param {array|object|string} o - the declarations.
    * @param {boolean} local - are we in @local or in @global scope.
-   * @param {function} state - @local helper.
    */
 
-  function declarations(o, emit, prefix, local, state) {
+  function declarations(parser, emit, prefix, o, local) {
     var k, v, kk
     if (o==null) return
 
@@ -103,7 +103,7 @@ define(function () { 'use strict';
     case ARRAY:
       for (k = 0; k < o.length; k++)
 
-        declarations(o[k], emit, prefix, local, state)
+        declarations(parser, emit, prefix, o[k], local)
 
       break
     case OBJECT:
@@ -115,12 +115,12 @@ define(function () { 'use strict';
         if (/\$/.test(k)) {
           for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-            declarations(v, emit, prefix + k[kk], local, state)
+            declarations(parser, emit, prefix + k[kk], v, local)
 
           }
         } else {
 
-          declarations(v, emit, prefix + k, local, state)
+          declarations(parser, emit, prefix + k, v, local)
 
         }
       }
@@ -138,10 +138,10 @@ define(function () { 'use strict';
 
       if (local && (k == 'animation-name' || k == 'animation' || k == 'list-style')) {
         // no need to tokenize here a plain `.split(',')` has all bases covered.
-        // We may 'state' a comment, but it's not a big deal.
+        // We may 'parser' a comment, but it's not a big deal.
         o = o.split(',').map(function (o) {
 
-          return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, state.l)
+          return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, parser.l)
 
         }).join(',')
       }
@@ -154,25 +154,28 @@ define(function () { 'use strict';
   /**
    * Hanldes at-rules
    *
-   * @param {string} k - The at-rule name, and, if takes both parameters and a
-   *                     block, the parameters.
-   * @param {string[]} emit - the contextual emitters to the final buffer
-   * @param {string[]} v - Either parameters for block-less rules or their block
-   *                       for the others.
-   * @param {string} prefix - the current selector or a prefix in case of nested rules
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
+   * @param {array} k - The parsed at-rule, including the parameters,
+   *                    if takes both parameters and a block.
+   * @param {string} prefix - the current selector or the selector prefix
+   *                          in case of nested rules
+   * @param {string|string[]|object|object[]} v - Either parameters for
+   *                                              block-less rules or
+   *                                              their block
+   *                                              for the others.
    * @param {string} inAtRule - are we nested in an at-rule?
    * @param {boolean} local - are we in @local or in @global scope?
-   * @param {function} state - @local helper
    */
 
-  function atRules(k, v, emit, prefix, inAtRule, local, state) {
-    k = /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','','']
+  function atRules(parser, emit, k, v, prefix, local, inAtRule) {
     if (!k[3] && /^global$/.test(k[2])) {
-      sheet(v, emit, prefix, inAtRule, 0, state)
+
+      sheet(parser, emit, prefix, v, 0, inAtRule)
 
     } else if (!k[3] && /^local$/.test(k[2])) {
 
-      sheet(v, emit, prefix, inAtRule, 1, state)
+      sheet(parser, emit, prefix, v, 1, inAtRule)
 
     } else if (!k[3] && /^(?:namespace|import|charset)$/.test(k[2])) {
       flatIter(function(v) {
@@ -186,7 +189,7 @@ define(function () { 'use strict';
 
         emit.a(k[1], '', '', ' {\n')
 
-        declarations(v, emit, '', local, state)
+        declarations(parser, emit, '', v, local)
 
         emit.c('}\n')
 
@@ -198,7 +201,7 @@ define(function () { 'use strict';
         k[3] = k[3].replace(
           // generated by script/regexps.js
           /:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,
-          state.l
+          parser.l
         )
       }
 
@@ -207,19 +210,23 @@ define(function () { 'use strict';
 
       if ('page' == k[2]) {
 
-        declarations(v, emit, '', local, state)
+        declarations(parser, emit, '', v, local)
 
       } else {
 
-        sheet(v, emit, prefix, 0, local, state)
+        sheet(
+          parser, emit,
+          'keyframes' == k[2] ? '' : prefix,
+          v, local, 1
+        )
 
       }
 
       emit.c('}\n')
 
     } else {
-      for (var i = 0; i < state.A.length; i++) {
-        if (state.A[i](k, v, emit, prefix, inAtRule, local, state)) return
+      for (var i = 0; i < parser.A.length; i++) {
+        if (parser.A[i](parser, emit, k, v, prefix, local, inAtRule)) return
       }
       emit.a('@-error-unsupported-at-rule', ' ', JSON.stringify(k[0]), ';\n')
 
@@ -227,31 +234,31 @@ define(function () { 'use strict';
   }
 
   /**
-   * Add rulesets and other CSS statements to the sheet.
+   * Add rulesets and other CSS tree to the sheet.
    *
-   * @param {array|string|object} statements - a source object or sub-object.
-   * @param {string[]} emit - the contextual emitters to the final buffer
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
    * @param {string} prefix - the current selector or a prefix in case of nested rules
-   * @param {string} canCompose - are we allowed to @compose here?
+   * @param {array|string|object} tree - a source object or sub-object.
+   * @param {string} inAtRule - are we nested in an at-rule?
    * @param {boolean} local - are we in @local or in @global scope?
-   * @param {function} state - @local helper
    */
-  function sheet(statements, emit, prefix, canCompose, local, state) {
+  function sheet(parser, emit, prefix, tree, local, inAtRule) {
     var k, v, inDeclaration, kk
 
-    switch (type.call(statements)) {
+    switch (type.call(tree)) {
 
     case ARRAY:
-      for (k = 0; k < statements.length; k++){
+      for (k = 0; k < tree.length; k++){
 
-        sheet(statements[k], emit, prefix, canCompose, local, state)
+        sheet(parser, emit, prefix, tree[k], local, inAtRule)
 
       }
       break
 
     case OBJECT:
-      for (k in statements) if (own.call(statements, k)) {
-        v = statements[k]
+      for (k in tree) if (own.call(tree, k)) {
+        v = tree[k]
         if (prefix && /^[-\w$]+$/.test(k)) {
           if (!inDeclaration) {
             inDeclaration = 1
@@ -262,12 +269,12 @@ define(function () { 'use strict';
           if (/\$/.test(k)) {
             for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-              declarations(v, emit, k[kk], local, state)
+              declarations(parser, emit, k[kk], v, local)
 
             }
           } else {
 
-            declarations(v, emit, k, local, state)
+            declarations(parser, emit, k, v, local)
 
           }
         } else if (/^@/.test(k)) {
@@ -275,19 +282,24 @@ define(function () { 'use strict';
 
           inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-          atRules(k, v, emit, prefix, canCompose, local, state)
+          atRules(parser, emit,
+            /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','',''],
+            v, prefix, local, inAtRule
+          )
 
         } else {
           // selector or nested sub-selectors
 
           inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-          sheet(v, emit,
+          sheet(
+            parser, emit,
+            // prefix... Hefty. Ugly. Sadly necessary.
             (/,/.test(prefix) || prefix && /,/.test(k)) ?
             /*0*/ (kk = splitSelector(prefix), splitSelector( local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k
@@ -301,7 +313,7 @@ define(function () { 'use strict';
                 local ?
 
                   k.replace(
-                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                   ) :
 
                   k,
@@ -311,13 +323,12 @@ define(function () { 'use strict';
                 local ?
 
                   k.replace(
-                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                   ) :
 
                   k
                 ),
-            canCompose,
-            local, state
+             v, local, inAtRule
           )
         }
       }
@@ -330,7 +341,7 @@ define(function () { 'use strict';
 
       emit.s(( prefix || ':-error-no-selector' ) , ' {\n')
 
-      declarations(statements, emit, '', local, state)
+      declarations(parser, emit, '', tree, local)
 
       emit.c('}\n')
     }
@@ -351,7 +362,9 @@ define(function () { 'use strict';
     if (
       arguments.length < 3
     ) {
+      // inner curry!
       var _at = at.bind.apply(at, [null].concat([].slice.call(arguments,0)))
+      // So that it can be used as a key in an ES6 object literal.
       _at.toString = function(){return '@' + rule + ' ' + params}
       return _at
     }
@@ -359,7 +372,8 @@ define(function () { 'use strict';
   }
 
   function j2c() {
-    var filters = [], atHandlers = []
+    var filters = []
+    var atHandlers = []
     var instance = {
       at: at,
       global: global,
@@ -408,7 +422,7 @@ define(function () { 'use strict';
       _default(instance, plugin)
     })
 
-    function makeEmitter(inline, state) {
+    function makeEmitter(inline, parser) {
       var buf = []
       function push() {
         emptyArray.push.apply(buf, arguments)
@@ -420,7 +434,7 @@ define(function () { 'use strict';
         d: push, // declaration
         c: push  // close
       }
-      for (var i = filters.length; i--;) emit = filters[i](emit, inline, state)
+      for (var i = filters.length; i--;) emit = filters[i](emit, inline, parser)
       return emit
     }
 
@@ -433,41 +447,41 @@ define(function () { 'use strict';
     localize.a = atHandlers
 
   /*/-statements-/*/
-    instance.sheet = function(statements, emit) {
-      var state = {
-        s: sheet,
+    instance.sheet = function(tree) {
+      var parser = {
+        A: atHandlers,
         a: atRules,
         d: declarations,
-        A: atHandlers,
         l: localize,
-        n: instance.names
+        n: instance.names,
+        s: sheet
       }
+      var emit = makeEmitter(false, parser)
       sheet(
-        statements,
-        emit = makeEmitter(false, state),
-        '', '',     // prefix and compose
-        1,          // local, by default
-        state
+        parser,
+        emit,
+        '',    // prefix
+        tree,
+        1,      // local, by default
+        0     // inAtRule
       )
 
       return emit.x()
     }
   /*/-statements-/*/
-    instance.inline = function (_declarations, emit) {
-      var state = {
-        s: sheet,
-        a: atRules,
+    instance.inline = function (tree) {
+      var parser = {
         d: declarations,
-        A: atHandlers,
         l: localize,
         n: instance.names
       }
+      var emit = makeEmitter(true, parser)
       declarations(
-        _declarations,
-        emit = makeEmitter(true, state),
+        parser,
+        emit,
         '',         // prefix
-        1,          //local
-        state
+        tree,
+        1           //local
       )
       return emit.x()
     }
diff --git a/dist/j2c.amd.min.js b/dist/j2c.amd.min.js
index 3d242871..a911df90 100644
--- a/dist/j2c.amd.min.js
+++ b/dist/j2c.amd.min.js
@@ -1 +1 @@
-define(function(){"use strict";function n(n,e){var t,a,r=[];for(a in e)if($.call(e,a))for(t in n)$.call(n,t)&&r.push(n[t]+e[a]);return r}function e(n){for(var e,t=[],a=[],r=0;e=d.exec(n);)switch(e[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;t.push(e.index)}for(e=t.length;e--;)a.unshift(n.slice(t[e]+1)),n=n.slice(0,t[e]);return a.unshift(n),a}function t(e,t){for(var a,r,l=[],i=[];r=A.exec(e);)"&"==r[0]&&l.push(r.index);for(r=l.length;r--;)i.unshift(e.slice(l[r]+1)),e=e.slice(0,l[r]);for(i.unshift(e),a=[i[0]],r=1;r<i.length;r++)a=n(a,n(t,[i[r]]));return a.join(",")}function a(n){return function e(t){if(h.call(t)===m)for(var a=0;a<t.length;a++)e(t[a]);else n(t)}}function r(n){return"-"+n.toLowerCase()}function l(n,e,t,a,i){var s,o,c;if(null!=n)switch(h.call(n=n.valueOf())){case m:for(s=0;s<n.length;s++)l(n[s],e,t,a,i);break;case w:t=t&&t+"-";for(s in n)if($.call(n,s))if(o=n[s],/\$/.test(s))for(c in s=s.split("$"))$.call(s,c)&&l(o,e,t+s[c],a,i);else l(o,e,t+s,a,i);break;default:s=t.replace(/_/g,"-").replace(/[A-Z]/g,r),!a||"animation-name"!=s&&"animation"!=s&&"list-style"!=s||(n=n.split(",").map(function(n){return n.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,i.l)}).join(",")),e.d(s,s?":":"",n,";\n")}}function i(n,e,t,r,i,o,c){if(n=/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(n)||["@","@","",""],!n[3]&&/^global$/.test(n[2]))s(e,t,r,i,0,c);else if(!n[3]&&/^local$/.test(n[2]))s(e,t,r,i,1,c);else if(!n[3]&&/^(?:namespace|import|charset)$/.test(n[2]))a(function(e){t.a(n[0]," ",e,";\n")})(e);else if(!n[3]&&/^(?:font-face|viewport)$/.test(n[2]))a(function(e){t.a(n[1],"",""," {\n"),l(e,t,"",o,c),t.c("}\n")})(e);else if(n[3]&&/^(?:media|supports|page|keyframes)$/.test(n[2]))o&&"keyframes"==n[2]&&(n[3]=n[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,c.l)),t.a(n[1]," ",n[3]," {\n"),"page"==n[2]?l(e,t,"",o,c):s(e,t,r,0,o,c),t.c("}\n");else{for(var f=0;f<c.A.length;f++)if(c.A[f](n,e,t,r,i,o,c))return;t.a("@-error-unsupported-at-rule"," ",JSON.stringify(n[0]),";\n")}}function s(n,a,r,o,c,f){var u,g,p,v;switch(h.call(n)){case m:for(u=0;u<n.length;u++)s(n[u],a,r,o,c,f);break;case w:for(u in n)if($.call(n,u))if(g=n[u],r&&/^[-\w$]+$/.test(u))if(p||(p=1,a.s(r," {\n")),/\$/.test(u))for(v in u=u.split("$"))$.call(u,v)&&l(g,a,u[v],c,f);else l(g,a,u,c,f);else/^@/.test(u)?(p=p&&a.c("}\n")&&0,i(u,g,a,r,o,c,f)):(p=p&&a.c("}\n")&&0,s(g,a,/,/.test(r)||r&&/,/.test(u)?(v=e(r),e(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u).map(function(n){return/&/.test(n)?t(n,v):v.map(function(e){return e+n}).join(",")}).join(",")):/&/.test(u)?t(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u,[r]):r+(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u),o,c,f));p&&a.c("}\n");break;case b:a.s(r||":-error-no-selector"," {\n"),l(n,a,"",c,f),a.c("}\n")}}function o(n){return":global("+n+")"}function c(n,e,t){return t={},t[n]=e,t}function f(n,e,t){if(arguments.length<3){var a=f.bind.apply(f,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+n+" "+e},a}return c("@"+n+" "+e,t)}function u(){function n(e,t){for(var a in t)$.call(t,a)&&a.indexOf("$")&&(w==h.call(t[a])&&w==h.call(e[a])?n(e[a],t[a]):a in e||(e[a]=t[a]))}function e(n,e){function t(){g.push.apply(a,arguments)}for(var a=[],l={x:function(n){return n?a:a.join("")},a:t,s:t,d:t,c:t},i=r.length;i--;)l=r[i](l,n,e);return l}function t(n,e,t,a){return e?e:(p.names[a]||(p.names[a]=a+p.suffix),t+p.names[a].match(/^\S+/))}var r=[],u=[],p={at:f,global:o,kv:c,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return m(g.slice.call(arguments)),p},$plugins:[]},m=a(function(e){~p.$plugins.indexOf(e)||(p.$plugins.push(e),h.call(e)===v&&(e=e(p)),e&&(a(function(n){r.push(n)})(e.$filter||[]),a(function(n){u.push(n)})(e.$at||[]),n(p,e)))});return t.a=u,p.sheet=function(n,a){var r={s:s,a:i,d:l,A:u,l:t,n:p.names};return s(n,a=e(!1,r),"","",1,r),a.x()},p.inline=function(n,a){var r={s:s,a:i,d:l,A:u,l:t,n:p.names};return l(n,a=e(!0,r),"",1,r),a.x()},p}var g=[],p={},h=p.toString,m=h.call(g),w=h.call(p),b=h.call(""),v=h.call(h),$=p.hasOwnProperty,d=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,A=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_=u();return"sheet|inline|names|at|global|kv|suffix".split("|").map(function(n){u[n]=_[n]}),u});
\ No newline at end of file
+define(function(){"use strict";function n(n,e){var t,a,r=[];for(a in e)if($.call(e,a))for(t in n)$.call(n,t)&&r.push(n[t]+e[a]);return r}function e(n){for(var e,t=[],a=[],r=0;e=d.exec(n);)switch(e[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;t.push(e.index)}for(e=t.length;e--;)a.unshift(n.slice(t[e]+1)),n=n.slice(0,t[e]);return a.unshift(n),a}function t(e,t){for(var a,r,l=[],i=[];r=A.exec(e);)"&"==r[0]&&l.push(r.index);for(r=l.length;r--;)i.unshift(e.slice(l[r]+1)),e=e.slice(0,l[r]);for(i.unshift(e),a=[i[0]],r=1;r<i.length;r++)a=n(a,n(t,[i[r]]));return a.join(",")}function a(n){return function e(t){if(h.call(t)===m)for(var a=0;a<t.length;a++)e(t[a]);else n(t)}}function r(n){return"-"+n.toLowerCase()}function l(n,e,t,a,i){var s,o,c;if(null!=a)switch(h.call(a=a.valueOf())){case m:for(s=0;s<a.length;s++)l(n,e,t,a[s],i);break;case w:t=t&&t+"-";for(s in a)if($.call(a,s))if(o=a[s],/\$/.test(s))for(c in s=s.split("$"))$.call(s,c)&&l(n,e,t+s[c],o,i);else l(n,e,t+s,o,i);break;default:s=t.replace(/_/g,"-").replace(/[A-Z]/g,r),!i||"animation-name"!=s&&"animation"!=s&&"list-style"!=s||(a=a.split(",").map(function(e){return e.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,n.l)}).join(",")),e.d(s,s?":":"",a,";\n")}}function i(n,e,t,r,i,o,c){if(!t[3]&&/^global$/.test(t[2]))s(n,e,i,r,0,c);else if(!t[3]&&/^local$/.test(t[2]))s(n,e,i,r,1,c);else if(!t[3]&&/^(?:namespace|import|charset)$/.test(t[2]))a(function(n){e.a(t[0]," ",n,";\n")})(r);else if(!t[3]&&/^(?:font-face|viewport)$/.test(t[2]))a(function(a){e.a(t[1],"",""," {\n"),l(n,e,"",a,o),e.c("}\n")})(r);else if(t[3]&&/^(?:media|supports|page|keyframes)$/.test(t[2]))o&&"keyframes"==t[2]&&(t[3]=t[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,n.l)),e.a(t[1]," ",t[3]," {\n"),"page"==t[2]?l(n,e,"",r,o):s(n,e,"keyframes"==t[2]?"":i,r,o,1),e.c("}\n");else{for(var f=0;f<n.A.length;f++)if(n.A[f](n,e,t,r,i,o,c))return;e.a("@-error-unsupported-at-rule"," ",JSON.stringify(t[0]),";\n")}}function s(n,a,r,o,c,f){var u,g,p,v;switch(h.call(o)){case m:for(u=0;u<o.length;u++)s(n,a,r,o[u],c,f);break;case w:for(u in o)if($.call(o,u))if(g=o[u],r&&/^[-\w$]+$/.test(u))if(p||(p=1,a.s(r," {\n")),/\$/.test(u))for(v in u=u.split("$"))$.call(u,v)&&l(n,a,u[v],g,c);else l(n,a,u,g,c);else/^@/.test(u)?(p=p&&a.c("}\n")&&0,i(n,a,/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(u)||["@","@","",""],g,r,c,f)):(p=p&&a.c("}\n")&&0,s(n,a,/,/.test(r)||r&&/,/.test(u)?(v=e(r),e(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u).map(function(n){return/&/.test(n)?t(n,v):v.map(function(e){return e+n}).join(",")}).join(",")):/&/.test(u)?t(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u,[r]):r+(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u),g,c,f));p&&a.c("}\n");break;case b:a.s(r||":-error-no-selector"," {\n"),l(n,a,"",o,c),a.c("}\n")}}function o(n){return":global("+n+")"}function c(n,e,t){return t={},t[n]=e,t}function f(n,e,t){if(arguments.length<3){var a=f.bind.apply(f,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+n+" "+e},a}return c("@"+n+" "+e,t)}function u(){function n(e,t){for(var a in t)$.call(t,a)&&a.indexOf("$")&&(w==h.call(t[a])&&w==h.call(e[a])?n(e[a],t[a]):a in e||(e[a]=t[a]))}function e(n,e){function t(){g.push.apply(a,arguments)}for(var a=[],l={x:function(n){return n?a:a.join("")},a:t,s:t,d:t,c:t},i=r.length;i--;)l=r[i](l,n,e);return l}function t(n,e,t,a){return e?e:(p.names[a]||(p.names[a]=a+p.suffix),t+p.names[a].match(/^\S+/))}var r=[],u=[],p={at:f,global:o,kv:c,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return m(g.slice.call(arguments)),p},$plugins:[]},m=a(function(e){~p.$plugins.indexOf(e)||(p.$plugins.push(e),h.call(e)===v&&(e=e(p)),e&&(a(function(n){r.push(n)})(e.$filter||[]),a(function(n){u.push(n)})(e.$at||[]),n(p,e)))});return t.a=u,p.sheet=function(n){var a={A:u,a:i,d:l,l:t,n:p.names,s:s},r=e(!1,a);return s(a,r,"",n,1,0),r.x()},p.inline=function(n){var a={d:l,l:t,n:p.names},r=e(!0,a);return l(a,r,"",n,1),r.x()},p}var g=[],p={},h=p.toString,m=h.call(g),w=h.call(p),b=h.call(""),v=h.call(h),$=p.hasOwnProperty,d=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,A=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_=u();return"sheet|inline|names|at|global|kv|suffix".split("|").map(function(n){u[n]=_[n]}),u});
\ No newline at end of file
diff --git a/dist/j2c.commonjs.js b/dist/j2c.commonjs.js
index 10db4910..a915d513 100644
--- a/dist/j2c.commonjs.js
+++ b/dist/j2c.commonjs.js
@@ -87,15 +87,15 @@ function decamelize(match) {
 /**
  * Handles the property:value; pairs.
  *
- * @param {array|object|string} o - the declarations.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current property or a prefix in case of nested
  *                          sub-properties.
+ * @param {array|object|string} o - the declarations.
  * @param {boolean} local - are we in @local or in @global scope.
- * @param {function} state - @local helper.
  */
 
-function declarations(o, emit, prefix, local, state) {
+function declarations(parser, emit, prefix, o, local) {
   var k, v, kk
   if (o==null) return
 
@@ -103,7 +103,7 @@ function declarations(o, emit, prefix, local, state) {
   case ARRAY:
     for (k = 0; k < o.length; k++)
 
-      declarations(o[k], emit, prefix, local, state)
+      declarations(parser, emit, prefix, o[k], local)
 
     break
   case OBJECT:
@@ -115,12 +115,12 @@ function declarations(o, emit, prefix, local, state) {
       if (/\$/.test(k)) {
         for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-          declarations(v, emit, prefix + k[kk], local, state)
+          declarations(parser, emit, prefix + k[kk], v, local)
 
         }
       } else {
 
-        declarations(v, emit, prefix + k, local, state)
+        declarations(parser, emit, prefix + k, v, local)
 
       }
     }
@@ -138,10 +138,10 @@ function declarations(o, emit, prefix, local, state) {
 
     if (local && (k == 'animation-name' || k == 'animation' || k == 'list-style')) {
       // no need to tokenize here a plain `.split(',')` has all bases covered.
-      // We may 'state' a comment, but it's not a big deal.
+      // We may 'parser' a comment, but it's not a big deal.
       o = o.split(',').map(function (o) {
 
-        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, state.l)
+        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, parser.l)
 
       }).join(',')
     }
@@ -154,25 +154,28 @@ function declarations(o, emit, prefix, local, state) {
 /**
  * Hanldes at-rules
  *
- * @param {string} k - The at-rule name, and, if takes both parameters and a
- *                     block, the parameters.
- * @param {string[]} emit - the contextual emitters to the final buffer
- * @param {string[]} v - Either parameters for block-less rules or their block
- *                       for the others.
- * @param {string} prefix - the current selector or a prefix in case of nested rules
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
+ * @param {array} k - The parsed at-rule, including the parameters,
+ *                    if takes both parameters and a block.
+ * @param {string} prefix - the current selector or the selector prefix
+ *                          in case of nested rules
+ * @param {string|string[]|object|object[]} v - Either parameters for
+ *                                              block-less rules or
+ *                                              their block
+ *                                              for the others.
  * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
 
-function atRules(k, v, emit, prefix, inAtRule, local, state) {
-  k = /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','','']
+function atRules(parser, emit, k, v, prefix, local, inAtRule) {
   if (!k[3] && /^global$/.test(k[2])) {
-    sheet(v, emit, prefix, inAtRule, 0, state)
+
+    sheet(parser, emit, prefix, v, 0, inAtRule)
 
   } else if (!k[3] && /^local$/.test(k[2])) {
 
-    sheet(v, emit, prefix, inAtRule, 1, state)
+    sheet(parser, emit, prefix, v, 1, inAtRule)
 
   } else if (!k[3] && /^(?:namespace|import|charset)$/.test(k[2])) {
     flatIter(function(v) {
@@ -186,7 +189,7 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
       emit.a(k[1], '', '', ' {\n')
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
       emit.c('}\n')
 
@@ -198,7 +201,7 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
       k[3] = k[3].replace(
         // generated by script/regexps.js
         /:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,
-        state.l
+        parser.l
       )
     }
 
@@ -207,19 +210,23 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
     if ('page' == k[2]) {
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
     } else {
 
-      sheet(v, emit, prefix, 0, local, state)
+      sheet(
+        parser, emit,
+        'keyframes' == k[2] ? '' : prefix,
+        v, local, 1
+      )
 
     }
 
     emit.c('}\n')
 
   } else {
-    for (var i = 0; i < state.A.length; i++) {
-      if (state.A[i](k, v, emit, prefix, inAtRule, local, state)) return
+    for (var i = 0; i < parser.A.length; i++) {
+      if (parser.A[i](parser, emit, k, v, prefix, local, inAtRule)) return
     }
     emit.a('@-error-unsupported-at-rule', ' ', JSON.stringify(k[0]), ';\n')
 
@@ -227,31 +234,31 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 }
 
 /**
- * Add rulesets and other CSS statements to the sheet.
+ * Add rulesets and other CSS tree to the sheet.
  *
- * @param {array|string|object} statements - a source object or sub-object.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current selector or a prefix in case of nested rules
- * @param {string} canCompose - are we allowed to @compose here?
+ * @param {array|string|object} tree - a source object or sub-object.
+ * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
-function sheet(statements, emit, prefix, canCompose, local, state) {
+function sheet(parser, emit, prefix, tree, local, inAtRule) {
   var k, v, inDeclaration, kk
 
-  switch (type.call(statements)) {
+  switch (type.call(tree)) {
 
   case ARRAY:
-    for (k = 0; k < statements.length; k++){
+    for (k = 0; k < tree.length; k++){
 
-      sheet(statements[k], emit, prefix, canCompose, local, state)
+      sheet(parser, emit, prefix, tree[k], local, inAtRule)
 
     }
     break
 
   case OBJECT:
-    for (k in statements) if (own.call(statements, k)) {
-      v = statements[k]
+    for (k in tree) if (own.call(tree, k)) {
+      v = tree[k]
       if (prefix && /^[-\w$]+$/.test(k)) {
         if (!inDeclaration) {
           inDeclaration = 1
@@ -262,12 +269,12 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
         if (/\$/.test(k)) {
           for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-            declarations(v, emit, k[kk], local, state)
+            declarations(parser, emit, k[kk], v, local)
 
           }
         } else {
 
-          declarations(v, emit, k, local, state)
+          declarations(parser, emit, k, v, local)
 
         }
       } else if (/^@/.test(k)) {
@@ -275,19 +282,24 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        atRules(k, v, emit, prefix, canCompose, local, state)
+        atRules(parser, emit,
+          /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','',''],
+          v, prefix, local, inAtRule
+        )
 
       } else {
         // selector or nested sub-selectors
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        sheet(v, emit,
+        sheet(
+          parser, emit,
+          // prefix... Hefty. Ugly. Sadly necessary.
           (/,/.test(prefix) || prefix && /,/.test(k)) ?
           /*0*/ (kk = splitSelector(prefix), splitSelector( local ?
 
               k.replace(
-                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
               ) :
 
               k
@@ -301,7 +313,7 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k,
@@ -311,13 +323,12 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k
               ),
-          canCompose,
-          local, state
+           v, local, inAtRule
         )
       }
     }
@@ -330,7 +341,7 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
 
     emit.s(( prefix || ':-error-no-selector' ) , ' {\n')
 
-    declarations(statements, emit, '', local, state)
+    declarations(parser, emit, '', tree, local)
 
     emit.c('}\n')
   }
@@ -351,7 +362,9 @@ function at (rule, params, block) {
   if (
     arguments.length < 3
   ) {
+    // inner curry!
     var _at = at.bind.apply(at, [null].concat([].slice.call(arguments,0)))
+    // So that it can be used as a key in an ES6 object literal.
     _at.toString = function(){return '@' + rule + ' ' + params}
     return _at
   }
@@ -359,7 +372,8 @@ function at (rule, params, block) {
 }
 
 function j2c() {
-  var filters = [], atHandlers = []
+  var filters = []
+  var atHandlers = []
   var instance = {
     at: at,
     global: global,
@@ -408,7 +422,7 @@ function j2c() {
     _default(instance, plugin)
   })
 
-  function makeEmitter(inline, state) {
+  function makeEmitter(inline, parser) {
     var buf = []
     function push() {
       emptyArray.push.apply(buf, arguments)
@@ -420,7 +434,7 @@ function j2c() {
       d: push, // declaration
       c: push  // close
     }
-    for (var i = filters.length; i--;) emit = filters[i](emit, inline, state)
+    for (var i = filters.length; i--;) emit = filters[i](emit, inline, parser)
     return emit
   }
 
@@ -433,41 +447,41 @@ function j2c() {
   localize.a = atHandlers
 
 /*/-statements-/*/
-  instance.sheet = function(statements, emit) {
-    var state = {
-      s: sheet,
+  instance.sheet = function(tree) {
+    var parser = {
+      A: atHandlers,
       a: atRules,
       d: declarations,
-      A: atHandlers,
       l: localize,
-      n: instance.names
+      n: instance.names,
+      s: sheet
     }
+    var emit = makeEmitter(false, parser)
     sheet(
-      statements,
-      emit = makeEmitter(false, state),
-      '', '',     // prefix and compose
-      1,          // local, by default
-      state
+      parser,
+      emit,
+      '',    // prefix
+      tree,
+      1,      // local, by default
+      0     // inAtRule
     )
 
     return emit.x()
   }
 /*/-statements-/*/
-  instance.inline = function (_declarations, emit) {
-    var state = {
-      s: sheet,
-      a: atRules,
+  instance.inline = function (tree) {
+    var parser = {
       d: declarations,
-      A: atHandlers,
       l: localize,
       n: instance.names
     }
+    var emit = makeEmitter(true, parser)
     declarations(
-      _declarations,
-      emit = makeEmitter(true, state),
+      parser,
+      emit,
       '',         // prefix
-      1,          //local
-      state
+      tree,
+      1           //local
     )
     return emit.x()
   }
diff --git a/dist/j2c.commonjs.min.js b/dist/j2c.commonjs.min.js
index fa315dfe..3ab700d7 100644
--- a/dist/j2c.commonjs.min.js
+++ b/dist/j2c.commonjs.min.js
@@ -1 +1 @@
-"use strict";function cartesian(e,t){var n,a,r=[];for(a in t)if(own.call(t,a))for(n in e)own.call(e,n)&&r.push(e[n]+t[a]);return r}function splitSelector(e){for(var t,n=[],a=[],r=0;t=selectorTokenizer.exec(e);)switch(t[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;n.push(t.index)}for(t=n.length;t--;)a.unshift(e.slice(n[t]+1)),e=e.slice(0,n[t]);return a.unshift(e),a}function ampersand(e,t){for(var n,a,r=[],l=[];a=ampersandTokenizer.exec(e);)"&"==a[0]&&r.push(a.index);for(a=r.length;a--;)l.unshift(e.slice(r[a]+1)),e=e.slice(0,r[a]);for(l.unshift(e),n=[l[0]],a=1;a<l.length;a++)n=cartesian(n,cartesian(t,[l[a]]));return n.join(",")}function flatIter(e){return function t(n){if(type.call(n)===ARRAY)for(var a=0;a<n.length;a++)t(n[a]);else e(n)}}function decamelize(e){return"-"+e.toLowerCase()}function declarations(e,t,n,a,r){var l,s,i;if(null!=e)switch(type.call(e=e.valueOf())){case ARRAY:for(l=0;l<e.length;l++)declarations(e[l],t,n,a,r);break;case OBJECT:n=n&&n+"-";for(l in e)if(own.call(e,l))if(s=e[l],/\$/.test(l))for(i in l=l.split("$"))own.call(l,i)&&declarations(s,t,n+l[i],a,r);else declarations(s,t,n+l,a,r);break;default:l=n.replace(/_/g,"-").replace(/[A-Z]/g,decamelize),!a||"animation-name"!=l&&"animation"!=l&&"list-style"!=l||(e=e.split(",").map(function(e){return e.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,r.l)}).join(",")),t.d(l,l?":":"",e,";\n")}}function atRules(e,t,n,a,r,l,s){if(e=/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(e)||["@","@","",""],!e[3]&&/^global$/.test(e[2]))sheet(t,n,a,r,0,s);else if(!e[3]&&/^local$/.test(e[2]))sheet(t,n,a,r,1,s);else if(!e[3]&&/^(?:namespace|import|charset)$/.test(e[2]))flatIter(function(t){n.a(e[0]," ",t,";\n")})(t);else if(!e[3]&&/^(?:font-face|viewport)$/.test(e[2]))flatIter(function(t){n.a(e[1],"",""," {\n"),declarations(t,n,"",l,s),n.c("}\n")})(t);else if(e[3]&&/^(?:media|supports|page|keyframes)$/.test(e[2]))l&&"keyframes"==e[2]&&(e[3]=e[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,s.l)),n.a(e[1]," ",e[3]," {\n"),"page"==e[2]?declarations(t,n,"",l,s):sheet(t,n,a,0,l,s),n.c("}\n");else{for(var i=0;i<s.A.length;i++)if(s.A[i](e,t,n,a,r,l,s))return;n.a("@-error-unsupported-at-rule"," ",JSON.stringify(e[0]),";\n")}}function sheet(e,t,n,a,r,l){var s,i,o,c;switch(type.call(e)){case ARRAY:for(s=0;s<e.length;s++)sheet(e[s],t,n,a,r,l);break;case OBJECT:for(s in e)if(own.call(e,s))if(i=e[s],n&&/^[-\w$]+$/.test(s))if(o||(o=1,t.s(n," {\n")),/\$/.test(s))for(c in s=s.split("$"))own.call(s,c)&&declarations(i,t,s[c],r,l);else declarations(i,t,s,r,l);else/^@/.test(s)?(o=o&&t.c("}\n")&&0,atRules(s,i,t,n,a,r,l)):(o=o&&t.c("}\n")&&0,sheet(i,t,/,/.test(n)||n&&/,/.test(s)?(c=splitSelector(n),splitSelector(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,l.l):s).map(function(e){return/&/.test(e)?ampersand(e,c):c.map(function(t){return t+e}).join(",")}).join(",")):/&/.test(s)?ampersand(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,l.l):s,[n]):n+(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,l.l):s),a,r,l));o&&t.c("}\n");break;case STRING:t.s(n||":-error-no-selector"," {\n"),declarations(e,t,"",r,l),t.c("}\n")}}function global(e){return":global("+e+")"}function kv(e,t,n){return n={},n[e]=t,n}function at(e,t,n){if(arguments.length<3){var a=at.bind.apply(at,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+e+" "+t},a}return kv("@"+e+" "+t,n)}function j2c(){function e(t,n){for(var a in n)own.call(n,a)&&a.indexOf("$")&&(OBJECT==type.call(n[a])&&OBJECT==type.call(t[a])?e(t[a],n[a]):a in t||(t[a]=n[a]))}function t(e,t){function n(){emptyArray.push.apply(r,arguments)}for(var r=[],l={x:function(e){return e?r:r.join("")},a:n,s:n,d:n,c:n},s=a.length;s--;)l=a[s](l,e,t);return l}function n(e,t,n,a){return t?t:(l.names[a]||(l.names[a]=a+l.suffix),n+l.names[a].match(/^\S+/))}var a=[],r=[],l={at:at,global:global,kv:kv,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return s(emptyArray.slice.call(arguments)),l},$plugins:[]},s=flatIter(function(t){~l.$plugins.indexOf(t)||(l.$plugins.push(t),type.call(t)===FUNCTION&&(t=t(l)),t&&(flatIter(function(e){a.push(e)})(t.$filter||[]),flatIter(function(e){r.push(e)})(t.$at||[]),e(l,t)))});return n.a=r,l.sheet=function(e,a){var s={s:sheet,a:atRules,d:declarations,A:r,l:n,n:l.names};return sheet(e,a=t(!1,s),"","",1,s),a.x()},l.inline=function(e,a){var s={s:sheet,a:atRules,d:declarations,A:r,l:n,n:l.names};return declarations(e,a=t(!0,s),"",1,s),a.x()},l}var emptyArray=[],emptyObject={},type=emptyObject.toString,ARRAY=type.call(emptyArray),OBJECT=type.call(emptyObject),STRING=type.call(""),FUNCTION=type.call(type),own=emptyObject.hasOwnProperty,selectorTokenizer=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,ampersandTokenizer=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_j2c=j2c();"sheet|inline|names|at|global|kv|suffix".split("|").map(function(e){j2c[e]=_j2c[e]}),module.exports=j2c;
\ No newline at end of file
+"use strict";function cartesian(e,t){var n,a,r=[];for(a in t)if(own.call(t,a))for(n in e)own.call(e,n)&&r.push(e[n]+t[a]);return r}function splitSelector(e){for(var t,n=[],a=[],r=0;t=selectorTokenizer.exec(e);)switch(t[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;n.push(t.index)}for(t=n.length;t--;)a.unshift(e.slice(n[t]+1)),e=e.slice(0,n[t]);return a.unshift(e),a}function ampersand(e,t){for(var n,a,r=[],l=[];a=ampersandTokenizer.exec(e);)"&"==a[0]&&r.push(a.index);for(a=r.length;a--;)l.unshift(e.slice(r[a]+1)),e=e.slice(0,r[a]);for(l.unshift(e),n=[l[0]],a=1;a<l.length;a++)n=cartesian(n,cartesian(t,[l[a]]));return n.join(",")}function flatIter(e){return function t(n){if(type.call(n)===ARRAY)for(var a=0;a<n.length;a++)t(n[a]);else e(n)}}function decamelize(e){return"-"+e.toLowerCase()}function declarations(e,t,n,a,r){var l,s,i;if(null!=a)switch(type.call(a=a.valueOf())){case ARRAY:for(l=0;l<a.length;l++)declarations(e,t,n,a[l],r);break;case OBJECT:n=n&&n+"-";for(l in a)if(own.call(a,l))if(s=a[l],/\$/.test(l))for(i in l=l.split("$"))own.call(l,i)&&declarations(e,t,n+l[i],s,r);else declarations(e,t,n+l,s,r);break;default:l=n.replace(/_/g,"-").replace(/[A-Z]/g,decamelize),!r||"animation-name"!=l&&"animation"!=l&&"list-style"!=l||(a=a.split(",").map(function(t){return t.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,e.l)}).join(",")),t.d(l,l?":":"",a,";\n")}}function atRules(e,t,n,a,r,l,s){if(!n[3]&&/^global$/.test(n[2]))sheet(e,t,r,a,0,s);else if(!n[3]&&/^local$/.test(n[2]))sheet(e,t,r,a,1,s);else if(!n[3]&&/^(?:namespace|import|charset)$/.test(n[2]))flatIter(function(e){t.a(n[0]," ",e,";\n")})(a);else if(!n[3]&&/^(?:font-face|viewport)$/.test(n[2]))flatIter(function(a){t.a(n[1],"",""," {\n"),declarations(e,t,"",a,l),t.c("}\n")})(a);else if(n[3]&&/^(?:media|supports|page|keyframes)$/.test(n[2]))l&&"keyframes"==n[2]&&(n[3]=n[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,e.l)),t.a(n[1]," ",n[3]," {\n"),"page"==n[2]?declarations(e,t,"",a,l):sheet(e,t,"keyframes"==n[2]?"":r,a,l,1),t.c("}\n");else{for(var i=0;i<e.A.length;i++)if(e.A[i](e,t,n,a,r,l,s))return;t.a("@-error-unsupported-at-rule"," ",JSON.stringify(n[0]),";\n")}}function sheet(e,t,n,a,r,l){var s,i,o,c;switch(type.call(a)){case ARRAY:for(s=0;s<a.length;s++)sheet(e,t,n,a[s],r,l);break;case OBJECT:for(s in a)if(own.call(a,s))if(i=a[s],n&&/^[-\w$]+$/.test(s))if(o||(o=1,t.s(n," {\n")),/\$/.test(s))for(c in s=s.split("$"))own.call(s,c)&&declarations(e,t,s[c],i,r);else declarations(e,t,s,i,r);else/^@/.test(s)?(o=o&&t.c("}\n")&&0,atRules(e,t,/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(s)||["@","@","",""],i,n,r,l)):(o=o&&t.c("}\n")&&0,sheet(e,t,/,/.test(n)||n&&/,/.test(s)?(c=splitSelector(n),splitSelector(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,e.l):s).map(function(e){return/&/.test(e)?ampersand(e,c):c.map(function(t){return t+e}).join(",")}).join(",")):/&/.test(s)?ampersand(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,e.l):s,[n]):n+(r?s.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,e.l):s),i,r,l));o&&t.c("}\n");break;case STRING:t.s(n||":-error-no-selector"," {\n"),declarations(e,t,"",a,r),t.c("}\n")}}function global(e){return":global("+e+")"}function kv(e,t,n){return n={},n[e]=t,n}function at(e,t,n){if(arguments.length<3){var a=at.bind.apply(at,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+e+" "+t},a}return kv("@"+e+" "+t,n)}function j2c(){function e(t,n){for(var a in n)own.call(n,a)&&a.indexOf("$")&&(OBJECT==type.call(n[a])&&OBJECT==type.call(t[a])?e(t[a],n[a]):a in t||(t[a]=n[a]))}function t(e,t){function n(){emptyArray.push.apply(r,arguments)}for(var r=[],l={x:function(e){return e?r:r.join("")},a:n,s:n,d:n,c:n},s=a.length;s--;)l=a[s](l,e,t);return l}function n(e,t,n,a){return t?t:(l.names[a]||(l.names[a]=a+l.suffix),n+l.names[a].match(/^\S+/))}var a=[],r=[],l={at:at,global:global,kv:kv,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return s(emptyArray.slice.call(arguments)),l},$plugins:[]},s=flatIter(function(t){~l.$plugins.indexOf(t)||(l.$plugins.push(t),type.call(t)===FUNCTION&&(t=t(l)),t&&(flatIter(function(e){a.push(e)})(t.$filter||[]),flatIter(function(e){r.push(e)})(t.$at||[]),e(l,t)))});return n.a=r,l.sheet=function(e){var a={A:r,a:atRules,d:declarations,l:n,n:l.names,s:sheet},s=t(!1,a);return sheet(a,s,"",e,1,0),s.x()},l.inline=function(e){var a={d:declarations,l:n,n:l.names},r=t(!0,a);return declarations(a,r,"",e,1),r.x()},l}var emptyArray=[],emptyObject={},type=emptyObject.toString,ARRAY=type.call(emptyArray),OBJECT=type.call(emptyObject),STRING=type.call(""),FUNCTION=type.call(type),own=emptyObject.hasOwnProperty,selectorTokenizer=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,ampersandTokenizer=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_j2c=j2c();"sheet|inline|names|at|global|kv|suffix".split("|").map(function(e){j2c[e]=_j2c[e]}),module.exports=j2c;
\ No newline at end of file
diff --git a/dist/j2c.es6.js b/dist/j2c.es6.js
index d55111d3..2afec147 100644
--- a/dist/j2c.es6.js
+++ b/dist/j2c.es6.js
@@ -85,15 +85,15 @@ function decamelize(match) {
 /**
  * Handles the property:value; pairs.
  *
- * @param {array|object|string} o - the declarations.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current property or a prefix in case of nested
  *                          sub-properties.
+ * @param {array|object|string} o - the declarations.
  * @param {boolean} local - are we in @local or in @global scope.
- * @param {function} state - @local helper.
  */
 
-function declarations(o, emit, prefix, local, state) {
+function declarations(parser, emit, prefix, o, local) {
   var k, v, kk
   if (o==null) return
 
@@ -101,7 +101,7 @@ function declarations(o, emit, prefix, local, state) {
   case ARRAY:
     for (k = 0; k < o.length; k++)
 
-      declarations(o[k], emit, prefix, local, state)
+      declarations(parser, emit, prefix, o[k], local)
 
     break
   case OBJECT:
@@ -113,12 +113,12 @@ function declarations(o, emit, prefix, local, state) {
       if (/\$/.test(k)) {
         for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-          declarations(v, emit, prefix + k[kk], local, state)
+          declarations(parser, emit, prefix + k[kk], v, local)
 
         }
       } else {
 
-        declarations(v, emit, prefix + k, local, state)
+        declarations(parser, emit, prefix + k, v, local)
 
       }
     }
@@ -136,10 +136,10 @@ function declarations(o, emit, prefix, local, state) {
 
     if (local && (k == 'animation-name' || k == 'animation' || k == 'list-style')) {
       // no need to tokenize here a plain `.split(',')` has all bases covered.
-      // We may 'state' a comment, but it's not a big deal.
+      // We may 'parser' a comment, but it's not a big deal.
       o = o.split(',').map(function (o) {
 
-        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, state.l)
+        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, parser.l)
 
       }).join(',')
     }
@@ -152,25 +152,28 @@ function declarations(o, emit, prefix, local, state) {
 /**
  * Hanldes at-rules
  *
- * @param {string} k - The at-rule name, and, if takes both parameters and a
- *                     block, the parameters.
- * @param {string[]} emit - the contextual emitters to the final buffer
- * @param {string[]} v - Either parameters for block-less rules or their block
- *                       for the others.
- * @param {string} prefix - the current selector or a prefix in case of nested rules
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
+ * @param {array} k - The parsed at-rule, including the parameters,
+ *                    if takes both parameters and a block.
+ * @param {string} prefix - the current selector or the selector prefix
+ *                          in case of nested rules
+ * @param {string|string[]|object|object[]} v - Either parameters for
+ *                                              block-less rules or
+ *                                              their block
+ *                                              for the others.
  * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
 
-function atRules(k, v, emit, prefix, inAtRule, local, state) {
-  k = /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','','']
+function atRules(parser, emit, k, v, prefix, local, inAtRule) {
   if (!k[3] && /^global$/.test(k[2])) {
-    sheet(v, emit, prefix, inAtRule, 0, state)
+
+    sheet(parser, emit, prefix, v, 0, inAtRule)
 
   } else if (!k[3] && /^local$/.test(k[2])) {
 
-    sheet(v, emit, prefix, inAtRule, 1, state)
+    sheet(parser, emit, prefix, v, 1, inAtRule)
 
   } else if (!k[3] && /^(?:namespace|import|charset)$/.test(k[2])) {
     flatIter(function(v) {
@@ -184,7 +187,7 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
       emit.a(k[1], '', '', ' {\n')
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
       emit.c('}\n')
 
@@ -196,7 +199,7 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
       k[3] = k[3].replace(
         // generated by script/regexps.js
         /:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,
-        state.l
+        parser.l
       )
     }
 
@@ -205,19 +208,23 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
     if ('page' == k[2]) {
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
     } else {
 
-      sheet(v, emit, prefix, 0, local, state)
+      sheet(
+        parser, emit,
+        'keyframes' == k[2] ? '' : prefix,
+        v, local, 1
+      )
 
     }
 
     emit.c('}\n')
 
   } else {
-    for (var i = 0; i < state.A.length; i++) {
-      if (state.A[i](k, v, emit, prefix, inAtRule, local, state)) return
+    for (var i = 0; i < parser.A.length; i++) {
+      if (parser.A[i](parser, emit, k, v, prefix, local, inAtRule)) return
     }
     emit.a('@-error-unsupported-at-rule', ' ', JSON.stringify(k[0]), ';\n')
 
@@ -225,31 +232,31 @@ function atRules(k, v, emit, prefix, inAtRule, local, state) {
 }
 
 /**
- * Add rulesets and other CSS statements to the sheet.
+ * Add rulesets and other CSS tree to the sheet.
  *
- * @param {array|string|object} statements - a source object or sub-object.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current selector or a prefix in case of nested rules
- * @param {string} canCompose - are we allowed to @compose here?
+ * @param {array|string|object} tree - a source object or sub-object.
+ * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
-function sheet(statements, emit, prefix, canCompose, local, state) {
+function sheet(parser, emit, prefix, tree, local, inAtRule) {
   var k, v, inDeclaration, kk
 
-  switch (type.call(statements)) {
+  switch (type.call(tree)) {
 
   case ARRAY:
-    for (k = 0; k < statements.length; k++){
+    for (k = 0; k < tree.length; k++){
 
-      sheet(statements[k], emit, prefix, canCompose, local, state)
+      sheet(parser, emit, prefix, tree[k], local, inAtRule)
 
     }
     break
 
   case OBJECT:
-    for (k in statements) if (own.call(statements, k)) {
-      v = statements[k]
+    for (k in tree) if (own.call(tree, k)) {
+      v = tree[k]
       if (prefix && /^[-\w$]+$/.test(k)) {
         if (!inDeclaration) {
           inDeclaration = 1
@@ -260,12 +267,12 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
         if (/\$/.test(k)) {
           for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-            declarations(v, emit, k[kk], local, state)
+            declarations(parser, emit, k[kk], v, local)
 
           }
         } else {
 
-          declarations(v, emit, k, local, state)
+          declarations(parser, emit, k, v, local)
 
         }
       } else if (/^@/.test(k)) {
@@ -273,19 +280,24 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        atRules(k, v, emit, prefix, canCompose, local, state)
+        atRules(parser, emit,
+          /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','',''],
+          v, prefix, local, inAtRule
+        )
 
       } else {
         // selector or nested sub-selectors
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        sheet(v, emit,
+        sheet(
+          parser, emit,
+          // prefix... Hefty. Ugly. Sadly necessary.
           (/,/.test(prefix) || prefix && /,/.test(k)) ?
           /*0*/ (kk = splitSelector(prefix), splitSelector( local ?
 
               k.replace(
-                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
               ) :
 
               k
@@ -299,7 +311,7 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k,
@@ -309,13 +321,12 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k
               ),
-          canCompose,
-          local, state
+           v, local, inAtRule
         )
       }
     }
@@ -328,7 +339,7 @@ function sheet(statements, emit, prefix, canCompose, local, state) {
 
     emit.s(( prefix || ':-error-no-selector' ) , ' {\n')
 
-    declarations(statements, emit, '', local, state)
+    declarations(parser, emit, '', tree, local)
 
     emit.c('}\n')
   }
@@ -349,7 +360,9 @@ function at (rule, params, block) {
   if (
     arguments.length < 3
   ) {
+    // inner curry!
     var _at = at.bind.apply(at, [null].concat([].slice.call(arguments,0)))
+    // So that it can be used as a key in an ES6 object literal.
     _at.toString = function(){return '@' + rule + ' ' + params}
     return _at
   }
@@ -357,7 +370,8 @@ function at (rule, params, block) {
 }
 
 function j2c() {
-  var filters = [], atHandlers = []
+  var filters = []
+  var atHandlers = []
   var instance = {
     at: at,
     global: global,
@@ -406,7 +420,7 @@ function j2c() {
     _default(instance, plugin)
   })
 
-  function makeEmitter(inline, state) {
+  function makeEmitter(inline, parser) {
     var buf = []
     function push() {
       emptyArray.push.apply(buf, arguments)
@@ -418,7 +432,7 @@ function j2c() {
       d: push, // declaration
       c: push  // close
     }
-    for (var i = filters.length; i--;) emit = filters[i](emit, inline, state)
+    for (var i = filters.length; i--;) emit = filters[i](emit, inline, parser)
     return emit
   }
 
@@ -431,41 +445,41 @@ function j2c() {
   localize.a = atHandlers
 
 /*/-statements-/*/
-  instance.sheet = function(statements, emit) {
-    var state = {
-      s: sheet,
+  instance.sheet = function(tree) {
+    var parser = {
+      A: atHandlers,
       a: atRules,
       d: declarations,
-      A: atHandlers,
       l: localize,
-      n: instance.names
+      n: instance.names,
+      s: sheet
     }
+    var emit = makeEmitter(false, parser)
     sheet(
-      statements,
-      emit = makeEmitter(false, state),
-      '', '',     // prefix and compose
-      1,          // local, by default
-      state
+      parser,
+      emit,
+      '',    // prefix
+      tree,
+      1,      // local, by default
+      0     // inAtRule
     )
 
     return emit.x()
   }
 /*/-statements-/*/
-  instance.inline = function (_declarations, emit) {
-    var state = {
-      s: sheet,
-      a: atRules,
+  instance.inline = function (tree) {
+    var parser = {
       d: declarations,
-      A: atHandlers,
       l: localize,
       n: instance.names
     }
+    var emit = makeEmitter(true, parser)
     declarations(
-      _declarations,
-      emit = makeEmitter(true, state),
+      parser,
+      emit,
       '',         // prefix
-      1,          //local
-      state
+      tree,
+      1           //local
     )
     return emit.x()
   }
diff --git a/dist/j2c.global.js b/dist/j2c.global.js
index 0f2f9d00..3ee46c76 100644
--- a/dist/j2c.global.js
+++ b/dist/j2c.global.js
@@ -88,15 +88,15 @@ var j2c = (function () {
   /**
    * Handles the property:value; pairs.
    *
-   * @param {array|object|string} o - the declarations.
-   * @param {string[]} emit - the contextual emitters to the final buffer
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
    * @param {string} prefix - the current property or a prefix in case of nested
    *                          sub-properties.
+   * @param {array|object|string} o - the declarations.
    * @param {boolean} local - are we in @local or in @global scope.
-   * @param {function} state - @local helper.
    */
 
-  function declarations(o, emit, prefix, local, state) {
+  function declarations(parser, emit, prefix, o, local) {
     var k, v, kk
     if (o==null) return
 
@@ -104,7 +104,7 @@ var j2c = (function () {
     case ARRAY:
       for (k = 0; k < o.length; k++)
 
-        declarations(o[k], emit, prefix, local, state)
+        declarations(parser, emit, prefix, o[k], local)
 
       break
     case OBJECT:
@@ -116,12 +116,12 @@ var j2c = (function () {
         if (/\$/.test(k)) {
           for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-            declarations(v, emit, prefix + k[kk], local, state)
+            declarations(parser, emit, prefix + k[kk], v, local)
 
           }
         } else {
 
-          declarations(v, emit, prefix + k, local, state)
+          declarations(parser, emit, prefix + k, v, local)
 
         }
       }
@@ -139,10 +139,10 @@ var j2c = (function () {
 
       if (local && (k == 'animation-name' || k == 'animation' || k == 'list-style')) {
         // no need to tokenize here a plain `.split(',')` has all bases covered.
-        // We may 'state' a comment, but it's not a big deal.
+        // We may 'parser' a comment, but it's not a big deal.
         o = o.split(',').map(function (o) {
 
-          return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, state.l)
+          return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, parser.l)
 
         }).join(',')
       }
@@ -155,25 +155,28 @@ var j2c = (function () {
   /**
    * Hanldes at-rules
    *
-   * @param {string} k - The at-rule name, and, if takes both parameters and a
-   *                     block, the parameters.
-   * @param {string[]} emit - the contextual emitters to the final buffer
-   * @param {string[]} v - Either parameters for block-less rules or their block
-   *                       for the others.
-   * @param {string} prefix - the current selector or a prefix in case of nested rules
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
+   * @param {array} k - The parsed at-rule, including the parameters,
+   *                    if takes both parameters and a block.
+   * @param {string} prefix - the current selector or the selector prefix
+   *                          in case of nested rules
+   * @param {string|string[]|object|object[]} v - Either parameters for
+   *                                              block-less rules or
+   *                                              their block
+   *                                              for the others.
    * @param {string} inAtRule - are we nested in an at-rule?
    * @param {boolean} local - are we in @local or in @global scope?
-   * @param {function} state - @local helper
    */
 
-  function atRules(k, v, emit, prefix, inAtRule, local, state) {
-    k = /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','','']
+  function atRules(parser, emit, k, v, prefix, local, inAtRule) {
     if (!k[3] && /^global$/.test(k[2])) {
-      sheet(v, emit, prefix, inAtRule, 0, state)
+
+      sheet(parser, emit, prefix, v, 0, inAtRule)
 
     } else if (!k[3] && /^local$/.test(k[2])) {
 
-      sheet(v, emit, prefix, inAtRule, 1, state)
+      sheet(parser, emit, prefix, v, 1, inAtRule)
 
     } else if (!k[3] && /^(?:namespace|import|charset)$/.test(k[2])) {
       flatIter(function(v) {
@@ -187,7 +190,7 @@ var j2c = (function () {
 
         emit.a(k[1], '', '', ' {\n')
 
-        declarations(v, emit, '', local, state)
+        declarations(parser, emit, '', v, local)
 
         emit.c('}\n')
 
@@ -199,7 +202,7 @@ var j2c = (function () {
         k[3] = k[3].replace(
           // generated by script/regexps.js
           /:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,
-          state.l
+          parser.l
         )
       }
 
@@ -208,19 +211,23 @@ var j2c = (function () {
 
       if ('page' == k[2]) {
 
-        declarations(v, emit, '', local, state)
+        declarations(parser, emit, '', v, local)
 
       } else {
 
-        sheet(v, emit, prefix, 0, local, state)
+        sheet(
+          parser, emit,
+          'keyframes' == k[2] ? '' : prefix,
+          v, local, 1
+        )
 
       }
 
       emit.c('}\n')
 
     } else {
-      for (var i = 0; i < state.A.length; i++) {
-        if (state.A[i](k, v, emit, prefix, inAtRule, local, state)) return
+      for (var i = 0; i < parser.A.length; i++) {
+        if (parser.A[i](parser, emit, k, v, prefix, local, inAtRule)) return
       }
       emit.a('@-error-unsupported-at-rule', ' ', JSON.stringify(k[0]), ';\n')
 
@@ -228,31 +235,31 @@ var j2c = (function () {
   }
 
   /**
-   * Add rulesets and other CSS statements to the sheet.
+   * Add rulesets and other CSS tree to the sheet.
    *
-   * @param {array|string|object} statements - a source object or sub-object.
-   * @param {string[]} emit - the contextual emitters to the final buffer
+   * @param {object} parser - holds the parser-related methods and state
+   * @param {object} emit - the contextual emitters to the final buffer
    * @param {string} prefix - the current selector or a prefix in case of nested rules
-   * @param {string} canCompose - are we allowed to @compose here?
+   * @param {array|string|object} tree - a source object or sub-object.
+   * @param {string} inAtRule - are we nested in an at-rule?
    * @param {boolean} local - are we in @local or in @global scope?
-   * @param {function} state - @local helper
    */
-  function sheet(statements, emit, prefix, canCompose, local, state) {
+  function sheet(parser, emit, prefix, tree, local, inAtRule) {
     var k, v, inDeclaration, kk
 
-    switch (type.call(statements)) {
+    switch (type.call(tree)) {
 
     case ARRAY:
-      for (k = 0; k < statements.length; k++){
+      for (k = 0; k < tree.length; k++){
 
-        sheet(statements[k], emit, prefix, canCompose, local, state)
+        sheet(parser, emit, prefix, tree[k], local, inAtRule)
 
       }
       break
 
     case OBJECT:
-      for (k in statements) if (own.call(statements, k)) {
-        v = statements[k]
+      for (k in tree) if (own.call(tree, k)) {
+        v = tree[k]
         if (prefix && /^[-\w$]+$/.test(k)) {
           if (!inDeclaration) {
             inDeclaration = 1
@@ -263,12 +270,12 @@ var j2c = (function () {
           if (/\$/.test(k)) {
             for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-              declarations(v, emit, k[kk], local, state)
+              declarations(parser, emit, k[kk], v, local)
 
             }
           } else {
 
-            declarations(v, emit, k, local, state)
+            declarations(parser, emit, k, v, local)
 
           }
         } else if (/^@/.test(k)) {
@@ -276,19 +283,24 @@ var j2c = (function () {
 
           inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-          atRules(k, v, emit, prefix, canCompose, local, state)
+          atRules(parser, emit,
+            /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','',''],
+            v, prefix, local, inAtRule
+          )
 
         } else {
           // selector or nested sub-selectors
 
           inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-          sheet(v, emit,
+          sheet(
+            parser, emit,
+            // prefix... Hefty. Ugly. Sadly necessary.
             (/,/.test(prefix) || prefix && /,/.test(k)) ?
             /*0*/ (kk = splitSelector(prefix), splitSelector( local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k
@@ -302,7 +314,7 @@ var j2c = (function () {
                 local ?
 
                   k.replace(
-                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                   ) :
 
                   k,
@@ -312,13 +324,12 @@ var j2c = (function () {
                 local ?
 
                   k.replace(
-                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                    /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                   ) :
 
                   k
                 ),
-            canCompose,
-            local, state
+             v, local, inAtRule
           )
         }
       }
@@ -331,7 +342,7 @@ var j2c = (function () {
 
       emit.s(( prefix || ':-error-no-selector' ) , ' {\n')
 
-      declarations(statements, emit, '', local, state)
+      declarations(parser, emit, '', tree, local)
 
       emit.c('}\n')
     }
@@ -352,7 +363,9 @@ var j2c = (function () {
     if (
       arguments.length < 3
     ) {
+      // inner curry!
       var _at = at.bind.apply(at, [null].concat([].slice.call(arguments,0)))
+      // So that it can be used as a key in an ES6 object literal.
       _at.toString = function(){return '@' + rule + ' ' + params}
       return _at
     }
@@ -360,7 +373,8 @@ var j2c = (function () {
   }
 
   function j2c() {
-    var filters = [], atHandlers = []
+    var filters = []
+    var atHandlers = []
     var instance = {
       at: at,
       global: global,
@@ -409,7 +423,7 @@ var j2c = (function () {
       _default(instance, plugin)
     })
 
-    function makeEmitter(inline, state) {
+    function makeEmitter(inline, parser) {
       var buf = []
       function push() {
         emptyArray.push.apply(buf, arguments)
@@ -421,7 +435,7 @@ var j2c = (function () {
         d: push, // declaration
         c: push  // close
       }
-      for (var i = filters.length; i--;) emit = filters[i](emit, inline, state)
+      for (var i = filters.length; i--;) emit = filters[i](emit, inline, parser)
       return emit
     }
 
@@ -434,41 +448,41 @@ var j2c = (function () {
     localize.a = atHandlers
 
   /*/-statements-/*/
-    instance.sheet = function(statements, emit) {
-      var state = {
-        s: sheet,
+    instance.sheet = function(tree) {
+      var parser = {
+        A: atHandlers,
         a: atRules,
         d: declarations,
-        A: atHandlers,
         l: localize,
-        n: instance.names
+        n: instance.names,
+        s: sheet
       }
+      var emit = makeEmitter(false, parser)
       sheet(
-        statements,
-        emit = makeEmitter(false, state),
-        '', '',     // prefix and compose
-        1,          // local, by default
-        state
+        parser,
+        emit,
+        '',    // prefix
+        tree,
+        1,      // local, by default
+        0     // inAtRule
       )
 
       return emit.x()
     }
   /*/-statements-/*/
-    instance.inline = function (_declarations, emit) {
-      var state = {
-        s: sheet,
-        a: atRules,
+    instance.inline = function (tree) {
+      var parser = {
         d: declarations,
-        A: atHandlers,
         l: localize,
         n: instance.names
       }
+      var emit = makeEmitter(true, parser)
       declarations(
-        _declarations,
-        emit = makeEmitter(true, state),
+        parser,
+        emit,
         '',         // prefix
-        1,          //local
-        state
+        tree,
+        1           //local
       )
       return emit.x()
     }
diff --git a/dist/j2c.global.min.js b/dist/j2c.global.min.js
index 86d3d107..4140ce35 100644
--- a/dist/j2c.global.min.js
+++ b/dist/j2c.global.min.js
@@ -1 +1 @@
-var j2c=function(){"use strict";function n(n,e){var t,a,r=[];for(a in e)if($.call(e,a))for(t in n)$.call(n,t)&&r.push(n[t]+e[a]);return r}function e(n){for(var e,t=[],a=[],r=0;e=d.exec(n);)switch(e[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;t.push(e.index)}for(e=t.length;e--;)a.unshift(n.slice(t[e]+1)),n=n.slice(0,t[e]);return a.unshift(n),a}function t(e,t){for(var a,r,l=[],i=[];r=A.exec(e);)"&"==r[0]&&l.push(r.index);for(r=l.length;r--;)i.unshift(e.slice(l[r]+1)),e=e.slice(0,l[r]);for(i.unshift(e),a=[i[0]],r=1;r<i.length;r++)a=n(a,n(t,[i[r]]));return a.join(",")}function a(n){return function e(t){if(h.call(t)===m)for(var a=0;a<t.length;a++)e(t[a]);else n(t)}}function r(n){return"-"+n.toLowerCase()}function l(n,e,t,a,i){var s,o,c;if(null!=n)switch(h.call(n=n.valueOf())){case m:for(s=0;s<n.length;s++)l(n[s],e,t,a,i);break;case v:t=t&&t+"-";for(s in n)if($.call(n,s))if(o=n[s],/\$/.test(s))for(c in s=s.split("$"))$.call(s,c)&&l(o,e,t+s[c],a,i);else l(o,e,t+s,a,i);break;default:s=t.replace(/_/g,"-").replace(/[A-Z]/g,r),!a||"animation-name"!=s&&"animation"!=s&&"list-style"!=s||(n=n.split(",").map(function(n){return n.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,i.l)}).join(",")),e.d(s,s?":":"",n,";\n")}}function i(n,e,t,r,i,o,c){if(n=/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(n)||["@","@","",""],!n[3]&&/^global$/.test(n[2]))s(e,t,r,i,0,c);else if(!n[3]&&/^local$/.test(n[2]))s(e,t,r,i,1,c);else if(!n[3]&&/^(?:namespace|import|charset)$/.test(n[2]))a(function(e){t.a(n[0]," ",e,";\n")})(e);else if(!n[3]&&/^(?:font-face|viewport)$/.test(n[2]))a(function(e){t.a(n[1],"",""," {\n"),l(e,t,"",o,c),t.c("}\n")})(e);else if(n[3]&&/^(?:media|supports|page|keyframes)$/.test(n[2]))o&&"keyframes"==n[2]&&(n[3]=n[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,c.l)),t.a(n[1]," ",n[3]," {\n"),"page"==n[2]?l(e,t,"",o,c):s(e,t,r,0,o,c),t.c("}\n");else{for(var f=0;f<c.A.length;f++)if(c.A[f](n,e,t,r,i,o,c))return;t.a("@-error-unsupported-at-rule"," ",JSON.stringify(n[0]),";\n")}}function s(n,a,r,o,c,f){var u,g,p,b;switch(h.call(n)){case m:for(u=0;u<n.length;u++)s(n[u],a,r,o,c,f);break;case v:for(u in n)if($.call(n,u))if(g=n[u],r&&/^[-\w$]+$/.test(u))if(p||(p=1,a.s(r," {\n")),/\$/.test(u))for(b in u=u.split("$"))$.call(u,b)&&l(g,a,u[b],c,f);else l(g,a,u,c,f);else/^@/.test(u)?(p=p&&a.c("}\n")&&0,i(u,g,a,r,o,c,f)):(p=p&&a.c("}\n")&&0,s(g,a,/,/.test(r)||r&&/,/.test(u)?(b=e(r),e(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u).map(function(n){return/&/.test(n)?t(n,b):b.map(function(e){return e+n}).join(",")}).join(",")):/&/.test(u)?t(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u,[r]):r+(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,f.l):u),o,c,f));p&&a.c("}\n");break;case w:a.s(r||":-error-no-selector"," {\n"),l(n,a,"",c,f),a.c("}\n")}}function o(n){return":global("+n+")"}function c(n,e,t){return t={},t[n]=e,t}function f(n,e,t){if(arguments.length<3){var a=f.bind.apply(f,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+n+" "+e},a}return c("@"+n+" "+e,t)}function u(){function n(e,t){for(var a in t)$.call(t,a)&&a.indexOf("$")&&(v==h.call(t[a])&&v==h.call(e[a])?n(e[a],t[a]):a in e||(e[a]=t[a]))}function e(n,e){function t(){g.push.apply(a,arguments)}for(var a=[],l={x:function(n){return n?a:a.join("")},a:t,s:t,d:t,c:t},i=r.length;i--;)l=r[i](l,n,e);return l}function t(n,e,t,a){return e?e:(p.names[a]||(p.names[a]=a+p.suffix),t+p.names[a].match(/^\S+/))}var r=[],u=[],p={at:f,global:o,kv:c,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return m(g.slice.call(arguments)),p},$plugins:[]},m=a(function(e){~p.$plugins.indexOf(e)||(p.$plugins.push(e),h.call(e)===b&&(e=e(p)),e&&(a(function(n){r.push(n)})(e.$filter||[]),a(function(n){u.push(n)})(e.$at||[]),n(p,e)))});return t.a=u,p.sheet=function(n,a){var r={s:s,a:i,d:l,A:u,l:t,n:p.names};return s(n,a=e(!1,r),"","",1,r),a.x()},p.inline=function(n,a){var r={s:s,a:i,d:l,A:u,l:t,n:p.names};return l(n,a=e(!0,r),"",1,r),a.x()},p}var g=[],p={},h=p.toString,m=h.call(g),v=h.call(p),w=h.call(""),b=h.call(h),$=p.hasOwnProperty,d=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,A=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_=u();return"sheet|inline|names|at|global|kv|suffix".split("|").map(function(n){u[n]=_[n]}),u}();
\ No newline at end of file
+var j2c=function(){"use strict";function n(n,e){var t,a,r=[];for(a in e)if($.call(e,a))for(t in n)$.call(n,t)&&r.push(n[t]+e[a]);return r}function e(n){for(var e,t=[],a=[],r=0;e=d.exec(n);)switch(e[0]){case"(":r++;break;case")":r--;break;case",":if(r)break;t.push(e.index)}for(e=t.length;e--;)a.unshift(n.slice(t[e]+1)),n=n.slice(0,t[e]);return a.unshift(n),a}function t(e,t){for(var a,r,l=[],i=[];r=A.exec(e);)"&"==r[0]&&l.push(r.index);for(r=l.length;r--;)i.unshift(e.slice(l[r]+1)),e=e.slice(0,l[r]);for(i.unshift(e),a=[i[0]],r=1;r<i.length;r++)a=n(a,n(t,[i[r]]));return a.join(",")}function a(n){return function e(t){if(h.call(t)===m)for(var a=0;a<t.length;a++)e(t[a]);else n(t)}}function r(n){return"-"+n.toLowerCase()}function l(n,e,t,a,i){var s,o,c;if(null!=a)switch(h.call(a=a.valueOf())){case m:for(s=0;s<a.length;s++)l(n,e,t,a[s],i);break;case v:t=t&&t+"-";for(s in a)if($.call(a,s))if(o=a[s],/\$/.test(s))for(c in s=s.split("$"))$.call(s,c)&&l(n,e,t+s[c],o,i);else l(n,e,t+s,o,i);break;default:s=t.replace(/_/g,"-").replace(/[A-Z]/g,r),!i||"animation-name"!=s&&"animation"!=s&&"list-style"!=s||(a=a.split(",").map(function(e){return e.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,n.l)}).join(",")),e.d(s,s?":":"",a,";\n")}}function i(n,e,t,r,i,o,c){if(!t[3]&&/^global$/.test(t[2]))s(n,e,i,r,0,c);else if(!t[3]&&/^local$/.test(t[2]))s(n,e,i,r,1,c);else if(!t[3]&&/^(?:namespace|import|charset)$/.test(t[2]))a(function(n){e.a(t[0]," ",n,";\n")})(r);else if(!t[3]&&/^(?:font-face|viewport)$/.test(t[2]))a(function(a){e.a(t[1],"",""," {\n"),l(n,e,"",a,o),e.c("}\n")})(r);else if(t[3]&&/^(?:media|supports|page|keyframes)$/.test(t[2]))o&&"keyframes"==t[2]&&(t[3]=t[3].replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,n.l)),e.a(t[1]," ",t[3]," {\n"),"page"==t[2]?l(n,e,"",r,o):s(n,e,"keyframes"==t[2]?"":i,r,o,1),e.c("}\n");else{for(var f=0;f<n.A.length;f++)if(n.A[f](n,e,t,r,i,o,c))return;e.a("@-error-unsupported-at-rule"," ",JSON.stringify(t[0]),";\n")}}function s(n,a,r,o,c,f){var u,g,p,b;switch(h.call(o)){case m:for(u=0;u<o.length;u++)s(n,a,r,o[u],c,f);break;case v:for(u in o)if($.call(o,u))if(g=o[u],r&&/^[-\w$]+$/.test(u))if(p||(p=1,a.s(r," {\n")),/\$/.test(u))for(b in u=u.split("$"))$.call(u,b)&&l(n,a,u[b],g,c);else l(n,a,u,g,c);else/^@/.test(u)?(p=p&&a.c("}\n")&&0,i(n,a,/^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(u)||["@","@","",""],g,r,c,f)):(p=p&&a.c("}\n")&&0,s(n,a,/,/.test(r)||r&&/,/.test(u)?(b=e(r),e(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u).map(function(n){return/&/.test(n)?t(n,b):b.map(function(e){return e+n}).join(",")}).join(",")):/&/.test(u)?t(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u,[r]):r+(c?u.replace(/:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g,n.l):u),g,c,f));p&&a.c("}\n");break;case w:a.s(r||":-error-no-selector"," {\n"),l(n,a,"",o,c),a.c("}\n")}}function o(n){return":global("+n+")"}function c(n,e,t){return t={},t[n]=e,t}function f(n,e,t){if(arguments.length<3){var a=f.bind.apply(f,[null].concat([].slice.call(arguments,0)));return a.toString=function(){return"@"+n+" "+e},a}return c("@"+n+" "+e,t)}function u(){function n(e,t){for(var a in t)$.call(t,a)&&a.indexOf("$")&&(v==h.call(t[a])&&v==h.call(e[a])?n(e[a],t[a]):a in e||(e[a]=t[a]))}function e(n,e){function t(){g.push.apply(a,arguments)}for(var a=[],l={x:function(n){return n?a:a.join("")},a:t,s:t,d:t,c:t},i=r.length;i--;)l=r[i](l,n,e);return l}function t(n,e,t,a){return e?e:(p.names[a]||(p.names[a]=a+p.suffix),t+p.names[a].match(/^\S+/))}var r=[],u=[],p={at:f,global:o,kv:c,names:{},suffix:"__j2c-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36)+"-"+Math.floor(4294967296*Math.random()).toString(36),use:function(){return m(g.slice.call(arguments)),p},$plugins:[]},m=a(function(e){~p.$plugins.indexOf(e)||(p.$plugins.push(e),h.call(e)===b&&(e=e(p)),e&&(a(function(n){r.push(n)})(e.$filter||[]),a(function(n){u.push(n)})(e.$at||[]),n(p,e)))});return t.a=u,p.sheet=function(n){var a={A:u,a:i,d:l,l:t,n:p.names,s:s},r=e(!1,a);return s(a,r,"",n,1,0),r.x()},p.inline=function(n){var a={d:l,l:t,n:p.names},r=e(!0,a);return l(a,r,"",n,1),r.x()},p}var g=[],p={},h=p.toString,m=h.call(g),v=h.call(p),w=h.call(""),b=h.call(h),$=p.hasOwnProperty,d=/[(),]|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,A=/&|"(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*'|\/\*[\s\S]*?\*\//g,_=u();return"sheet|inline|names|at|global|kv|suffix".split("|").map(function(n){u[n]=_[n]}),u}();
\ No newline at end of file
diff --git a/dist/j2c.global.min.js.gz b/dist/j2c.global.min.js.gz
index 683b7e54b6577e3bd4bd8b6171a00b45b09b0f89..d08688821d7dd1fbe1e07edadca315b2160588fa 100644
GIT binary patch
literal 1926
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
M5Bv;7HysiH0C*;^WB>pF

literal 1901
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

diff --git a/src/at-rules.js b/src/at-rules.js
index a0c8338c..77708e7a 100644
--- a/src/at-rules.js
+++ b/src/at-rules.js
@@ -5,25 +5,28 @@ import {declarations} from './declarations'
 /**
  * Hanldes at-rules
  *
- * @param {string} k - The at-rule name, and, if takes both parameters and a
- *                     block, the parameters.
- * @param {string[]} emit - the contextual emitters to the final buffer
- * @param {string[]} v - Either parameters for block-less rules or their block
- *                       for the others.
- * @param {string} prefix - the current selector or a prefix in case of nested rules
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
+ * @param {array} k - The parsed at-rule, including the parameters,
+ *                    if takes both parameters and a block.
+ * @param {string} prefix - the current selector or the selector prefix
+ *                          in case of nested rules
+ * @param {string|string[]|object|object[]} v - Either parameters for
+ *                                              block-less rules or
+ *                                              their block
+ *                                              for the others.
  * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
 
-export function atRules(k, v, emit, prefix, inAtRule, local, state) {
-  k = /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','','']
+export function atRules(parser, emit, k, v, prefix, local, inAtRule) {
   if (!k[3] && /^global$/.test(k[2])) {
-    sheet(v, emit, prefix, inAtRule, 0, state)
+
+    sheet(parser, emit, prefix, v, 0, inAtRule)
 
   } else if (!k[3] && /^local$/.test(k[2])) {
 
-    sheet(v, emit, prefix, inAtRule, 1, state)
+    sheet(parser, emit, prefix, v, 1, inAtRule)
 
   } else if (!k[3] && /^(?:namespace|import|charset)$/.test(k[2])) {
     flatIter(function(v) {
@@ -37,7 +40,7 @@ export function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
       emit.a(k[1], '', '', ' {\n')
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
       emit.c('}\n')
 
@@ -49,7 +52,7 @@ export function atRules(k, v, emit, prefix, inAtRule, local, state) {
       k[3] = k[3].replace(
         // generated by script/regexps.js
         /:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/,
-        state.l
+        parser.l
       )
     }
 
@@ -58,19 +61,23 @@ export function atRules(k, v, emit, prefix, inAtRule, local, state) {
 
     if ('page' == k[2]) {
 
-      declarations(v, emit, '', local, state)
+      declarations(parser, emit, '', v, local)
 
     } else {
 
-      sheet(v, emit, prefix, 0, local, state)
+      sheet(
+        parser, emit,
+        'keyframes' == k[2] ? '' : prefix,
+        v, local, 1
+      )
 
     }
 
     emit.c('}\n')
 
   } else {
-    for (var i = 0; i < state.A.length; i++) {
-      if (state.A[i](k, v, emit, prefix, inAtRule, local, state)) return
+    for (var i = 0; i < parser.A.length; i++) {
+      if (parser.A[i](parser, emit, k, v, prefix, local, inAtRule)) return
     }
     emit.a('@-error-unsupported-at-rule', ' ', JSON.stringify(k[0]), ';\n')
 
diff --git a/src/declarations.js b/src/declarations.js
index dbf3a76c..73d5cc2f 100644
--- a/src/declarations.js
+++ b/src/declarations.js
@@ -7,15 +7,15 @@ function decamelize(match) {
 /**
  * Handles the property:value; pairs.
  *
- * @param {array|object|string} o - the declarations.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current property or a prefix in case of nested
  *                          sub-properties.
+ * @param {array|object|string} o - the declarations.
  * @param {boolean} local - are we in @local or in @global scope.
- * @param {function} state - @local helper.
  */
 
-export function declarations(o, emit, prefix, local, state) {
+export function declarations(parser, emit, prefix, o, local) {
   var k, v, kk
   if (o==null) return
 
@@ -23,7 +23,7 @@ export function declarations(o, emit, prefix, local, state) {
   case ARRAY:
     for (k = 0; k < o.length; k++)
 
-      declarations(o[k], emit, prefix, local, state)
+      declarations(parser, emit, prefix, o[k], local)
 
     break
   case OBJECT:
@@ -35,12 +35,12 @@ export function declarations(o, emit, prefix, local, state) {
       if (/\$/.test(k)) {
         for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-          declarations(v, emit, prefix + k[kk], local, state)
+          declarations(parser, emit, prefix + k[kk], v, local)
 
         }
       } else {
 
-        declarations(v, emit, prefix + k, local, state)
+        declarations(parser, emit, prefix + k, v, local)
 
       }
     }
@@ -58,10 +58,10 @@ export function declarations(o, emit, prefix, local, state) {
 
     if (local && (k == 'animation-name' || k == 'animation' || k == 'list-style')) {
       // no need to tokenize here a plain `.split(',')` has all bases covered.
-      // We may 'state' a comment, but it's not a big deal.
+      // We may 'parser' a comment, but it's not a big deal.
       o = o.split(',').map(function (o) {
 
-        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, state.l)
+        return o.replace(/:?global\(\s*([_A-Za-z][-\w]*)\s*\)|()(-?[_A-Za-z][-\w]*)/, parser.l)
 
       }).join(',')
     }
diff --git a/src/main.js b/src/main.js
index b69fe1b9..50c35b09 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,9 @@ function at (rule, params, block) {
   if (
     arguments.length < 3
   ) {
+    // inner curry!
     var _at = at.bind.apply(at, [null].concat([].slice.call(arguments,0)))
+    // So that it can be used as a key in an ES6 object literal.
     _at.toString = function(){return '@' + rule + ' ' + params}
     return _at
   }
@@ -26,7 +28,8 @@ function at (rule, params, block) {
 }
 
 export default function j2c() {
-  var filters = [], atHandlers = []
+  var filters = []
+  var atHandlers = []
   var instance = {
     at: at,
     global: global,
@@ -75,7 +78,7 @@ export default function j2c() {
     _default(instance, plugin)
   })
 
-  function makeEmitter(inline, state) {
+  function makeEmitter(inline, parser) {
     var buf = []
     function push() {
       emptyArray.push.apply(buf, arguments)
@@ -87,7 +90,7 @@ export default function j2c() {
       d: push, // declaration
       c: push  // close
     }
-    for (var i = filters.length; i--;) emit = filters[i](emit, inline, state)
+    for (var i = filters.length; i--;) emit = filters[i](emit, inline, parser)
     return emit
   }
 
@@ -100,41 +103,41 @@ export default function j2c() {
   localize.a = atHandlers
 
 /*/-statements-/*/
-  instance.sheet = function(statements, emit) {
-    var state = {
-      s: sheet,
+  instance.sheet = function(tree) {
+    var parser = {
+      A: atHandlers,
       a: atRules,
       d: declarations,
-      A: atHandlers,
       l: localize,
-      n: instance.names
+      n: instance.names,
+      s: sheet
     }
+    var emit = makeEmitter(false, parser)
     sheet(
-      statements,
-      emit = makeEmitter(false, state),
-      '', '',     // prefix and compose
-      1,          // local, by default
-      state
+      parser,
+      emit,
+      '',    // prefix
+      tree,
+      1,      // local, by default
+      0     // inAtRule
     )
 
     return emit.x()
   }
 /*/-statements-/*/
-  instance.inline = function (_declarations, emit) {
-    var state = {
-      s: sheet,
-      a: atRules,
+  instance.inline = function (tree) {
+    var parser = {
       d: declarations,
-      A: atHandlers,
       l: localize,
       n: instance.names
     }
+    var emit = makeEmitter(true, parser)
     declarations(
-      _declarations,
-      emit = makeEmitter(true, state),
+      parser,
+      emit,
       '',         // prefix
-      1,          //local
-      state
+      tree,
+      1           //local
     )
     return emit.x()
   }
diff --git a/src/sheet.js b/src/sheet.js
index c5c837ec..dbfacedc 100644
--- a/src/sheet.js
+++ b/src/sheet.js
@@ -5,31 +5,31 @@ import {atRules} from './at-rules'
 
 
 /**
- * Add rulesets and other CSS statements to the sheet.
+ * Add rulesets and other CSS tree to the sheet.
  *
- * @param {array|string|object} statements - a source object or sub-object.
- * @param {string[]} emit - the contextual emitters to the final buffer
+ * @param {object} parser - holds the parser-related methods and state
+ * @param {object} emit - the contextual emitters to the final buffer
  * @param {string} prefix - the current selector or a prefix in case of nested rules
- * @param {string} canCompose - are we allowed to @compose here?
+ * @param {array|string|object} tree - a source object or sub-object.
+ * @param {string} inAtRule - are we nested in an at-rule?
  * @param {boolean} local - are we in @local or in @global scope?
- * @param {function} state - @local helper
  */
-export function sheet(statements, emit, prefix, canCompose, local, state) {
+export function sheet(parser, emit, prefix, tree, local, inAtRule) {
   var k, v, inDeclaration, kk
 
-  switch (type.call(statements)) {
+  switch (type.call(tree)) {
 
   case ARRAY:
-    for (k = 0; k < statements.length; k++){
+    for (k = 0; k < tree.length; k++){
 
-      sheet(statements[k], emit, prefix, canCompose, local, state)
+      sheet(parser, emit, prefix, tree[k], local, inAtRule)
 
     }
     break
 
   case OBJECT:
-    for (k in statements) if (own.call(statements, k)) {
-      v = statements[k]
+    for (k in tree) if (own.call(tree, k)) {
+      v = tree[k]
       if (prefix && /^[-\w$]+$/.test(k)) {
         if (!inDeclaration) {
           inDeclaration = 1
@@ -40,12 +40,12 @@ export function sheet(statements, emit, prefix, canCompose, local, state) {
         if (/\$/.test(k)) {
           for (kk in (k = k.split('$'))) if (own.call(k, kk)) {
 
-            declarations(v, emit, k[kk], local, state)
+            declarations(parser, emit, k[kk], v, local)
 
           }
         } else {
 
-          declarations(v, emit, k, local, state)
+          declarations(parser, emit, k, v, local)
 
         }
       } else if (/^@/.test(k)) {
@@ -53,19 +53,24 @@ export function sheet(statements, emit, prefix, canCompose, local, state) {
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        atRules(k, v, emit, prefix, canCompose, local, state)
+        atRules(parser, emit,
+          /^(.(?:-[\w]+-)?([_A-Za-z][-\w]*))\b\s*(.*?)\s*$/.exec(k) || ['@','@','',''],
+          v, prefix, local, inAtRule
+        )
 
       } else {
         // selector or nested sub-selectors
 
         inDeclaration = (inDeclaration && emit.c('}\n') && 0)
 
-        sheet(v, emit,
+        sheet(
+          parser, emit,
+          // prefix... Hefty. Ugly. Sadly necessary.
           (/,/.test(prefix) || prefix && /,/.test(k)) ?
           /*0*/ (kk = splitSelector(prefix), splitSelector( local ?
 
               k.replace(
-                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
               ) :
 
               k
@@ -79,7 +84,7 @@ export function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k,
@@ -89,13 +94,12 @@ export function sheet(statements, emit, prefix, canCompose, local, state) {
               local ?
 
                 k.replace(
-                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, state.l
+                  /:global\(\s*(\.-?[_A-Za-z][-\w]*)\s*\)|(\.)(-?[_A-Za-z][-\w]*)/g, parser.l
                 ) :
 
                 k
               ),
-          canCompose,
-          local, state
+           v, local, inAtRule
         )
       }
     }
@@ -108,7 +112,7 @@ export function sheet(statements, emit, prefix, canCompose, local, state) {
 
     emit.s(( prefix || ':-error-no-selector' ) , ' {\n')
 
-    declarations(statements, emit, '', local, state)
+    declarations(parser, emit, '', tree, local)
 
     emit.c('}\n')
   }
diff --git a/test/test.js b/test/test.js
index 3ebe215c..26870ef5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1519,25 +1519,25 @@ function randInt() {
   ////////////////////////////////////
 
 
-  test('one $at filter', function() {
+  test('one $at plugin', function() {
     function plugin(name) {
-      return {$at: function(match, v, emit, prefix, inAtRule, local, state){
+      return {$at: function(parser, emit, match, v, prefix, inAtRule, local){
         expect(match).to.be.an(Array)
-        // `v` can be many things
+        expect(parser).to.be.an(Object)
+        expect(parser).to.have.key('A')
+        expect(parser).to.have.key('a')
+        expect(parser).to.have.key('d')
+        expect(parser).to.have.key('l')
+        expect(parser).to.have.key('n')
+        expect(parser).to.have.key('s')
         expect(emit).to.be.an(Object)
         expect(emit).to.have.key('a')
+        // `v` can be many things
         expect(prefix).to.be.a('string')
         // `inAtRule` can be many things, the only things that matters is its truthiness
         expect(!!inAtRule).to.be(false)
         // `local` can be many things, the only things that matters is its truthiness
         expect(!!local).to.be(true)
-        expect(state).to.be.an(Object)
-        expect(state).to.have.key('A')
-        expect(state).to.have.key('a')
-        expect(state).to.have.key('d')
-        expect(state).to.have.key('l')
-        expect(state).to.have.key('n')
-        expect(state).to.have.key('s')
         if (match[2] !== name) return false
         emit.a(match[1], ' ', v, ';\n')
         return true
@@ -1553,9 +1553,9 @@ function randInt() {
     )
   })
 
-  test('two $at filters', function() {
+  test('two $at plugins', function() {
     function plugin(name) {
-      return {$at: function(match, v, emit){
+      return {$at: function(parser, emit, match, v){
         if (match[2] !== name) return false
         emit.a(match[1], ' ', v, ';\n')
         return true
@@ -1581,4 +1581,7 @@ function randInt() {
 // in these native functions.
 // - verify that all at-rules behave properly in filters
 // (wrt selectors and definitions)
-// - verify that CSS variables are not localized as if they were names.
\ No newline at end of file
+// - verify that CSS variables are not localized as if they were names.
+// - test `inAtRule` from $at plugins (is it set appropriately?
+// - test the `parser` object from within $at and $filter plugins
+// - verify that custom at rules take precedence over default ones.
\ No newline at end of file