maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Addressed CR feedback.

Browse source
This commit is contained in:
Daniel Rosenwasser 2015-02-18 12:01:24 -08:00
parent 5fc2ec701b
commit 826ed0545b
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/compiler/emitter.ts
View file

@ -2520,7 +2520,7 @@ module ts {
}
for (var i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
writeSeparator();
writeComma();
var property = properties[i];
@ -2593,7 +2593,7 @@ module ts {
emitEnd(property);
}
writeSeparator();
writeComma();
emit(tempVar);
if (multiLine) {
@ -2603,7 +2603,7 @@ module ts {
write(")");
function writeSeparator() {
function writeComma() {
if (multiLine) {
write(",");
writeLine();
@ -2614,31 +2614,32 @@ module ts {
}
}
function emitObjectLiteral(node: ObjectLiteralExpression) {
if (languageVersion >= ScriptTarget.ES6) {
emitObjectLiteralBody(node, node.properties.length);
return;
}
function emitObjectLiteral(node: ObjectLiteralExpression): void {
var properties = node.properties;
// Find the first computed property.
// Everything until that point can be emitted as part of the initial object literal.
var numInitialNonComputedProperties = properties.length;
forEach(properties, (property, i) => {
if (hasDynamicName(properties[i])) {
numInitialNonComputedProperties = i;
return true;
}
});
if (languageVersion < ScriptTarget.ES6) {
var hasComputedProperty = numInitialNonComputedProperties !== properties.length;
if (hasComputedProperty) {
emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
}
else {
emitObjectLiteralBody(node, properties.length);
// Find the first computed property.
// Everything until that point can be emitted as part of the initial object literal.
var numProperties = properties.length;
var numInitialNonComputedProperties = numProperties;
for (var i = 0, n = properties.length; i < n; i++) {
if (properties[i].name.kind === SyntaxKind.ComputedPropertyName) {
numInitialNonComputedProperties = i;
break;
}
}
var hasComputedProperty = numInitialNonComputedProperties !== properties.length;
if (hasComputedProperty) {
emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
return;
}
}
// Ordinary case: either the object has no computed properties
// or we're compiling with an ES6+ target.
emitObjectLiteralBody(node, properties.length);
}
function emitComputedPropertyName(node: ComputedPropertyName) {