mirror of
https://github.com/jashkenas/coffeescript.git
synced 2022-11-09 12:23:24 -05:00

* Make `addLocationDataFn` more DRY * Style fixes * Provide access to full parser inside our custom function running in parser.js; rename the function to lay the groundwork for adding data aside from location data * Fix style. * Fix style. * Label test comments * Update grammar to remove comment tokens; update DSL to call new helper function that preserves comments through parsing * New implementation of compiling block comments: the lexer pulls them out of the token stream, attaching them as a property to a token; the rewriter moves the attachment around so it lives on a token that is destined to make it through to compilation (and in a good placement); and the nodes render the block comment. All tests but one pass (commented out). * If a comment follows a class declaration, move the comment inside the class body * Style * Improve indentation of multiline comments * Fix indentation for block comments, at least in the cases covered by the one failing test * Don’t reverse the order of unshifted comments * Simplify rewriter’s handling of comments, generalizing the special case * Expand the list of tokens we need to avoid for passing comments through the parser; get some literal tokens to have nodes created for them so that the comments pass through * Improve comments; fix multiline flag * Prepare HereComments for processing line comments * Line comments, first draft: the tests pass, but the line comments aren’t indented and sometimes trail previous lines when they shouldn’t; updated compiler output in following commit * Updated compiler, now with line comments * `process` doesn’t exist in the browser, so we should check for its existence first * Update parser output * Test that proves #4290 is fixed * Indent line comments, first pass * Compiled output with indented line comments * Comments that start a new line shouldn’t trail; don’t skip comments attached to generated tokens; stop looking for indentation once we hit a newline * Revised output * Cleanup * Split “multiline” line comment tokens, shifting them forward or back as appropriate * Fix comments in module specifiers * Abstract attaching comments to a node * Line comments in interpolated strings * Line comments can’t be multiline anymore * Improve handling of blank lines and indentation of following comments that start a new line (i.e. don’t trail) * Make comments compilation more object-oriented * Remove lots of dead code that we don’t need anymore because a comment is never a node, only a fragment * Improve eqJS helper * Fix #4290 definitively, with improved output for arrays with interspersed block comments * Add support for line comments output interspersed within arrays * Fix mistake, don’t lose the variable we’re working on * Remove redundant replacements * Check for indentation only from the start of the string * Indentations in generated JS are always multiples of two spaces (never tabs) so just look for 2+ spaces * Update package versions; run Babel twice, once for each preset, temporarily until a Babili bug is fixed that prevents it from running with the env preset * Don’t rely on `fragment.type`, which can break when the compiler is minified * Updated generated docs and browser compiler * Output block comments after function arguments * Comments appear above scope `var` declarations; better tracking of generated `JS` tokens created only to shepherd comments through to the output * Create new FuncGlyph node, to hold comments we want to output near the function parameters * Block comments between `)` and `->`/`=>` get output between `)` and `{`. * Fix indentation of comments that are the first line inside a bare mode block * Updated output * Full Flow example * Updated browser compiler * Abstract and organize comment fragment generation code; store more properties on the comment fragment objects; make `throw` behave like `return` * Abstract token insertion code * Add missing locationData to STRING_START token, giving it the locationData of the overall StringWithInterpolations token so that comments attached to STRING_START end up on the StringWithInterpolations node * Allow `SUPER` tokens to carry comments * Rescue comments from `Existence` nodes and `If` nodes’ conditions * Rescue comments after `\` line continuation tokens * Updated compiled output * Updated browser compiler * Output block comments in the same `compileFragments` method as line comments, except for inline block comments * Comments before splice * Updated browser compiler * Track compiledComments as a property of Base, to ensure that it’s not a global variable * Docs: split up the Usage section * Docs for type annotations via Flow; updated docs output * Update regular comments documentation * Updated browser compiler * Comments before soak * Comments before static methods, and probably before `@variable =` (this) assignments generally * Comments before ‘if exists?’, refactor comment before ‘if this.var’ to be more precise, improve helper methods * Comments before a method that contains ‘super()’ should output above the method property, not above the ‘super.method()’ call * Fix missing comments before `if not` (i.e. before a UNARY token) * Fix comments before ‘for’; add test for comment before assignment if (fixed in earlier commit) * Comments within heregexes * Updated browser compiler * Update description to reflect what’s now happening in compileCommentFragments * Preserve blank lines between line comments; output “whitespace-only” line comments as blank lines, rather than `//` following by whitespace * Better future-proof comments tests * Comments before object destructuring; abstract method for setting comments aside before compilation * Handle more cases of comments before or after `for` loop declaration lines * Fix indentation of comments preceding `for` loops * Fix comment before splat function parameter * Catch another RegexWithInterpolations comment edge case * Updated browser compiler * Change heregex example to one that’s more readable; update output * Remove a few last references to the defunct HERECOMMENT token * Abstract location hash creation into a function * Improved clarity per code review notes * Updated browser compiler
185 lines
5.9 KiB
JavaScript
185 lines
5.9 KiB
JavaScript
// Generated by CoffeeScript 2.0.0-beta3
|
|
(function() {
|
|
// The **Scope** class regulates lexical scoping within CoffeeScript. As you
|
|
// generate code, you create a tree of scopes in the same shape as the nested
|
|
// function bodies. Each scope knows about the variables declared within it,
|
|
// and has a reference to its parent enclosing scope. In this way, we know which
|
|
// variables are new and need to be declared with `var`, and which are shared
|
|
// with external scopes.
|
|
var Scope,
|
|
indexOf = [].indexOf;
|
|
|
|
exports.Scope = Scope = class Scope {
|
|
// Initialize a scope with its parent, for lookups up the chain,
|
|
// as well as a reference to the **Block** node it belongs to, which is
|
|
// where it should declare its variables, a reference to the function that
|
|
// it belongs to, and a list of variables referenced in the source code
|
|
// and therefore should be avoided when generating variables.
|
|
constructor(parent, expressions, method, referencedVars) {
|
|
var ref, ref1;
|
|
this.parent = parent;
|
|
this.expressions = expressions;
|
|
this.method = method;
|
|
this.referencedVars = referencedVars;
|
|
this.variables = [
|
|
{
|
|
name: 'arguments',
|
|
type: 'arguments'
|
|
}
|
|
];
|
|
this.positions = {};
|
|
if (!this.parent) {
|
|
this.utilities = {};
|
|
}
|
|
// The `@root` is the top-level **Scope** object for a given file.
|
|
this.root = (ref = (ref1 = this.parent) != null ? ref1.root : void 0) != null ? ref : this;
|
|
}
|
|
|
|
// Adds a new variable or overrides an existing one.
|
|
add(name, type, immediate) {
|
|
if (this.shared && !immediate) {
|
|
return this.parent.add(name, type, immediate);
|
|
}
|
|
if (Object.prototype.hasOwnProperty.call(this.positions, name)) {
|
|
return this.variables[this.positions[name]].type = type;
|
|
} else {
|
|
return this.positions[name] = this.variables.push({name, type}) - 1;
|
|
}
|
|
}
|
|
|
|
// When `super` is called, we need to find the name of the current method we're
|
|
// in, so that we know how to invoke the same method of the parent class. This
|
|
// can get complicated if super is being called from an inner function.
|
|
// `namedMethod` will walk up the scope tree until it either finds the first
|
|
// function object that has a name filled in, or bottoms out.
|
|
namedMethod() {
|
|
var ref;
|
|
if (((ref = this.method) != null ? ref.name : void 0) || !this.parent) {
|
|
return this.method;
|
|
}
|
|
return this.parent.namedMethod();
|
|
}
|
|
|
|
// Look up a variable name in lexical scope, and declare it if it does not
|
|
// already exist.
|
|
find(name, type = 'var') {
|
|
if (this.check(name)) {
|
|
return true;
|
|
}
|
|
this.add(name, type);
|
|
return false;
|
|
}
|
|
|
|
// Reserve a variable name as originating from a function parameter for this
|
|
// scope. No `var` required for internal references.
|
|
parameter(name) {
|
|
if (this.shared && this.parent.check(name, true)) {
|
|
return;
|
|
}
|
|
return this.add(name, 'param');
|
|
}
|
|
|
|
// Just check to see if a variable has already been declared, without reserving,
|
|
// walks up to the root scope.
|
|
check(name) {
|
|
var ref;
|
|
return !!(this.type(name) || ((ref = this.parent) != null ? ref.check(name) : void 0));
|
|
}
|
|
|
|
// Generate a temporary variable name at the given index.
|
|
temporary(name, index, single = false) {
|
|
var diff, endCode, letter, newCode, num, startCode;
|
|
if (single) {
|
|
startCode = name.charCodeAt(0);
|
|
endCode = 'z'.charCodeAt(0);
|
|
diff = endCode - startCode;
|
|
newCode = startCode + index % (diff + 1);
|
|
letter = String.fromCharCode(newCode);
|
|
num = Math.floor(index / (diff + 1));
|
|
return `${letter}${num || ''}`;
|
|
} else {
|
|
return `${name}${index || ''}`;
|
|
}
|
|
}
|
|
|
|
// Gets the type of a variable.
|
|
type(name) {
|
|
var i, len, ref, v;
|
|
ref = this.variables;
|
|
for (i = 0, len = ref.length; i < len; i++) {
|
|
v = ref[i];
|
|
if (v.name === name) {
|
|
return v.type;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// If we need to store an intermediate result, find an available name for a
|
|
// compiler-generated variable. `_var`, `_var2`, and so on...
|
|
freeVariable(name, options = {}) {
|
|
var index, ref, temp;
|
|
index = 0;
|
|
while (true) {
|
|
temp = this.temporary(name, index, options.single);
|
|
if (!(this.check(temp) || indexOf.call(this.root.referencedVars, temp) >= 0)) {
|
|
break;
|
|
}
|
|
index++;
|
|
}
|
|
if ((ref = options.reserve) != null ? ref : true) {
|
|
this.add(temp, 'var', true);
|
|
}
|
|
return temp;
|
|
}
|
|
|
|
// Ensure that an assignment is made at the top of this scope
|
|
// (or at the top-level scope, if requested).
|
|
assign(name, value) {
|
|
this.add(name, {
|
|
value,
|
|
assigned: true
|
|
}, true);
|
|
return this.hasAssignments = true;
|
|
}
|
|
|
|
// Does this scope have any declared variables?
|
|
hasDeclarations() {
|
|
return !!this.declaredVariables().length;
|
|
}
|
|
|
|
// Return the list of variables first declared in this scope.
|
|
declaredVariables() {
|
|
var v;
|
|
return ((function() {
|
|
var i, len, ref, results;
|
|
ref = this.variables;
|
|
results = [];
|
|
for (i = 0, len = ref.length; i < len; i++) {
|
|
v = ref[i];
|
|
if (v.type === 'var') {
|
|
results.push(v.name);
|
|
}
|
|
}
|
|
return results;
|
|
}).call(this)).sort();
|
|
}
|
|
|
|
// Return the list of assignments that are supposed to be made at the top
|
|
// of this scope.
|
|
assignedVariables() {
|
|
var i, len, ref, results, v;
|
|
ref = this.variables;
|
|
results = [];
|
|
for (i = 0, len = ref.length; i < len; i++) {
|
|
v = ref[i];
|
|
if (v.type.assigned) {
|
|
results.push(`${v.name} = ${v.type.value}`);
|
|
}
|
|
}
|
|
return results;
|
|
}
|
|
|
|
};
|
|
|
|
}).call(this);
|