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

Fix generation of calls to List.remove(int) which should become RemoveAt

This commit is contained in:
Sam Harwell 2013-02-17 15:31:14 -06:00
parent fb5c7655ea
commit a960ca940e
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Antlr4.Runtime/Atn/ATNConfigSet.cs
View File

@ -360,7 +360,7 @@ namespace Antlr4.Runtime.Atn
if (addKey) if (addKey)
{ {
mergedConfigs.Put(key, unmergedConfig); mergedConfigs.Put(key, unmergedConfig);
unmerged.Remove(i); unmerged.RemoveAt(i);
} }
return true; return true;
} }
@ -635,7 +635,7 @@ namespace Antlr4.Runtime.Atn
{ {
if (unmerged[i] == config) if (unmerged[i] == config)
{ {
unmerged.Remove(i); unmerged.RemoveAt(i);
return; return;
} }
} }

4
Antlr4.Runtime/Atn/ATNState.cs
View File

@ -223,7 +223,7 @@ namespace Antlr4.Runtime.Atn
public virtual Antlr4.Runtime.Atn.Transition RemoveTransition(int index) public virtual Antlr4.Runtime.Atn.Transition RemoveTransition(int index)
{ {
return transitions.Remove(index); return transitions.RemoveAt(index);
} }
public abstract Antlr4.Runtime.Atn.StateType StateType public abstract Antlr4.Runtime.Atn.StateType StateType
@ -290,7 +290,7 @@ namespace Antlr4.Runtime.Atn
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
optimizedTransitions.Remove(i); optimizedTransitions.RemoveAt(i);
} }
public ATNState() public ATNState()

4
Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs
View File

@ -168,13 +168,13 @@ namespace Antlr4.Runtime.Dfa
} }
if (index == values.Count - 1) if (index == values.Count - 1)
{ {
values.Remove(index); values.RemoveAt(index);
return this; return this;
} }
Antlr4.Runtime.Dfa.SparseEdgeMap<T> result = new Antlr4.Runtime.Dfa.SparseEdgeMap Antlr4.Runtime.Dfa.SparseEdgeMap<T> result = new Antlr4.Runtime.Dfa.SparseEdgeMap
<T>(this, GetMaxSparseSize()); <T>(this, GetMaxSparseSize());
System.Array.Copy(result.keys, index + 1, result.keys, index, Size() - index - 1); System.Array.Copy(result.keys, index + 1, result.keys, index, Size() - index - 1);
result.values.Remove(index); result.values.RemoveAt(index);
return result; return result;
} }

2
Antlr4.Runtime/Misc/IntervalSet.cs
View File

@ -780,7 +780,7 @@ namespace Antlr4.Runtime.Misc
// if whole interval x..x, rm // if whole interval x..x, rm
if (el == a && el == b) if (el == a && el == b)
{ {
intervals.Remove(i); intervals.RemoveAt(i);
break; break;
} }
// if on left edge x..b, adjust left // if on left edge x..b, adjust left

2
Antlr4.Runtime/Misc/OrderedHashSet`1.cs
View File

@ -75,7 +75,7 @@ namespace Antlr4.Runtime.Misc
public virtual bool Remove(int i) public virtual bool Remove(int i)
{ {
T o = elements.Remove(i); T o = elements.RemoveAt(i);
return base.Remove(o); return base.Remove(o);
} }

2
Antlr4.Runtime/ParserRuleContext.cs
View File

@ -202,7 +202,7 @@ namespace Antlr4.Runtime
{ {
if (children != null) if (children != null)
{ {
children.Remove(children.Count - 1); children.RemoveAt(children.Count - 1);
} }
} }

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

@ -14,7 +14,8 @@
-typeMapping java.util.Comparator System.Collections.IComparer -typeMapping java.util.Comparator System.Collections.IComparer
-typeMapping java.util.ArrayList System.Collections.ArrayList -typeMapping java.util.ArrayList System.Collections.ArrayList
-methodMapping java.util.List.addAll AddRange -methodMapping java.util.List.addAll AddRange
-methodMapping java.util.List.remove(int) RemoveAt
-methodMapping java.util.AbstractList.addAll AddRange -methodMapping java.util.AbstractList.addAll AddRange
-methodMapping java.util.ArrayList.addAll AddRange -methodMapping java.util.ArrayList.addAll AddRange
@ -43,9 +44,6 @@
-namespaceMapping javax.net.ssl Sharpen -namespaceMapping javax.net.ssl Sharpen
-methodMapping java.lang.Object.memberwiseClone Clone -methodMapping java.lang.Object.memberwiseClone Clone
-methodMapping java.nio.charset.Charset.forName Sharpen.Extensions.GetEncoding -methodMapping java.nio.charset.Charset.forName Sharpen.Extensions.GetEncoding
-methodMapping java.util.List<>.remove RemoveAt
-methodMapping java.util.IList<>.remove RemoveAt
-methodMapping java.util.ArrayList.remove RemoveAt
-methodMapping java.util.ArrayList.trimToSize TrimExcess -methodMapping java.util.ArrayList.trimToSize TrimExcess
-methodMapping java.lang.Integer.toOctalString Sharpen.Extensions.ToOctalString -methodMapping java.lang.Integer.toOctalString Sharpen.Extensions.ToOctalString
-methodMapping java.lang.Integer.toHexString Sharpen.Extensions.ToHexString -methodMapping java.lang.Integer.toHexString Sharpen.Extensions.ToHexString