github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-04-11 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/jashkenas/coffee-script into refactorTests

Browse Source 
Conflicts:
	test/importing.coffee
This commit is contained in:
Michael Ficarra
2010-12-14 03:23:44 -05:00
parent 47acbefa57 466cd43277
commit eba7b16ccf
8 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/command.js
View File

@@ -211,8 +211,9 @@
return jsl.stdin.end();
};
printTokens = function(tokens) {
var strings, tag, token, value, _i, _len, _ref, _results;
var strings, tag, token, value;
strings = function() {
var _i, _len, _ref, _results;
_results = [];
for (_i = 0, _len = tokens.length; _i < _len; _i++) {
token = tokens[_i];

3
lib/grammar.js
View File

@@ -1,5 +1,5 @@
(function() {
var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap, _i, _j, _len, _len2, _ref, _results;
var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
Parser = require('jison').Parser;
unwrap = /^function\s*\(\)\s*\{\s*return\s*([\s\S]*);\s*\}/;
o = function(patternString, action, options) {
@@ -561,6 +561,7 @@
for (name in grammar) {
alternatives = grammar[name];
grammar[name] = function() {
var _i, _j, _len, _len2, _ref, _results;
_results = [];
for (_i = 0, _len = alternatives.length; _i < _len; _i++) {
alt = alternatives[_i];

68
lib/nodes.js
View File

@@ -44,7 +44,7 @@
if (this.containsPureStatement()) {
throw SyntaxError('cannot include a pure statement in an expression.');
}
o.sharedScope = o.scope;
o.sharedScope = true;
return Closure.wrap(this).compileNode(o);
};
Base.prototype.cache = function(o, level, reused) {
@@ -597,7 +597,7 @@
return ifn;
};
Call.prototype.compileNode = function(o) {
var arg, args, code, _i, _len, _ref, _ref2, _results;
var arg, args, code, _ref;
if ((_ref = this.variable) != null) {
_ref.front = this.front;
}
@@ -605,10 +605,11 @@
return this.compileSplat(o, code);
}
args = (function() {
_ref2 = this.args;
var _i, _len, _ref, _results;
_ref = this.args;
_results = [];
for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
arg = _ref2[_i];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
arg = _ref[_i];
_results.push(arg.compile(o, LEVEL_LIST));
}
return _results;
@@ -803,7 +804,7 @@
}
Obj.prototype.children = ['properties'];
Obj.prototype.compileNode = function(o) {
var i, idt, indent, join, lastNoncom, nonComments, obj, prop, props, _i, _len, _len2, _ref, _results, _results2;
var i, idt, indent, join, lastNoncom, nonComments, obj, prop, props;
props = this.properties;
if (!props.length) {
if (this.front) {
@@ -814,6 +815,7 @@
}
idt = o.indent += TAB;
nonComments = (function() {
var _i, _len, _ref, _results;
_ref = this.properties;
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -826,8 +828,9 @@
}.call(this));
lastNoncom = last(nonComments);
props = function() {
_results2 = [];
for (i = 0, _len2 = props.length; i < _len2; i++) {
var _len, _results;
_results = [];
for (i = 0, _len = props.length; i < _len; i++) {
prop = props[i];
join = i === props.length - 1 ? '' : prop === lastNoncom || prop instanceof Comment ? '\n' : ',\n';
indent = prop instanceof Comment ? '' : idt;
@@ -836,9 +839,9 @@
} else if (!(prop instanceof Assign) && !(prop instanceof Comment)) {
prop = new Assign(prop, prop, 'object');
}
_results2.push(indent + prop.compile(o, LEVEL_TOP) + join);
_results.push(indent + prop.compile(o, LEVEL_TOP) + join);
}
return _results2;
return _results;
}();
props = props.join('');
obj = "{" + (props && '\n' + props + '\n' + this.tab) + "}";
@@ -868,7 +871,7 @@
}
Arr.prototype.children = ['objects'];
Arr.prototype.compileNode = function(o) {
var code, obj, _i, _len, _ref, _results;
var code, obj;
if (!this.objects.length) {
return '[]';
}
@@ -877,6 +880,7 @@
return code;
}
code = (function() {
var _i, _len, _ref, _results;
_ref = this.objects;
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -1218,12 +1222,9 @@
return !!this.ctor;
};
Code.prototype.compileNode = function(o) {
var code, exprs, i, idt, lit, p, param, ref, sharedScope, splats, v, val, vars, wasEmpty, _i, _j, _k, _len, _len2, _len3, _len4, _ref, _ref2, _ref3, _ref4, _results;
sharedScope = del(o, 'sharedScope');
o.scope = sharedScope || new Scope(o.scope, this.body, this);
if (sharedScope) {
o.scope.shared = true;
}
var code, exprs, i, idt, lit, p, param, ref, splats, v, val, vars, wasEmpty, _i, _j, _len, _len2, _len3, _ref, _ref2, _ref3;
o.scope = new Scope(o.scope, this.body, this);
o.scope.shared = del(o, 'sharedScope');
o.indent += TAB;
delete o.bare;
delete o.globals;
@@ -1234,10 +1235,11 @@
param = _ref[_i];
if (param.splat) {
splats = new Assign(new Value(new Arr(function() {
_ref2 = this.params;
var _i, _len, _ref, _results;
_ref = this.params;
_results = [];
for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
p = _ref2[_j];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
p = _ref[_i];
_results.push(p.asReference(o));
}
return _results;
@@ -1245,9 +1247,9 @@
break;
}
}
_ref3 = this.params;
for (_k = 0, _len3 = _ref3.length; _k < _len3; _k++) {
param = _ref3[_k];
_ref2 = this.params;
for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
param = _ref2[_j];
if (param.isComplex()) {
val = ref = param.asReference(o);
if (param.value) {
@@ -1273,10 +1275,10 @@
exprs.unshift(splats);
}
if (exprs.length) {
(_ref4 = this.body.expressions).unshift.apply(_ref4, exprs);
(_ref3 = this.body.expressions).unshift.apply(_ref3, exprs);
}
if (!splats) {
for (i = 0, _len4 = vars.length; i < _len4; i++) {
for (i = 0, _len3 = vars.length; i < _len3; i++) {
v = vars[i];
o.scope.parameter(vars[i] = v.compile(o));
}
@@ -1367,7 +1369,7 @@
}
};
Splat.compileSplattedArray = function(o, list, apply) {
var args, base, code, i, index, node, _i, _len, _len2, _ref, _results;
var args, base, code, i, index, node, _len;
index = -1;
while ((node = list[++index]) && !(node instanceof Splat)) {
continue;
@@ -1392,9 +1394,10 @@
return args[0] + (".concat(" + (args.slice(1).join(', ')) + ")");
}
base = (function() {
var _i, _len, _ref, _results;
_ref = list.slice(0, index);
_results = [];
for (_i = 0, _len2 = _ref.length; _i < _len2; _i++) {
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
node = _ref[_i];
_results.push(node.compile(o, LEVEL_LIST));
}
@@ -1611,14 +1614,15 @@
}
};
In.prototype.compileOrTest = function(o) {
var cmp, cnj, i, item, ref, sub, tests, _len, _ref, _ref2, _ref3, _results;
var cmp, cnj, i, item, ref, sub, tests, _ref, _ref2;
_ref = this.object.cache(o, LEVEL_OP), sub = _ref[0], ref = _ref[1];
_ref2 = this.negated ? [' !== ', ' && '] : [' === ', ' || '], cmp = _ref2[0], cnj = _ref2[1];
tests = function() {
_ref3 = this.array.base.objects;
var _len, _ref, _results;
_ref = this.array.base.objects;
_results = [];
for (i = 0, _len = _ref3.length; i < _len; i++) {
item = _ref3[i];
for (i = 0, _len = _ref.length; i < _len; i++) {
item = _ref[i];
_results.push((i ? ref : sub) + cmp + item.compile(o, LEVEL_OP));
}
return _results;
@@ -1882,7 +1886,7 @@
args.unshift(new Literal('this'));
}
body.expressions[idx] = new Call(base, args);
o.sharedScope = o.scope;
o.sharedScope = true;
defs += this.tab + new Assign(ref, fn).compile(o, LEVEL_TOP) + ';\n';
}
return defs;

9
lib/scope.js
View File

@@ -18,8 +18,11 @@
Scope.root = this;
}
}
Scope.prototype.add = function(name, type) {
Scope.prototype.add = function(name, type, immediate) {
var pos;
if (this.shared && !immediate) {
return this.parent.add(name, type, immediate);
}
if (typeof (pos = this.positions[name]) === 'number') {
return this.variables[pos].type = type;
} else {
@@ -37,7 +40,7 @@
return false;
};
Scope.prototype.parameter = function(name) {
if (this.shared && this.check(name, true)) {
if (this.shared && this.parent.check(name, true)) {
return;
}
return this.add(name, 'param');
@@ -74,7 +77,7 @@
while (this.check((temp = this.temporary(type, index)), true)) {
index++;
}
this.add(temp, 'var');
this.add(temp, 'var', true);
return temp;
};
Scope.prototype.assign = function(name, value) {