From 4e7cd5495464a37c3fdc88f766fc1faffe7c63d4 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Sat, 16 Feb 2013 10:38:55 -0600 Subject: [PATCH 1/2] Map IntegerList to List --- Antlr4.Runtime/Atn/ParserATNSimulator.cs | 6 +++--- Antlr4.Runtime/Misc/IntervalSet.cs | 4 ++-- reference/sharpen-all-options.txt | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Antlr4.Runtime/Atn/ParserATNSimulator.cs b/Antlr4.Runtime/Atn/ParserATNSimulator.cs index 605dec509..e2bd0164f 100644 --- a/Antlr4.Runtime/Atn/ParserATNSimulator.cs +++ b/Antlr4.Runtime/Atn/ParserATNSimulator.cs @@ -856,7 +856,7 @@ namespace Antlr4.Runtime.Atn ); } IList closureConfigs = new List(s0.configs); - IntegerList contextElements = null; + List contextElements = null; ATNConfigSet reach = new ATNConfigSet(); bool stepIntoGlobal; do @@ -926,7 +926,7 @@ namespace Antlr4.Runtime.Atn int nextContextElement = GetReturnState(remainingGlobalContext); if (contextElements == null) { - contextElements = new IntegerList(); + contextElements = new List(); } if (remainingGlobalContext.IsEmpty()) { @@ -1928,7 +1928,7 @@ namespace Antlr4.Runtime.Atn [NotNull] protected internal virtual DFAState AddDFAEdge(DFA dfa, DFAState fromState, int t - , IntegerList contextTransitions, ATNConfigSet toConfigs, PredictionContextCache + , List contextTransitions, ATNConfigSet toConfigs, PredictionContextCache contextCache) { System.Diagnostics.Debug.Assert(dfa.IsContextSensitive() || contextTransitions == diff --git a/Antlr4.Runtime/Misc/IntervalSet.cs b/Antlr4.Runtime/Misc/IntervalSet.cs index b4283099c..a44e22ade 100644 --- a/Antlr4.Runtime/Misc/IntervalSet.cs +++ b/Antlr4.Runtime/Misc/IntervalSet.cs @@ -706,9 +706,9 @@ namespace Antlr4.Runtime.Misc return n; } - public virtual IntegerList ToIntegerList() + public virtual List ToIntegerList() { - IntegerList values = new IntegerList(Size()); + List values = new List(Size()); int n = intervals.Count; for (int i = 0; i < n; i++) { diff --git a/reference/sharpen-all-options.txt b/reference/sharpen-all-options.txt index 7ba3ff889..83c009daf 100644 --- a/reference/sharpen-all-options.txt +++ b/reference/sharpen-all-options.txt @@ -186,6 +186,7 @@ -typeMapping org.antlr.v4.runtime.misc.Tuple System.Tuple -typeMapping org.antlr.v4.runtime.misc.Tuple2<,> System.Tuple -typeMapping org.antlr.v4.runtime.misc.Tuple3<,,> System.Tuple +-typeMapping org.antlr.v4.runtime.misc.IntegerList System.Collections.Generic.List -typeMapping org.antlr.v4.runtime.ANTLRErrorListener<> IAntlrErrorListener -typeMapping org.antlr.v4.runtime.ANTLRErrorStrategy IAntlrErrorStrategy From 45ab2eb70ab9f455c120da783114c002dee5df65 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Sat, 16 Feb 2013 10:40:35 -0600 Subject: [PATCH 2/2] Ignore GUI-related methods --- Antlr4.Runtime/RuleContext.cs | 17 ----------------- Antlr4.Runtime/Tree/Trees.cs | 32 -------------------------------- reference/antlr4 | 2 +- 3 files changed, 1 insertion(+), 50 deletions(-) diff --git a/Antlr4.Runtime/RuleContext.cs b/Antlr4.Runtime/RuleContext.cs index bde51c6db..55eb86cdb 100644 --- a/Antlr4.Runtime/RuleContext.cs +++ b/Antlr4.Runtime/RuleContext.cs @@ -32,8 +32,6 @@ using System.Text; using Antlr4.Runtime; using Antlr4.Runtime.Misc; using Antlr4.Runtime.Tree; -using Antlr4.Runtime.Tree.Gui; -using Javax.Swing; using Sharpen; namespace Antlr4.Runtime @@ -195,21 +193,6 @@ namespace Antlr4.Runtime return visitor.VisitChildren(this); } - /// Call this method to view a parse tree in a dialog box visually. - /// Call this method to view a parse tree in a dialog box visually. - public virtual IFuture Inspect(Parser parser) - { - IList ruleNames = parser != null ? Arrays.AsList(parser.GetRuleNames()) : - null; - return Inspect(ruleNames); - } - - public virtual IFuture Inspect(IList ruleNames) - { - TreeViewer viewer = new TreeViewer(ruleNames, this); - return viewer.Open(); - } - /// Save this tree in a postscript file /// /// diff --git a/Antlr4.Runtime/Tree/Trees.cs b/Antlr4.Runtime/Tree/Trees.cs index a29160cf2..1f8cd8067 100644 --- a/Antlr4.Runtime/Tree/Trees.cs +++ b/Antlr4.Runtime/Tree/Trees.cs @@ -28,12 +28,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System.Collections.Generic; -using System.IO; using System.Text; using Antlr4.Runtime; using Antlr4.Runtime.Misc; using Antlr4.Runtime.Tree; -using Antlr4.Runtime.Tree.Gui; using Sharpen; namespace Antlr4.Runtime.Tree @@ -42,36 +40,6 @@ namespace Antlr4.Runtime.Tree /// A set of utility routines useful for all kinds of ANTLR trees. public class Trees { - public static string GetPS(ITree t, IList ruleNames, string fontName, int - fontSize) - { - TreePostScriptGenerator psgen = new TreePostScriptGenerator(ruleNames, t, fontName - , fontSize); - return psgen.GetPS(); - } - - public static string GetPS(ITree t, IList ruleNames) - { - return GetPS(t, ruleNames, "Helvetica", 11); - } - - /// - public static void WritePS(ITree t, IList ruleNames, string fileName, string - fontName, int fontSize) - { - string ps = GetPS(t, ruleNames, fontName, fontSize); - FileWriter f = new FileWriter(fileName); - BufferedWriter bw = new BufferedWriter(f); - bw.Write(ps); - bw.Close(); - } - - /// - public static void WritePS(ITree t, IList ruleNames, string fileName) - { - WritePS(t, ruleNames, fileName, "Helvetica", 11); - } - /// Print out a whole tree in LISP form. /// /// Print out a whole tree in LISP form. diff --git a/reference/antlr4 b/reference/antlr4 index 878b34fec..15c7bc6a2 160000 --- a/reference/antlr4 +++ b/reference/antlr4 @@ -1 +1 @@ -Subproject commit 878b34fecc519d3eb131fa5f83db6a6a70face61 +Subproject commit 15c7bc6a2623747ddfb9e19d923d1119e9af538f