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

Merge branch 'sharpen'

This commit is contained in:
Sam Harwell 2014-07-04 20:42:13 -05:00
parent 20fdbad8af bd8d057d02
commit 580ef4f950
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reference/sharpen-all-options.txt
View File

@ -18,11 +18,16 @@
-typeMapping java.util.Comparator System.Collections.IComparer
-typeMapping java.util.ArrayList System.Collections.ArrayList
-typeMapping java.util.ArrayDeque<> System.Collections.Generic.Stack
-typeMapping java.util.Deque<> System.Collections.Generic.Stack
-methodMapping java.util.List.addAll AddRange
-methodMapping java.util.List.remove(int) RemoveAt
-methodMapping java.util.AbstractList.addAll AddRange
-methodMapping java.util.ArrayList.addAll AddRange
-methodMapping java.util.concurrent.ConcurrentMap.putIfAbsent GetOrAdd
-fullyQualify File
-namespaceMapping java.lang.ref Antlr4.Runtime.Sharpen
-namespaceMapping java.lang Antlr4.Runtime.Sharpen
@ -127,7 +132,7 @@
-typeMapping java.util.zip.ZipException ICSharpCode.SharpZipLib.SharpZipBaseException
-typeMapping java.util.zip.DataFormatException ICSharpCode.SharpZipLib.SharpZipBaseException
-typeMapping java.io.FileNotFoundException System.IO.FileNotFoundException
-typeMapping java.io.Reader System.IO.StreamReader
-typeMapping java.io.Reader System.IO.TextReader
-typeMapping java.util.SortedSet<> System.Collections.Generic.ICollection
-typeMapping java.lang.AssertionError System.Exception
-typeMapping java.io.InterruptedIOException System.Threading.ThreadInterruptedException

6
runtime/CSharp/Antlr4.Runtime/Misc/TestRig.cs
View File

@ -220,7 +220,7 @@ namespace Antlr4.Runtime.Misc
if (inputFiles.IsEmpty())
{
Stream @is = Sharpen.Runtime.@in;
StreamReader r;
TextReader r;
if (encoding != null)
{
r = new StreamReader(@is, encoding);
@ -239,7 +239,7 @@ namespace Antlr4.Runtime.Misc
{
@is = new FileInputStream(inputFile);
}
StreamReader r;
TextReader r;
if (encoding != null)
{
r = new StreamReader(@is, encoding);
@ -260,7 +260,7 @@ namespace Antlr4.Runtime.Misc
/// <exception cref="System.MemberAccessException"/>
/// <exception cref="System.Reflection.TargetInvocationException"/>
/// <exception cref="Javax.Print.PrintException"/>
protected internal virtual void Process<_T0>(Lexer lexer, Type<_T0> parserClass, Parser parser, Stream @is, StreamReader r)
protected internal virtual void Process<_T0>(Lexer lexer, Type<_T0> parserClass, Parser parser, Stream @is, TextReader r)
where _T0 : Parser
{
try