Skip to content

Commit

Permalink
Merge pull request css#2 from indutny/feature-port-to-new-ometa
Browse files Browse the repository at this point in the history 
[lib] port to ometajs@2.1.9
  • Loading branch information
@afelix
afelix committed Nov 28, 2011
2 parents 3c99ce8 + ca20f89 commit 4b528ec
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 35 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -10,7 +10,7 @@
},
"directories" : { "lib" : "./lib" },
"main" : "./lib/csspapi",
"dependencies" : { "ometajs" : ">= 2.1.1" },
"dependencies" : { "ometajs" : "~ 2.1.9" },
"bin" : "./bin/cssp",
"engines" : { "node" : ">=0.4.0" },
"licenses" : [ { "type" : "MIT" } ]
Expand Down
83 changes: 49 additions & 34 deletions src/cssptt.js
View file
@@ -1,6 +1,6 @@
var ometajs = require('ometajs'),
OMeta = ometajs.OMeta;
var ometajs_ = require('ometajs').globals;var StringBuffer = ometajs_.StringBuffer;
var ometajs_ = require('ometajs').globals || global;var StringBuffer = ometajs_.StringBuffer;
var objectThatDelegatesTo = ometajs_.objectThatDelegatesTo;
var isImmutable = ometajs_.isImmutable;
var digitValue = ometajs_.digitValue;
Expand All @@ -27,7 +27,12 @@ var BSJSIdentity = ometajs_.BSJSIdentity;
var BSJSTranslator = ometajs_.BSJSTranslator;
var BSOMetaJSParser = ometajs_.BSOMetaJSParser;
var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
{
if (global === ometajs_) {
fail = (function(fail) {
return function() { return fail };
})(fail);
OMeta = require('ometajs').OMeta;
}{
var CSSParser = exports.CSSParser = objectThatDelegatesTo(OMeta, {
m_comment: function() {
var $elf = this, _fromIdx = this.input.idx, x;
Expand Down Expand Up @@ -77,7 +82,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "-" + x + z.join("");
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
}, function() {
Expand Down Expand Up @@ -158,7 +163,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "." + x.join("");
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
}, function() {
Expand Down Expand Up @@ -209,7 +214,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "'" + s.join("") + "'";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand All @@ -228,7 +233,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "\r":
return "\r";
default:
throw fail;
throw fail();
}
}.call(this);
return x;
Expand All @@ -249,7 +254,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "\r":
return "\r";
default:
throw fail;
throw fail();
}
}.call(this);
return x;
Expand Down Expand Up @@ -427,7 +432,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "^=";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
return [ "attrselector", x ];
Expand Down Expand Up @@ -669,7 +674,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "+":
return "+";
default:
throw fail;
throw fail();
}
}.call(this);
return [ "combinator", x ];
Expand Down Expand Up @@ -718,7 +723,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
}.call(this);
});
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand Down Expand Up @@ -825,27 +830,27 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "last-child";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
return x + y;
Expand All @@ -864,7 +869,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "n":
return "n";
default:
throw fail;
throw fail();
}
}.call(this);
});
Expand All @@ -889,7 +894,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "even";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
return [ "nth", x ];
Expand Down Expand Up @@ -1010,7 +1015,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "-ms-filter";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
case "f":
Expand All @@ -1033,7 +1038,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "_filter";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
s0 = this._many(function() {
Expand Down Expand Up @@ -1168,7 +1173,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "+":
return "+";
default:
throw fail;
throw fail();
}
}.call(this);
return [ "unary", x ];
Expand All @@ -1188,7 +1193,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case ",":
return ",";
default:
throw fail;
throw fail();
}
}.call(this);
return [ "operator", x ];
Expand Down Expand Up @@ -1246,19 +1251,19 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
}.call(this);
});
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand Down Expand Up @@ -1325,7 +1330,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return this.concat([ "braces", "(", ")" ], x);
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand All @@ -1338,7 +1343,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
case "\r":
return "\r";
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand Down Expand Up @@ -1412,7 +1417,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "'" + x.join("") + "'";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
},
Expand Down Expand Up @@ -1529,7 +1534,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return "(" + x.join("") + xx.join("") + ")";
}.call(this);
default:
throw fail;
throw fail();
}
}.call(this);
}, function() {
Expand Down Expand Up @@ -1635,7 +1640,7 @@ var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
return /^[ \t\r\n\f]+$/.test(x);
};
}
var ometajs_ = require('ometajs').globals;var StringBuffer = ometajs_.StringBuffer;
var ometajs_ = require('ometajs').globals || global;var StringBuffer = ometajs_.StringBuffer;
var objectThatDelegatesTo = ometajs_.objectThatDelegatesTo;
var isImmutable = ometajs_.isImmutable;
var digitValue = ometajs_.digitValue;
Expand All @@ -1662,7 +1667,12 @@ var BSJSIdentity = ometajs_.BSJSIdentity;
var BSJSTranslator = ometajs_.BSJSTranslator;
var BSOMetaJSParser = ometajs_.BSOMetaJSParser;
var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
var CSSTransformer = exports.CSSTransformer = objectThatDelegatesTo(OMeta, {
if (global === ometajs_) {
fail = (function(fail) {
return function() { return fail };
})(fail);
OMeta = require('ometajs').OMeta;
}var CSSTransformer = exports.CSSTransformer = objectThatDelegatesTo(OMeta, {
anys: function() {
var $elf = this, _fromIdx = this.input.idx;
return this._many(function() {
Expand Down Expand Up @@ -2354,7 +2364,7 @@ var CSSTransformer = exports.CSSTransformer = objectThatDelegatesTo(OMeta, {
}.call(this);
}
});
var ometajs_ = require('ometajs').globals;var StringBuffer = ometajs_.StringBuffer;
var ometajs_ = require('ometajs').globals || global;var StringBuffer = ometajs_.StringBuffer;
var objectThatDelegatesTo = ometajs_.objectThatDelegatesTo;
var isImmutable = ometajs_.isImmutable;
var digitValue = ometajs_.digitValue;
Expand All @@ -2381,7 +2391,12 @@ var BSJSIdentity = ometajs_.BSJSIdentity;
var BSJSTranslator = ometajs_.BSJSTranslator;
var BSOMetaJSParser = ometajs_.BSOMetaJSParser;
var BSOMetaJSTranslator = ometajs_.BSOMetaJSTranslator;
var CSSTranslator = exports.CSSTranslator = objectThatDelegatesTo(OMeta, {
if (global === ometajs_) {
fail = (function(fail) {
return function() { return fail };
})(fail);
OMeta = require('ometajs').OMeta;
}var CSSTranslator = exports.CSSTranslator = objectThatDelegatesTo(OMeta, {
anys: function() {
var $elf = this, _fromIdx = this.input.idx;
return this._many(function() {
Expand Down

0 comments on commit 4b528ec

Please sign in to comment.