mirror of
https://github.com/jashkenas/coffeescript.git
synced 2022-11-09 12:23:24 -05:00
Merge branch '2' into 2.0.0-alpha1
# Conflicts: # Cakefile # README.md # documentation/sections/changelog.md
This commit is contained in:
commit
221a8720fe
18 changed files with 942 additions and 657 deletions
|
@ -1045,6 +1045,22 @@
|
|||
}
|
||||
}
|
||||
|
||||
updateLocationDataIfMissing(locationData) {
|
||||
var base, ref3;
|
||||
if (this.locationData && this.needsUpdatedStartLocation) {
|
||||
this.locationData.first_line = locationData.first_line;
|
||||
this.locationData.first_column = locationData.first_column;
|
||||
base = ((ref3 = this.variable) != null ? ref3.base : void 0) || this.variable;
|
||||
if (base.needsUpdatedStartLocation) {
|
||||
this.variable.locationData.first_line = locationData.first_line;
|
||||
this.variable.locationData.first_column = locationData.first_column;
|
||||
base.updateLocationDataIfMissing(locationData);
|
||||
}
|
||||
delete this.needsUpdatedStartLocation;
|
||||
}
|
||||
return super.updateLocationDataIfMissing(locationData);
|
||||
}
|
||||
|
||||
newInstance() {
|
||||
var base, ref3;
|
||||
base = ((ref3 = this.variable) != null ? ref3.base : void 0) || this.variable;
|
||||
|
@ -1053,6 +1069,7 @@
|
|||
} else {
|
||||
this.isNew = true;
|
||||
}
|
||||
this.needsUpdatedStartLocation = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue