Merge branch 'master' into sourceFileUpdate

Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/parser.ts
	tests/baselines/reference/FunctionDeclaration5_es6.errors.txt
	tests/baselines/reference/VariableDeclaration2_es6.errors.txt
	tests/baselines/reference/VariableDeclaration4_es6.errors.txt
	tests/baselines/reference/anonymousModules.errors.txt
	tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt
	tests/baselines/reference/conflictMarkerTrivia1.errors.txt
	tests/baselines/reference/dottedModuleName.errors.txt
	tests/baselines/reference/innerModExport1.errors.txt
	tests/baselines/reference/innerModExport2.errors.txt
	tests/baselines/reference/parserAccessors10.errors.txt
	tests/baselines/reference/parserComputedPropertyName5.errors.txt
	tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt
	tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt
	tests/baselines/reference/parserModifierOnStatementInBlock2.errors.txt
	tests/baselines/reference/parserSkippedTokens16.errors.txt
	tests/baselines/reference/privateIndexer2.errors.txt
This commit is contained in:
Cyrus Najmabadi
2014-12-16 21:50:10 -08:00
371 changed files with 3658 additions and 3234 deletions

View File

@@ -15,7 +15,7 @@ while (true);
var obj;
with (obj)
const c5 = 0;
const c5 = 0; // No Error will be reported here since we turn off all type checking
for (var i = 0; i < 10; i++)
const c6 = 0;

View File

@@ -0,0 +1,3 @@
function foo(obj: { name?: string; id: number }) { }
var name:any, id: any;
foo({ name?, id? });

View File

@@ -0,0 +1,2 @@
var greet = "hello";
var obj = { greet? };