forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Fix use of encoding argument in AntlrFileStream

This commit is contained in:
Sam Harwell 2013-02-23 23:11:06 -06:00
parent 7d7f5a1afc
commit 2ea504a493
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/CSharp/Antlr4.Runtime/ANTLRFileStream.cs
View File

@ -53,22 +53,26 @@ namespace Antlr4.Runtime
}
/// <exception cref="System.IO.IOException"></exception>
public AntlrFileStream(string fileName, string encoding)
public AntlrFileStream(string fileName, Encoding encoding)
{
this.fileName = fileName;
Load(fileName, encoding);
}
/// <exception cref="System.IO.IOException"></exception>
public virtual void Load(string fileName, string encoding)
public virtual void Load(string fileName, Encoding encoding)
{
if (fileName == null)
{
return;
}
Encoding fileEncoding = Encoding.GetEncoding(encoding);
string text = File.ReadAllText(fileName, fileEncoding);
string text;
if (encoding != null)
text = File.ReadAllText(fileName, encoding);
else
text = File.ReadAllText(fileName);
data = text.ToCharArray();
n = data.Length;
}