github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-18 11:31:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

resolving merge conflict.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-10-19 23:31:19 -04:00
parent 113d7ce98f 2c84f3ed1f
commit 303be86291
11 changed files with 413 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nodes.js
View File

@@ -1409,20 +1409,20 @@
};
Op.prototype.compileNode = function(o) {
var _ref2, ifn;
if (this.isChainable() && this.first.unwrap().isChainable()) {
return this.compileChain(o);
}
if (this.isUnary()) {
if ((_ref2 = this.operator, __indexOf.call(this.MUTATORS, _ref2) >= 0) && (ifn = If.unfoldSoak(o, this, 'first'))) {
return ifn.compile(o);
}
return this.compileUnary(o);
}
if (this.isChainable() && this.first.unwrap().isChainable()) {
return this.compileChain(o);
}
if (this.operator === '?') {
return this.compileExistence(o);
}
this.first.tags.front = this.tags.front;
return [this.first.compile(o), this.operator, this.second.compile(o)].join(' ');
return "" + (this.first.compile(o)) + " " + (this.operator) + " " + (this.second.compile(o));
};
Op.prototype.compileChain = function(o) {
var _ref2, _ref3, first, second, shared;