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

Updated collections

This commit is contained in:
Sam Harwell 2013-02-18 19:59:15 -06:00
parent 5326ad4f26
commit 6aa4042c00
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Antlr4.Runtime/Atn/ATN.cs
View File

@ -65,7 +65,7 @@ namespace Antlr4.Runtime.Atn
[NotNull] [NotNull]
public readonly IDictionary<string, TokensStartState> modeNameToStartState = new public readonly IDictionary<string, TokensStartState> modeNameToStartState = new
LinkedHashMap<string, TokensStartState>(); Dictionary<string, TokensStartState>();
public int grammarType; public int grammarType;

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

@ -29,6 +29,7 @@
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using Antlr4.Runtime.Atn; using Antlr4.Runtime.Atn;
using Antlr4.Runtime.Misc; using Antlr4.Runtime.Misc;
using Sharpen; using Sharpen;
@ -94,7 +95,7 @@ namespace Antlr4.Runtime.Atn
{ {
public const int InitialNumTransitions = 4; public const int InitialNumTransitions = 4;
public static readonly IList<string> serializationNames = Sharpen.Collections.UnmodifiableList public static readonly IReadOnlyList<string> serializationNames = new ReadOnlyCollection<string>
(Arrays.AsList("INVALID", "BASIC", "RULE_START", "BLOCK_START", "PLUS_BLOCK_START" (Arrays.AsList("INVALID", "BASIC", "RULE_START", "BLOCK_START", "PLUS_BLOCK_START"
, "STAR_BLOCK_START", "TOKEN_START", "RULE_STOP", "BLOCK_END", "STAR_LOOP_BACK" , "STAR_BLOCK_START", "TOKEN_START", "RULE_STOP", "BLOCK_END", "STAR_LOOP_BACK"
, "STAR_LOOP_ENTRY", "PLUS_LOOP_BACK", "LOOP_END")); , "STAR_LOOP_ENTRY", "PLUS_LOOP_BACK", "LOOP_END"));
@ -112,10 +113,10 @@ namespace Antlr4.Runtime.Atn
/// <summary>Track the transitions emanating from this ATN state.</summary> /// <summary>Track the transitions emanating from this ATN state.</summary>
/// <remarks>Track the transitions emanating from this ATN state.</remarks> /// <remarks>Track the transitions emanating from this ATN state.</remarks>
protected internal readonly IList<Antlr4.Runtime.Atn.Transition> transitions = new protected internal readonly List<Antlr4.Runtime.Atn.Transition> transitions = new
List<Antlr4.Runtime.Atn.Transition>(InitialNumTransitions); List<Antlr4.Runtime.Atn.Transition>(InitialNumTransitions);
protected internal IList<Antlr4.Runtime.Atn.Transition> optimizedTransitions; protected internal List<Antlr4.Runtime.Atn.Transition> optimizedTransitions;
/// <summary>Used to cache lookahead during parsing, not used during construction</summary> /// <summary>Used to cache lookahead during parsing, not used during construction</summary>
public IntervalSet nextTokenWithinRule; public IntervalSet nextTokenWithinRule;
@ -179,10 +180,9 @@ namespace Antlr4.Runtime.Atn
return stateNumber.ToString(); return stateNumber.ToString();
} }
public virtual Antlr4.Runtime.Atn.Transition[] GetTransitions() public virtual Transition[] GetTransitions()
{ {
return Sharpen.Collections.ToArray(transitions, new Antlr4.Runtime.Atn.Transition return transitions.ToArray();
[transitions.Count]);
} }
public virtual int NumberOfTransitions public virtual int NumberOfTransitions
@ -203,12 +203,12 @@ namespace Antlr4.Runtime.Atn
{ {
if (epsilonOnlyTransitions != e.IsEpsilon) if (epsilonOnlyTransitions != e.IsEpsilon)
{ {
System.Console.Error.Format("ATN state %d has both epsilon and non-epsilon transitions.\n" System.Console.Error.WriteLine("ATN state {0} has both epsilon and non-epsilon transitions."
, stateNumber); , stateNumber);
epsilonOnlyTransitions = false; epsilonOnlyTransitions = false;
} }
} }
transitions.AddItem(e); transitions.Add(e);
} }
public virtual Antlr4.Runtime.Atn.Transition Transition(int i) public virtual Antlr4.Runtime.Atn.Transition Transition(int i)
@ -221,9 +221,9 @@ namespace Antlr4.Runtime.Atn
transitions.Set(i, e); transitions.Set(i, e);
} }
public virtual Antlr4.Runtime.Atn.Transition RemoveTransition(int index) public virtual void RemoveTransition(int index)
{ {
return transitions.RemoveAt(index); transitions.RemoveAt(index);
} }
public abstract Antlr4.Runtime.Atn.StateType StateType public abstract Antlr4.Runtime.Atn.StateType StateType
@ -271,7 +271,7 @@ namespace Antlr4.Runtime.Atn
{ {
optimizedTransitions = new List<Antlr4.Runtime.Atn.Transition>(); optimizedTransitions = new List<Antlr4.Runtime.Atn.Transition>();
} }
optimizedTransitions.AddItem(e); optimizedTransitions.Add(e);
} }
public virtual void SetOptimizedTransition(int i, Antlr4.Runtime.Atn.Transition e public virtual void SetOptimizedTransition(int i, Antlr4.Runtime.Atn.Transition e