microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-01 03:36:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove error about missing module flag from checker

Browse Source
This commit is contained in:
Jason Freeman 2014-07-18 14:06:08 -07:00
parent 91d31c7f51
commit 837a8935c7
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/checker.ts
View File

@ -54,7 +54,6 @@ module ts {
var stringLiteralTypes: Map<StringLiteralType> = {};
var emitExtends = false;
var modulesVerified = false;
var mergedSymbols: Symbol[] = [];
var symbolLinks: SymbolLinks[] = [];
@ -4509,7 +4508,6 @@ module ts {
function checkConstructorDeclaration(node: ConstructorDeclaration) {
// TODO
checkDeclarationModifiers(node);
checkSignatureDeclaration(node);
checkSourceElement(node.body);
@ -4682,12 +4680,6 @@ module ts {
return false;
}
function checkDeclarationModifiers(node: Node) {
if (node.flags & NodeFlags.Export && node.parent.kind === SyntaxKind.SourceFile) {
checkModulesEnabled(node);
}
}
function checkSpecializedSignatureDeclaration(signatureDeclarationNode: SignatureDeclaration): void {
var signature = getSignatureFromDeclaration(signatureDeclarationNode);
if (!signature.hasStringLiterals) {
@ -4850,7 +4842,6 @@ module ts {
}
function checkFunctionDeclaration(node: FunctionDeclaration) {
checkDeclarationModifiers(node);
checkSignatureDeclaration(node);
var symbol = getSymbolOfNode(node);
@ -5082,7 +5073,6 @@ module ts {
}
function checkVariableStatement(node: VariableStatement) {
checkDeclarationModifiers(node);
forEach(node.declarations, checkVariableDeclaration);
}
@ -5337,7 +5327,6 @@ module ts {
}
function checkClassDeclaration(node: ClassDeclaration) {
checkDeclarationModifiers(node);
checkTypeNameIsReserved(node.name, Diagnostics.Class_name_cannot_be_0);
checkTypeParameters(node.typeParameters);
checkCollisionWithCapturedThisVariable(node, node.name);
@ -5493,7 +5482,6 @@ module ts {
}
function checkInterfaceDeclaration(node: InterfaceDeclaration) {
checkDeclarationModifiers(node);
checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0);
checkTypeParameters(node.typeParameters);
var symbol = getSymbolOfNode(node);
@ -5539,7 +5527,6 @@ module ts {
}
function checkEnumDeclaration(node: EnumDeclaration) {
checkDeclarationModifiers(node);
checkTypeNameIsReserved(node.name, Diagnostics.Enum_name_cannot_be_0);
checkCollisionWithCapturedThisVariable(node, node.name);
var enumSymbol = getSymbolOfNode(node);
@ -5612,7 +5599,6 @@ module ts {
}
function checkModuleDeclaration(node: ModuleDeclaration) {
checkDeclarationModifiers(node);
checkCollisionWithCapturedThisVariable(node, node.name);
var symbol = getSymbolOfNode(node);
if (symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length > 1 && !isInAmbientContext(node)) {
@ -5638,7 +5624,6 @@ module ts {
}
function checkImportDeclaration(node: ImportDeclaration) {
checkDeclarationModifiers(node);
checkCollisionWithCapturedThisVariable(node, node.name);
var symbol = getSymbolOfNode(node);
var target: Symbol;
@ -5660,7 +5645,6 @@ module ts {
// Import declaration for an external module
if (node.parent.kind === SyntaxKind.SourceFile) {
// Parent is a source file, check that external modules are enabled
checkModulesEnabled(node);
target = resolveImport(symbol);
}
else if (node.parent.kind === SyntaxKind.ModuleBlock && (<ModuleDeclaration>node.parent.parent).name.kind === SyntaxKind.StringLiteral) {
@ -5691,20 +5675,10 @@ module ts {
}
}
}
function checkModulesEnabled(node: Node) {
if (!modulesVerified) {
if (!program.getCompilerOptions().module) {
error(node, Diagnostics.Cannot_compile_external_modules_unless_the_module_flag_is_provided);
}
modulesVerified = true;
}
}
function checkExportAssignment(node: ExportAssignment) {
var container = node.parent;
if (container.kind === SyntaxKind.SourceFile) {
checkModulesEnabled(node);
}
else {
// In a module, the immediate parent will be a block, so climb up one more parent

3
src/compiler/commandLineParser.ts
View File

@ -45,7 +45,8 @@ module ts {
export function parseCommandLine(commandLine: string[]): ParsedCommandLine {
// Set default compiler option values
var options: CompilerOptions = {
target: ScriptTarget.ES3
target: ScriptTarget.ES3,
module: ModuleKind.None
};
var filenames: string[] = [];
var errors: Diagnostic[] = [];

3
src/harness/harness.ts
View File

@ -618,6 +618,7 @@ module Harness {
options = options || { noResolve: false };
options.target = options.target || ts.ScriptTarget.ES3;
options.module = options.module || ts.ModuleKind.None;
if (settingsCallback) {
settingsCallback(null);
@ -717,7 +718,7 @@ module Harness {
var filemap: { [name: string]: ts.SourceFile; } = {};
var register = (file: { unitName: string; content: string; }) => {
var filename = Path.switchToForwardSlashes(file.unitName);
filemap[filename] = ts.createSourceFile(filename, file.content, options.target || ts.ScriptTarget.ES3);
filemap[filename] = ts.createSourceFile(filename, file.content, options.target);
};
inputFiles.forEach(register);
otherFiles.forEach(register);