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 2014-10-21 15:08:04 -07:00
parent aac8b3fae5
commit b371b02ea0
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/sys.ts
View file

@ -27,10 +27,6 @@ declare var module: any;
declare var process: any;
declare var global: any;
enum SystemError {
UnsupportedFileEncoding
}
var sys: System = (function () {
function getWScriptSystem(): System {
@ -72,9 +68,7 @@ var sys: System = (function () {
return fileStream.ReadText();
}
catch (e) {
if (e.number === -2147024809) {
e.systemError = SystemError.UnsupportedFileEncoding;
}
throw e;
}
finally {
fileStream.Close();

18
src/compiler/tsc.ts
View file

@ -71,15 +71,6 @@ module ts {
return true;
}
function getSystemErrorMessage(e: SystemError): string {
switch (e) {
case SystemError.UnsupportedFileEncoding:
return getDiagnosticText(Diagnostics.Unsupported_file_encoding);
default:
Debug.assert("Unreachable code in 'getSystemErrorMessage'");
}
}
function countLines(program: Program): number {
var count = 0;
@ -151,14 +142,19 @@ module ts {
// otherwise use toLowerCase as a canonical form.
return sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
}
// returned by CScript sys environment
var unsupportedFileEncodingErrorCode = -2147024809;
function getSourceFile(filename: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile {
try {
var text = sys.readFile(filename, options.charset);
}
catch (e) {
if (onError) {
onError(e.systemError ? getSystemErrorMessage(e.systemError) : e.message);
onError(e.number === unsupportedFileEncodingErrorCode ?
getDiagnosticText(Diagnostics.Unsupported_file_encoding) :
e.message);
}
text = "";
}