Use a const enum for the syntax kind.
Conflicts: Jakefile src/services/syntax/SyntaxGenerator.js.map tests/Fidelity/Program.ts tests/Fidelity/program.js tests/Fidelity/program.js.map
This commit is contained in:
Cyrus Najmabadi
parent
8f6730cc88
commit
ab057b9e58
|
|
@ -627,26 +627,26 @@ var TypeScript;
|
|||
SyntaxKind[SyntaxKind["PropertyAssignment"] = 215] = "PropertyAssignment";
|
||||
SyntaxKind[SyntaxKind["ExternalModuleReference"] = 216] = "ExternalModuleReference";
|
||||
SyntaxKind[SyntaxKind["ModuleNameModuleReference"] = 217] = "ModuleNameModuleReference";
|
||||
SyntaxKind[SyntaxKind["FirstStandardKeyword"] = SyntaxKind.BreakKeyword] = "FirstStandardKeyword";
|
||||
SyntaxKind[SyntaxKind["LastStandardKeyword"] = SyntaxKind.WithKeyword] = "LastStandardKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstFutureReservedKeyword"] = SyntaxKind.ClassKeyword] = "FirstFutureReservedKeyword";
|
||||
SyntaxKind[SyntaxKind["LastFutureReservedKeyword"] = SyntaxKind.SuperKeyword] = "LastFutureReservedKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstFutureReservedStrictKeyword"] = SyntaxKind.ImplementsKeyword] = "FirstFutureReservedStrictKeyword";
|
||||
SyntaxKind[SyntaxKind["LastFutureReservedStrictKeyword"] = SyntaxKind.YieldKeyword] = "LastFutureReservedStrictKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstTypeScriptKeyword"] = SyntaxKind.AnyKeyword] = "FirstTypeScriptKeyword";
|
||||
SyntaxKind[SyntaxKind["LastTypeScriptKeyword"] = SyntaxKind.StringKeyword] = "LastTypeScriptKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstKeyword"] = SyntaxKind.FirstStandardKeyword] = "FirstKeyword";
|
||||
SyntaxKind[SyntaxKind["LastKeyword"] = SyntaxKind.LastTypeScriptKeyword] = "LastKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstToken"] = SyntaxKind.ErrorToken] = "FirstToken";
|
||||
SyntaxKind[SyntaxKind["LastToken"] = SyntaxKind.SlashEqualsToken] = "LastToken";
|
||||
SyntaxKind[SyntaxKind["FirstPunctuation"] = SyntaxKind.OpenBraceToken] = "FirstPunctuation";
|
||||
SyntaxKind[SyntaxKind["LastPunctuation"] = SyntaxKind.SlashEqualsToken] = "LastPunctuation";
|
||||
SyntaxKind[SyntaxKind["FirstFixedWidth"] = SyntaxKind.FirstKeyword] = "FirstFixedWidth";
|
||||
SyntaxKind[SyntaxKind["LastFixedWidth"] = SyntaxKind.LastPunctuation] = "LastFixedWidth";
|
||||
SyntaxKind[SyntaxKind["FirstTrivia"] = SyntaxKind.WhitespaceTrivia] = "FirstTrivia";
|
||||
SyntaxKind[SyntaxKind["LastTrivia"] = SyntaxKind.SkippedTokenTrivia] = "LastTrivia";
|
||||
SyntaxKind[SyntaxKind["FirstNode"] = SyntaxKind.SourceUnit] = "FirstNode";
|
||||
SyntaxKind[SyntaxKind["LastNode"] = SyntaxKind.ModuleNameModuleReference] = "LastNode";
|
||||
SyntaxKind[SyntaxKind["FirstStandardKeyword"] = 17] = "FirstStandardKeyword";
|
||||
SyntaxKind[SyntaxKind["LastStandardKeyword"] = 45] = "LastStandardKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstFutureReservedKeyword"] = 46] = "FirstFutureReservedKeyword";
|
||||
SyntaxKind[SyntaxKind["LastFutureReservedKeyword"] = 52] = "LastFutureReservedKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstFutureReservedStrictKeyword"] = 53] = "FirstFutureReservedStrictKeyword";
|
||||
SyntaxKind[SyntaxKind["LastFutureReservedStrictKeyword"] = 61] = "LastFutureReservedStrictKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstTypeScriptKeyword"] = 62] = "FirstTypeScriptKeyword";
|
||||
SyntaxKind[SyntaxKind["LastTypeScriptKeyword"] = 73] = "LastTypeScriptKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstKeyword"] = 17] = "FirstKeyword";
|
||||
SyntaxKind[SyntaxKind["LastKeyword"] = 73] = "LastKeyword";
|
||||
SyntaxKind[SyntaxKind["FirstToken"] = 7] = "FirstToken";
|
||||
SyntaxKind[SyntaxKind["LastToken"] = 123] = "LastToken";
|
||||
SyntaxKind[SyntaxKind["FirstPunctuation"] = 74] = "FirstPunctuation";
|
||||
SyntaxKind[SyntaxKind["LastPunctuation"] = 123] = "LastPunctuation";
|
||||
SyntaxKind[SyntaxKind["FirstFixedWidth"] = 17] = "FirstFixedWidth";
|
||||
SyntaxKind[SyntaxKind["LastFixedWidth"] = 123] = "LastFixedWidth";
|
||||
SyntaxKind[SyntaxKind["FirstTrivia"] = 2] = "FirstTrivia";
|
||||
SyntaxKind[SyntaxKind["LastTrivia"] = 6] = "LastTrivia";
|
||||
SyntaxKind[SyntaxKind["FirstNode"] = 124] = "FirstNode";
|
||||
SyntaxKind[SyntaxKind["LastNode"] = 217] = "LastNode";
|
||||
})(TypeScript.SyntaxKind || (TypeScript.SyntaxKind = {}));
|
||||
var SyntaxKind = TypeScript.SyntaxKind;
|
||||
})(TypeScript || (TypeScript = {}));
|
||||
|
|
@ -783,11 +783,11 @@ var TypeScript;
|
|||
}
|
||||
SyntaxFacts.getText = getText;
|
||||
function isAnyKeyword(kind) {
|
||||
return kind >= TypeScript.SyntaxKind.FirstKeyword && kind <= TypeScript.SyntaxKind.LastKeyword;
|
||||
return kind >= 17 /* FirstKeyword */ && kind <= 73 /* LastKeyword */;
|
||||
}
|
||||
SyntaxFacts.isAnyKeyword = isAnyKeyword;
|
||||
function isAnyPunctuation(kind) {
|
||||
return kind >= TypeScript.SyntaxKind.FirstPunctuation && kind <= TypeScript.SyntaxKind.LastPunctuation;
|
||||
return kind >= 74 /* FirstPunctuation */ && kind <= 123 /* LastPunctuation */;
|
||||
}
|
||||
SyntaxFacts.isAnyPunctuation = isAnyPunctuation;
|
||||
function isPrefixUnaryExpressionOperatorToken(tokenKind) {
|
||||
|
|
@ -1904,9 +1904,13 @@ var definitions = [
|
|||
]
|
||||
}
|
||||
];
|
||||
function getSyntaxKindEnum() {
|
||||
var name = "SyntaxKind";
|
||||
return TypeScript[name];
|
||||
}
|
||||
function firstKind(definition) {
|
||||
var kindName = getNameWithoutSuffix(definition);
|
||||
return TypeScript.SyntaxKind[kindName];
|
||||
return getSyntaxKindEnum()[kindName];
|
||||
}
|
||||
definitions.sort(function (d1, d2) { return firstKind(d1) - firstKind(d2); });
|
||||
function getStringWithoutSuffix(definition) {
|
||||
|
|
@ -2115,7 +2119,7 @@ function generateKeywordCondition(keywords, currentCharacter, indent) {
|
|||
if (keywords.length === 1) {
|
||||
var keyword = keywords[0];
|
||||
if (currentCharacter === length) {
|
||||
return " return SyntaxKind." + firstEnumName(TypeScript.SyntaxKind, keyword.kind) + ";\r\n";
|
||||
return " return SyntaxKind." + firstEnumName(getSyntaxKindEnum(), keyword.kind) + ";\r\n";
|
||||
}
|
||||
var keywordText = keywords[0].text;
|
||||
result = " return (";
|
||||
|
|
@ -2126,7 +2130,7 @@ function generateKeywordCondition(keywords, currentCharacter, indent) {
|
|||
index = i === 0 ? "start" : ("start + " + i);
|
||||
result += "str.charCodeAt(" + index + ") === CharacterCodes." + keywordText.substr(i, 1);
|
||||
}
|
||||
result += ") ? SyntaxKind." + firstEnumName(TypeScript.SyntaxKind, keyword.kind) + " : SyntaxKind.IdentifierName;\r\n";
|
||||
result += ") ? SyntaxKind." + firstEnumName(getSyntaxKindEnum(), keyword.kind) + " : SyntaxKind.IdentifierName;\r\n";
|
||||
}
|
||||
else {
|
||||
result += " // " + TypeScript.ArrayUtilities.select(keywords, function (k) { return k.text; }).join(", ") + "\r\n";
|
||||
|
|
@ -2171,11 +2175,11 @@ function generateUtilities() {
|
|||
function generateScannerUtilities() {
|
||||
var result = "///<reference path='references.ts' />\r\n" + "\r\n" + "module TypeScript {\r\n" + " export module ScannerUtilities {\r\n";
|
||||
result += " export var fixedWidthArray = [";
|
||||
for (var i = 0; i <= TypeScript.SyntaxKind.LastFixedWidth; i++) {
|
||||
for (var i = 0; i <= 123 /* LastFixedWidth */; i++) {
|
||||
if (i) {
|
||||
result += ", ";
|
||||
}
|
||||
if (i < TypeScript.SyntaxKind.FirstFixedWidth) {
|
||||
if (i < 17 /* FirstFixedWidth */) {
|
||||
result += "0";
|
||||
}
|
||||
else {
|
||||
|
|
@ -2185,7 +2189,7 @@ function generateScannerUtilities() {
|
|||
result += "];\r\n";
|
||||
var i;
|
||||
var keywords = [];
|
||||
for (i = TypeScript.SyntaxKind.FirstKeyword; i <= TypeScript.SyntaxKind.LastKeyword; i++) {
|
||||
for (i = 17 /* FirstKeyword */; i <= 73 /* LastKeyword */; i++) {
|
||||
keywords.push({ kind: i, text: TypeScript.SyntaxFacts.getText(i) });
|
||||
}
|
||||
keywords.sort(function (a, b) { return a.text.localeCompare(b.text); });
|
||||
|
|
@ -2208,8 +2212,8 @@ function generateScannerUtilities() {
|
|||
return result;
|
||||
}
|
||||
function syntaxKindName(kind) {
|
||||
for (var name in TypeScript.SyntaxKind) {
|
||||
if (TypeScript.SyntaxKind[name] === kind) {
|
||||
for (var name in getSyntaxKindEnum()) {
|
||||
if (getSyntaxKindEnum()[name] === kind) {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4,7 +4,7 @@
|
|||
///<reference path='syntaxFacts.ts' />
|
||||
///<reference path='syntaxKind.ts' />
|
||||
// ///<reference path='..\..\..\tests\fidelity\es5compat.ts' />
|
||||
|
||||
|
||||
var forPrettyPrinter = false;
|
||||
|
||||
interface ITypeDefinition {
|
||||
|
|
@ -1033,9 +1033,14 @@ var definitions:ITypeDefinition[] = [
|
|||
<any>{ name: 'semicolonToken', isToken: true, isOptional: true, excludeFromAST: true }]
|
||||
}];
|
||||
|
||||
function getSyntaxKindEnum() {
|
||||
var name = "SyntaxKind";
|
||||
return (<any>TypeScript)[name];
|
||||
}
|
||||
|
||||
function firstKind(definition: ITypeDefinition): TypeScript.SyntaxKind {
|
||||
var kindName = getNameWithoutSuffix(definition);
|
||||
return (<any>TypeScript.SyntaxKind)[kindName];
|
||||
return getSyntaxKindEnum()[kindName];
|
||||
}
|
||||
|
||||
definitions.sort((d1, d2) => firstKind(d1) - firstKind(d2));
|
||||
|
|
@ -1328,7 +1333,7 @@ function generateKeywordCondition(keywords: { text: string; kind: TypeScript.Syn
|
|||
var keyword = keywords[0];
|
||||
|
||||
if (currentCharacter === length) {
|
||||
return " return SyntaxKind." + firstEnumName(TypeScript.SyntaxKind, keyword.kind) + ";\r\n";
|
||||
return " return SyntaxKind." + firstEnumName(getSyntaxKindEnum(), keyword.kind) + ";\r\n";
|
||||
}
|
||||
|
||||
var keywordText = keywords[0].text;
|
||||
|
|
@ -1343,7 +1348,7 @@ function generateKeywordCondition(keywords: { text: string; kind: TypeScript.Syn
|
|||
result += "str.charCodeAt(" + index + ") === CharacterCodes." + keywordText.substr(i, 1);
|
||||
}
|
||||
|
||||
result += ") ? SyntaxKind." + firstEnumName(TypeScript.SyntaxKind, keyword.kind) + " : SyntaxKind.IdentifierName;\r\n";
|
||||
result += ") ? SyntaxKind." + firstEnumName(getSyntaxKindEnum(), keyword.kind) + " : SyntaxKind.IdentifierName;\r\n";
|
||||
}
|
||||
else {
|
||||
result += " // " + TypeScript.ArrayUtilities.select(keywords, k => k.text).join(", ") + "\r\n"
|
||||
|
|
@ -1466,8 +1471,8 @@ function generateScannerUtilities(): string {
|
|||
}
|
||||
|
||||
function syntaxKindName(kind: TypeScript.SyntaxKind): string {
|
||||
for (var name in TypeScript.SyntaxKind) {
|
||||
if (<any>TypeScript.SyntaxKind[name] === kind) {
|
||||
for (var name in getSyntaxKindEnum()) {
|
||||
if (getSyntaxKindEnum()[name] === kind) {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// If you change anything in this enum, make sure you run SyntaxGenerator again!
|
||||
|
||||
module TypeScript {
|
||||
export enum SyntaxKind {
|
||||
export const enum SyntaxKind {
|
||||
// Variable width tokens, trivia and lists.
|
||||
None,
|
||||
List,
|
||||
|
|
|
|||
936
tests/Fidelity/Program.ts
Normal file
936
tests/Fidelity/Program.ts
Normal file
|
|
@ -0,0 +1,936 @@
|
|||
/// <reference path='es5compat.ts' />
|
||||
/// <reference path='json2.ts' />
|
||||
/// <reference path='environment.ts' />
|
||||
|
||||
///<reference path='..\..\src\compiler\checker.ts' />
|
||||
///<reference path='..\..\src\services\syntax\references.ts' />
|
||||
///<reference path='..\..\src\services\syntax\syntaxNodes.concrete.generated.ts' />
|
||||
///<reference path='..\..\src\services\syntax\prettyPrinter.ts' />
|
||||
///<reference path='Test262.ts' />
|
||||
///<reference path='incremental\IncrementalParserTests.ts' />
|
||||
// ///<reference path='..\..\src\compiler\core\environment.ts' />
|
||||
///<reference path='..\..\src\compiler\checker.ts' />
|
||||
///<reference path='..\..\src\services\syntax\incrementalParser.ts' />
|
||||
///<reference path='..\..\src\services\syntax\testUtilities.ts' />
|
||||
|
||||
var specificFile: string =
|
||||
// "S7.9_A4.js";
|
||||
undefined;
|
||||
|
||||
var generate = false;
|
||||
|
||||
function isDTSFile(s: string) {
|
||||
return ts.fileExtensionIs(s, ".d.ts");
|
||||
}
|
||||
|
||||
class PositionValidatingWalker extends TypeScript.SyntaxWalker {
|
||||
private position = 0;
|
||||
|
||||
public visitToken(token: TypeScript.ISyntaxToken): void {
|
||||
TypeScript.Debug.assert(this.position === token.fullStart());
|
||||
this.position += token.fullWidth();
|
||||
}
|
||||
}
|
||||
|
||||
function tokenToJSON(token: TypeScript.ISyntaxToken, text: TypeScript.ISimpleText, mergeTrivia: boolean): any {
|
||||
if (!token) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
var isSkippedToken = token.parent && token.parent.kind === TypeScript.SyntaxKind.SkippedTokenTrivia;
|
||||
var isMissingToken = token.fullWidth() === 0 && token.kind !== TypeScript.SyntaxKind.EndOfFileToken;
|
||||
|
||||
var result: any = {};
|
||||
|
||||
for (var name in getSyntaxKindEnum()) {
|
||||
if (getSyntaxKindEnum()[name] === token.kind) {
|
||||
result.kind = name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
var fullStart = TypeScript.fullStart(token);
|
||||
var fullEnd = TypeScript.fullEnd(token);
|
||||
|
||||
result.fullStart = fullStart;
|
||||
|
||||
result.start = TypeScript.start(token, text);
|
||||
|
||||
result.fullWidth = fullEnd - fullStart;
|
||||
result.width = TypeScript.width(token, text);
|
||||
|
||||
result.text = token.text();
|
||||
|
||||
var value = TypeScript.tokenValue(token);
|
||||
if (value !== undefined) {
|
||||
result.value = value;
|
||||
result.valueText = TypeScript.tokenValueText(token);
|
||||
}
|
||||
|
||||
if (token.isKeywordConvertedToIdentifier()) {
|
||||
result.isKeywordConvertedToIdentifier = true;
|
||||
}
|
||||
|
||||
if (token.isIncrementallyUnusable()) {
|
||||
result.isIncrementallyUnusable = true;
|
||||
}
|
||||
|
||||
if (isSkippedToken || isMissingToken) {
|
||||
TypeScript.Debug.assert(!token.hasLeadingTrivia());
|
||||
}
|
||||
else {
|
||||
var leadingTriviaList = token.hasLeadingTrivia() ? token.leadingTrivia(text) : undefined;
|
||||
|
||||
if (leadingTriviaList) {
|
||||
var leadingTrivia = leadingTriviaList.toArray();
|
||||
result.hasLeadingTrivia = true;
|
||||
|
||||
if (TypeScript.ArrayUtilities.any(leadingTrivia, t => t.isComment())) {
|
||||
result.hasLeadingComment = true;
|
||||
}
|
||||
if (TypeScript.ArrayUtilities.any(leadingTrivia, t => t.isNewLine())) {
|
||||
result.hasLeadingNewLine = true;
|
||||
}
|
||||
if (TypeScript.ArrayUtilities.any(leadingTrivia, t => t.isSkippedToken())) {
|
||||
result.hasLeadingSkippedToken = true;
|
||||
}
|
||||
result.leadingTrivia = triviaListToJSON(leadingTrivia, text);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function triviaListToJSON(trivia: TypeScript.ISyntaxTrivia[], text: TypeScript.ISimpleText): any {
|
||||
var result: any[] = [];
|
||||
|
||||
for (var i = 0, n = trivia.length; i < n; i++) {
|
||||
result.push(triviaToJSON(trivia[i], text));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function triviaToJSON(trivia: TypeScript.ISyntaxTrivia, text: TypeScript.ISimpleText): any {
|
||||
var result: any = {};
|
||||
|
||||
for (var name in getSyntaxKindEnum()) {
|
||||
if (getSyntaxKindEnum()[name] === trivia.kind) {
|
||||
result.kind = name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (trivia.isSkippedToken()) {
|
||||
result.skippedToken = tokenToJSON(trivia.skippedToken(), text, /*megeTrivia:*/ false);
|
||||
}
|
||||
else {
|
||||
result.fullStart = trivia.fullStart();
|
||||
result.fullEnd = trivia.fullStart() + trivia.fullWidth();
|
||||
result.text = trivia.fullText();
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function getSyntaxKindEnum() {
|
||||
var name = "SyntaxKind";
|
||||
return (<any>TypeScript)[name];
|
||||
}
|
||||
|
||||
function nodeToJSON(node: TypeScript.ISyntaxNode, text: TypeScript.ISimpleText): any {
|
||||
var result: any = {}
|
||||
|
||||
for (var name in getSyntaxKindEnum()) {
|
||||
if (getSyntaxKindEnum()[name] === node.kind) {
|
||||
result.kind = name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
result.start = TypeScript.start(node);
|
||||
result.end = TypeScript.fullEnd(node);
|
||||
result.width = TypeScript.width(node);
|
||||
|
||||
if (TypeScript.isIncrementallyUnusable(node)) {
|
||||
result.isIncrementallyUnusable = true;
|
||||
}
|
||||
|
||||
if (TypeScript.parsedInStrictModeContext(node)) {
|
||||
result.parsedInStrictModeContext = true;
|
||||
}
|
||||
|
||||
if (TypeScript.parsedInDisallowInContext(node)) {
|
||||
result.parsedInDisallowInContext = true;
|
||||
}
|
||||
|
||||
if (TypeScript.parsedInYieldContext(node)) {
|
||||
result.parsedInYieldContext = true;
|
||||
}
|
||||
|
||||
if (TypeScript.parsedInGeneratorParameterContext(node)) {
|
||||
result.parsedInGeneratorParameterContext = true;
|
||||
}
|
||||
|
||||
if (TypeScript.parsedInAsyncContext(node)) {
|
||||
result.parsedInAsyncContext = true;
|
||||
}
|
||||
|
||||
var usedNames: any = {};
|
||||
var thisAsIndexable: ts.Map<any> = <any>node;
|
||||
for (var i = 0, n = TypeScript.childCount(node); i < n; i++) {
|
||||
var value = TypeScript.childAt(node, i);
|
||||
|
||||
if (value) {
|
||||
for (var name in node) {
|
||||
if (usedNames[name] === undefined && value === thisAsIndexable[name]) {
|
||||
result[name] = elementToJSON(value, text);
|
||||
usedNames[name] = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function elementToJSON(element: TypeScript.ISyntaxElement, text: TypeScript.ISimpleText): any {
|
||||
if (element !== undefined) {
|
||||
if (TypeScript.isToken(element)) {
|
||||
return tokenToJSON(<TypeScript.ISyntaxToken>element, text,/*megeTrivia:*/ true);
|
||||
}
|
||||
else if (TypeScript.isList(element)) {
|
||||
if (TypeScript.childCount(element) > 0) {
|
||||
var result: any[] = [];
|
||||
|
||||
for (var i = 0, n = TypeScript.childCount(element); i < n; i++) {
|
||||
result.push(elementToJSON(TypeScript.childAt(element, i), text));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
else {
|
||||
return nodeToJSON(<TypeScript.ISyntaxNode>element, text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function syntaxTreeToJSON(tree: TypeScript.SyntaxTree): any {
|
||||
var result: any = {};
|
||||
|
||||
result.isDeclaration = tree.isDeclaration();
|
||||
switch (tree.languageVersion()) {
|
||||
case ts.ScriptTarget.ES3:
|
||||
result.languageVersion = "EcmaScript3";
|
||||
break;
|
||||
case ts.ScriptTarget.ES5:
|
||||
result.languageVersion = "EcmaScript5";
|
||||
break;
|
||||
case ts.ScriptTarget.ES6:
|
||||
result.languageVersion = "EcmaScript6";
|
||||
break;
|
||||
default:
|
||||
throw new Error();
|
||||
}
|
||||
|
||||
if (tree.diagnostics().length > 0) {
|
||||
result.diagnostics = tree.diagnostics();
|
||||
}
|
||||
|
||||
result.sourceUnit = elementToJSON(tree.sourceUnit(), tree.text);
|
||||
result.lineMap = tree.lineMap();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function emptySourceUnit(): TypeScript.SourceUnitSyntax {
|
||||
return TypeScript.Parser.parse("", TypeScript.SimpleText.fromString(""), ts.ScriptTarget.ES5, false).sourceUnit();
|
||||
}
|
||||
|
||||
class Program {
|
||||
runAllTests(verify: boolean): void {
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
|
||||
//var libdts = TypeScript.Environment.readFile("built\\local\\lib.d.ts", undefined);
|
||||
|
||||
//TypeScript.Environment.standardOut.WriteLine("size: " + libdts.contents.length);
|
||||
//var libsource = ts.createSourceFile("lib.d.ts", libdts.contents);
|
||||
//ts.parseSourceFile(libsource);
|
||||
|
||||
//var reps = 10;
|
||||
//timer.start();
|
||||
//for (var i = 0; i < reps; i++) {
|
||||
// var libsource = ts.createSourceFile("lib.d.ts", libdts.contents);
|
||||
// ts.parseSourceFile(libsource);
|
||||
//}
|
||||
//timer.end();
|
||||
//TypeScript.Environment.standardOut.WriteLine("Anders Parse: " + (timer.time / reps));
|
||||
|
||||
//var txt = TypeScript.SimpleText.fromString(libdts.contents);
|
||||
//timer.start();
|
||||
//for (var i = 0; i < reps; i++) {
|
||||
// TypeScript.Parser.parse("lib.d.ts.", txt, true, new TypeScript.ParseOptions(ts.ScriptTarget.ES5, true));
|
||||
//}
|
||||
//timer.end();
|
||||
//TypeScript.Environment.standardOut.WriteLine("Cyrus Parse: " + (timer.time / reps));
|
||||
|
||||
if (generate) {
|
||||
TypeScript.Environment.standardOut.WriteLine("!!!!!!!!!! WARNING - GENERATING !!!!!!!!!");
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
}
|
||||
|
||||
if (specificFile === undefined) {
|
||||
TypeScript.Environment.standardOut.WriteLine("Testing Incremental 2.");
|
||||
TypeScript.IncrementalParserTests.runAllTests();
|
||||
}
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing Incremental 1:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\parser\\ecmascript5",
|
||||
fileName => this.runIncremental(fileName, ts.ScriptTarget.ES5));
|
||||
|
||||
if (specificFile === undefined) {
|
||||
this.testIncrementalSpeed(TypeScript.Environment.currentDirectory() + "\\src\\services\\syntax\\syntaxNodes.concrete.generated.ts");
|
||||
}
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing scanner ES3:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\scanner\\ecmascript3",
|
||||
fileName => this.runScanner(fileName, ts.ScriptTarget.ES3, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing scanner ES5:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\scanner\\ecmascript5",
|
||||
fileName => this.runScanner(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing findToken:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\findToken\\ecmascript5",
|
||||
fileName => this.runFindToken(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing trivia:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\trivia\\ecmascript5",
|
||||
fileName => this.runTrivia(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing parser ES6:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\parser\\ecmascript6",
|
||||
fileName => this.runParser(fileName, ts.ScriptTarget.ES6, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing parser ES5:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\parser\\ecmascript5",
|
||||
fileName => this.runParser(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing parser ES3:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\parser\\ecmascript3",
|
||||
fileName => this.runParser(fileName, ts.ScriptTarget.ES3, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing emitter 2:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\emitter2\\ecmascript5",
|
||||
fileName => this.runEmitter(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate, /*justText:*/ true));
|
||||
|
||||
//TypeScript.Environment.standardOut.WriteLine("Testing Monoco.");
|
||||
//this.runTests(TypeScript.Environment.currentDirectory() + "c:\\temp\\monoco",
|
||||
// fileName => this.runParser(fileName, ts.ScriptTarget.ES5, false, /*generateBaselines:*/ generate, /*allowErrors:*/ false));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing emitter 1:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\emitter\\ecmascript5",
|
||||
fileName => this.runEmitter(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate, /*justText:*/ false));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing pretty printer:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\prettyPrinter\\ecmascript5",
|
||||
fileName => this.runPrettyPrinter(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
|
||||
TypeScript.Environment.standardOut.Write("Testing against 262:");
|
||||
this.runTests(TypeScript.Environment.currentDirectory() + "\\tests\\Fidelity\\test262",
|
||||
fileName => this.runParser(fileName, ts.ScriptTarget.ES5, verify, /*generateBaselines:*/ generate));
|
||||
}
|
||||
|
||||
private static reusedElements(oldNode: TypeScript.SourceUnitSyntax, newNode: TypeScript.SourceUnitSyntax, key: any): { originalElements: number; reusedElements: number; } {
|
||||
var allOldElements = TypeScript.SyntaxElementsCollector.collectElements(oldNode);
|
||||
var allNewElements = TypeScript.SyntaxElementsCollector.collectElements(newNode);
|
||||
|
||||
for (var i = 0; i < allOldElements.length; i++) {
|
||||
var oldElement: ts.Map<any> = <any>allOldElements[i];
|
||||
oldElement[key] = key;
|
||||
}
|
||||
|
||||
var reused = 0;
|
||||
for (var j = 0; j < allNewElements.length; j++) {
|
||||
var newElement: ts.Map<any> = <any>allNewElements[j];
|
||||
if (newElement[key] === key) {
|
||||
reused++;
|
||||
}
|
||||
}
|
||||
|
||||
return { originalElements: allOldElements.length, reusedElements: reused };
|
||||
}
|
||||
|
||||
private testIncrementalSpeed(fileName: string): void {
|
||||
var repeat = 500;
|
||||
TypeScript.Environment.standardOut.WriteLine("Incremental Perf - Changed Text.");
|
||||
this.testIncrementalSpeedChange(fileName, repeat);
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
TypeScript.Environment.standardOut.WriteLine("Incremental Perf - No Changed Text.");
|
||||
this.testIncrementalSpeedNoChange(fileName, repeat);
|
||||
}
|
||||
|
||||
private testIncrementalSpeedNoChange(fileName: string, repeat: number): void {
|
||||
if (specificFile !== undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
var tree = TypeScript.Parser.parse(fileName, text, ts.ScriptTarget.ES5, isDTSFile(fileName));
|
||||
var originalTree = tree;
|
||||
|
||||
var totalIncrementalTime = 0;
|
||||
|
||||
for (var i = 0; i < repeat; i++) {
|
||||
var changeLength = i * 2;
|
||||
|
||||
var start = new Date().getTime();
|
||||
var tree2 = TypeScript.IncrementalParser.parse(tree, new TypeScript.TextChangeRange( new TypeScript.TextSpan(((text.length() / 2) >> 0) - i, changeLength), changeLength), text);
|
||||
totalIncrementalTime += (new Date().getTime() - start);
|
||||
|
||||
// we can't check parents here because we are explicitly destroying the original tree
|
||||
// to make the new tree. Thus, the parents in the first tree won't actually match.
|
||||
TypeScript.Debug.assert(TypeScript.treeStructuralEquals(tree, tree2, /*checkParents:*/ false));
|
||||
|
||||
tree = tree2;
|
||||
}
|
||||
|
||||
var rateBytesPerMillisecond = (contents.length * repeat) / totalIncrementalTime;
|
||||
var rateBytesPerSecond = rateBytesPerMillisecond * 1000;
|
||||
var rateMBPerSecond = rateBytesPerSecond / (1024 * 1024);
|
||||
|
||||
// TypeScript.Environment.standardOut.WriteLine("Incremental time: " + totalIncrementalTime);
|
||||
TypeScript.Environment.standardOut.WriteLine("Incremental rate: " + rateMBPerSecond + " MB/s");
|
||||
|
||||
var allOldElements = TypeScript.SyntaxElementsCollector.collectElements(originalTree.sourceUnit());
|
||||
var allNewElements = TypeScript.SyntaxElementsCollector.collectElements(tree.sourceUnit());
|
||||
|
||||
var reuse = TypeScript.ArrayUtilities.where(allNewElements,
|
||||
v => TypeScript.ArrayUtilities.contains(allOldElements, v)).length;
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("Reuse: " + reuse / allNewElements.length);
|
||||
}
|
||||
|
||||
private testIncrementalSpeedChange(fileName: string, repeat: number): void {
|
||||
if (specificFile !== undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
var tree = TypeScript.Parser.parse(fileName, text, ts.ScriptTarget.ES5, isDTSFile(fileName));
|
||||
var originalTree = tree;
|
||||
|
||||
var allElements = TypeScript.SyntaxElementsCollector.collectElements(tree.sourceUnit());
|
||||
var nonSharedElements = TypeScript.ArrayUtilities.where(allElements, e => !(TypeScript.isList(e) && (<any>e).length === 0));
|
||||
TypeScript.Environment.standardOut.WriteLine("All elements : " + allElements.length);
|
||||
TypeScript.Environment.standardOut.WriteLine("Non empty lists: " + nonSharedElements.length);
|
||||
|
||||
var totalIncrementalTime = 0;
|
||||
var totalIncrementalASTTime = 0;
|
||||
|
||||
for (var i = 0; i < repeat; i++) {
|
||||
var changeLength = i * 2;
|
||||
var changeSpan = new TypeScript.TextSpan(((text.length() / 2) >> 0) - i, changeLength);
|
||||
|
||||
contents = text.substr(0, text.length());
|
||||
var contentsToReplace = contents.substr(changeSpan.start(), changeSpan.length());
|
||||
|
||||
var first = true;
|
||||
var updatedText = contentsToReplace.replace(/[^a-zA-Z0-9][a-z]+[^a-zA-Z0-9]/, (sub) => {
|
||||
if (first && TypeScript.SyntaxFacts.getTokenKind(sub.substr(1, sub.length - 2)) === TypeScript.SyntaxKind.None) {
|
||||
first = false;
|
||||
return sub.substr(0, sub.length - 1) + "a" + sub.substr(sub.length - 1);
|
||||
}
|
||||
|
||||
return sub;
|
||||
});
|
||||
|
||||
text = TypeScript.SimpleText.fromString(
|
||||
contents.substr(0, changeSpan.start()) +
|
||||
updatedText +
|
||||
contents.substr(changeSpan.end()));
|
||||
var changeRange = new TypeScript.TextChangeRange(changeSpan, updatedText.length);
|
||||
|
||||
var start = new Date().getTime();
|
||||
var tree2 = TypeScript.IncrementalParser.parse(tree, changeRange, text);
|
||||
totalIncrementalTime += (new Date().getTime() - start);
|
||||
|
||||
tree = tree2;
|
||||
}
|
||||
|
||||
var rateBytesPerMillisecond = (contents.length * repeat) / totalIncrementalTime;
|
||||
var rateBytesPerSecond = rateBytesPerMillisecond * 1000;
|
||||
var rateMBPerSecond = rateBytesPerSecond / (1024 * 1024);
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("Incremental rate: " + rateMBPerSecond + " MB/s");
|
||||
|
||||
rateBytesPerMillisecond = (contents.length * repeat) / totalIncrementalASTTime;
|
||||
rateBytesPerSecond = rateBytesPerMillisecond * 1000;
|
||||
rateMBPerSecond = rateBytesPerSecond / (1024 * 1024);
|
||||
|
||||
var allOldElements = TypeScript.SyntaxElementsCollector.collectElements(originalTree.sourceUnit());
|
||||
var allNewElements = TypeScript.SyntaxElementsCollector.collectElements(tree.sourceUnit());
|
||||
|
||||
var reuse = TypeScript.ArrayUtilities.where(allNewElements,
|
||||
v => TypeScript.ArrayUtilities.contains(allOldElements, v)).length;
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("Reuse: " + reuse / allNewElements.length);
|
||||
}
|
||||
|
||||
private handleException(fileName: string, e: Error): void {
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
if ((<string>e.message).indexOf(fileName) < 0) {
|
||||
TypeScript.Environment.standardOut.WriteLine("Exception: " + fileName + ": " + e.message);
|
||||
}
|
||||
else {
|
||||
TypeScript.Environment.standardOut.WriteLine(e.message);
|
||||
}
|
||||
}
|
||||
|
||||
private runTests(
|
||||
path: string,
|
||||
action: (fileName: string) => void) {
|
||||
|
||||
var testFiles = TypeScript.Environment.listFiles(path, undefined, { recursive: true });
|
||||
var indexNum = 0;
|
||||
|
||||
testFiles.forEach(fileName => {
|
||||
if (specificFile !== undefined && fileName.indexOf(specificFile) < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (indexNum % 100 === 0) {
|
||||
TypeScript.Environment.standardOut.Write(".");
|
||||
}
|
||||
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
try {
|
||||
action(fileName);
|
||||
}
|
||||
catch (e) {
|
||||
this.handleException(fileName, e);
|
||||
}
|
||||
|
||||
indexNum++;
|
||||
});
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
}
|
||||
|
||||
private checkResult(fileName: string, result: any, convert: (a: any) => any, verify: boolean, generateBaseline: boolean, justText: boolean): void {
|
||||
var actualResult: string;
|
||||
|
||||
var expectedFile = fileName + ".expected";
|
||||
var actualFile = fileName + ".actual";
|
||||
|
||||
if (generateBaseline) {
|
||||
actualResult = justText ? result : JSON.stringify(convert(result), undefined, 4);
|
||||
expectedFile = fileName + ".expected";
|
||||
|
||||
// TypeScript.Environment.standardOut.WriteLine("Generating baseline for: " + fileName);
|
||||
TypeScript.Environment.writeFile(expectedFile, actualResult, /*writeByteOrderMark:*/ false);
|
||||
|
||||
if (TypeScript.Environment.fileExists(actualFile)) {
|
||||
TypeScript.Environment.deleteFile(actualFile);
|
||||
}
|
||||
}
|
||||
else if (verify) {
|
||||
actualResult = justText ? result : JSON.stringify(convert(result), undefined, 4);
|
||||
|
||||
var expectedResult: string = undefined;
|
||||
if (!TypeScript.Environment.fileExists(expectedFile)) {
|
||||
TypeScript.Environment.writeFile(expectedFile, "", false);
|
||||
}
|
||||
else {
|
||||
expectedResult = TypeScript.Environment.readFile(expectedFile, /*codepage*/ undefined).contents;
|
||||
}
|
||||
|
||||
if (expectedResult !== actualResult) {
|
||||
TypeScript.Environment.standardOut.WriteLine(" ! Fail: " + actualFile);
|
||||
TypeScript.Environment.writeFile(actualFile, actualResult, /*writeByteOrderMark:*/ false);
|
||||
}
|
||||
else {
|
||||
if (TypeScript.Environment.fileExists(actualFile)) {
|
||||
TypeScript.Environment.deleteFile(actualFile);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
runEmitter(fileName: string,
|
||||
languageVersion: ts.ScriptTarget,
|
||||
verify: boolean,
|
||||
generateBaseline: boolean,
|
||||
justText: boolean): void {
|
||||
if (true) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts") && !TypeScript.StringUtilities.endsWith(fileName, ".js")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (fileName.indexOf("RealSource") >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
totalSize += contents.length;
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
|
||||
var tree = TypeScript.Parser.parse(fileName, text, languageVersion, isDTSFile(fileName));
|
||||
//var emitted = TypeScript.Emitter1.emit(<TypeScript.SourceUnitSyntax>tree.sourceUnit());
|
||||
|
||||
//var result = justText
|
||||
// ? <any>emitted.fullText()
|
||||
// : { fullText: emitted.fullText().split("\r\n"), sourceUnit: emitted };
|
||||
//this.checkResult(fileName, result, verify, generateBaseline, justText);
|
||||
}
|
||||
|
||||
runPrettyPrinter(fileName: string,
|
||||
languageVersion: ts.ScriptTarget,
|
||||
verify: boolean,
|
||||
generateBaseline: boolean): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts") && !TypeScript.StringUtilities.endsWith(fileName, ".js")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (fileName.indexOf("RealSource") >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
totalSize += contents.length;
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
|
||||
var tree = TypeScript.Parser.parse(fileName, text, languageVersion, isDTSFile(fileName));
|
||||
var result = TypeScript.PrettyPrinter.prettyPrint(tree.sourceUnit());
|
||||
|
||||
this.checkResult(fileName, result, undefined, verify, generateBaseline, true);
|
||||
}
|
||||
|
||||
runParser(fileName: string,
|
||||
languageVersion: ts.ScriptTarget,
|
||||
verify: boolean,
|
||||
generateBaseline: boolean,
|
||||
allowErrors = true): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts") && !TypeScript.StringUtilities.endsWith(fileName, ".js")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (fileName.indexOf("RealSource") >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
totalSize += contents.length;
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
|
||||
var andersStart = new Date().getTime();
|
||||
var andersText = ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, "0");
|
||||
andersTime += (new Date().getTime() - andersStart);
|
||||
|
||||
var start = new Date().getTime();
|
||||
var tree = TypeScript.Parser.parse(fileName, text, languageVersion, isDTSFile(fileName));
|
||||
|
||||
var delta = new Date().getTime() - start;
|
||||
cyrusTime += delta;
|
||||
|
||||
if (!allowErrors) {
|
||||
var diagnostics = tree.diagnostics();
|
||||
if (diagnostics.length > 0) {
|
||||
TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
TypeScript.Environment.standardOut.WriteLine("\t" + diagnostics[0].message());
|
||||
}
|
||||
}
|
||||
|
||||
if (verify) {
|
||||
TypeScript.Debug.assert(TypeScript.fullWidth(tree.sourceUnit()) === contents.length);
|
||||
TypeScript.visitNodeOrToken(new PositionValidatingWalker(), tree.sourceUnit());
|
||||
|
||||
this.checkResult(fileName, tree, syntaxTreeToJSON, verify, generateBaseline, /*justText:*/ false);
|
||||
}
|
||||
totalTime += delta;
|
||||
}
|
||||
|
||||
runIncremental(fileName: string, languageVersion: ts.ScriptTarget): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts") && !TypeScript.StringUtilities.endsWith(fileName, ".js")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (fileName.indexOf("RealSource") >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
|
||||
var tree1 = TypeScript.Parser.parse(fileName, text, languageVersion, isDTSFile(fileName));
|
||||
var tree2 = TypeScript.IncrementalParser.parse(
|
||||
new TypeScript.SyntaxTree(emptySourceUnit(), isDTSFile(fileName), [], fileName, text, tree1.languageVersion()),
|
||||
new TypeScript.TextChangeRange(new TypeScript.TextSpan(0, 0), text.length()),
|
||||
text);
|
||||
|
||||
TypeScript.Debug.assert(TypeScript.treeStructuralEquals(tree1, tree2, /*checkParents:*/ true));
|
||||
}
|
||||
|
||||
runFindToken(fileName: string, languageVersion: ts.ScriptTarget, verify: boolean, generateBaseline: boolean): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts") && !TypeScript.StringUtilities.endsWith(fileName, ".js")) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (fileName.indexOf("RealSource") >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
// TypeScript.Environment.standardOut.WriteLine(fileName);
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
var tree = TypeScript.Parser.parse(fileName, text, languageVersion, isDTSFile(fileName));
|
||||
var sourceUnit = tree.sourceUnit();
|
||||
|
||||
TypeScript.Debug.assert(TypeScript.fullWidth(tree.sourceUnit()) === contents.length);
|
||||
|
||||
var tokens: ts.Map<any>= {};
|
||||
var tokensOnLeft: ts.Map<any> = {};
|
||||
var leftToRight: TypeScript.ISyntaxToken[] = [];
|
||||
var rightToLeft: TypeScript.ISyntaxToken[] = [];
|
||||
|
||||
for (var i = 0; i <= contents.length; i++) {
|
||||
var token = TypeScript.findToken(sourceUnit, i);
|
||||
|
||||
var left = TypeScript.Syntax.findTokenOnLeft(sourceUnit, i);
|
||||
var tokenOnLeft = left || null;
|
||||
|
||||
TypeScript.Debug.assert(TypeScript.isToken(token));
|
||||
if (i === contents.length) {
|
||||
TypeScript.Debug.assert(token.kind === TypeScript.SyntaxKind.EndOfFileToken);
|
||||
}
|
||||
else {
|
||||
TypeScript.Debug.assert(TypeScript.width(token) > 0 || token.kind === TypeScript.SyntaxKind.EndOfFileToken);
|
||||
TypeScript.Debug.assert(token.fullWidth() > 0);
|
||||
}
|
||||
|
||||
tokens[i] = tokenToJSON(token, text, /*megeTrivia:*/ false);
|
||||
tokensOnLeft[i] = tokenToJSON(tokenOnLeft, text, /*megeTrivia:*/ false) || null;
|
||||
}
|
||||
|
||||
var positionedToken = TypeScript.findToken(sourceUnit, 0);
|
||||
while (positionedToken) {
|
||||
leftToRight.push(tokenToJSON(positionedToken, text, /*megeTrivia:*/ false));
|
||||
positionedToken = TypeScript.nextToken(positionedToken);
|
||||
}
|
||||
|
||||
positionedToken = TypeScript.findToken(sourceUnit, contents.length);
|
||||
while (positionedToken) {
|
||||
rightToLeft.push(tokenToJSON(positionedToken, text, /*megeTrivia:*/ false));
|
||||
positionedToken = TypeScript.previousToken(positionedToken);
|
||||
}
|
||||
|
||||
var result = {
|
||||
tokens: tokens,
|
||||
tokensOnLeft: tokensOnLeft,
|
||||
leftToRight: leftToRight,
|
||||
rightToLeft: rightToLeft,
|
||||
};
|
||||
|
||||
this.checkResult(fileName, result, a => a, verify, generateBaseline, /*justText:*/ false);
|
||||
}
|
||||
|
||||
runTrivia(fileName: string, languageVersion: ts.ScriptTarget, verify: boolean, generateBaseline: boolean): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts")) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
var scanner = TypeScript.Scanner.createScanner(languageVersion, text, () => { });
|
||||
|
||||
var tokens: TypeScript.ISyntaxToken[] = [];
|
||||
var textArray: string[] = [];
|
||||
var diagnostics: TypeScript.Diagnostic[] = [];
|
||||
|
||||
while (true) {
|
||||
var token = scanner.scan(/*allowRegularExpression:*/ false);
|
||||
tokens.push(tokenToJSON(token, text, /*megeTrivia:*/ false));
|
||||
|
||||
if (token.kind === TypeScript.SyntaxKind.EndOfFileToken) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
this.checkResult(fileName, tokens, a => a, verify, generateBaseline, false);
|
||||
}
|
||||
|
||||
runScanner(fileName: string, languageVersion: ts.ScriptTarget, verify: boolean, generateBaseline: boolean): void {
|
||||
if (!TypeScript.StringUtilities.endsWith(fileName, ".ts")) {
|
||||
return;
|
||||
}
|
||||
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
|
||||
var diagnostics: TypeScript.Diagnostic[] = [];
|
||||
var reportDiagnostic = (position: number, fullWidth: number, diagnosticKey: string, args: any[]) => {
|
||||
diagnostics.push(new TypeScript.Diagnostic(fileName, text.lineMap(), position, fullWidth, diagnosticKey, args));
|
||||
};
|
||||
|
||||
var text = TypeScript.SimpleText.fromString(contents);
|
||||
var scanner = TypeScript.Scanner.createScanner(languageVersion, text, reportDiagnostic);
|
||||
|
||||
var tokens: TypeScript.ISyntaxToken[] = [];
|
||||
var jsonTokens: any[] = [];
|
||||
var textArray: string[] = [];
|
||||
var position = 0;
|
||||
|
||||
while (true) {
|
||||
var token = scanner.scan(/*allowRegularExpression:*/ false);
|
||||
jsonTokens.push(tokenToJSON(token, text, /*megeTrivia:*/ false));
|
||||
tokens.push(token);
|
||||
|
||||
TypeScript.Debug.assert(position === token.fullStart());
|
||||
position += token.fullWidth();
|
||||
|
||||
if (token.kind === TypeScript.SyntaxKind.EndOfFileToken) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (verify) {
|
||||
var tokenText = TypeScript.ArrayUtilities.select(tokens, t => t.fullText(text)).join("");
|
||||
|
||||
if (tokenText !== contents) {
|
||||
throw new Error("Token invariant broken!");
|
||||
}
|
||||
}
|
||||
|
||||
var result = diagnostics.length === 0 ? <any>jsonTokens : { diagnostics: diagnostics, tokens: jsonTokens };
|
||||
this.checkResult(fileName, result, a => a, verify, generateBaseline, false);
|
||||
}
|
||||
|
||||
parseArguments(): void {
|
||||
TypeScript.Environment.standardOut.WriteLine("Testing input files.");
|
||||
for (var index in TypeScript.Environment.arguments) {
|
||||
var fileName: string = TypeScript.Environment.arguments[index];
|
||||
if (specificFile !== undefined && fileName.indexOf(specificFile) < 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
this.runParser(fileName, ts.ScriptTarget.ES5, /*verify:*/ false, /*generate:*/ false, /*allowErrors:*/ false);
|
||||
}
|
||||
}
|
||||
|
||||
run262(): void {
|
||||
var path = "C:\\temp\\test262\\suite";
|
||||
var testFiles = TypeScript.Environment.listFiles(path, undefined, { recursive: true });
|
||||
|
||||
var testCount = 0;
|
||||
var failCount = 0;
|
||||
var skippedTests:string[] = [];
|
||||
|
||||
for (var index in testFiles) {
|
||||
var fileName: string = testFiles[index];
|
||||
|
||||
if (specificFile !== undefined && fileName.indexOf(specificFile) < 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// All 262 files are utf8. But they dont' have a BOM. Force them to be read in
|
||||
// as UTF8.
|
||||
var contents = TypeScript.Environment.readFile(fileName, /*codepage*/ undefined).contents;
|
||||
|
||||
var isNegative = contents.indexOf("@negative") >= 0
|
||||
|
||||
testCount++;
|
||||
|
||||
try {
|
||||
var stringText = TypeScript.SimpleText.fromString(contents);
|
||||
var tree = TypeScript.Parser.parse(fileName, stringText, ts.ScriptTarget.ES5, isDTSFile(fileName));
|
||||
|
||||
if (isNegative) {
|
||||
var nameOnly = fileName.substr(fileName.lastIndexOf("\\") + 1);
|
||||
var canParseSuccessfully = negative262ExpectedResults[nameOnly];
|
||||
|
||||
if (canParseSuccessfully) {
|
||||
// We expected to parse this successfully. Report an error if we didn't.
|
||||
if (tree.diagnostics() && tree.diagnostics().length > 0) {
|
||||
TypeScript.Environment.standardOut.WriteLine("Negative test. Unexpected failure: " + fileName);
|
||||
failCount++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// We expected to fail on this. Report an error if we don't.
|
||||
if (!tree.diagnostics() || tree.diagnostics().length === 0) {
|
||||
TypeScript.Environment.standardOut.WriteLine("Negative test. Unexpected success: " + fileName);
|
||||
failCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Not a negative test. We can't have any errors or skipped tokens.
|
||||
if (tree.diagnostics() && tree.diagnostics().length > 0) {
|
||||
TypeScript.Environment.standardOut.WriteLine("Unexpected failure: " + fileName);
|
||||
failCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
failCount++;
|
||||
this.handleException(fileName, e);
|
||||
}
|
||||
}
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("");
|
||||
TypeScript.Environment.standardOut.WriteLine("Test 262 results:");
|
||||
TypeScript.Environment.standardOut.WriteLine("Test Count: " + testCount);
|
||||
TypeScript.Environment.standardOut.WriteLine("Skip Count: " + skippedTests.length);
|
||||
TypeScript.Environment.standardOut.WriteLine("Fail Count: " + failCount);
|
||||
|
||||
for (var i = 0; i < skippedTests.length; i++) {
|
||||
TypeScript.Environment.standardOut.WriteLine(skippedTests[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var andersTime = 0;
|
||||
var cyrusTime = 0;
|
||||
|
||||
var totalTime = 0;
|
||||
var totalSize = 0;
|
||||
var program = new Program();
|
||||
|
||||
// New parser.
|
||||
totalTime = 0;
|
||||
totalSize = 0;
|
||||
program.runAllTests(true);
|
||||
|
||||
var count = 1;
|
||||
|
||||
//for (var i = 0; i < count; i++) {
|
||||
// program.parseArguments();
|
||||
//}
|
||||
|
||||
TypeScript.Environment.standardOut.WriteLine("Total time: " + (totalTime / count));
|
||||
TypeScript.Environment.standardOut.WriteLine("Total size: " + (totalSize / count));
|
||||
TypeScript.Environment.standardOut.WriteLine("Anders time: " + andersTime);
|
||||
TypeScript.Environment.standardOut.WriteLine("Cyrus time : " + cyrusTime);
|
||||
32340
tests/Fidelity/program.js
Normal file
32340
tests/Fidelity/program.js
Normal file
File diff suppressed because one or more lines are too long
1
tests/Fidelity/program.js.map
Normal file
1
tests/Fidelity/program.js.map
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue