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

Merge branch 'master' of github.com:jashkenas/coffeescript into 2

Browse Source 
# Conflicts:
#	lib/coffee-script/nodes.js
#	lib/coffee-script/scope.js
This commit is contained in:
Geoffrey
2017-02-04 12:36:49 -08:00
parent 396bd4f2f2 87e537c917
commit da3db1be39
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/coffee-script/nodes.js
View File

@@ -2161,7 +2161,7 @@
compileNode(o) {
var code;
o.scope.add(this.identifier, this.moduleDeclarationType);
o.scope.find(this.identifier, this.moduleDeclarationType);
code = [];
code.push(this.makeCode(this.original.value));
if (this.alias != null) {

4
lib/coffee-script/scope.js
View File

@@ -45,11 +45,11 @@
return this.parent.namedMethod();
}
find(name) {
find(name, type = 'var') {
if (this.check(name)) {
return true;
}
this.add(name, 'var');
this.add(name, type);
return false;
}